[00:19] <wgrant> blr: ui-project-setbranch has conflicts; can you merge devel and resolve them?
[00:20] <wgrant> And would it be worth cherrypicking the semi-unrelated menu changes into a separate branch, to get the "Configure translations" -> "Configure Translations" bits out of the big diff?
[00:20] <blr> ugh, yep sure
[00:21] <blr> wgrant: can do sure, if it is obscuring the primary intention of the branch.
[00:22] <wgrant> blr: I think it should be pretty easy to put in a separate branch, and it would shrink the 2200-line diff by quite a bit...
[00:22] <wgrant> Just a bzr merge -i from the old branch into the new plus a couple of fixups where they overlap should work.
[00:22] <wgrant> Then we can review and land the new branch before the old, and the diff will be a whooooole lot more sensible.
[00:24] <blr> wgrant: sounds reasonable
[00:30] <wgrant> blr: New JS is much better, thanks.
[00:31] <blr> yep I think that should work well enough.
[00:32] <blr> will let you know when I have the 2 branches
[00:33] <wgrant> I think there should only be like one file that needs the two sets of changes disentangled.
[02:32] <blr> wgrant: wow, managed to blow up more tests than anticipated. Also update the BMP factories. Ready for you now if you have a moment: https://code.launchpad.net/~blr/launchpad/recycle-commit-message/+merge/261793
[02:34] <wgrant> blr: Explosive tests are fun.
[03:45] <blr> wgrant: is there a reason there's no argument for 'description' on resubmit? (in the interface)
[03:46] <wgrant> blr: Someone probably forgot to add it there when the field was added.
[03:46] <wgrant> Probably an idea to fix that too.
[03:46] <blr> wgrant: yep, I did - just checking I wasn't missing something :)
[03:53] <blr> as much as I like the keyboard on the lenovo, it is such an improvement using a proper mechanical keyboard...
[03:53] <wgrant> As laptop keyboards go, the T4[45]0s have by far the best I've used.
[03:53] <wgrant> But yes, a proper desktop mechanical keyboard is hard to beat.
[03:54] <blr> had a look at the new macbook the other day - impressive hardware, but there's even less travel on the keys now than previous models... it would be intolerable I think heh
[03:55] <wgrant> The one-port-to-rule-them-all model?
[03:55] <wgrant> Yeah, certainly shiny and expensive.
[03:55] <blr> hah yeah
[03:55] <wgrant> But the keyboard is way worse than an MBA
[03:55] <wgrant> And that's saying something...
[04:32] <blr> wgrant: hmm I didn't receive a pqm notification for that last lp-land, and I don't see anything in the queue..
[04:39] <wgrant> blr: buildbot had spuriously failed.
[04:42] <blr> wgrant: ah that old chestnut.
[07:32] <wgrant> lp:~person-name-100028/ubuntu/+source/unique-from-factory-py-line3422-100026/+git/gitrepository-100029
[07:32] <wgrant> The factory creates the best URLs.
[07:33] <StevenK> wgrant: Not enough -deactivatedaccount-deactivatedaccount in the person portion
[07:37] <wgrant> StevenK: I'll have you know that no account has more than 17 of them.
[07:38] <wgrant> https://launchpad.net/~deactivatedaccount-deactivatedaccount-deactivatedaccount-deactivatedaccount-deactivatedaccount-deactivatedaccount-deactivatedaccount-deactivatedaccount-deactivatedaccount-deactivatedaccount-deactivatedaccount-deactivatedaccount-deactivatedaccount-deactivatedaccount-deactivatedaccount-deactivatedaccount-deactivatedaccount-deactivatedaccount for reference
[07:38] <wgrant> Which isn't actually deactivated.
[07:39] <wgrant> Also I guess that technically has 18, since I missed the first one, as it doesn't start with -
[07:39] <StevenK> Hahaha
[12:09] <wgrant> cjwatson: Oh, good catch.
[12:09] <wgrant> Thanks.
[12:10] <cjwatson> Some day I'll find a problem with one of your MPs that isn't entirely trivial :-)
[12:11] <wgrant> I'm normally sufficiently pedantic about things like that :/
[12:11] <cjwatson> Almost finished syncing everything over, should be back in the saddle properly this afternoon
[12:11] <wgrant> Yay
[12:12] <cjwatson> Trying to sort out my git-detect-merges branch, which is proving a bit awkward because passing a mock hosting client through the event infrastructure would be nightmarish, so I'm having to bite the bullet and sort out a fixture
[12:12] <cjwatson> But despite being on PyPI now using turnip proper as the fixture is rather difficult - I don't want LP deployments to have to have a usable version of pygit2, and we don't have test_requires in LP at the moment
[12:12] <wgrant> Considered ZopeUtilityFixture?
[12:13] <cjwatson> So I'm doing a quick Twisted emulation of the relevant bits of the API in the short term
[12:14] <cjwatson> Hm, yeah, that might be easier if I turned GitHostingClient into a utility, it's true
[12:14] <cjwatson> Easier than writing something that emulates the other end of the API and then having a fixture to override the endpoint URL, which is what I'd been doing
[12:15] <wgrant> Yep.
[12:15] <wgrant> There are also various libraries around that mock out requests responses.
[12:15] <wgrant> I've gone through three so far for webhooks stuff
[12:15] <cjwatson> And GHC really ought to be a utility.
[12:15] <wgrant> And they all mostly work.
[12:15] <wgrant> But they're a bit weird.
[12:16] <cjwatson> I have the guts of the Twisted version, but it means converting things over to AsynchronousDeferredRunTests and then drinking heavily.
[12:16] <cjwatson> So maybe that's a blind alley.
[12:16] <wgrant> You got the order wrong, but sure.
[12:17] <cjwatson> I think order is immaterial, they can be done concurrently
[12:17] <wgrant> Indeed.
[15:18] <lifeless> cjwatson: whats the drinking heavily for? Is there framework stuff we can do to make it less drenched?
[15:19] <lifeless> cjwatson: also, the glasgow haskell compiler should be a utility?
[15:21] <cjwatson> GitHostingClient :-)
[15:23] <cjwatson> y'all still advertise AsynchronousDeferredRunTest as "use at your own peril"; I'm happy to modify tests that are already using it but for something new where all I need is for LP to use a mock version of a utility, I think wgrant is right that ZopeUtilityFixture is simpler
[16:21] <cjwatson> ... and indeed it is.  /me pushes
[20:15] <lifeless> cjwatson: oh, we should remove that terror warning
[20:16] <lifeless> I'll consult with jml