| achiang | is there a way to pipe bzr log -p output through a pager that can do colorized diff? i really really like that feature from git. can less do it? | 00:30 |
|---|---|---|
| achiang | hm, not according to 'less' man page | 00:30 |
| * mgedmin raises hand | 00:31 | |
| achiang | colordiff | 00:31 |
| mgedmin | here's my ~/bin/bzrdiff: http://pastie.org/3157485 | 00:31 |
| mgedmin | colorization + paging, a la git diff | 00:31 |
| achiang | hm, nope | 00:31 |
| mgedmin | oh, wait, -p? don't have that... | 00:31 |
| mgedmin | oh, wait, bzr log? | 00:32 |
| * mgedmin should stop answering questions on IRC when his brain has shut down because of excessive tiredness | 00:32 | |
| achiang | i *think* git log shows colorized diffs | 00:32 |
| mgedmin | well, I have a ~/bin/bzrlog too: http://pastie.org/3157495 | 00:32 |
| mgedmin | spc is apt-get install supercat | 00:33 |
| mgedmin | and ~/.spcrc/spcrc-bzr_log is ... not in my home directory | 00:33 |
| mgedmin | ho hum | 00:33 |
| mgedmin | my old hard disk is in a drawer and I'm too tired to go hunt for it | 00:34 |
| mgedmin | also, supercat is a horrible horrible tool | 00:34 |
| mgedmin | on the plus side it does what I want | 00:34 |
| mgedmin | after I spent a few hours crafting a syntax file for it | 00:34 |
| achiang | ah yep, 'git log -p' does similar to 'bzr log -p' except ... prettier | 00:35 |
| mgedmin | it's as if git was written by loving people who like command-line interfaces | 00:35 |
| achiang | more colorful, perhaps, is a neutral way to say it | 00:35 |
| spiv | achiang: you can use 'less -R' preserves coloring (if you can get the command to emit it how you want in the first place) | 00:35 |
| achiang | spiv: yeah, i guess the problem is, bzr won't do color control codes (a design decision, i suppose) | 00:37 |
| spiv | Well, it can do diffs with colour | 00:38 |
| * achiang discovers bzr cdiff | 00:38 | |
| spiv | So it's not a fundamental limitation, or a design decision against colouring. | 00:39 |
| spiv | Yeah, I frequently use 'bzr cdiff | less -R' | 00:39 |
| achiang | but how to make bzr log do it, so i don't have to type in every revspec? | 00:40 |
| spiv | There's *possibly* a config option. If not, there should be :) | 00:40 |
| spiv | (I think there might be an option to set the default diff colouriser/formatter? I forget.) | 00:40 |
| spiv | IIRC plugins can register alternative diff formatters, and perhaps at worst you could have a plugin tweak the default so that log uses coloured diffs. (as a workaround for getting that feature into bzr properly) | 00:42 |
| achiang | thanks for the pointers. it's a little too daunting to figure out easily, so i give up | 00:46 |
| achiang | maybe i'll try again some day | 00:46 |
| achiang | from the bzr log man page: "GUI tools and IDEs are often better at exploring history than command line tools" | 00:47 |
| achiang | sadface | 00:47 |
| spiv | Well, it's difficult to draw clear diagrams of revision graphs in ASCII art :) | 00:49 |
| spiv | Patches welcome though! | 00:49 |
| mgedmin | diagrams are overrated, /methinks | 00:49 |
| mgedmin | incidentally, is there a bzr equivalent of gitk --all? | 00:49 |
| mgedmin | i.e. a diagram of merges that shows more than one branch at once? | 00:49 |
| spiv | mgedmin: 'bzr qlog BRANCH_A BRANCH_B BRANCH_C ...' | 00:50 |
| mgedmin | thanks, good to know! | 00:50 |
| spiv | mgedmin: you might even be able to pass just a repo to it these days, or use a magic option, but it can certainly do it. | 00:50 |
| achiang | spiv: personal opinion, i don't find the rev graphs to be useful in either bzr or git. the squashed "linear" history is the view i use the most in any scm (and yes, i do understand it's not truly linear, but it's often close enough) | 00:51 |
| achiang | spiv: but i am truly appreciative of your help. #bzr is always very friendly, thanks. :) | 00:52 |
| achiang | oh, and normally, i would use bzr qlog on my local machine, but i'm looking at something remotely | 00:52 |
| fullermd | That's why X is network-transparent :> | 00:58 |
| achiang | can i get your speshul t00bs that eliminate latency too? :P | 00:59 |
| fullermd | I've got a 386 you can borrow. That makes network latency a non-issue... | 00:59 |
| achiang | actually, i don't understand this line of teasing. are you truly suggesting that X forwarding from a remote openstack shell is enjoyable to use? | 01:01 |
| fullermd | You never know. I once ran Netscape 4 across the Internet. Mind, it was excruciating... but then, it was NS4, so it was hard to tell the difference. | 01:02 |
| mwhudson | bzr qlog <remote url> probably works, no? | 01:03 |
| fullermd | It might, but I would expect it to be... uh... what's the laughing-hysterical-like opposite of 'optimized'? | 01:04 |
| mwhudson | compared to remote x? :) | 01:11 |
| fullermd | Pfui. FTP is never as cool as GTP :p | 01:11 |
| fullermd | Would certainly be more responsive interactively. But I wouldn't be overly surprised if some of the info lookup ended up being pathologically bad. | 01:12 |
| * mgedmin hates when vim's vcscommand.vim decides to use bzr for :VCSAnnotate in Subversion checkouts -- can you spell insaaaaaane slownesss? | 01:17 | |
| fullermd | Are ee em oh tee ee space .... wait, that's your joke. | 01:19 |
| spiv | fullermd: actually, I think qlog against a remote URL has had a least a little bit of optimisation | 01:55 |
| spiv | fullermd: so it's probably just rather slow, rather than truly horrific. | 01:55 |
| === hloeung_ is now known as hloeung | ||
| elmo | No branch/tags file in BzrBranch7('file:///srv/foo/bar/'). This branch was probably created by bzr 0.15pre. Create an empty file to silence this message. | 09:53 |
| elmo | srsly? | 09:53 |
| elmo | Create an empty file called what? where? | 09:53 |
| mgz | elmo: you can get that if you `rm .bzr/branch/tags` | 09:58 |
| mgz | provided that's all that happened, touching it and pulling will get it happy again | 09:58 |
| mgz | but if other files have gone missing as well, you may need to branch again | 09:59 |
| === AuroraBorealis is now known as aurora|sc2 | ||
| === Quintasan_ is now known as Quintasan | ||
| jonesy | what's the bzr command to get a rundown of files that would be changed in launchpad if I committed/pushed right now? | 14:10 |
| jonesy | 'status' seems to show ignored files that have been modified. | 14:10 |
| === tchan1 is now known as tchan | ||
| === james_w` is now known as james_w | ||
| === spi_ is now known as siip | ||
| siip | is it possible to branch only a specified subdirectory (e.g. the src subdirectory of lp:connectorj)? | 17:55 |
| maxb | no, it isn't | 17:56 |
| siip | thanks maxb (arg this is going to be a %#$!) | 17:57 |
| AuroraBorealis | you really cant? thats sort of a useful thing to do in svn | 18:01 |
| LeoNerd | Doh! | 18:34 |
| LeoNerd | Note to self: bzr merge -c-133 . does _not_ mean "reverse-merge changeset 133" | 18:34 |
| * LeoNerd reverts and tries again ;) | 18:34 | |
| LeoNerd | -r133..132 \o/ | 18:35 |
| === yofel_ is now known as yofel | ||
| kgoetz | hey, i'm getting a key denied (publickey) when trying to bzr branch from an lp: address. does bzr care that i'm running it as root? bzr version 2.3.4 fwiw | 22:50 |
| jelmer | kgoetz: hi | 22:52 |
| jelmer | kgoetz: bzr doesn't care you're running as root - if you're branching as root, do you have ssh keys set up, and your launchpad login set? | 22:52 |
| kgoetz | jelmer: hey (: | 22:52 |
| mgedmin | I would be tempted to check the $HOME setting | 22:53 |
| mgedmin | if it points to /root, most likely you don't have your usual ssh keys/global bzr config | 22:53 |
| kgoetz | no i don't. i assumed to branch from publicly available code i wouldn't need to do that ritual :/ | 22:53 |
| mgedmin | sounds like bzr thinks it knows your launchpad login, but you don't have access to the keys... | 22:54 |
| kgoetz | since this is a server, is there a way to work around it? i'd rather not go adding ssh keys from all my hosts into my LP account | 22:54 |
| mgedmin | IIRC lp: use bzr+ssh for performance reasons when they know what username to ssh to | 22:54 |
| mgedmin | I'm sure jelmer will correct me if I"m wrong | 22:55 |
| jelmer | mgedmin: you're right | 22:55 |
| jelmer | kgoetz: check "bzr config" for the launchpad_username | 22:55 |
| jelmer | you can unset it if you don't want bzr+ssh:// to be used | 22:55 |
| mgedmin | hm, bzr launchpad-login lets me set my launchpad username, but doesn't provide a way to reset it (and there's no bzr launchpad-logout) | 22:56 |
| kgoetz | thanks :) | 22:56 |
| mgedmin | so it's bzr config --remove launchpad_username then? | 22:56 |
| jelmer | yeah, that should work | 22:57 |
| kgoetz | you are both correct. my launchpad_username was set (for reasons unknown), but ssh keys not set up | 22:57 |
| kgoetz | thanks! | 22:58 |
| kgoetz | incidentally, is there a plan to move ~/.bzr.log into ~/bazaar? i keep missing them up when tab completing | 22:58 |
| jelmer | kgoetz: not that I'm aware of | 22:59 |
| kgoetz | jelmer: ok, thanks | 22:59 |
| jelmer | kgoetz: I'm not aware of a good reason not to, but also not aware of any plans to do so | 23:00 |
| kgoetz | the argument i expect would be made is if you're going to move it you should put things in XDG_* locations | 23:01 |
| mgedmin | if ~/.bazaar lived under ~/.config, your tab-completion trouble would be gone as well ;) | 23:01 |
| kgoetz | mgedmin: snap (: | 23:01 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!