[00:01:11] DarTar, hey [00:01:25] are you guys starting? [00:02:21] I'm at home. I've got both... [00:02:34] ha [01:06:57] Woot, native .before(), .after(), .prepend(), .append(), .remove() in the spec http://dom.spec.whatwg.org/#mutation-methods [01:07:18] (replacing akward insertBefore, appendChild, removeChild which need annoying cross-reference to the parent, which is almost never useful) [06:11:46] New patchset: Krinkle; "Grunt: Add phplint task." [integration/grunt-contrib-wikimedia] (master) - https://gerrit.wikimedia.org/r/34488 [09:36:09] any gerrit people around? I'd like to delete one remote tag [10:44:35] New patchset: Hashar; "ant sourcedir now default to workspace" [integration/jenkins] (master) - https://gerrit.wikimedia.org/r/34502 [10:44:50] Change merged: Hashar; [integration/jenkins] (master) - https://gerrit.wikimedia.org/r/34502 [10:49:24] New patchset: Hashar; "disable three non working extensions" [integration/jenkins] (master) - https://gerrit.wikimedia.org/r/34504 [10:49:24] New patchset: Hashar; "remove archived/test jobs" [integration/jenkins] (master) - https://gerrit.wikimedia.org/r/34505 [10:49:57] Change merged: Hashar; [integration/jenkins] (master) - https://gerrit.wikimedia.org/r/34505 [10:49:58] Change merged: Hashar; [integration/jenkins] (master) - https://gerrit.wikimedia.org/r/34504 [10:50:07] !bz test [10:50:19] !a is b [10:50:19] Unable to modify db, access denied, link to database isn't valid [10:50:23] aha [10:52:41] !a is b [10:52:42] This key already exist - remove it, if you want to change it [11:19:30] New patchset: Hashar; "Zuul jobs as generated by Jenkins Job Builder" [integration/jenkins] (zuul) - https://gerrit.wikimedia.org/r/33580 [11:19:31] Change merged: Hashar; [integration/jenkins] (zuul) - https://gerrit.wikimedia.org/r/33580 [14:00:12] New patchset: Hashar; "mediawiki: fix path to junit log file" [integration/jenkins-job-builder-config] (master) - https://gerrit.wikimedia.org/r/34523 [14:00:24] Change merged: Hashar; [integration/jenkins-job-builder-config] (master) - https://gerrit.wikimedia.org/r/34523 [14:01:01] ahh [14:20:24] New patchset: Hashar; "rename sqlite install job to use full project name" [integration/zuul-config] (master) - https://gerrit.wikimedia.org/r/34528 [14:20:34] Change merged: Hashar; [integration/zuul-config] (master) - https://gerrit.wikimedia.org/r/34528 [14:29:44] hashar- Any word on the merging of multiversion into mediawiki-config? [14:29:53] hi [14:30:08] talked about it with ^demon and Reedy , seems they don't mind [14:30:15] I guess we could be bold and simply do it [14:31:17] The problem is getting it into gerrit, I guess we need someone with the ability to fake revision authors (I forget what it's called) to do it? [14:31:46] Otherwise when it tries to import the history for multiversion into mediawiki-config, it complains about wrong email addresses on all those history revisions. [14:33:06] how are you going to merge it ? [14:33:26] have you created a new branch in mediawiki-config that contains the history of multiversion then merge that in ? [14:37:15] hashar- ^demon sent a link last week. Let's see if I can find it again. [14:38:27] http://nuclearsquid.com/writings/subtree-merging-and-you/ I think it was, although the submodule needs removing too as part of the change. I set it all up locally last week, but couldn't get it into Gerrit. Then someone mentioned the "fake revision authors" thing. [14:39:08] BTW, the topic for this channel says "Channel logged http://is.gd/xPx2Po", but that gives a 403 error. [14:43:09] hmm [14:43:19] we should be able to fake revision authors [14:43:35] or maybe in this case that is the commit author [14:43:37] err [14:43:39] committer [14:47:56] anomie: ok I finished what I was doing [14:48:01] now you get my full attention: -] [14:53:00] anomie: one of the administrators ( https://gerrit.wikimedia.org/r/#/admin/groups/1,members ) needs to allow us to "Forge Commiter Identity" on operations/mediawiki-config [14:53:22] I am wondering if we can push a merge commit for review [14:55:27] ahh "Push Merge Commit" is allowed to anyone against refs/for/* [15:02:10] hashar- So how do you push a merge commit to gerrit? [15:02:31] just like any other commit [15:02:54] git checkout master; git merge your-feature; git push gerrit your-feature:refs/for/master [15:03:12] "git merge your-feature" creates a merge commit on top of your 'master' branch [15:03:36] git push command send to a remote named "gerrit" the branch named your-feature for review on the upstream master branch [15:03:51] since "your-feature" happen to be a merge commit… that send a merge commit to gerrit [15:08:30] So how would I make a merge commit that merged in the entire history of mediawiki-multiversion? [15:08:46] what I would try: [15:08:51] get a copy of mediawiki-config [15:09:08] create an orphan branch with something like git checkout -b multiversion-merge --orphan [15:09:42] get all of mwmultiversion history there, probably by adding mwmultiversion as a remote and merging that change in the orphaned multiversion-merge [15:09:44] branch [15:09:49] then merge that branch to master and ocmmit [15:09:51] will try out [15:11:07] BTW: http://dpaste.org/oo4RA/ is what I did following the instructions at that link from last week [15:14:15] yeahhh one other git command I never about: read-tree :-) [15:15:53] trying out on my comp [15:19:46] anomie: so that works fine [15:20:13] anomie: I am definitely +2ing that way of merging things in [15:20:38] anomie: but that will unfortunately require some Administrators to allow you to fake commiter identity :( [15:20:54] very good evening [15:21:13] anomie: ^demon can do it during our timezone, but he is not there this afternoon apparently (or too busy) [15:21:21] so have to wait for SF people to wake up [15:23:23] Nikerabbit: hello Niklas :-) [15:42:21] hashar: what the... MediaWikiLangTestCase is not in autoloader? [15:42:42] nm, used the wrong command [16:00:43] New review: Hashar; "Javascript looks fun :-] Anyway this shell out to php -l which is damn slow although it is only go..." [integration/grunt-contrib-wikimedia] (master); V: 0 C: -1; - https://gerrit.wikimedia.org/r/34488 [16:02:43] I am out now, getting my daughter :-] [16:02:46] see you tomorrow! [16:27:10] qgil: Can I PM you to chat about an OPW question? [16:43:25] New review: Krinkle; "@Hashar: I'm migrating the ant build.xml (which you wrote) and also shells out to php -l. Lets focus..." [integration/grunt-contrib-wikimedia] (master); V: 0 C: 0; - https://gerrit.wikimedia.org/r/34488 [16:43:26] qgil: Ping? [16:45:51] maybe you should just email him or talk to him in person, marktraceur [16:48:44] marktraceur, pong (hum, X-Chat notifications are too hidden) [16:51:17] er... sorry for the noise [16:54:00] sumanah: I'm not in office today, and I knew he was around (given the right amount of pinging, evidently) [16:54:56] qgil: So once again, can I PM you about an OPW question? [16:55:27] marktraceur, sure, and next time you can d it directly :) [17:21:26] Language Engineering team office hours in #wikimedia-office in 9 minutes. [17:33:05] ok, time for the language engineering team office hours! [17:34:36] qgil: you should come into #wikimedia-office and be part of the language team office hours [17:42:54] chrismcmahon: " Language team test day: We're planning on doing a monthly test day on language features. This needs to be documented well, so people can actually participate." [17:42:56] sumanah, I'm there now [17:42:59] right now in #wikimedia-office [17:43:05] sumanah, marktraceur https://www.mediawiki.org/wiki/Outreach_Program_for_Women#Candidates [17:43:09] comments? [17:43:26] "Your microtask must be linked to a bug report." nope [17:43:34] some are Commons files or other [17:45:23] sumanah, how do you know what the microtask is about when you land in a ommons file? [17:45:50] example: I asked someone to create a video, gave her some specifications, via email [17:46:16] sumanah, well, that is a non-documented microtask. Difficult to share and follow [17:46:48] qgil: ok, not PUBLICLY documented, but it's at http://commons.wikimedia.org/wiki/File:Join_a_Wikimedia_Hackathon_-_Draft.ogv [17:47:25] sumanah, ok, the point is that we need a link to something we can follow [17:47:54] sumanah, and I'm sure your request could be formulated as a public enhancement request in bugzilla :) [17:48:52] true [17:49:04] the point, then, is for the *mentors* to only be giving out these tasks publicly? [17:49:13] that's more overhead but if that's the way you want it ok [17:50:25] sumanah, it helps everybody, and we avoid risk of overlapping, or to have very different percepotions of what a microtask is [17:51:02] sumanah, have microtasks in the form of bugzilla reports also make it clear and easy to see progress and resolution [17:51:17] you're right [17:51:40] it's worth it [17:59:44] sumanah, ok, we can always fine as we go. The table looks like good progress already, so I'll notify mentors and everybody about it [17:59:49] cool [18:22:32] sumanah ... aaand there goes the first candidate! :) https://www.mediawiki.org/w/index.php?title=Outreach_Program_for_Women&diff=608141&oldid=608131 [18:22:45] \o/ [18:23:05] er.. which broke the table :) [18:23:37] fixed :) [18:34:04] ^demon- Got time to discuss that merging of mediawiki-config and mediawiki-multiversion? hashar and I were talking about it this morning, but he had to leave before you showed up. [18:34:51] <^demon> I've never attempted such a merge--my knowledge is limited to what I can google. [18:34:54] <^demon> But shoot. [18:36:36] http://dpaste.org/oo4RA/ looks to be the commands to do it. Just the last one fails when I try it because I don't have "Forge Commiter Identity". [18:46:13] dschoon: ping [18:46:37] preilly: ping [18:46:40] dschoon: Can you do your call in a conference room instead of at your desk? [18:47:23] that can totally happen [19:27:09] New patchset: Stefan.petrea; "Added conf for wikistats only for editors" [analytics/wikistats] (master) - https://gerrit.wikimedia.org/r/33858 [19:56:50] New review: Diederik; "All feedback from Erik has been incorporated." [analytics/wikistats] (master); V: 1 C: 2; - https://gerrit.wikimedia.org/r/33858 [21:08:03] anyone available to review these? [21:08:04] https://gerrit.wikimedia.org/r/#/c/32576/ [21:08:04] https://gerrit.wikimedia.org/r/#/c/34104/ [21:08:25] they're a couple of tablesorter fixes that should be merged [21:08:47] robla- I looked, but they're both at least partially mine ;) [21:09:55] yeah, thanks for looking :) [21:14:58] any gerrit guys around? I'd want to delete a tag [21:15:48] ^demon is around, crying about puppet apparently :-) [21:16:33] sumanah: anomie: did we work out a plan for anomie to attend the Lua thing? [21:16:40] <^demon> Nikerabbit: Delete the tag locally, then `git push origin :refs/tags/myfootag` [21:17:06] I was not part of a plan per se; I made encouraging noises and don't know the current status [21:17:09] anomie: I hope you are going [21:17:18] robla- Oh yeah. No plan that I know of, what do we need to do? [21:17:38] ^demon: gerrit didn't let me do that [21:17:41] anomie: I presume you look at the webpage, register, & go? :) [21:17:46] <^demon> Nikerabbit: Response? [21:17:53] http://www.lua.org/wshop12.html [21:18:01] let me try again [21:18:27] looks like reg is free and like registration is still open, just send an email to the relevant address [21:18:47] To ssh://nikerabbit@gerrit.wikimedia.org:29418/mediawiki/extensions/Translate.git ! [remote rejected] 2012.11 (can not delete references) [21:19:42] actuallly I have no idea what that means [21:19:55] <^demon> Nikerabbit: What repository is this on? [21:19:59] <^demon> Oh, translate. [21:20:13] <^demon> Ok, so to delete references, you need to grant yourself Push + force. [21:20:31] <^demon> Actually, project owners should have that on refs/tags/* [21:20:34] <^demon> Lemme make that change. [21:21:15] <^demon> Nikerabbit: Try again! [21:21:29] done [21:21:36] To ssh://nikerabbit@gerrit.wikimedia.org:29418/mediawiki/extensions/Translate.git - [deleted] 2012.11 [21:21:58] thanks ^demon [21:22:02] <^demon> You're welcome. [21:29:01] saper, ^demon, anyone: git tells you to work with origin/master. gerrit works with gerrit/master. For WMF they're the same repo, but currently `git log origin/master` and `git log gerrit/master` produce different output for me. Is there a way to set up .git/config to eliminate the discrepancy? [21:29:22] <^demon> origin is probably the same thing. [21:29:30] <^demon> the gerrit remote is only because of git-review. [21:29:50] <^demon> `git remote -v` will show you your remotes, and allow you to modify/add/delete them [21:30:38] <^demon> If remote logs are showing different things, sounds like one of the remotes is out of date. `git remote update` should resolve that. [21:31:21] spagewmf: I have some WIP on git-review to use any workable remote [21:31:21] ^demon, thanks. Yes, `git remote -v` outputs 4 lines: both gerrit and origin for both fetch and push, all identical ssh commands. [21:31:43] spagewmf: in this case you are quite safe [21:31:55] Any regex experts here? I'm trying to figure out if it is possible to make a regex that as multiple matches within a single pattern. For example: "Foobar: < stuff stuff stuff stuff >" Where the regex should match each stuff. [21:32:09] spagewmf: actually you can remove "origin" and use only "gerrit". My favourite is "review" which is not default for neither :) [21:32:15] In this case it is a FastCGI error log of php. It logs php errors of 1 request in 1 entry [21:32:36] Krinkle: extended regex like (stuff){3} ? [21:32:37] So it has "PHP message: PHP Notice: ... on line .in .. \nPHP Notice: ... on line... in...\n" [21:32:58] And I want the inividual lines between "PHP message: " and "'" as separate matches [21:33:00] saper, no, because I did `git checkout master` and `git merge origin/master` , and now I'm out of sync with gerrit. [21:33:24] Krinkle: /Foobar: \< ((stuff )*)\>/ or something [21:33:47] RoanKattouw: interesting [21:33:59] Krinkle: I don't think you can do it directly. Instead, you'd have to do ((pattern)*) which matches the whole set, then preg_split() that [21:34:25] RoanKattouw: Hm.. okay. Maybe I'll have to use a different tool. [21:34:36] I don't have a programming language in this context. [21:34:43] Checking out a tool now for php error logs. [21:34:53] spagewmf: are you doing "git fetch --all" or "git pull" ? [21:34:53] but using nginx locally [21:35:02] Oh. Right [21:36:08] ^demon: thinking about forking git-review, any ideas for a better name (there are already two tools called like that - openstack's and facebook's) [21:36:26] <^demon> There's also git-change, which I never got around to playing with. [21:36:44] spagewmf: in case you do "git fetch --all" all remotes should be updated at the same time, so "origin/master" === "gerrit/master" [21:38:02] saper, I did git fetch origin, git checkout master ("Your branch is behind 'origin/master' by 63 commits, and can be fast-forwarded.") git merge origin/master. [21:40:28] ^demon: git-change author imports the same sh*tty code from git-review I'd like to kick out: https://github.com/simonpercivall/git-change/commit/fd2813ed26e9b2ae55917c52d26b28d08d9eaf6c [21:40:38] ah no, it's a pull request [21:41:51] spagewmf: you can "git branch --set-upstream gerrit/master" to get rid of "origin" [21:42:11] saper (earlier) thanks! Sounds like `git fetch --all` would work it, but I still don't understand how the fetch of the same repo resulted in different git logs. [21:42:17] spagewmf: and probably you should "git fetch gerrit" as well [21:42:47] spagewmf: "git log" is always local to the branch - "git log master" when you're in master [21:43:06] <^demon> saper: Did you see the new theme go in to master? [21:43:12] <^demon> It got deployed to gerrit-review. [21:43:19] spagewmf: use "git log -1 origin/master ^gerrit/master" to find out which commits "master" branch on "review" is missing [21:43:21] saper yes, maybe --set-upstream is the thing to do. The problem is a naive `git clone` or any instructions you find on the internet lead to "origin" reappearing, like a zombie. [21:43:33] ^demon: not yet [21:43:47] <^demon> saper: Just click to gerrit-review :) [21:43:53] ^demon: is this "new" ? looks like openstack [21:43:54] Either way, I humbly beg the git gerrit masters to update Git/Tutorial and/or Git/Workflow about this issue. [21:44:15] <^demon> saper: Based on ours. [21:44:30] <^demon> Which was based on openstack. [21:44:41] * saper hears chest-thumping :) [21:44:54] <^demon> Indeed :) [21:44:57] yeah it's too pale to me but good that there is progress [21:45:12] <^demon> Anything is better than green and yellow :p [21:46:02] spagewmf: there is some confusion what to teach people... I prefer to skip git-review altogether because of this remote/branch magic; but people of course like to use it; it won't be helpful to have a section "how to rename your remote from origin to gerrit" :) [21:46:40] ^demon: somehow I got used to that puke green; now the contrast is too low for my elderly eyes [21:50:12] anomie: did you manage to submit the merge of mwmultiversion into mediawiki-config ? [21:50:18] spagewmf: what about I change instructions for people to use "-o gerrit" to git clone? [21:50:33] hashar- I talked to ^demon about it, but he hasn't gotten back to me yet. [21:50:52] anomie: nice :-) [21:51:24] saper, the siamese twins Git/Tutorial and Git/Workflow are heavily based around `git review`. I think the least invasive change would be to mention that git review creates another remote called "gerrit" in addition to the normal "origin", the two probably point to the same thing, and you should always use `git fetch --all` to keep them in sync. [21:52:05] saper, that -o gerrit is a neat idea, but I think every extension page has git clone instructions that don't say it. [21:52:56] <^demon> anomie, hashar: I said I don't really know how to do it. I found that article from Google--that's the extent of my knowledge on subtree merging. [21:53:05] <^demon> I can google & guess with you guys. [21:53:12] <^demon> But I don't have any expertise. [21:53:49] ^demon- I sent you that list of commands. The problem is the submit to gerrit fails due to all the historical revisions being imported with other people's authorship. [21:54:18] Here it is again: http://dpaste.org/oo4RA/ [21:54:52] I have redone the steps manually on my comp [21:54:54] that looks fine [21:55:23] <^demon> If it's an authorship issue, you probably need to grant Forge Committer temporarily. [21:55:35] yup [21:55:40] tried, I am not allowed to do so :( [21:55:45] I can't edit rights on mediawiki-config [21:56:00] so if you could enable it for anomie that would be nice [21:56:24] then I guess that we can simply merge it and deploy on fenari [21:56:54] from then we will be able to rebase the various changes in just one (except the one change coming from WikimediaMaintenance extension) [21:59:46] New review: Hashar; "> @Hashar: I'm migrating the ant build.xml (which you wrote) and also shells out to php -l. Lets foc..." [integration/grunt-contrib-wikimedia] (master); V: 0 C: -1; - https://gerrit.wikimedia.org/r/34488 [22:07:28] spagewmf: https://www.mediawiki.org/w/index.php?title=Git%2FWorkflow&diff=608215&oldid=608145 [22:09:31] anomie: tried to do "git commit --reset-author" in the commit stage? (shouldn't matter, but...)? [22:09:39] anomie: what's the gerrit message? [22:10:24] saper- If that worked, wouldn't that make all the historical revisions be imported under my authorship? Probably not good. [22:10:47] <^demon> I'll grant that. [22:11:33] <^demon> wmf-deployment can now forge committer. [22:11:53] <^demon> hashar: I gave wmf-deployment full owner on the repo, so feel free to revoke when you guys are done [22:12:32] ^demon: mind leading the way to anomie? Iam in my bed right now ;) [22:12:44] anomie: there is an option to squash all those commits as one :-( [22:12:55] <^demon> anomie: You should be able to push that history now. [22:12:57] saper- Again, loses history [22:12:58] ^demon: I would also let him push merge commits [22:13:35] <^demon> Done as well. [22:13:57] anomie: in this case normal "git merge" should work without git read-tree (I hope) [22:14:12] s,in this case,after permissions got changed, [22:16:05] ^demon- Still complains at me about email addresses not matching my account. :( [22:16:15] <^demon> Blargh. [22:16:26] <^demon> Well, you're not in the deploy group. [22:16:28] <^demon> That'd make sense. [22:16:41] <^demon> Added. [22:17:42] ohh [22:18:06] Sam moved all the files up in the root of multi version repo (commit 274d2fd ) [22:18:21] unfortunate ;) [22:18:45] I end up with: [22:18:46] * beb7d86 - (HEAD, master) Merge operations/mediawiki-multiversion into multiversion/ (7 hou [22:18:46] * 274d2fd - Move everything in the multiversion repo up a level... (2 weeks ago) [22:18:47] ;) [22:19:10] Hmm. Now it's complaining about missing Change-Ids on all those old pre-gerrit revisions. That seems like trouble. [22:19:37] we can disable that temporarily on a per repo basis [22:20:37] saper, thanks for the docs! I've been following a suggestion from I think krinkle to always `git checkout -b myNewFeature -t gerrit/master`, which means at least your feature branches track the right remote. [22:21:14] (without "-t", that is for when you want to create it withotu checking it out) [22:21:59] anyway I am out [22:22:03] sleepp time [22:26:21] hmm, disconnected :( [22:29:03] anomie: you did not miss a thing :) [22:29:11] saper- Thanks