[00:20] is there something like tig for bzr ? [00:24] If there is not, no one here would know, as no one here would know - or care - what 'big' is. [00:24] ^big^tig [00:25] http://jonas.nitro.dk/tig/ [00:25] a curses gui [00:25] no, i'd recommend using the actual gui [00:25] qbzr/bzr explorer [00:25] looks useful [00:25] Or even the actual cli :) [01:43] wgz: thanks! === thumper is now known as thumper-afk === aj00200 is now known as Aj00300 === thumper-afk is now known as thumper [09:04] morning all === jelmer changed the topic of #bzr to: Bazaar version control | try https://answers.launchpad.net/bzr for more help | http://irclogs.ubuntu.com/ | Patch pilot: mgz [10:53] argh, the command hooks again [10:53] these tests are all broken [10:56] ha, and fixing the test makes it fail spectacularly. === Quintasan_ is now known as Quintasan [11:59] mgz: :-S [12:02] what's the best help we have on using scenarios? I just poke around the code base looking for examples each time [12:02] and have no idea of the best way of doing things. [12:02] ...using scenarios here is probably a dodgy idea, but amusing. [12:04] mgz: that's what I do too.. [12:13] mgz, vila: Could I persuade either of you to have a look at my lazy-regex-pickle branch? [12:15] ...that's actually what I was going to do before I got distracted [12:18] I wonder if 246 tests is too many... :) [12:20] 246 tests for what ? :) [12:21] option help :D [12:23] hmmok :) [12:57] hi guys. Is there a viable way to squash commits (without a merge operation)? [12:57] so for `A-B-C-D-E-F`, I'd like `A-----D----` [12:57] I figure I can do the second part with 3 uncommits, followed by a commit. But I couldn't go any further back [13:01] I suppose I could `bzr diff -r A..C > squashA.patch` & `bzr diff -r D..F squashB.patch`, uncommit back to A, then patch, commit, patch, commit [13:01] shelve works [13:01] avoids messing around with patches [13:02] uncommit F-D, shelve, uncommit C-A, commit, unshelve, commit? [13:03] right. [13:04] I could also re-order with shelving too [13:04] great. That completley complements our Git workflow [16:16] jelmer: could you set aside some time this week to team up on reviewing MvG's lazy import branch? [16:19] mgz: sure [16:19] mgz: that reminds me, could we perhaps talk through some of the HPSS reviews? [16:20] sounds like a good thing to do at the same time. [16:20] cool === yofel_ is now known as yofel [16:24] I'm working from town tomorrow, so how about we say Friday, or do you think we can fit it all in the rest of today? [16:25] friday works for me === iBasic is now known as BasicOSX === iBasic is now known as BasicOSX [20:47] o/ [20:47] quick quesiton [20:47] how would I run a plugin's command from python? [20:48] I'm integration qbzr into an IDE written in python [20:48] and I want the context manu to bring up qbzr's commit dialog [20:49] do you want to yield execution to qbzr? [20:49] if not, use subprocess.call [20:50] otherwise, there are a couple of steps, but it's similar to calling a bzrlib command [20:53] I guess I could just subprocess it [20:54] you'll need to work with the qt main loop otherwise, which may or may not be an issue for you. [20:54] it's a QT app, but also, I ahve zero experience with QT :) === iBasic is now known as BasicOSX [20:56] ah, you're doing the qt creator integration? [20:56] or a different qt ide... you said written in python... [20:58] starting with subprocess isn't bad, but I recommend a post to the bazaar list with some details, as something more integrated may be preferable [21:01] different [21:01] ninja-idea [21:02] yeah, I'll get the basics with subprocess [21:02] and email the list === iBasic is now known as BasicOSX [22:00] goofd morning, hi beuno [22:02] hey poolie [22:16] hi there [22:44] ♥ jelmer [23:07] hi lifeless, what's with the question mark? [23:12] heh [23:20] haha [23:21] hi james [23:24] jelmer: hah, surely your utf8 setup works ;) [23:37] lifeless: hah, I see it now.. :) [23:37] lifeless: glad you like it