| poolie | hello all | 00:07 |
|---|---|---|
| poolie | lifeless: hi, i was thinking about having a stab at either bug 385826 or bug 393677 today... | 00:15 |
| ubottu | Launchpad bug 385826 in bzr "push and pull with different formats extremely slow on network" [Critical,Triaged] https://launchpad.net/bugs/385826 | 00:15 |
| ubottu | Launchpad bug 393677 in bzr "pushing a 1.9 branch stacked on a 2a branch causes problems" [High,Confirmed] https://launchpad.net/bugs/393677 | 00:15 |
| lifeless | 38826 is what spiv is working on | 00:15 |
| lifeless | 393677 doesn't conflict with anyone | 00:16 |
| lifeless | so I'd suggest 393677 | 00:16 |
| poolie | hm i meant the one with InterDifferingSerializer | 00:24 |
| poolie | but at any rate it's related to what he's doing | 00:24 |
| poolie | i was hoping it would be complementary | 00:24 |
| poolie | i wonder if he sent his patch... | 00:24 |
| lifeless | poolie: so there are three things that need to lang all roughly at the same time | 00:25 |
| lifeless | 1) streaming inv deltas | 00:25 |
| lifeless | 2) fixup the streaming rich root conversion | 00:25 |
| lifeless | 3) disable IDS for non-local operations | 00:26 |
| lifeless | my hunch is that its better to have one person do all three, as I expect test interactions | 00:26 |
| spiv | poolie: still working on that patch... currently fixing differences in behaviour between the streaming path and InterDifferingSerializer that the tests found. | 00:29 |
| lifeless | spiv: the rich root conversion path? | 00:30 |
| spiv | lifeless: right | 00:30 |
| lifeless | great | 00:30 |
| spiv | Which I guess is your 2) from above. | 00:30 |
| lifeless | yes | 00:30 |
| lifeless | there are three separate bugs for 1,2 and 3 | 00:30 |
| spiv | I'm basically taking the logic from IDS and transplanting it. | 00:30 |
| lifeless | you'll probably want to close them all :) | 00:30 |
| spiv | Sure, the more bugs closed the merrier :) | 00:31 |
| spiv | FWIW, I have the bulk of 1) done, although I haven't finished exhaustively testing or polishing because of 2). | 00:32 |
| lifeless | the reason for 2 is that without 3, which needed 1, I'd have had to write awkward tests for 2 rather than the simpler generic tests | 00:33 |
| lifeless | and as it wasn't being used that seemed counterproductive | 00:33 |
| GungaJin | hHi | 00:35 |
| GungaJin | I upgraded to 1.16 on Windows and I keep getting now "bzr: ERROR: Unable to look up default port for ssh". | 00:35 |
| GungaJin | Any ideas why? | 00:35 |
| spiv | GungaJin: Someone else had that error the other day, but I don't recall the cause :/ | 00:35 |
| spiv | Which version did you upgrade from? | 00:36 |
| GungaJin | 1.14 | 00:37 |
| spiv | Hmm, I wouldn't expect there to be any changes since 1.14 that would cause that. | 00:37 |
| GungaJin | But that's what I'm getting on Windows | 00:38 |
| spiv | I wonder if something odd changed in the build process for the Windows installer since 1.14? | 00:38 |
| spiv | It sounds like a system misconfiguration issue, but I don't know why 1.16 would expose it if 1.14 didn't. | 00:38 |
| spiv | GungaJin: can you run the command with -Derror added to the commandline, and pastebin the traceback? | 00:39 |
| GungaJin | sure | 00:40 |
| spiv | Hmm. That error string isn't part of bzrlib, so maybe it's one of the bundled plugins that's causing it... | 00:41 |
| GungaJin | http://pastebin.com/m6d892fee | 00:41 |
| spiv | Ah-hah, and I was right. | 00:42 |
| spiv | It seems to be due to the bzr-svn plugin. | 00:42 |
| lifeless | please file a bug on bzr-svn | 00:42 |
| spiv | Probably you can work around it by using --no-plugins or explicitly giving the port number in your URLs (i.e. bzr+ssh://hostname:22/...) | 00:43 |
| spiv | But please do file a bug. | 00:43 |
| GungaJin | How can you tell it's in bzr-svn? | 00:44 |
| spiv | I *think* this bug is already fixed in bzr-svn trunk, looking at the code. | 00:44 |
| GungaJin | I think so too.. I just found a similar post in launchpad. | 00:45 |
| spiv | (it now mutters that message to the log and returns cleanly, rather than raising an error) | 00:45 |
| GungaJin | https://answers.launchpad.net/bzr/+question/73528 | 00:45 |
| spiv | GungaJin: I can tell because the last part of the traceback is in plugins\svn\auth.py | 00:45 |
| GungaJin | i c | 00:46 |
| GungaJin | (sorry.. I don't really know python..) | 00:46 |
| spiv | Sure, that's ok. | 00:46 |
| spiv | That's what we're here for :) | 00:46 |
| poolie | igc, you should blog about the bzr-explorer release with pretty pictures | 00:48 |
| igc | poolie: shall do | 00:51 |
| zsquareplusc | is there a recommended way to convert from svn to bzr? i used just "branch" (with bzr-svn installed) and it seems to do the expected (creating a native bzr branch) | 00:53 |
| SamB | jelmer: with what should I replace "svnversion" in a Makefile in order to get something sensible from a bzr-svn working copy? | 00:53 |
| RAOF | zsquareplusc: Yeah, that's about it. | 00:59 |
| RAOF | SamB: GNOME Do uses 'bzr version-info --custom --template="bzr {branch_nick} r{revno}"' | 01:00 |
| zsquareplusc | fine | 01:00 |
| zsquareplusc | and is there a history editing tool. i.e i have an private branch that i'd like to clean up before publishing | 01:00 |
| dash | zsquareplusc: 'uncommit' is about all there is | 01:01 |
| RAOF | zsquareplusc: Not really. You _can_ effectivly re-structure history by judicious merging, though. | 01:01 |
| SamB | RAOF: I meant, a way to extract just the nearest ancestral SVN revision number | 01:01 |
| SamB | with maybe some indication of how far away it was | 01:01 |
| dash | zsquareplusc: in general, there's not much reason to clean up history in a branch | 01:01 |
| poolie | igc, it does look like links to the group blog posts are broken on planet bazaar | 01:02 |
| dash | since it doesn't show up in the normal log of mainline | 01:02 |
| poolie | the feed looks ok to me so i'll file an rt I guess | 01:02 |
| === abentley1 is now known as abentley | ||
| SamB | poolie: but clicking on things from the feed, does that work? | 01:02 |
| poolie | yep | 01:03 |
| RAOF | zsquareplusc: If you've got a branch with lots of experimental commits, and you'd like to tie them into feature-commits, you can bzr merge -rA..B ../experimental branch, possibly fix stuff, then commit. Follow with bzr merge -rB..C ../experimental, rince and repeat. | 01:03 |
| poolie | how about for you? http://bazaarvcs.wordpress.com/feed/ | 01:03 |
| GungaJin | How do I uninstall the svn plugin? | 01:03 |
| zsquareplusc | dash: because i ran that project privately it may contain comments not intended for others eyes. or think of passwords in old changsets | 01:03 |
| zsquareplusc | RAOF: ah ok. so i could create a new history with a few important points relatively easy. | 01:05 |
| RAOF | zsquareplusc: I don't _think_ there's much support for that yet, although it's an acknowledged need. Someone more knowledgable might have a better idea. IIRC I've seen lifeless talk about this before? | 01:05 |
| dash | zsquareplusc: what RAOF described doesn't erase history | 01:06 |
| zsquareplusc | the alternative is i just import the head w/o any history. but that is kind of sad for all the time i took to write the commit comments :-) | 01:06 |
| RAOF | Yeah. What I sugested merely clusters history into potentialy more useful groups. | 01:06 |
| lifeless | GungaJin: if you've used the executable installer you can't | 01:07 |
| lifeless | GungaJin: because its bundled in the same exe | 01:07 |
| === abentley1 is now known as abentley | ||
| poolie | filing an rt for the feed links... | 01:07 |
| lifeless | GungaJin: I think we'll need to fix the 1.16.1 installer with a new bzr-svn | 01:09 |
| zsquareplusc | i could start with an empty branch and go through the revisions of the original, copying the files to my branch for each step. would some work. :/ | 01:10 |
| dash | zsquareplusc: _do_ you have passwords in your revision history? | 01:11 |
| GungaJin | lifeless - probably, but I don't feel like writing --no-plugins all the time... and I don't use this plugin anyway. | 01:12 |
| dash | there is a plugin named 'bzr-rebase', it might be of help | 01:12 |
| zsquareplusc | dash: probably not :-) but it is a history over a few years, who knows what i did back then ;-) | 01:12 |
| zsquareplusc | an other issue i have is with bzr-gtk. everytime i start one of its commands like bzr vis i get a traceback (DBusException) on the 1st run. the 2nd time it is working. | 01:13 |
| zsquareplusc | mm. with 1.13.1 (jaunty) | 01:14 |
| spiv | GungaJin: I think there may be another way around it | 01:14 |
| GungaJin | I'll be glad to hear it. | 01:15 |
| spiv | GungaJin: you might be able to avoid that error by adding an entry for ssh to your windows\system32\drivers\etc\services directory | 01:15 |
| spiv | s/directory/file// | 01:15 |
| GungaJin | ? | 01:16 |
| spiv | GungaJin: I haven't used Windows in a pretty long time, so I might be wrong, but I think that file is used to lookup port numbers when a program calls the getservbyname winsock function. | 01:18 |
| spiv | GungaJin: you can probably just add a line like "ssh 22/tcp" to that file to avoid that bzr-svn bug | 01:19 |
| GungaJin | hmmmm... could be. | 01:19 |
| GungaJin | but I'm just using the default port... | 01:19 |
| SamB | spiv: why does guessing that have anything to do with using windows? | 01:19 |
| spiv | (that bzr-svn bug is triggered when getservbyname fails to look up a port for a scheme like 'ssh') | 01:19 |
| SamB | oh, because you can't remember if there is a file like that? | 01:19 |
| spiv | SamB: I'm pretty sure there used to be a file like that in roughly that location in older versions of Windows. | 01:20 |
| spiv | SamB: I could be wrong about the details, current Windows might do something completely different, etc :) | 01:20 |
| SamB | well, if there is already a file there, you can be pretty sure that it's for that | 01:20 |
| spiv | I think I'm mostly right, or wouldn't be wasting GungaJin's time, but I figure I should be clear when I'm not totally sure about my advice :) | 01:21 |
| SamB | a quick google indicates that they're apparantly still there in vista | 01:21 |
| kingos | lifeless: sorry to bug you, but any plans of what to do about my bzr check failing bug? | 01:29 |
| kingos | lifeless: I have a lot of users that would like some faster performance, and we can't upgrade because check fails | 01:29 |
| kingos | maybe there is someone else who could help? | 01:29 |
| poolie | kingos: what's the bug number? | 01:30 |
| kingos | bug 356028 | 01:31 |
| ubottu | Launchpad bug 356028 in bzr "bzr check fails with KeyError" [Undecided,New] https://launchpad.net/bugs/356028 | 01:31 |
| lifeless | kingos: hi. I'll look into it this afternoon. | 01:35 |
| === obstriege is now known as obst | ||
| kingos | lifeless: thanks | 01:49 |
| emet | jhello | 02:45 |
| emet | 2 collaborators, no server | 02:46 |
| emet | how do I set up something like this | 02:46 |
| zsquareplusc | no server at all, or could you run a ssh/sftp server? | 02:49 |
| poolie | emet, if you have email you can just use bzr send | 02:50 |
| poolie | then merge or pulll from the bundles | 02:50 |
| davidstrauss | zsquareplusc: please explain your question a little more | 02:50 |
| zsquareplusc | davidstrauss: that was directed to emet. i like that you can push and pull a bzr branch to a server with just an ssh account there. so no special SW on server | 02:52 |
| emet | okay bzr send might be a solution, SSH seems like a more secure solution | 02:57 |
| SamB | emet: bzr send is plenty secure if you review the diffs | 02:59 |
| poolie | well, send is as secure as your email setup | 03:00 |
| poolie | send with gpg and smtp tls and it's about as secure as ssh imo | 03:00 |
| spiv | Grr, pycurl test hangs are annoying. At least you can strace to find out the fd it is polling then use gdb to close the fd to unhang it (and fail the test). | 03:02 |
| lifeless | popping out for a walk; going to think about how best to fit in the iterchanges changes for dirstate | 03:07 |
| spiv | Still, everything other test is passing, so that's good. | 03:14 |
| spiv | Now to fix the duplicated code... | 03:15 |
| * igc lunch | 03:53 | |
| poolie | spiv, can you push it before you go out? | 04:04 |
| === spm_ is now known as spm | ||
| lifeless | I wish pyrex could be run straight from python | 05:21 |
| lifeless | it would be awesome | 05:21 |
| Peng_ | Like what, import a .pyx and it would be automagically sorted out? | 05:22 |
| Peng_ | Doesn't Cython have a feature like that? | 05:22 |
| Peng_ | lifeless: http://docs.cython.org/docs/tutorial.html#pyximport-cython-compilation-the-easy-way | 05:23 |
| lifeless | Peng_: no, I mean run in emulation | 05:30 |
| lifeless | Peng_: to allow debugging with pdb etc while fixing shit | 05:30 |
| lifeless | then set it free with C after that | 05:30 |
| Peng_ | Oooooh. | 05:31 |
| lifeless | Peng_: do you do stuff with GnomeDo? | 05:31 |
| Peng_ | lifeless: Never heard of it. | 05:31 |
| lifeless | I saw a reference to Peng in the release blog post for it yesterday | 05:32 |
| lifeless | was wonding if Peng == Peng_ | 05:32 |
| Peng_ | I really should've gone with a more unique handle... | 05:33 |
| lifeless | Peng__? | 05:44 |
| Peng_ | lifeless: Too many other people use Peng. | 05:53 |
| lifeless | Uin? | 05:54 |
| Peng_ | Yeah. :\ | 05:54 |
| lifeless | (pronounced 'win') | 05:54 |
| * Peng_ is terrible at coming up with names. | 05:54 | |
| lifeless | I'm suggesting it for a name for you | 05:54 |
| Peng_ | God forbid I ever have children... :D | 05:54 |
| Peng_ | Oh. | 05:54 |
| Peng_ | Not taken. Does Freenode allow 3-lettern icks? | 05:54 |
| Peng_ | err, s/n / n/ | 05:54 |
| poolie | try it... :) | 05:54 |
| lifeless | I suggested Peng__ too, but you seemed to miss the joke :) | 05:54 |
| Peng_ | lifeless: Oh. Yes, I did. | 05:55 |
| Peng_ | Someone on one network is annoyed by the single _. Two would probably kill him. :D | 05:55 |
| poolie | "joke" :) | 05:55 |
| === BasicPRO is now known as BasicOSX | ||
| lifeless | \o/ dirstate pyx passing the first test | 06:35 |
| lifeless | its polish from here on it | 06:35 |
| lifeless | *in* | 06:35 |
| poolie | that's good | 06:39 |
| lifeless | still got some careful thinking to do | 06:39 |
| poolie | but also surprising to me | 06:39 |
| lifeless | about ways we could still generate bad inv deltas | 06:39 |
| lifeless | poolie: whats surprising? | 06:39 |
| lifeless | python passes; CHKInv next | 06:45 |
| vila | hi all | 07:13 |
| poolie | hello vila! | 07:16 |
| poolie | vila, lifeless, any thoughts on my recent comments at the bottom of bug 340347? | 07:41 |
| ubottu | Launchpad bug 340347 in bzr "log+ transport apparently breaks readv iterator" [High,In progress] https://launchpad.net/bugs/340347 | 07:41 |
| lifeless | poolie: listifying is permitted by the contract | 07:41 |
| lifeless | poolie: in particular, the http transports all buffer a full copy AIUI (because of the underlying behaviour) | 07:42 |
| poolie | hm | 07:42 |
| poolie | i doubt access to packs over http would work in that case | 07:42 |
| poolie | and it does seem to | 07:42 |
| vila | lifeless: meeep, only pycurl does that | 07:43 |
| poolie | if it doesn't turn them back into a generator it will probably give a similar failure | 07:43 |
| poolie | it might... | 07:43 |
| * vila checking | 07:43 | |
| lifeless | poolie: so what failure do you get? MemoryError? | 07:44 |
| poolie | lifeless: http does buffer a lot of stuff potentially but does eventually yield it out of readv, as a generator | 07:45 |
| poolie | bzr: ERROR: exceptions.AttributeError: 'list' object has no attribute 'next' | 07:45 |
| lifeless | oh | 07:45 |
| poolie | typical failure for something that wanted a generator and got a list of course | 07:45 |
| lifeless | the iterator probably wants to return iter() of what its returning at the moment | 07:45 |
| lifeless | s/iterator/generator/ | 07:45 |
| vila | poolie, lifeless : confirmed, pycurl buffers as much as 4M, while urllib-based goes to great lengths to *not* buffer at all | 07:46 |
| lifeless | -or- the calling code should iter() what it gets | 07:46 |
| lifeless | vila: hyopthetical | 07:46 |
| vila | lifeless: ?? | 07:46 |
| poolie | lifeless: itym s/iterator/decorator/? | 07:46 |
| lifeless | vila: what happens if you ask for 10000000-10000999, 15-20, and the server gives a 200 | 07:46 |
| poolie | as i say, i'm actually wondering if we should do both of those | 07:46 |
| lifeless | poolie: yes, yes, I do | 07:47 |
| lifeless | poolie: and I think both would be sensible | 07:47 |
| vila | lifeless: as in 'squid is involved' ? :-P Seriously, pycurl will certainly raise MemoryError, urllib should just seek() the unwanted bits (I don remember exactly if we allow unsorted ranges) | 07:48 |
| lifeless | vila: any server is allowed to do this | 07:49 |
| vila | lifeless: I know, but some proxies abuse it (still joking ;-) | 07:49 |
| lifeless | vila: squid doesn't do this in fact; it generates ranges from its local cache | 07:50 |
| lifeless | vila: if we _permitted_ it to cache it would do better | 07:50 |
| vila | lifeless: hmm, I didn't thought about that... From https://bugs.edge.launchpad.net/bzr/+bug/120697/comments/7 , my conclusions at that point was that we don't want squid to download a whole xxGB pack files for answering requests that will at most represent yyyMB, am I wrong ? | 07:54 |
| ubottu | Ubuntu bug 120697 in bzr "bzr shouldn't bypass http caches" [Unknown,Fix released] | 07:54 |
| davidstrauss | Is it time to talk about Squid in this channel, too? :-) | 07:55 |
| lifeless | vila: we don't, but on the other hand if we're going to read all the pack file eventually anyway, cache hits would be good | 07:55 |
| vila | lifeless: ok | 07:56 |
| vila | poolie: I implemented readv as http://paste.ubuntu.com/207353/ in my transportstats plugin, AFAIK the tests are still passing | 07:58 |
| vila | poolie: i.e. just do for item in whatever-the-decorated-returns: yield item | 07:58 |
| poolie | yeah | 07:59 |
| poolie | log+ folds the whole thing into a list | 07:59 |
| poolie | this may be inferior | 07:59 |
| poolie | in several ways, but it does mean we can print the whole size | 07:59 |
| vila | yup, that's a problem transportstats has to address at a different level (and theres is still that big FIXME) | 08:00 |
| poolie | let's merge it sometime... | 08:00 |
| poolie | at least the feature if not the code | 08:01 |
| poolie | getting a total count at the end of -Dhpss is good... | 08:01 |
| vila | yeah, there is a huge TODO in that plugin :-/ | 08:01 |
| lifeless | ciao | 08:06 |
| vila | lifeless: g'night | 08:06 |
| poolie | cheerio | 08:06 |
| poolie | lifeless, how about moving ReadVFile from pack.py into transport? | 08:19 |
| poolie | it seems totally generic | 08:19 |
| poolie | i guess it can wait though. | 08:19 |
| nono0 | is there a bzr service like bitbucket | 08:40 |
| lifeless | launchpad.net | 08:41 |
| === abentley1 is now known as abentley | ||
| * igc1 dinner | 09:35 | |
| victory747 | Hi, I have a problem with bzr-svn - I branched a repo and then branched from that for my working copy. Later, I had to bzr svn-upgrade the svn repo due to the format changing in bzr-svn. Now I can't merge my working copy back into the svn one since the ids are different, nor can I bzr svn-upgrade the working copy since the parent is not a foreign repository. | 09:47 |
| === spetrunia is now known as spetrunia|bbl | ||
| === jelmer is now known as Guest78562 | ||
| === Guest78562 is now known as jelmer | ||
| awilkins | Should 2a always be smaller than the equivalent 1.14-rich-root repository? | 11:49 |
| LarstiQ | awilkins: http://bazaarvcs.wordpress.com/2009/06/30/scability-benchmarking/ | 11:51 |
| awilkins | I'm just repacking it | 11:53 |
| awilkins | It was 711M to start with now it's 904 | 11:53 |
| Peng_ | Don't forget obsolete_packs. | 11:53 |
| awilkins | Deleted those | 11:53 |
| awilkins | And I'm only sizing "/packs" | 11:53 |
| asabil | hi all | 11:54 |
| asabil | a small stupid question, how can I cherry pick the last 3 commits from a release branch into trunk ? | 11:54 |
| asabil | bzr merge -r -3.. ../series/0.2 doesn't produce the expected result for me | 11:55 |
| jelmer | asabil, what's unexpected exactly? | 12:02 |
| asabil | I would like it to apply the 3 last commits as patches into the current working tree | 12:03 |
| asabil | at least that what I would expect since bzr doesn't track cherry picks | 12:04 |
| === kkubasik_ is now known as kkubasik | ||
| jelmer | asabil, but what does bzr merge -r3... do that you don't expect? | 12:04 |
| asabil | it just applies the last commit as a patch | 12:04 |
| jelmer | asabil, ah, sorry | 12:04 |
| jelmer | asabil, if you mean the *last* three patches, try -r-3 | 12:04 |
| asabil | -r-3 will only apply the 3rd to the last patch according to the bzr user guide | 12:05 |
| awilkins | LarstiQ: After a repack it's now 651MB so a little smaller :) | 12:08 |
| LarstiQ | awilkins: ok | 12:09 |
| Peng_ | bzr.dev r4494 ("(Jelmer) Pass create_prefix paremeter to BzrDir.push_branch.") doesn't actually introduce any changes... | 12:13 |
| jelmer | asabil, I mean -r-3.. | 12:13 |
| asabil | jelmer: doesn't work, it tries to delete all the files | 12:14 |
| LeoNerd | Having 'bzr shelve'd some changes, can I show the stored diff somehow; like bzr shelf1 show ? | 12:29 |
| === cprov1 is now known as cprov | ||
| * asabil thinks that bzr needs something like bitbucket or github | 13:04 | |
| === mrevell is now known as mrevell-lunch | ||
| gmb | Hi. | 13:23 |
| gmb | I'm receiving the following error when trying to `bzr branch`: http://pastebin.ubuntu.com/207499/ Is there anything I can do to resolve it? | 13:23 |
| LarstiQ | gmb: there are bugs filed that look like that. Offhand you could try reconcile | 13:36 |
| gmb | LarstiQ: Okay, I'll give that a shot and do some digging. Thanks. | 13:37 |
| === mrevell-lunch is now known as mrevell | ||
| === maxb__ is now known as maxb | ||
| vila | Goood morning jam ! | 14:50 |
| jam | morning vila | 14:50 |
| Tak | meh - is there a way to resolve "AssertionError: Tried registering <blah> as parent while None already was parent" on a bzr-svn pull? | 15:02 |
| jelmer | Tak, what version of bzr-svn? | 15:06 |
| Tak | whatever comes with the bzr1.16 winstaller | 15:13 |
| jelmer | Tak, you may be able to fix it by removing the cache directory and letting it regenerate that | 15:14 |
| Tak | where is the cache directory? | 15:14 |
| jelmer | somewhere under the directory with local settings for your user account | 15:15 |
| awilkins | %appdata%\bazaar\2.0\svn-cache | 15:15 |
| awilkins | Yegods, our network is reaching new lows today | 15:16 |
| Tak | success! | 15:17 |
| bialix | hello bzr! | 15:28 |
| bialix | jam, vila: I have fix for bug 307554 | 15:29 |
| ubottu | Launchpad bug 307554 in qbzr "`bzr branch URL .` refuses to create new branch in empty directory" [Medium,In progress] https://launchpad.net/bugs/307554 | 15:29 |
| bialix | can somebody review it? please | 15:29 |
| bialix | http://bundlebuggy.aaronbentley.com/project/bzr/request/%3Ch21ldm%248pt%241%40ger.gmane.org%3E | 15:29 |
| vila | wow, I was convinced you managed to addresed the problem in qbzr only and din't need a fix bzr 8-/ I realized you updated the bug on lp correctly but I misread things between the greyed 'undecided' and the double affectation bzr/qbzr :-/ | 15:34 |
| bialix | vila: no, the fix for bzr core is still required | 15:35 |
| vila | bialix: I see that | 15:35 |
| bialix | ok | 15:35 |
| bialix | I've followed lifeless suggestions | 15:36 |
| vila | bialix: sounds correct at first read, I'll install it and review | 15:37 |
| bialix | I know, I've missed NEWS entry | 15:38 |
| vila | bialix: an Ukrainian and French to write NEWS entry in English :-) Help ! | 15:39 |
| LarstiQ | can I help? ;) | 15:39 |
| vila | Dutch to rescue ! Hurrah ! | 15:39 |
| bialix | it was joke, I knew | 15:40 |
| bialix | :-) | 15:40 |
| vila | bialix, LarstiQ : Joke aside if alex can pastebin a proposed NEWS entry and wouter can review it, I'll submit the result :) | 15:41 |
| bialix | ouch! | 15:41 |
| vila | branch now accepts a --use-existing-dir parameter (Alexander Alexander Belchenko, #307554) | 15:42 |
| vila | Is that correct and complete enough ? | 15:43 |
| bialix | no, you wrote my name twice | 15:45 |
| vila | bialix: :) | 15:46 |
| bialix | one sec | 15:46 |
| vila | bialix: your got the code from cmd_checkout ? | 15:46 |
| bialix | cmd_push | 15:46 |
| bialix | vila, larstiq: http://pastebin.com/m160586c6 | 15:47 |
| bialix | LarstiQ: ^ | 15:47 |
| bialix | ok? | 15:47 |
| vila | god for me | 15:48 |
| vila | good for me | 15:48 |
| bialix | LarstiQ: you have to approve it | 15:48 |
| bialix | pleeeease! | 15:48 |
| bialix | heh | 15:49 |
| bialix | he's ran away? | 15:49 |
| bialix | vila: it seems so | 15:50 |
| bialix | vila: what is your verdict? | 15:54 |
| vila | approve, I'm fixing a few typos and I'll submit | 15:55 |
| bialix | ok, many thanks | 15:55 |
| Tak | jelmer: should I file a bug about that? I'm not sure how to reproduce... | 15:57 |
| Tak | (bzr-svn issue from hours ago...) | 15:57 |
| jelmer | Tak, It works now? | 16:00 |
| jelmer | Tak, I'm suspecting it's a bug in bzr-svn that was fixed earlier but caused issues in the cache | 16:00 |
| Tak | ok | 16:09 |
| Tak | yeah, it seems to be working | 16:09 |
| SamB | jelmer: what was it that needed to happen before bzr-svn supports ignoring files based on that SVN property? | 16:17 |
| SamB | jelmer: and more immediately useful, do you know of any tools to convert that property into the form used in .bzrignore files? | 16:18 |
| jelmer | SamB: bzr needs to support a generic API for handling ignores rather than relying on the fact that a versioned file named ".bzrignore" exists | 16:19 |
| SamB | jelmer: oh, that has to be versioned? | 16:20 |
| jelmer | SamB, there's some functions in bzr-svn for handling svn:ignore data, which is used for svn:ignore in working copies | 16:20 |
| SamB | that sounds kind of sick | 16:20 |
| jelmer | SamB, .bzrignore doesn't have to be versioned atm | 16:20 |
| SamB | ah good | 16:20 |
| SamB | that's as it should be, I think | 16:20 |
| SamB | ... how else is a soul supposed to test changes? | 16:20 |
| SamB | so ... can bzr-svn access the svn revprops when in a bzr-format working copy for a bzr-format branch? | 16:22 |
| jelmer | SamB, only svn:author, svn:log and svn:date (which are mapped to their bzr equivalents) | 16:27 |
| jelmer | SamB, if you think there's a reason to support others, please file a bug :-) | 16:27 |
| SamB | I was just hoping to add a command to to generate ignore rules in the form required by ".bzrignore" | 16:28 |
| SamB | so it would have to get the property from somewhere ... | 16:29 |
| jelmer | SamB, svn:ignore is not a revision property but a file property | 16:29 |
| SamB | oh, file property | 16:29 |
| SamB | right | 16:30 |
| jelmer | file properties aren't stored anywhere either (bzr doesn't have "free-form" file properties, only specific ones) | 16:30 |
| * SamB doesn't know why he said revprop above | 16:30 | |
| SamB | well, would it be reasonable to write a command that takes an SVN url (perhaps defaulting to bound or parent URL?) and perhaps SVN revision number and outputs .bzrignore rules ? | 16:32 |
| * SamB wonders where svn:ignore is documented ... tries googling | 16:33 | |
| jelmer | SamB, yeah, that'd be reasonable | 16:37 |
| SamB | is there a URL for the latest released svnbook ...? | 16:44 |
| SamB | jelmer: so where is this code dealing with svn:ignore? | 16:49 |
| jelmer | SamB, workingtree.py | 16:51 |
| SamB | and would I be able to use this even if I don't have an SVN working tree? | 16:52 |
| SamB | hmm, the main bit seems to be a method on SvnWorkingTree, so I'm thinking "not without refactoring" | 16:53 |
| === thekorn_ is now known as thekorn | ||
| === thekorn_ is now known as thekorn | ||
| === weltende is now known as welterde | ||
| === kartik_rustagi is now known as join | ||
| === join is now known as kartik_rustagi | ||
| SamB | jelmer: how do you test bzr-svn? | 18:11 |
| SamB | I mean, I don't really want to run all of the bzr self tests for bzr+all-installed-plugins | 18:12 |
| === mario_ is now known as pygi | ||
| backz | hi, how to get a list of changed files since X rev? | 19:05 |
| beuno | backz, bzr log -v -r X | 19:07 |
| backz | beuno: ok, but I need only list of files | 19:08 |
| backz | I'm creating a rsync.txt | 19:08 |
| === mario_ is now known as pygi | ||
| beuno | backz, not sure if there's a command that will give you that exact output | 19:09 |
| backz | ok, no prob, I'll parse log -v output in vim | 19:10 |
| backz | thanks! | 19:10 |
| Tak | ffs, how do you show the branch uri(s) in git? | 19:20 |
| garyvdm | Wrong channel? | 19:21 |
| Tak | it's relevant, because I'm trying to refind the uri for an existing git branch so I can rebranch it with bzr-git :-P | 19:23 |
| Tak | then the voices will stop shouting | 19:24 |
| === Kissaki^0ff is now known as Kissaki | ||
| phinze | just had a cool idea; wondering if there already exists a plugin that does this | 19:54 |
| phinze | would be nice if i could put in a comment some keyword that would block a checkin with that file | 19:54 |
| phinze | wouldn't be hard to have a plugin that checked incoming checkin for that keyword and bailed if it was found | 19:55 |
| phinze | something like # DONT-CHECK-ME-IN \n print($SECRET_VALUE) | 19:55 |
| ddaa | phinze: first note that you have to store secret values in the source tree of your deployment, you need a better configuration system. | 20:49 |
| ddaa | phinze: then, the common way to deal with this use case is with "bzr ignore" | 20:50 |
| ddaa | since involuntary commit is usually a consequence of runnig "bzr add" and not checking the result. | 20:50 |
| phinze | ddaa: right, i was just using a simple example | 20:50 |
| phinze | i'm just picturing a sanity-check that allows a dev to, for example, insert debugging code and make sure she doesn't forget about it before commit | 20:51 |
| phinze | whereas bzr ignore is file-wise | 20:52 |
| ddaa | oh, that's a much better use case :) | 20:53 |
| phinze | i looked at a few other pre-commit plugins; and it should be pretty simple to whip up. i'll post to the room if/when i do that | 20:53 |
| ddaa | I sometimes put "NOCOMMIT" comments in my code. But what I usually mean is "do not merge that into trunk", not "do not commit that in my development brancH" | 20:53 |
| ddaa | so, I guess it would be useful to have an option that says in essence "bzr commit --with-the-nocommit-crap-too" | 20:54 |
| ddaa | <rant>You know, bzr developers have this strange habits of doing multiple commits on development branches before merging on mainline, while other dvcs have crappy log commands that cause this behaviour to be regarded as "commit log pollution"</rant> | 20:56 |
| ddaa | <rant>So they write strange tools to avoid doing commits, such as hg queues, and they claim they are really cool, while they are half-assed solutions to the wrong problem.</rant> | 20:56 |
| ddaa | Oops, sorry, I ranted on hg queues again. | 20:57 |
| fullermd | ddaa: You should try hg queues; they totally solve that problem. They're really cool. | 20:57 |
| * ddaa hits fullermd with a large nail-studded stick | 20:58 | |
| mneptok | fullermd: don;t take offense. that's ddaa's customary mating ritual. | 20:59 |
| ddaa | mneptok: I do not remember hitting any female with a nail-studded stick at our former common employer's meetings. | 21:00 |
| ddaa | I guess it was against company etiquette, unlike, say, filling a female's belly button with sugar. | 21:02 |
| fullermd | Are you mad? Think of the calories! | 21:02 |
| moldy | hi | 21:10 |
| moldy | does bzr have an equivalent to svn export? | 21:10 |
| Tak | export? | 21:10 |
| moldy | Tak: i just realized that. the syntax was a little weird to me :) | 21:11 |
| ddaa | moldy: what about 'bzr export'? | 21:11 |
| moldy | ddaa: yep, thank you | 21:11 |
| moldy | i got irritated by the fact that it takes the destination as first and the source as second argument | 21:12 |
| ddaa | the common use case is to run this command from within the source | 21:12 |
| moldy | yep, i happen to have another use case :) | 21:13 |
| mwhudson | jelmer: hello | 21:41 |
| jelmer | mwhudson, hey | 21:42 |
| mwhudson | jelmer: thinking about using bzr-svn for launchpad again | 21:44 |
| dash | horray | 21:44 |
| jelmer | mwhudson, \o/ | 21:44 |
| mwhudson | jelmer: have you made any releases subvertpy of bzr-svn since the last time i talked to you about this? | 21:44 |
| mwhudson | jelmer: does bzr-svn have anything like the git.db file? | 21:45 |
| jelmer | mwhudson, that depends on what the last time was that we talked about this :-) | 21:46 |
| mwhudson | jelmer: it has something in ~/.bazaar/svn-cache, right? not in the repo | 21:46 |
| jelmer | mwhudson, bzr-svn basically has a companion release for every bzr major release | 21:46 |
| mwhudson | jelmer: :) | 21:46 |
| jelmer | mwhudson, yeah, it's separate from the repo indeed | 21:46 |
| mwhudson | jelmer: so i guess if i did nothing each slave would end up building the cache separately | 21:49 |
| mwhudson | jelmer: do you think it's worth trying to preserve it somehow? | 21:49 |
| jelmer | mwhudson, if you have patience it's not really a problem to recreate it each time | 21:53 |
| mwhudson | sounds easiest :) | 21:53 |
| jelmer | preserving it would mainly save some CPU cycles on Launchpad's side | 21:53 |
| jelmer | and if people start roundtripping revisions from bzr into svn heavily you might face some other performance problems | 21:54 |
| jelmer | mwhudson: It would be nice to be able to import all of the branches from a foreign repository at once, that should in the general case be only slightly more expensive than fetching trunk | 22:15 |
| jelmer | mwhudson: There are separate commands for this, but no infrastructure afaik | 22:16 |
| mwhudson | jelmer: i think i'm going to mumble something about colocated branches here | 22:16 |
| jelmer | mwhudson: :-) | 22:17 |
| mwhudson | jelmer: i guess we could do something where we update all branches that we're doing from a particular repository at once | 22:23 |
| mwhudson | jelmer: but that sounds a bit complicated | 22:24 |
| jelmer | mwhudson, Well, the functionality for that is mostly already there but spread across multiple commands | 22:24 |
| jelmer | this is what "bzr svn-import" / "bzr git-import" do, and we'll probably end up with a "bzr hg-import", too | 22:24 |
| mwhudson | jelmer: complicated on my side, i meat | 22:25 |
| mwhudson | *meant | 22:25 |
| * mwhudson needs coffee | 22:25 | |
| jelmer | mwhudson, ah | 22:25 |
| jelmer | yeah, it would I guess | 22:26 |
| mwhudson | i'm not really worried about wasting launchpad cpu cycles | 22:27 |
| mwhudson | (we can just buy more machines :) | 22:27 |
| mwhudson | load on the remote server is more of a concern | 22:27 |
| mwhudson | but heck | 22:27 |
| mwhudson | cscvs is about as bad as it can possibly be for this... | 22:27 |
| jelmer | well, there wouldn't be much overhead on the remote server with this | 22:28 |
| jelmer | because we can update all branches at once | 22:28 |
| jelmer | importing all branches at once would be a lot easier on the remote server than importing two individual branches separately | 22:28 |
| mtaylor | lifeless: awake yet? | 22:46 |
| mwhudson | jelmer: what about servers like svn.apache.org or svn.kde.org? | 22:52 |
| mwhudson | that contain squillions of projects | 22:52 |
| jelmer | mwhudson, that's trickier, though svn-import can import parts of the repository already | 22:53 |
| mwhudson | which, obscurely, reminds me to go check on a svnsync i've had running for days | 22:55 |
| lifeless | mtaylor: yes | 22:58 |
| lifeless | mwhudson: multipull | 22:59 |
| mtaylor | lifeless: yay! | 23:00 |
| mtaylor | lifeless: so - since you know everything... you wouldn't happen to know what the gcc option is that causes pointer values to be set to certain values indicating uninitialized and freed, would you? | 23:01 |
| mtaylor | lifeless: sometihng like ABBACDDC and BADDAFFA or something like that | 23:01 |
| lifeless | in forte? | 23:02 |
| mtaylor | is it in forte? I thought it was a gcc opt | 23:02 |
| mtaylor | that might explain why I haven't been able to find it in the gcc manual | 23:02 |
| lifeless | I'm fairly sure gcc doesn't, but othere compilers do (and I don't know which ones do) | 23:03 |
| lifeless | it came up in the past in standards-wrangling discussions | 23:03 |
| mtaylor | k. thanks. | 23:03 |
| lifeless | 'is NULL == 0L' | 23:03 |
| lifeless | and so on | 23:03 |
| mtaylor | yes. lovely conversations those must bre | 23:03 |
| LarstiQ | vila: hmm, no bialix. Sorry about earlier, but the conference wifi is pretty spotty at times | 23:03 |
| lifeless | oh yes | 23:03 |
| lifeless | mtaylor: if gcc has it it would be a -f option | 23:06 |
| lifeless | mtaylor: and you'd need to compile the closure of libraries | 23:06 |
| lifeless | [potentially] | 23:06 |
| lifeless | -fdelete-null-pointer-checks - nice | 23:07 |
| mtaylor | that's pretty | 23:10 |
| mneptok | oh no! The Other Monty has infected #bzr! | 23:27 |
| mneptok | *muah* | 23:27 |
| lifeless | mtaylor: a quick google.. http://www.google.com/url?sa=t&source=web&ct=res&cd=11&url=http%3A%2F%2Fwww.parasoft-embedded.com%2Fproducts%2Finsure.jsp&ei=m-NLSs79N5Pq6gOPyMDFBQ&usg=AFQjCNH33zIQ-AZmFK1aptLpTwE9x-6ZPg | 23:32 |
| * mtaylor is EVERYWHERE | 23:37 | |
| fullermd | Really? Cool, I was needing somebody already in my attic to run some coax... | 23:39 |
| mtaylor | fullermd: I'm not only there, the coax is already run ! | 23:39 |
| mtaylor | fullermd: now you just have to pay me the yearly licensing fee for use of the coax... | 23:40 |
| poolie | hello all | 23:48 |
| igc1 | hi poolie | 23:53 |
| === igc1 is now known as igc | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!