[15:59:52] <Krenair>	 Hi ^demon
[15:59:59] <^demon>	 hi.
[16:00:03] <Krenair>	 I tried to do `git review -d 41035`
[16:00:24] <Krenair>	 But I get an exception because the owner of that change has no name, just an email address
[16:00:43] <^demon>	 I hate git-review :\
[16:00:59] <apergos>	 don't use it
[16:01:08] <Krenair>	 I can probably look into fixing git-review when I'm back home, but in the mean time can someone fix this user?
[16:01:09] <apergos>	 (that's to Kren air)
[16:02:03] <^demon>	 The commit looks fine, I see both user.name and user.email.
[16:02:19] <^demon>	 I dunno about the owner being an e-mail address. Didn't know we allowed any cn's to be that.
[16:02:25] <^demon>	 That's ldap, not gerrit, btw.
[16:02:29] <Krenair>	 It gets stuck on review_info['owner']['name']
[16:02:33] <Krenair>	 KeyError: 'name'
[16:03:24] <apergos>	 hm
[16:03:25] <^demon>	 I blame whatever in labsconsole allowed an e-mail address for a username.
[16:03:29] <^demon>	 I thought we disallowed that.
[16:03:50] <Krenair>	 I saw a @wikimedia.org address being used as a name earlier on
[16:04:06] <^demon>	 Bah....
[16:04:12] <Krenair>	 https://gerrit.wikimedia.org/r/#/dashboard/499
[16:05:16] <apergos>	 ugh. well that's no good
[16:05:22] <^demon>	 How is this possible. Just tried to register an e-mail address via labsconsole and it said nowai.
[16:06:02] <^demon>	 Hmm, cn's look correct.
[16:06:17] <apergos>	 ?!
[16:06:33] <^demon>	 Seems gerrit's letting you login with e-mail or cn.
[16:07:00] <^demon>	 Whatever you login as the first time.
[16:07:01] <apergos>	 oh no and then it keeps whatever you used and stuffs it in the commit?
[16:07:06] <apergos>	 bbbaaaahhhhh
[16:07:15] <^demon>	 Gerrit's binding to ldap is stupid.
[16:07:18] <^demon>	 This is known.
[16:07:27] <^demon>	 I just didn't know you could *also* sign in via email, not just cn.
[16:07:34] <^demon>	 *That* is what's the problem.
[16:07:35] <^demon>	 And stupid.
[16:07:37] <apergos>	 awesoem
[16:07:41] <^demon>	 Stupid stupid stupid.
[16:08:22] <^demon>	 accountPattern = (&(objectClass=person)(cn=${username}))
[16:08:27] <^demon>	 There is *no* reason e-mail should work.
[16:19:07] <Amgine>	 <snuggles ^demon>
[17:05:37] <Krenair>	 Heh, CR emails from people using their email addresses as names are from 'Anonymous Coward'
[18:25:28] <kaldari>	 jdlrobson: Chad set up a new repository for me, so I checked in that new extension for you
[18:25:33] <kaldari>	 https://gerrit.wikimedia.org/r/#/c/41043/
[18:25:57] <kaldari>	 Ori already merged the core code
[18:26:11] <jdlrobson>	 sweet kaldari
[18:26:18] <jdlrobson>	 i haven't had a chance to look
[18:26:27] <jdlrobson>	 been trying to install wikidiff2 on a mac - have you any experience of that?
[18:26:30] <jdlrobson>	 proving painful
[18:26:42] <kaldari>	 no, haven't tried. What is it?
[18:28:52] <jdlrobson>	 it's what we use to generate diffs on the server apparently
[18:28:56] <jdlrobson>	 http://www.mediawiki.org/wiki/Extension:Wikidiff2
[18:29:08] <jdlrobson>	 (server being en.wiki)
[18:29:52] <^demon>	 jdlrobson: Should just be phpize && ./configure && make
[18:30:07] <jdlrobson>	 ^demon: seems to be installed
[18:30:10] <jdlrobson>	 php -i | grep wikidiff2
[18:30:18] <jdlrobson>	 shows stuff...
[18:30:34] <jdlrobson>	 but i don't think it is working / or at least can't tell if it is working. It doesn't seem to be mentioned in php info
[18:31:12] <^demon>	 You have to configure MediaWiki to use wikidiff2.
[18:31:40] <^demon>	 I don't believe much will show up in phpinfo.
[18:32:16] <^demon>	 Oh, might need to restart apache if you edited php.ini.
[18:32:25] <^demon>	 (Which is why it might show up in one but not the other)
[18:34:42] <jdlrobson>	 i did all this :( - maybe it's running but it's just not obvious to me it's running
[18:42:14] <kaldari>	 jdlrobson: the extension I wrote for disambiguation pages doesn't currently do anything on the client side or provide an API (since I didn't know what you needed specifically)
[18:43:10] <jdlrobson>	 ^demon: looks like it was caching previous diffs from the previous diff engine so I think it is actually working :)
[18:43:25] <jdlrobson>	 kaldari: no worries it's not super urgent right now but will make use of it
[18:43:56] <^demon>	 Heh, why doesn't that surprise me.
[18:44:30] <kaldari>	 If you have a chance to review it before the bikeshed brigade descends on it, that would be awesome ;)
[18:44:39] <jdlrobson>	 haha
[18:45:48] <jdlrobson>	 kaldari: i'll see how i get on today
[18:46:31] <kaldari>	 I'll write up a documentation page for it on mediawiki.org
[18:50:54] <^demon>	 kaldari: Just to put it out there--I prefer green bikesheds.
[18:51:08] <kaldari>	 good to know ;)
[18:51:49] <kaldari>	 thanks for the repo, BTW!
[18:56:26] <^demon>	 Not a problem. Really need to whip up a script for people to make their own extension repos. They're super easy, it's only non-extensions that can be funny.
[19:15:45] <Yurik>	 hi, if i submitted an update with git-rievew -R, and the server complained with "This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset." - could someone elaborate what i have to do?
[19:16:06] <Yurik>	 do i do a separate git-review?
[19:16:12] <Yurik>	 and kill this patch?
[19:16:23] <marktraceur>	 Yurik: Basically you need to rebase onto master, so we can merge it easily
[19:16:34] <Yurik>	 git rebase master
[19:17:09] <marktraceur>	 Something like that
[19:22:45] <Yurik>	 oh, i figured it out - i had another local master change checked in, and as the result it was doing all sorts of weird things :)
[19:22:49] <Yurik>	 thanks!
[19:44:52] <saper>	 Yurik: "git reset --hard" when in doubt and there are no local changes:)
[19:46:06] <awjr>	 anybody have experience setting up wikidiff2? i'm trying to set it up locally - i've followed instrux on http://mediawiki.org/, but am now getting the following php error: /mnt/hgfs/testing/core/bin/ulimit4.sh: line 4: wikidiff2: command not found
[22:23:06] <Krenair>	 kaldari, you do know about https://gerrit.wikimedia.org/r/#/c/40793/2 don't you?
[22:23:59] <kaldari>	 hadn't looked at it
[22:24:41] <kaldari>	 your qqq description is an improvement on mine :)
[22:25:04] <kaldari>	 I was thinking of using "Your notifications" though to match all the other titles for those links in the user toolbar
[22:26:06] <kaldari>	 I didn't realize you had already checked in a fix. Didn't mean to repeat the same work :)
[22:27:15] <kaldari>	 I'll abandon mine, and we can work on yours
[22:28:41] <kaldari>	 done
[22:29:23] <kaldari>	 This is why I prefer closing bugs when the change is checked in :P
[22:29:26] <Krenair>	 ok, ty
[22:29:41] <Krenair>	 Well, I did mark it as assigned and patch-in-gerrit
[22:44:20] <kaldari>	 Krenair: my fault, I wasn't paying attention :P