[00:00:16] Wait [00:00:19] Are you rebasing? [00:00:23] You shouldn't be rebasing [00:00:25] nope [00:00:30] git rebase --abort ? [00:00:32] Oh wait [00:00:34] sorry [00:00:37] This is the cherry-pick of course [00:00:47] Run git status [00:00:56] It'll tell you which files are conflicted [00:01:01] Edit those files to fix the conflicts [00:01:04] Then git add filename.php [00:01:08] Then git commit when all files are done [00:01:56] sweet mother [00:02:05] ah [00:02:06] nevermind [00:02:07] one sec [00:09:17] so to get out of the cherry-pick operation, I need to commit it's saying [00:09:21] Yes [00:09:23] I can't commit --amend [00:09:24] Once you've fixed the conflicts [00:09:26] No [00:09:31] Okay. [00:09:35] I've comitted [00:09:38] OK [00:09:43] Now run git show to verify your commit looks sane [00:10:05] Check that the commit message is still OK and there's no weird stuff in the diff (like conflict markers or other conflict-related snafus) [00:10:48] yep [00:10:49] looks good [00:12:58] so now....push for review/ [00:12:59] ? [00:14:39] Ye [00:14:44] s [00:14:48] Normally this is easier [00:14:54] But you seem to have done .... weird stuff [00:15:12] lol [00:15:13] sorry [00:15:17] I'm learning still [00:15:26] No worries [00:15:27] been coding php for some time. I'm just new to git and mediawiki. [00:15:31] sorry for the trouble. [00:15:38] Everyone is confused by git at first [00:16:02] Every single human, when first confronted with git, is utterly bewildered by it. There is only one exception to this rule and his name is Linus Torvalds [00:16:26] That man...is not a man at all...but a god [00:17:07] dang it [00:17:11] missing change id in commit message [00:17:15] !! [00:17:16] A red exclamation mark (!) in the recent changes or on your watchlist means that edit is not patrolled yet. Read more about patrolling at https://www.mediawiki.org/wiki/Help:Patrolled_edits and configuration at https://www.mediawiki.org/wiki/Manual:$wgUseRCPatrol [00:17:28] Grr alright [00:17:31] naw [00:17:32] i got it [00:17:32] hang on [00:17:34] Wait [00:17:36] I've done this one before. [00:17:49] You need to make sure that the Change-Id is the same as the one that's already in Gerrit, because it's an amendment [00:17:54] Otherwise Gerrit won't process it correctly [00:18:01] and it'll create a brand new change instead [00:18:13] So it needs to be exactly this, at the bottom of the commit message: Change-Id: I83f6a614874c3d289ff4bd8d015f1d9c92e500b6 [00:18:35] weird [00:19:15] this is in the bottom [00:19:16] Change-Id: I83f6a614874c3d289ff4bd8d015f1d9c92e500b6 [00:19:22] very last line in my commit log [00:19:25] one sec [00:19:26] here's the error [00:19:27] Hah [00:19:41] Hint: A potential Change-Id was found, but it was not in the footer of the commit message. [00:19:45] Right [00:20:00] perhaps it's the commented out lines causing me grief [00:20:01] OK, so please remove all existing Change-Id lines, and put the one I gave you at the bottom [00:20:27] there aren't any others in there [00:20:30] OK [00:20:37] one sec [00:21:01] Either way, make sure there's exactly one Change-Id, that it's at the very bottom right before the commented-out short novel that git inserts, and that it's the ID that I gave you [00:21:18] http://pastebin.com/RJYKELEw [00:21:43] I think you'll need a blank line before the Change-Id as well [00:21:54] Not entirely sure but you might as well add it to be safe [00:21:54] lol [00:21:55] okay [00:21:58] (Sorry about that) [00:22:18] Naw. you're good. i'm the one who's lost here. [00:22:27] wait a minute.... [00:22:29] This is weird [00:22:45] in the output of push-for-review, it's showing me two Change-Ids [00:22:51] oh wait [00:22:52] I bet I know why [00:22:54] hang on [00:24:24] or not [00:25:04] dang it [00:25:10] now it's saying the Change-Id is missing [00:26:43] got it [00:28:01] finally [00:28:02] okay [00:28:04] we're good [00:28:10] commit ammended [00:28:36] Thanks for your help RoanKattouw. Gotta head out here. Wife wants to go see a movie. (yay!) [00:28:49] and same for you Krinkle. Thanks! [00:28:58] You're welcome [01:11:02] RoanKattouw: Hm.. ResourceLoader (class) doesn't have context (ResourceLoaderContext), ideas? [01:13:24] ResourceLoaderContext != RequestContext [01:13:34] I know [01:13:40] I mean stuff like skin,lang,debug [01:13:42] especially debug [01:13:44] Yeah [01:13:59] It uses context objects in places, I'm not sure if it has it as an object member [01:14:03] I don't think that's the intention either [01:14:15] But I have branches to merge for Thursday's deployment, sorry :) [01:14:20] ah, okay [01:15:06] I'm wondering if we can make it have 1 context as member, so that it can be accessed easily without having to pass it to each method that needs it (slightly touches bug 26818, which suggests using pretty-print instead of minified for mw.config.set in debug mode)_ [01:15:18] anyway, nevermind for now [04:30:28] Heyyyy...anyone present for a quick gerrit question? [04:33:24] nullspoon: Maybe, what is it? [04:33:54] hey marktraceur [04:34:08] I am new to submitting code to mediawiki [04:34:23] my first patch someone assigned me reviewers [04:34:30] I submitted another patch tonight [04:34:46] do I need to request people to review it, or will they just come take a look when they get around to it? [04:44:36] nullspoon: My understanding is that people will look at it when they can [04:45:13] However, there are cases where someone in particular should be added, because they're interested in that topic or are the ones who wanted the feature [04:45:26] (I'm not an authority on this, but it seems reasonable) [04:45:46] marktraceur: sorry for the delay. wasn't paying attention. [04:46:00] Thanks for the input. [04:46:06] I wasn't sure if I was missing a step or not. [04:46:14] as far as I know no one in particular is interested in my change. [04:46:26] mostly just a fix for a mime type association that was missing [04:50:14] it likely won't affect anyone noticably [04:50:21] OK the [04:50:22] n [04:50:41] And no problem, IRC is usually an asynchronous communication network :) [04:50:56] (which is why we have the following message) [04:50:57] !ask [04:50:57] Hi, how can we help you? Just ask your question. [04:54:34] holy smokes that's awesome [04:54:39] i'ma have to use that in the future. [04:54:54] i'm a newb at submitting code through git/gerrit to the mediawiki project. [04:55:04] looks like that'll come in handy [04:55:05] !help [04:55:05] http://www.mediawiki.org/wiki/Help:$1 [04:55:24] ! [04:55:25] ok, you just typed an exclamation mark with no meaning in the channel, good job. If you want to see a list of all keys, check !botbrain [04:55:31] !botbrain [04:55:31] Hello, I'm wm-bot. The database for this channel is published at http://bots.wmflabs.org/~petrb/db/%23mediawiki.htm More about WM-Bot: https://meta.wikimedia.org/wiki/wm-bot [04:55:44] wm-bot: will you be my friend [04:56:29] alrighty. well I'mout for the night. gotta get up a la 5:00 am [04:56:45] Thanks so much for your help marktraceur! [04:56:47] have a great night [08:28:43] New review: Hashar; "(no comment)" [integration/jenkins] (master); V: 1 C: 2; - https://gerrit.wikimedia.org/r/12108 [08:28:46] Change merged: Hashar; [integration/jenkins] (master) - https://gerrit.wikimedia.org/r/12108 [08:30:00] New review: Hashar; "Deployed on gallium." [integration/jenkins] (master) - https://gerrit.wikimedia.org/r/12108 [09:10:26] hey gabriel [09:18:54] Dereckson: apparement http://commons.wikimedia.org/wiki/File:Wikipedia-logo-chr.png est toujours editable [09:19:05] Dereckson: ( https://gerrit.wikimedia.org/r/#/c/11741/ ) [09:20:25] Oui. [09:20:30] Il est protégé contre l'upload. [09:20:35] ohh [09:20:54] http://commons.wikimedia.org/w/index.php?title=Special:Log&page=File%3AWikipedia-logo-chr.png [09:21:21] Dereckson: arf il faut que je revois mon process de vérification :-D [09:21:37] Dereckson: je voyais juste le lien [Modifier] en haut :( [09:21:43] Yes, as it could even be protected against edition but with upload still allowed. [09:22:59] je deplois [09:23:02] deploie [09:23:04] rgrr [09:23:06] I am deploying it [09:26:56] done [09:26:58] thanks Dereckson :) [13:47:05] JeroenDeDauw: https://en.wikipedia.org/wiki/Special:ManageCourses [13:47:12] PHP fatal error in /usr/local/apache/common-local/php-1.20wmf5/extensions/EducationProgram/includes/EPRoleObject.php line 253: [13:47:12] Call to undefined method EPCourses::getCoursesForUser() [13:51:54] [13:52:21] yup [13:52:25] hence the message beneath it [13:52:28] submitted a fix ;) [13:54:37] More a case of ... wut? en.WP haz courses? [13:54:51] Reedy: having a look [13:54:58] JeroenDeDauw: I've already fixed it [13:55:01] just needs merging etc [13:57:50] stupid typo :) [14:10:47] Reedy: still doing the deploy or is this all done now? [14:10:55] should be all done now [14:11:45] yay [14:11:47] Reedy: thnx :) [16:16:10] Reedy: can you have a look at this? https://gerrit.wikimedia.org/r/#/c/12189/1 [16:16:31] JeroenDeDauw, I just replied it [16:16:34] what's the problem? [16:16:40] PHP dies [16:16:42] and fails [16:16:44] but why? [16:16:45] that's the problem [16:16:47] a fatal error? [16:17:04] it passes both php -l and a require [16:17:10] Platonides: http://dpaste.org/gRkfD/ [16:17:24] it's obviously a ftal error no to define that function but... [16:17:38] The issue is that it is defined in the base interface [16:17:44] And that this one is re-declatring it [16:17:48] Which apparently you cannot do [16:17:55] -> fail [16:18:16] So if the interface change gets deployed on WP< it will break EP extension [16:18:29] Unless this gets merged in first [16:19:45] Platonides: seems legit to you? :p [16:20:44] if it's an error to redefine that, it shouldn't have allowed it to load.. [16:30:36] Platonides: yeah, the niceness of PHP... [17:15:01] Hi Nikerabbit [17:15:12] how has your day gone? [17:20:37] sumanah: not very productive [17:20:47] Nikerabbit: my sympathies [17:21:11] sumanah: I have talk in Akademy in about a week I need to finish... it's bugging in my mind [17:21:30] Nikerabbit: if you want someone to help listen to a practice talk or edit a draft, I can help with that [17:21:33] or Guillaume can [17:21:37] (maybe) [17:21:42] (certainly me, maybe him) [17:22:00] I'm not there yet [17:22:32] just some rough plans for the content [17:23:23] ok. [17:23:37] other than that I've been doing lots of code review for our team, Robin, Barry and other stuff in my backlog (there is still stuff in there) [17:24:18] sure [17:24:37] Nikerabbit: SPQRobin - anything blocking either of you re GSoC? any frustrations? [17:29:53] I have to head off to a meeting now, feel free to leave a memo [17:35:17] oki [18:02:35] how is it with aliasing mediaWiki to mw? [18:02:38] having jQuery( document ).ready( function ( $ ) { ... mw.foobar ... }); works but jslint shouts with /*global mediaWiki, jQuery */ that mw is used before defined [18:02:53] so what would be the correct approach? [18:03:12] put mw into /*global */ ? [18:18:29] Danny_B|backup: no [18:18:42] Danny_B|backup: Only use globals mediaWiki and jQuery [18:18:51] TrevorParscal: https://gerrit.wikimedia.org/r/#/c/12203/ [18:18:55] Danny_B|backup: Alias them locally, with a closure [18:19:02] Danny_B|backup: There are examples at [[mw:CC/JS]] [18:29:15] so properly this way? ( function ( mw, $ ) { $(function() { ... mw.foobar ... }); }( mediaWiki, jQuery ) ); [18:32:22] to anybody who might know: i need to take a look at the suppression log on my local installation. what do i need to do to make it show up in the list on Special:Log? [18:39:50] Give yourself some right, lemme look up which one [18:40:15] 'suppressionlog' [18:40:17] RoanKattouw: i've given myself everything listed, except "bot" [18:40:25] Those are the groups [18:40:26] hm, that group's not an option [18:40:43] You'll need to do something like $wgGroupPermissions['sysop']['suppressionlog'] = true; then [18:40:53] ok [18:40:56] you have to assign that right to one of the groups [18:41:27] awesome, thanks! [18:43:09] Does anyone know if there is a hook that allows inserting a script tag into the head? Now that the geoIP lookup issues have been resolved, I'd like to move it back to the head, but it looks like BeforePageDisplay doesn't put things in the head anymore (except on test2 for some reason). [18:44:07] kaldari: Make it an RL module and set 'position' => 'top' on it [18:44:37] hey thedj - got a moment? [18:46:31] RoanKattouw: it's not a local file, it's a call to bits.wikimedia.org/geoiplookup [18:47:00] Bah [18:47:29] test2 probably has ExperimentalAsyncLoading enabled [18:47:36] What are you using to add to the ? [18:48:38] Right now, nothing. It's using the SkinAfterBottomScripts hook [18:49:32] and the Controller is using BeforePageDisplay [18:50:30] what's ExperimentalAsyncLoading? Is that something that might get turned on everywhere before November? [18:52:22] Maybe [18:52:28] But no current plans [18:58:24] Guess I'm out of luck then unless I create a new hook, or maybe hack it in through OutputPageBeforeHTML [18:59:32] actually it looks like OutputPageBeforeHTML probably wouldn't help me either [19:15:33] https://bits.wikimedia.org/en.wikipedia.org/load.php?debug=false&lang=en&modules=jquery%2Cmediawiki&only=scripts&skin=vector&version=20120611T151323Z [19:15:44] Interesting, google seems to think we could save a further 385B [19:16:12] https://meta.wikimedia.org/w/index.php?title=MediaWiki:Wikiminiatlas.js&action=raw&ctype=text/javascript&smaxage=21600&maxage=86400 <- 1.7KB (gadget-ise! [19:21:53] Reedy: no can do, it is cross-wiki [19:21:57] Not yet at least :) [19:22:39] Reedy: that google byte shaving in startup is a flaky one, I've looked it up in the past [19:22:40] has to do with uglification [19:22:41] e.g true -> !0 [19:22:47] and there are a few spots outputted by php directly and contain spaces/new lines [19:22:57] Krinkle: could you pls check my question about an hour ago? thx [19:23:05] Danny_B|backup: irc? [19:23:34] Danny_B|backup: ah, the closure. Yes, its on [[mw:CC/JS]] [19:24:48] well, not necessarily this case which is combining of both, i think i'll add it [19:25:26] Danny_B|backup: No, its not combining them [19:25:36] Danny_B|backup: The closure is the outer wrapping [19:25:37] w [19:25:38] hat [19:25:51] what you do inside is whats inside [19:26:01] can be mw.foo = , can be $.foo(), whatever. [19:26:21] I know. wishful future thinking [19:29:59] Reedy: This is already implemented in Gadgets:RL2 though [19:30:23] that was my point ;) [19:30:34] hurry up! [19:47:51] Krinkle: howdy [19:48:07] Hi [19:48:13] i saw you suggested using mw.watch instead of watch for an event name [19:48:23] what happens in jQuery when you bind to mw.watch ? [19:48:28] it binds to mw... [19:48:30] fail! [19:48:31] lol [19:48:34] we were having a laugh [19:48:45] Explain [19:48:50] we are going to use mw-watch though, because the point of your comment is good [19:49:02] "it binds to mw" [19:49:07] meaning what? [19:49:10] query event bindings have namespaces, like click.myClickHandler [19:49:23] right [19:49:41] it binds to click, but then you can remove by the .myClickHanlder name [19:49:53] so, if you trigger an event using mw.watch [19:50:08] then binding to it would bind to the mw event, with the watch namespace [19:50:34] http://docs.jquery.com/Namespaced_Events [19:51:04] yeah [19:51:13] i know how it works [19:51:25] using namespaces makes sense though [19:51:36] not sure we should work around it by dashing in the main space [19:51:43] that's why triggering mw.watch triggers the mw event only for bindings that have specified the watch namespace [19:51:49] so watch.mw [19:52:01] there you go, that could work [19:52:06] but.. [19:52:14] as I recall also writing, what is the purpose of this? [19:52:55] so we can know when the page has been watched or unwatched [19:53:08] and update our "watch this page" checkbox accordingly [19:53:44] anyways, the hooks thing you were talking about is cool, but we need this now [19:53:52] sounds a little fragile though. If I understand correctly, you'd bind an event listener to an link from core, to update your own. [19:53:57] right [19:54:20] no, we bind to the li with the id #ca-watch or #ca-unwatch [19:54:37] i'm not saying it's bulletproof, I'm saying we need it now and it won't break anything on the live site [19:54:42] sure [19:54:51] should be fine :) [19:55:01] right, just explaining why we need it [19:55:07] how've you been man? [19:55:15] busy [19:55:22] fun busy [19:55:56] working on what? [19:56:19] code review, core js, RL2 and continuos integration [19:56:58] little behind on mailing lists, but I'll catch up later. too much noise lately [20:01:19] http://www.youtube.com/playlist?list=PL41D1E1A30A9432CA [20:01:49] TrevorParscal: those thumbnails look like trouble :P [20:02:09] it's totally safe for work [20:02:10] Dude Friday Night Dinner is an awesome show [20:02:11] Yeah [20:02:38] oh, I was expecting some classic 80s intro tune based on the thumbanil [20:02:49] No, it's actually a very recent BBC show [20:02:57] 2nd season comes out this fall [20:03:01] Sweet! [20:03:58] bookmarked! [20:19:51] @regsearch https:.*mediawiki [20:19:51] Results (Found 49): !, 1.17, 1.18, 1.20, actionpaths, amend, analytics, announce, annoyinglittlebug, api, berlin, browser, ci, core, debug, events, ext, gadget, git, git-access, git-review, gitaccount, giturl, hello, howto, iis404, javascript, labs, lists, man, manapi, meetings, mw, noshell, patch, punehackathon, repeat, resourceloader, start, svn-rev, ui, unreviewedcode, upload, wf, wg, mwbot, testswarm, blacklist, mediawiki.org, [20:19:58] .meh [20:20:09] @regsearch https:.*mediawiki.org.*\$ [20:20:09] Results (Found 9): !, actionpaths, ext, man, manapi, mw, svn-rev, wg, mediawiki.org, [20:20:29] !mw [20:20:29] https://www.mediawiki.org/wiki/$1 [20:20:32] aha [20:20:41] !mediawiki.org del [20:20:41] Successfully removed mediawiki.org [21:39:12] TrevorParscal: https://gerrit.wikimedia.org/r/12271 adds translateOffset [21:57:03] good morning, Krinkle