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