| igc | morning | 00:00 |
|---|---|---|
| jml | with loom up-thread conflicts, do the *.THIS files refer to the lower of the two threads? | 00:16 |
| lifeless | jml: IIRC, yes. Its switched because we use symmetry to make the operation faster | 00:17 |
| jml | lifeless: ahh ok. how hard would it be to make them .UPPER and .LOWER, for example? | 00:17 |
| lifeless | jml: patches appreciated | 00:17 |
| lifeless | jml: (I don't know) | 00:18 |
| jml | or .<thread-name>, I guess. | 00:18 |
| * igc breakfast | 00:32 | |
| lifeless | poolie: ping | 01:09 |
| lifeless | http://bundlebuggy.aaronbentley.com/request/<1214359843.1536.41.camel@lifeless-64> <- I'm blocked on that; igc has commented but neither as tweak or resubmit | 01:09 |
| thumper | I use a shared repo with no trees | 01:30 |
| thumper | and use cbranch most of the time | 01:30 |
| thumper | however now I need to make a new checkout of someone else's branch | 01:30 |
| thumper | and I want to use --hardlink | 01:31 |
| thumper | what's the magic? | 01:31 |
| lifeless | EPARSE | 01:31 |
| thumper | checkout --lightweight --hardlink ??? <branch location> | 01:31 |
| thumper | lifeless: did the last bit help? | 01:31 |
| lifeless | thumper: is branch location on your local disk ? | 01:31 |
| thumper | yes | 01:31 |
| lifeless | uhm. I don't know that co --lightweight knows about hardlink | 01:32 |
| thumper | but the branch has no working tree | 01:32 |
| thumper | hm, ok | 01:32 |
| lifeless | then there is no point | 01:32 |
| thumper | I'll just use the lightweight | 01:32 |
| lifeless | can't hardlink to files that don't exist | 01:32 |
| lifeless | thumper: hardlink is only relevant for working trees, it doesn't hardlink history | 01:32 |
| thumper | I was hoping that there would be some magic where it could link to trunk if it knew the file was unchanged | 01:32 |
| lifeless | thumper: uhm | 01:33 |
| thumper | I have a working tree of trunk | 01:33 |
| lifeless | thumper: cp -al trunk foo; cd foo; bzr switch otherbranchname | 01:33 |
| thumper | bzr col it is (another alias :-) | 01:33 |
| thumper | ETOOMANYCMDS | 01:34 |
| igc | lifeless: I'm just wrapping up that review now. | 01:35 |
| lifeless | igc: thanks | 01:36 |
| igc | lifeless: there were some questions buried in my comments. Can you reply to those please? | 01:39 |
| lifeless | sure | 01:39 |
| poolie | lifeless: pong | 01:41 |
| lifeless | igc: done | 01:47 |
| lifeless | poolie: nvm, igc is here today :) | 01:47 |
| nandersson | What is the easiest way to see if plugin bzr-xmloutput is installed or not? Can I try something from the command line? bzr + ??? | 01:50 |
| Odd_Bloke | nandersson: bzr plugins | 01:50 |
| nandersson | Odd_Bloke, Thanks! I see bzr_xmloutput in the list! | 01:51 |
| Odd_Bloke | nandersson: No worries. | 01:51 |
| poolie | lifeless: he'll be away in the afternoon but i'm trying to do reviews today | 01:53 |
| nandersson | Am I able to checkout a bzr branch in Eclipse into my project? It seems that feature is not implemented | 01:55 |
| nandersson | I'm using BzrEclipse that is | 01:55 |
| lifeless | nandersson: you can, but its a bit weird, because of eclipse's project concept | 01:56 |
| lifeless | beuno: do you know the trick? | 01:56 |
| nandersson | lifeless, No, what's the trick? | 01:58 |
| poolie | just what is the limit on transferring revisions between rich root and other repositories? | 01:58 |
| nandersson | lifeless, I do it from the command line from within the project folder? | 01:58 |
| poolie | (referring to Marius's mail) | 01:58 |
| poolie | does it depend on the revision or is it blocked altogether? | 01:58 |
| lifeless | poolie: subtrees -> rich root is blocked on subtrees being used I think; rich root->plain is full blocked | 02:00 |
| lifeless | poolie: because we can't tell 'made here' from 'converted' | 02:01 |
| nandersson | In Eclipse I select "New Project" - "Bazaar" - "Branch as a new Project". In the next dialog I choose "Use existing branch location" but then the "next" button is greyed out and I can't go further. Is it a bug? Using Eclipse 3.4 and most recent BzrEclipse. | 02:07 |
| nandersson | Hrmm.... seems it work if I use "New branch"... *investigating* | 02:11 |
| igc | lifeless: That review is complete now - I've voted tweak fyi. The email should come through soon. | 02:49 |
| lifeless | igc: thanks very much | 02:49 |
| jelmer | spiv, Thanks for that memory analysis | 02:55 |
| spiv | jelmer: not a problem. I just wish I had a clear idea of what we can do about it... | 02:56 |
| jelmer | spiv: not just because of the bzr push analysis but also because it explains Python memory usage analysis a bit | 02:57 |
| * spiv nods | 02:57 | |
| spiv | Yeah, I learned a bit while doing it. | 02:57 |
| spiv | I'd like to be able to introspect CPython's memory management a bit more | 02:57 |
| spiv | It shouldn't be hard conceptually for CPython to tell me about all the arenas its allocated and what their stats are. | 02:58 |
| mwhudson | heh, the coloured diffs plugin for tbird does extremely strange things to that mail | 02:58 |
| spiv | mwhudson: heh. | 02:58 |
| mwhudson | spiv: have you trying compiling python --without-pymalloc ? | 03:02 |
| spiv | mwhudson: I haven't, and I don't want to :) | 03:03 |
| spiv | I think that is where I'm headed, though. | 03:03 |
| mwhudson | why not, it shouldn't be hard | 03:03 |
| spiv | (But not today, I have other things to do as well...) | 03:03 |
| spiv | Admittedly the last time I compiled Python was around 1.5.2. It's probably a little less icky than it was then. | 03:04 |
| spiv | But I don't really fancy tracking down random C extensions and things. | 03:04 |
| Peng | It's easy to compile it. The only problem is if you don't have all of its build deps installed, it'll lack readline, or bz2, etc. | 03:04 |
| mwhudson | spiv: it _really_ isn't hard | 03:04 |
| spiv | I'll probably be compiling it myself soon anyway, because I want to play with 2.6 | 03:04 |
| spiv | Anyway, why do you suggest --without-pymalloc? To see if the fragementation is better/worse? | 03:05 |
| mwhudson | yes | 03:06 |
| lifeless | spiv- apt-get source | 03:06 |
| lifeless | spiv: apt-get build-dep | 03:06 |
| spiv | lifeless: yep | 03:07 |
| spiv | mwhudson: Hmm, I'm not sure how that would help me, really | 03:07 |
| lifeless | spiv: it would let us file bugs | 03:07 |
| lifeless | :P | 03:07 |
| mwhudson | spiv: it would be data | 03:07 |
| spiv | I see. | 03:07 |
| spiv | Well, I have data. :P | 03:07 |
| mwhudson | spiv: i don't know that it would help with finding a solution necessarily | 03:08 |
| * spiv nods | 03:08 | |
| * lifeless speeds up on the b+tree index | 03:09 | |
| meuserj | Is there any way to have a remote repository which you CAN update the working files by pushing (or similar) to it? I have a project I need to work on which I don't have shell access and would like to be able to push to it to update it. | 03:34 |
| meuserj | well, repository is the wrong term.. branch I guess | 03:34 |
| Verterok | meuserj: maybe the bzr-upload plugin might be useful | 03:35 |
| meuserj | Verterok: ah, that looks perfect, thanks. | 03:38 |
| meuserj | quit | 03:38 |
| Verterok | bye meuserj | 03:39 |
| === lamont` is now known as lamont | ||
| lifeless | poolie: ping | 03:57 |
| lifeless | (Pdb) print original_size | 03:57 |
| lifeless | 5308576 | 03:57 |
| lifeless | (Pdb) print len(contents) | 03:57 |
| lifeless | 2564096 | 03:57 |
| poolie | pong | 03:57 |
| beuno | mwhudson, poking at your dont-hold-branches branch now, while I pack | 03:57 |
| mwhudson | beuno: cool, i'm still working on it a bit | 03:58 |
| beuno | mwhudson, haven't looked into bzr.lru_cache, but does that cache automagically? | 04:06 |
| mwhudson | beuno: it's like a dict | 04:07 |
| mwhudson | that throws items out when it reaches a certain size | 04:07 |
| beuno | well, code looks good, and from the looks of it, this should reduce RAM consumption a bit. Let's give it a spin... | 04:13 |
| beuno | not a good start: | 04:14 |
| beuno | File "/home/beuno/bzr_devel/loggerhead.dont_hold_branches/loggerhead/apps/filesystem.py", line 48, in __call__ | 04:14 |
| beuno | cached = self.root.cache.get(path) | 04:14 |
| beuno | AttributeError: 'BranchesFromFileSystemRoot' object has no attribute 'cache'[A[A[A[A[AA[A[A[A[A | 04:14 |
| beuno | right, serve-branches hasn't been tweaked yet | 04:15 |
| mwhudson | beuno: try pulling maybe | 04:15 |
| mwhudson | ? | 04:15 |
| beuno | mwhudson, I'm on revno 191 | 04:16 |
| * spiv -> lunch | 04:16 | |
| mwhudson | hm | 04:16 |
| beuno | start-loggerhead works though | 04:16 |
| beuno | browsing the project has a small glitch: Exception: 'BranchWSGIApp' object has no attribute 'history' | 04:16 |
| lifeless | spiv: when you return, I'd like to chat memory with you | 04:17 |
| beuno | mwhudson, other than those two things, code looks sensible to me, and it *feels* faster, although I don't have any facts to back that up | 04:18 |
| mwhudson | i'm working on the browse view now | 04:19 |
| beuno | may be my head is working slower | 04:19 |
| thumper | AfC: ping | 04:21 |
| AfC | thumper: hello | 04:22 |
| mwhudson | oh argh i hate the browse view | 04:22 |
| mwhudson | beuno: try rev 194, just pushed | 04:29 |
| beuno | mwhudson, fixed both issues, can't find more :) | 04:33 |
| mwhudson | beuno: ok, now see if the code makes sense :) | 04:33 |
| mwhudson | (i guarantee config.py won't) | 04:33 |
| beuno | I'm curious on to how this affects memory usage. Where is Peng when you need him... | 04:33 |
| mwhudson | it should be a bit better i guess | 04:34 |
| mwhudson | not massively | 04:34 |
| Peng | He's watching TV. :) | 04:34 |
| beuno | ah, view_data_by_name is interesting... | 04:35 |
| mwhudson | beuno: that's one word for it | 04:36 |
| lifeless | oh | 04:37 |
| beuno | it's not bad, maybe with some docstring slapped on it explaining a bit of the logic would work | 04:37 |
| lifeless | that reminds me | 04:37 |
| lifeless | bzr-search_integration? | 04:37 |
| beuno | Peng, tv is bad for you :p | 04:37 |
| Peng | beuno: Yeah, I'm gonna die young. | 04:37 |
| * Peng eats some potato chips. | 04:38 | |
| beuno | lifeless, well, that's in a mergeable-ish state. I'm not sure mwhudson is in a reviable-ish state though :) | 04:38 |
| beuno | Peng, you dare devil.... | 04:38 |
| mwhudson | maybe | 04:38 |
| beuno | "reviewable-ish" state is probably what I meant, but since I'm already making up words... | 04:39 |
| beuno | mwhudson, if this fixes the problem with too many branches open, some explanation in config.py should be good enough, IMHO | 04:41 |
| mwhudson | beuno: ok, thanks | 04:42 |
| * mwhudson writes some docstrings | 04:42 | |
| beuno | maybe even try to get the guy with the 100% CPU bug to give it a spin | 04:42 |
| beuno | you know, make him break his server before you break LP :p | 04:42 |
| beuno | damn, still haven't started packing | 04:43 |
| lifeless | igc: the pb thing is tricky | 04:44 |
| lifeless | igc: passing it to the child - and each child will do 0..total | 04:44 |
| lifeless | for total == what the child has | 04:45 |
| igc | lifeless: yes, it's ugly | 04:45 |
| igc | not passing it the child means the pb only shows the progress of local revisions | 04:46 |
| igc | it's almost like you need to pass through an offset and total so the one pb can just keep stepping | 04:47 |
| lifeless | igc: also, get_sha1s - | 04:47 |
| lifeless | igc: its part of the overall 'VersionedFile is dead, long live VersionedFiles' | 04:48 |
| lifeless | igc: agreed on the pb thing - thats the sort of tweak that would work | 04:48 |
| igc | wrt no NEWS you mean? | 04:48 |
| lifeless | igc: yes | 04:48 |
| igc | ok | 04:48 |
| lifeless | igc: we can list every single method if wanted, but its essentially everything that broke in that space; highlighting get_sha1s isn't very useful IMO | 04:48 |
| igc | agreed | 04:49 |
| lifeless | cool | 04:49 |
| igc | my concern is always plugin authors | 04:49 |
| lifeless | happy for me to land this? | 04:49 |
| igc | yes | 04:49 |
| lifeless | wooo | 04:49 |
| igc | looking forward to it :-) | 04:49 |
| igc | lifeless: well done on this, being able to stack across formats will be pretty magic when it all comes together | 04:50 |
| lifeless | igc: it is :) | 04:51 |
| lifeless | igc: I've been playing with it | 04:51 |
| lifeless | igc: I'm pushing the latest shallow-branches loom too | 04:52 |
| igc | cool | 04:52 |
| lifeless | ok, with that done, I'm going to go write a parser/reader for BTreeIndex's | 04:53 |
| igc | lifeless: I'm heading off to the doctors soon for most the afternoon so I probably won't get much more reviewing done today sorry | 04:54 |
| lifeless | igc: thats cool; I'll sweet talk poolie | 04:54 |
| igc | lifeless: yep, I'm hoping poolie can keep you unblocked | 04:55 |
| lifeless | it is his job :) | 04:55 |
| lifeless | now, where is that plumbers friend | 04:55 |
| Peng | Eek, LH's memory usage is still going up a bit. | 04:59 |
| thumper | Peng: where are you looking? | 05:01 |
| beuno | Peng, even with mwhudson's new branch? :) | 05:01 |
| Peng | beuno: No, I haven't tried that. Want me to? | 05:01 |
| Peng | beuno: Should it be reasonably stable? And does serve-branches.py work? | 05:01 |
| beuno | Peng, https://code.edge.launchpad.net/~mwhudson/loggerhead/dont-hold-branches-open | 05:01 |
| beuno | Peng, "yes" and yes :) | 05:01 |
| mwhudson | Peng: yes, just pushed revision 195 | 05:01 |
| Peng | Those are some ominous quotation marks. :P | 05:01 |
| mwhudson | will probably merge to trunk soon | 05:01 |
| Peng | How soon? | 05:02 |
| mwhudson | in a few minutes | 05:02 |
| Peng | Oh. I'll wait then. | 05:02 |
| Peng | My Loggerhead setup uses a custom branch in ~/loggerhead, so I'm not sure how I'd try a different branch than trunk. | 05:03 |
| mwhudson | man, 1221 lines of diff | 05:03 |
| Peng | (And yes, it is a stupid reason not to try another branch, but I'm lazy. :D ) | 05:04 |
| lifeless | Peng: serve-branches ../differnet | 05:06 |
| lifeless | spiv: pingish (refreshing scrollback) | 05:06 |
| mwhudson | Peng: trunk revno 180 | 05:09 |
| mwhudson | it's landed | 05:09 |
| Peng | Okay. | 05:09 |
| mwhudson | Peng: when you said that the memory usage was going up, how much memory was it using? | 05:11 |
| Peng | mwhudson: It had gone from 101 to 102 MB. | 05:12 |
| mwhudson | Peng: oh | 05:12 |
| mwhudson | that's not especially exciting :) | 05:12 |
| Peng | I was surprised it hadn't stopped growing. | 05:13 |
| mwhudson | (given that it routinely uses upwards of a gig on launchpad, though that's old old code now) | 05:13 |
| Peng | Well, I'm on a 360 MB VPS, so it is concerning. :P | 05:14 |
| mwhudson | ok | 05:15 |
| Peng | Anyway, I'm using the latest trunk now. | 05:15 |
| mwhudson | do you know what revno you were on before? | 05:15 |
| Peng | The last one. | 05:16 |
| Peng | So, 179, I guess. | 05:16 |
| mwhudson | ok, so you had the streaming output | 05:16 |
| Peng | Yeah. | 05:16 |
| Peng | Streaming can't be used with compression, right? | 05:17 |
| Peng | Because that would really reduce bandwidth use.. | 05:17 |
| mwhudson | um, don't really see why not | 05:17 |
| lifeless | get apache to do it ? :) | 05:18 |
| lifeless | (because compression is a great way to break buggy browsers, and the apache modules have the workarounds well noted) | 05:18 |
| Peng | lifeless: I use lighttpd. 1.4 doesn't support compressing dynamic stuff, though 1.5 does. | 05:18 |
| lifeless | Peng: there you go then :) | 05:18 |
| lifeless | Peng: though, if they followed the spec, and didn't read mod_gzip etc from apache, expect problems :) | 05:19 |
| mwhudson | hm, it looks like paste.gzipper will stop the streaming from streaming indeed | 05:20 |
| Peng | lifeless: The only breakiness I know of is IE and CSS and JS? | 05:20 |
| Peng | Woah. | 05:20 |
| Peng | I'm still connected, right? | 05:20 |
| lifeless | Peng: ye | 05:21 |
| lifeless | s | 05:21 |
| Peng | I thought I wasn't. I was about to reconnect everything when it started working again... | 05:21 |
| spiv | lifeless: pong | 05:21 |
| lifeless | spiv: memory usage; would a new index with an LRU cache help much do you think? (can we talk voice?) | 05:21 |
| spiv | lifeless: perhaps (and yes) | 05:22 |
| lifeless | is that you? | 05:23 |
| spiv | it is | 05:23 |
| lifeless | handset out of juice | 05:23 |
| spiv | Ah. | 05:23 |
| spiv | skype? | 05:23 |
| lifeless | its a silly bug in the battery | 05:24 |
| lifeless | yes skye | 05:24 |
| igc | bbl | 05:35 |
| lifeless | poolie: chatted with spiv; the memory from reading existing indices was a significant thing. | 05:49 |
| lifeless | poolie: also - for my copy of python-in-bzr-packs: | 05:50 |
| lifeless | Original aggregate index size: 39016345 | 05:50 |
| lifeless | B+Tree aggregate index size: 7585936 | 05:50 |
| lifeless | Difference: 31430409 | 05:50 |
| lifeless | spiv: ^ | 05:50 |
| spiv | That's a huge improvement! | 05:52 |
| spiv | I hope the improvement in memory consumption is as good :) | 05:52 |
| lifeless | it will be different | 05:52 |
| lifeless | I'll need some pointers on string interning etc | 05:52 |
| mwhudson | wow | 05:53 |
| spiv | Interning strings is easy, at least. Just "intern(s)", it's a builtin. | 05:53 |
| spiv | Oh, rather "s = intern(s)" | 05:53 |
| lifeless | spiv: whats the overhead? (why isn't it the default) | 05:55 |
| spiv | It's the default for string literals that look like python identifiers. | 05:56 |
| mwhudson | the overhead is looking in and storing references in a big-ass global dictionary | 05:57 |
| spiv | But Python doesn't automatically check every str you read from disk to see if it is already intern'd. I assume the cost is roughly similar to checking a big dict. | 05:57 |
| lifeless | I'm a little concerned about the cost of running millions of keys through that | 05:58 |
| spiv | I am too, although from what I saw from my testing it wasn't a big cost. | 05:58 |
| spiv | It's definitely worth benchmarking it more carefully though. | 05:59 |
| spiv | The upside speed-wise is that string comparisons get slightly faster (s1 == s2 is quick if s1 and s2 are the same str, it's just a pointer comparison). | 06:02 |
| spiv | It wouldn't shock me at all if it was less of a win with B+Tree indices... | 06:04 |
| lifeless | spiv: an open question to think about is making index creation use less memory | 06:09 |
| spiv | Hmm, yeah. | 06:11 |
| beuno | mwhudson, I'm off to bed, have to catch a plain in a few hours. I'll probably be fairly unresponsive the next few days, especially on IRC, I may do better with email. Hopefully, long hours on the plane will get me to finish setup and directory-templates | 06:13 |
| mwhudson | beuno: ok, sounds good, sleep well | 06:14 |
| mwhudson | i'm stopping for the day too | 06:14 |
| mwhudson | (no internet at home yet, should get connected tomorrow) | 06:14 |
| beuno | mwhudson, ah, so we can expect less mwhudson_'ns? | 06:14 |
| mwhudson | we shall see | 06:15 |
| beuno | wish you luck with that :) | 06:15 |
| bob2 | AttributeError: 'KnitPackRepository' object has no attribute 'weave_store' | 06:31 |
| bob2 | ah, fixed already | 06:36 |
| lifeless | bob2: what plugin? | 06:36 |
| bob2 | ah, search | 06:37 |
| lifeless | :) | 06:37 |
| bob2 | (doesn't happen with 3515) | 06:38 |
| lifeless | bob2: 3515? | 06:38 |
| bob2 | r of bzr.dev | 06:38 |
| lifeless | oh, revno of bzr.dev? VersionedFiles hath landed:) | 06:38 |
| bob2 | ah, piffy | 06:39 |
| bob2 | well, spiffy | 06:39 |
| lifeless | bob2: yes, massive API breaks R us | 06:39 |
| * spiv ducks out for a bit | 06:39 | |
| Peng | So far, I think the dont-cache thing improved Loggerhead's memory usage, but I can't really tell. | 06:56 |
| Peng | At the least, it sent back a 490 KB page and is using less than 22 MB of memory. | 07:11 |
| Peng | So the point of that branch was keeping branches open and stuff, but still, that surprised me. | 07:11 |
| catsclaw | Anyone around for a quick question? | 07:22 |
| catsclaw | Is anyone around for a quick question? | 07:23 |
| RAOF | catsclaw: Generally it's a better idea to ask the question. | 07:23 |
| catsclaw | I've never had much luck doing that. | 07:23 |
| RAOF | You've obviously been in the wrong chanels :) | 07:23 |
| catsclaw | At any rate, I'm hosted on Dreamhost and I'm trying to use Bazaar. | 07:23 |
| Peng | How unfortunate. | 07:24 |
| RAOF | I'm not familiar with dreamhost, but at worst you've got sftp access, right? | 07:24 |
| Peng | Yes. | 07:24 |
| catsclaw | Yes. But then I have to define shell access for every one of my users. | 07:24 |
| catsclaw | Correct? | 07:25 |
| Peng | Isn't it possible to restrict a user to sftp with no other ssh access? | 07:25 |
| bob2 | yes | 07:25 |
| sabdfl | even better, use bzr+ssh, restricted | 07:25 |
| Peng | sabdfl: That would involve installing bzr on the server, which is more of a pain. | 07:26 |
| catsclaw | At the moment, all access is generated from a database, which dynamically writes an .htaccess file and the svn access file dynamically | 07:27 |
| catsclaw | I don't know of any way of doing the same with the ssh users and passwords | 07:27 |
| catsclaw | And because the ssh usernames have to be unique across the server, I couldn't have easy logins to the site. | 07:28 |
| catsclaw | Is there any way to share an ssh login, but keep the contributor's logins distinct? | 07:29 |
| Peng | With bzr, commit authors and ssh users are not related in any way. | 07:29 |
| catsclaw | Where do commit authors get set, and is that secure? | 07:29 |
| Peng | ~/.bazaar/bazaar.conf, or by running "bzr whoami" | 07:30 |
| Peng | And anyone can claim to be anything. | 07:30 |
| catsclaw | There's no way to include validation? | 07:30 |
| RAOF | Peng: And presumably the next statement is "but you can GPG sign your commits" :) | 07:31 |
| Peng | Oh, right. | 07:31 |
| bob2 | are you using svn over ssh? | 07:32 |
| catsclaw | I'm planning on using sftp | 07:33 |
| Odd_Bloke | catsclaw: For SVN or for bzr? | 07:34 |
| catsclaw | bzr | 07:36 |
| Odd_Bloke | catsclaw: So what protocol are you using for svn? | 07:36 |
| bob2 | must be raw svn:// or you'd have the same spoofing potential as with bzr | 07:37 |
| catsclaw | It's http | 07:38 |
| bob2 | how usable is the bzr webdav thing? | 07:38 |
| catsclaw | Not, at the moment. It requires 1.6. | 07:39 |
| Odd_Bloke | I'm not sure, it's vila's thing (SUBTLE PING). | 07:39 |
| catsclaw | How do I uninstall a plugin, btw? | 07:41 |
| lifeless | catsclaw: reverse however you installed it | 07:41 |
| lifeless | catsclaw: if you used the plugins setup.py, it will have installed to python_lib_prefix/bzrlib/plugins/NAME | 07:42 |
| lifeless | catsclaw: but if you installed via apt, use apt to uninstall, if you installed by branching into ~/.bazaar/plugins/NAME, just remove NAME from there | 07:42 |
| catsclaw | I did a bzr branch command from lp | 07:43 |
| Peng | Where did you branch it to...? | 07:43 |
| catsclaw | I don't know. I was sitting in the Bazaar plugin directory, but it didn't put it there | 07:43 |
| vila | bob2: webdav is usable, the 1.6 requirement is a bit artificial, I haven't the resources to test it against 1.5 and nobody will care in a few weeks. I'm just trying to minimize my entropy :) | 07:44 |
| lifeless | catsclaw: if you ran 'bzr branch lp:FOO' then it made a basename(FOO) directory in the directory you were in | 07:44 |
| catsclaw | Well, it did it in such a way that it doesn't show up in explorer or a command line | 07:44 |
| lifeless | catsclaw: interesting :) | 07:45 |
| Odd_Bloke | catsclaw: 'bzr plugins -v' will tell you where it is, if it's affecting bzr. | 07:46 |
| drxnele | hi | 07:46 |
| catsclaw | not installing http[s]+webdav:// support (only supported for bzr 1.6 and above) | 07:46 |
| catsclaw | Unable to load u'bzr.webdav' in u'C:/Program Files/Bazaar/plugins' as a plugin b | 07:46 |
| catsclaw | ecause the file path isn't a valid module name; try renaming it to u'webdav'. | 07:46 |
| drxnele | can somebody help | 07:46 |
| Peng | drxnele: Not without knowing what you need help with. | 07:46 |
| drxnele | bzr push lp:~screenlets-extras-team/screenlets/screenlets-extras | 07:46 |
| drxnele | bzr: ERROR: Cannot lock LockDir(http://bazaar.launchpad.net/%7Escreenlets-extras-team/screenlets/screenlets-extras/.bzr/branch/lock): Transport operation not possible: http does not support mkdir() | 07:46 |
| Odd_Bloke | drxnele: 'bzr launchpad-login' | 07:46 |
| Peng | catsclaw: You should do that then. | 07:47 |
| catsclaw | C:\Program Files\Bazaar\plugins\webdav | 07:47 |
| catsclaw | Only the only thing listed there is Launchpad | 07:47 |
| drxnele | No Launchpad user ID configured. | 07:47 |
| drxnele | how to do this? | 07:47 |
| Odd_Bloke | drxnele: Sorry, I meant 'bzr launchpad-login <username>'. | 07:47 |
| drxnele | meny thanks | 07:49 |
| drxnele | it worked | 07:49 |
| catsclaw | I just deleted the plugins directory. I get the same error, and the same results from bzr plugins -v | 07:49 |
| bob2 | vila: awesome | 07:49 |
| lifeless | catsclaw: run bzr --version | 07:50 |
| lifeless | catsclaw: it will tell you where the 'log file is' | 07:50 |
| lifeless | catsclaw: delete the log file, then run the command that is showing an error, then pastebin (e.g. to http://rafb.net/paste) the contents of the log, and the output bzr gave | 07:50 |
| Peng | You shouldn't have deleted that directory... | 07:51 |
| catsclaw | I can reinstall it | 07:52 |
| catsclaw | http://rafb.net/p/7tqMoL85.html | 07:54 |
| lifeless | catsclaw: so in C:/Program Files/Bazaar/plugins | 07:55 |
| catsclaw | Yes? | 07:55 |
| lifeless | catsclaw: you would appear to have a directory called 'bzr.webdav' | 07:55 |
| lifeless | catsclaw: and bzr is telling you to rename that to 'webdav' | 07:55 |
| lifeless | catsclaw: please do that, then try again | 07:55 |
| catsclaw | Which I would do, if I had a directory "C:\Program Files\Bazaar\plugins" | 07:56 |
| catsclaw | I don't. I deleted it. | 07:56 |
| Odd_Bloke | catsclaw: Are you on Vista, by any chance? | 07:56 |
| lifeless | catsclaw: [ 6096] 2008-07-01 01:51:29.979 WARNING: Unable to load u'bzr.webdav' in u'C:/Pr | 07:56 |
| lifeless | ogram Files/Bazaar/plugins' as a plugin because the file path isn't a valid modu | 07:56 |
| lifeless | le name; try renaming it to u'webdav'. | 07:56 |
| lifeless | catsclaw: that says that you do; please check :) | 07:56 |
| catsclaw | There wasn't a subdirectory except for "launchpad" there before, either | 07:57 |
| catsclaw | I am on Vista. | 07:57 |
| Odd_Bloke | Right, it does some screwy stuff in Program Files. | 07:57 |
| Odd_Bloke | All in the name of saving you from yourself, of course. | 07:57 |
| catsclaw | There is no subdirectory named "plugins" in the Bazaar directory. | 07:58 |
| Odd_Bloke | I'm not sure what to suggest, but I think you're right when you say you can't see anything and bzr is right when it says there is something there. | 07:58 |
| luks | well, try to search for bzr.webdav on your disk | 07:58 |
| luks | but first look to C:/Users/catsclaw/AppData/Roaming/bazaar/2.0/plugins | 07:59 |
| catsclaw | Directory of C:\Users\catsclaw\AppData\Local\VirtualStore\Program Files\Bazaar\plugins | 08:01 |
| catsclaw | 07/01/2008 01:05 AM <DIR> bzr.webdav | 08:01 |
| luks | so there is a bug in bzr, which reports incorrect directory | 08:02 |
| catsclaw | More to the point, when I ran the bzr branch command, why did it extract things to the VirtualStore? | 08:03 |
| catsclaw | And not the directory I was sitting in? And shouldn't bzr know about that, and warn you? | 08:03 |
| Odd_Bloke | bzr _should_ be told about it. | 08:04 |
| luks | I'm guessing it's Vista playig tricks on you | 08:04 |
| Odd_Bloke | Whether it actually is or not is another matter. | 08:04 |
| luks | bzr was probably not allowed to write to C:\Program Files or something like that | 08:05 |
| RAOF | It looks like bzr is triggering some of the "don't break permissions-ignorant code" workarounds in Vista | 08:05 |
| catsclaw | I'm sure that was it. | 08:06 |
| RAOF | So you need to do whatever the vista equivalent of "sudo bzr branch ..." is. Presumably it has one. | 08:06 |
| catsclaw | I can launch a cmd window as an administrator | 08:07 |
| lifeless | yay windows. | 08:07 |
| lifeless | catsclaw: sorry, I didn't realise just how much Vista gets in users way :) | 08:07 |
| catsclaw | But no point, since I can't use the webdav stuff without 1.6 | 08:07 |
| catsclaw | And if people can log in with different commit names under ssh, that works anyway | 08:08 |
| Odd_Bloke | vila: Is there the chance for subtle bugs if the webdav stuff is used with <1.6, or will any problems be glaringly obvious? | 08:08 |
| vila | Odd_Bloke: You tell me :-) | 08:09 |
| vila | seriously, I'm not aware of any potential problem | 08:09 |
| Odd_Bloke | Presumably it would be API mismatch, which'll ditch before anything could go wrong. | 08:10 |
| vila | event there, the only API I use that may cause problems with old versions is test related only, the transport API is pretty stable | 08:11 |
| vila | the last transport API break was requiring writable transport to implement list_dir and stat. This was the only reason I stop working on it for some months | 08:12 |
| vila | Now, that plugin has of course not been widely used, so file bugs, file bugs, file bugs :) | 08:13 |
| Odd_Bloke | catsclaw: You could try using the plugin with <1.6 if you want to. Just change the 'minor < 6' on line 31 of __init__.py to something lower. | 08:13 |
| Odd_Bloke | Of course, the SSH route is safer. :) | 08:13 |
| catsclaw | bzr: ERROR: Permission denied: "/.bzr": [Errno 13] Permission denied | 08:14 |
| catsclaw | That's when I try init-repo on the sftp site | 08:14 |
| catsclaw | Login works, though, and I can manually upload files | 08:15 |
| Odd_Bloke | catsclaw: Find the relevant part in bzr.log and that should help us out. | 08:16 |
| lifeless | catsclaw: when I see that its usually a virtual vs absolute path difference | 08:16 |
| lifeless | catsclaw: if you are doing 'bzr init-repo sftp://HOST/FOO', be aware that that is '/FOO' on the host, not '~/FOO' aka 'FOO' | 08:16 |
| lifeless | catsclaw: if you want 'the current directory' you need 'sftp://HOST/~/FOO' | 08:16 |
| catsclaw | Ah. Sure enough. | 08:17 |
| catsclaw | Final question tonight, I swear | 08:20 |
| lifeless | the more the merrier | 08:20 |
| catsclaw | There's nothing out there that allows you to edit bzr files from a web interface, is there? | 08:20 |
| catsclaw | Edit text files stored in a bzr repository, I mean. | 08:21 |
| Odd_Bloke | catsclaw: ikiwiki might do it. | 08:21 |
| Odd_Bloke | Wait, do I mean ikiwiki. *thinks* | 08:21 |
| Peng | catsclaw: There are lots of programs to edit files from a web interface, but committing them with bzr afterwards is another story... | 08:21 |
| catsclaw | Got any good ones to recommend? | 08:22 |
| Peng | Odd_Bloke: I'm not sure if ikiwiki can use bzr as a backend. | 08:22 |
| Peng | catsclaw: DreamHost has WebFTP set up. | 08:22 |
| Odd_Bloke | http://jameswestby.net/bzr/ikiwiki.bzr/trunk/ suggests that james_w has looked at it at some point. | 08:22 |
| lifeless | spiv, I have iter_all_entries workig | 08:23 |
| lifeless | spiv: is there a simple test to check memory impact? | 08:23 |
| spiv | lifeless: I included a simple script in my mail | 08:23 |
| spiv | lifeless: want me to pastebin it for you? | 08:24 |
| lifeless | you did? I'll grab it | 08:24 |
| Odd_Bloke | Actually, that just looks like a conversion of ikiwiki's history to bzr. | 08:24 |
| lifeless | spiv: (by simple I mean, no bzr needed :P) | 08:24 |
| Peng | Odd_Bloke: I think I heard that bzr doesn't support one of the hooks ikiwiki sues. | 08:24 |
| spiv | Or, just bzr push bzr.dev into /tmp and watch top ;) | 08:24 |
| Peng | Odd_Bloke: That may have changed, of course. | 08:24 |
| lifeless | spiv: I don't have a repo format using this | 08:24 |
| lifeless | spiv: that needs iter_entries working | 08:24 |
| lifeless | spiv: and possibly iter_entries_prefix | 08:25 |
| spiv | Fair enough. So, search my email for iter_all_entries | 08:25 |
| Odd_Bloke | Peng: http://ikiwiki.info/rcs/bzr/ | 08:25 |
| aantn | hello | 08:26 |
| Odd_Bloke | aantn: Hi. | 08:26 |
| aantn | is it possible to uncommit one specific revision after other revisions have been made | 08:26 |
| aantn | hey Odd_Bloke | 08:26 |
| Odd_Bloke | aantn: Do you want to remove it from history, or just undo the changes it made? | 08:27 |
| aantn | Odd_Bloke: remove it from the histroy | 08:27 |
| aantn | it has an incorrect commit log :-[ | 08:27 |
| catsclaw | Ok. I gotta jet. | 08:28 |
| catsclaw | Thanks for the help. I'll have more later, have no doubt. | 08:28 |
| Peng | aantn: How incorrect? Most people learn to live with typos.. | 08:28 |
| aantn | Peng: I forgot to add files, so it picked up on a tiny minor change and missed the big change | 08:28 |
| aantn | Peng: another developer ended up committing the big change | 08:29 |
| lifeless | spiv: 117M vss, 58M res | 08:31 |
| hsn_ | anybody knows if bzr is installed on sf.net shell server? | 08:31 |
| lifeless | spiv: http://rafb.net/p/zCpYDb71.html | 08:31 |
| lifeless | spiv: thats for my bzr.dev's indices converted | 08:32 |
| lifeless | spiv: robertc@lifeless-64:~/source/baz/integration$ du -sh --apparent /tmp/fo/ | 08:33 |
| lifeless | 5.5M /tmp/fo/ | 08:33 |
| spiv | lifeless: interesting, that's vs. 61M res I get with bzr.dev and my original script. | 08:33 |
| spiv | Although your vss is much higher. But you have a 64-bit system, I think? So the comparison isn't 100% fair. | 08:33 |
| lifeless | spiv: I do | 08:34 |
| lifeless | spiv: lets get a baseline | 08:34 |
| spiv | That suggests your new stuff is a bit better, though. That's a promising sign. | 08:35 |
| spiv | Hmm, also your vss is double mine, which seems odd. | 08:35 |
| lifeless | spiv: 16474 robertc 20 0 72804 11m 2800 S 0 0.6 0:00.20 python | 08:35 |
| lifeless | spiv: thats before any indices are processed | 08:36 |
| spiv | Ok, so the oddness is someone else's fault :) | 08:36 |
| lifeless | 16474 robertc 20 0 117m 58m 2864 S 0 2.9 0:02.56 python | 08:36 |
| lifeless | and thats after it finishes | 08:36 |
| lifeless | now, the largest index is 2.5MB | 08:36 |
| lifeless | and readv() does some interesting data slicing | 08:37 |
| lifeless | oh, hmm, lets gc() too | 08:37 |
| lifeless | 16565 robertc 20 0 117m 58m 2864 S 0 2.9 0:02.62 python | 08:38 |
| lifeless | so, gc isn't freeing anything :) | 08:38 |
| spiv | Yeah, I'd be a little surprised if you had reference cycles. | 08:38 |
| spiv | Worth being careful with our measurements, though. | 08:39 |
| lifeless | spiv: http://rafb.net/p/iDf7SP71.html | 08:39 |
| spiv | So, what do you get on your system with my script (i.e. the current index format)? | 08:39 |
| lifeless | spiv: thats what I've ended up with | 08:39 |
| spiv | That script consumes memory? It looks like it should be freeing everything before the final raw_input | 08:40 |
| lifeless | spiv: thats right | 08:43 |
| lifeless | spiv: strange huh | 08:43 |
| spiv | Very. | 08:43 |
| lifeless | 16825 robertc 20 0 91764 18m 2980 S 0 0.9 0:00.56 python | 08:43 |
| lifeless | using bzr.dev | 08:43 |
| lifeless | your script (well, nearly) | 08:43 |
| lifeless | I'm buggered if I know where its going | 08:44 |
| === timely is now known as timelyx | ||
| spiv | Try my countrefs hack? (http://twistedmatrix.com/users/spiv/countrefs.py) Getting the counts before and after might tell you something. | 08:45 |
| lifeless | 16984 robertc 20 0 74368 13m 2860 S 48 0.7 0:03.74 python | 08:47 |
| lifeless | for item in index.iter_all_entries(): | 08:47 |
| lifeless | pass | 08:47 |
| lifeless | that tells me all I need to know :P | 08:48 |
| spiv | Heh. | 08:48 |
| lifeless | fragmentation anyone ? | 08:48 |
| lifeless | seriously, I think I'm better off getting this code out there in a repo format for you to try | 08:48 |
| spiv | Yeah, I'd like that. | 08:49 |
| lifeless | I wanted to see if it was potentially useful :) | 08:49 |
| hsn_ | any work in progress on making commited log messages editable by other commits? | 08:52 |
| berto- | jelmer: hello. | 09:03 |
| lifeless | spiv: I'd be interested if chewing rather than listing the iterators affects your results | 09:03 |
| lifeless | spiv: also, going down to the _indices attribute and doing each one might also be useful | 09:04 |
| lifeless | hmm, 12 second test case. not good | 09:07 |
| berto- | jelmer: i figured out my compilation issues on OS X. it had to do with having MacPython installed on my system. Once I cleaned that up, running make worked just fine. I also updated the OS X instructions: http://bazaar-vcs.org/BzrForeignBranches/Subversion#mac-os-x | 09:21 |
| berto- | is bzrsvn a good way to migrate over to bzr? i noticed that bzrsvn uses SvnRepository; how different is that from the standard Bzr repository? | 09:24 |
| gour | berto-: have you tried tailor? | 09:27 |
| berto- | gour: no, what's that? | 09:27 |
| gour | berto-: kind of universal migration tool | 09:27 |
| Peng | berto-: bzr-svn stores the data in a regular rich-root-pack repository; I'd think SvnRepository is just how it communicates with the svn server. | 09:27 |
| luks | berto-: bzr-svn uses SvnRepository only if you want a checkout | 09:27 |
| berto- | thanks, everyone. | 09:28 |
| Peng | Also, I dislike Tailor. | 09:28 |
| gour | why? | 09:28 |
| Peng | I only used it once, to convert from bzr to hg, and the result was a bit messy. | 09:29 |
| Peng | Also, it might be a "jack of all trades, master of none" thing. | 09:29 |
| berto- | more general, if i wanted to put a bunch of related codebases in a single bzr repository how would i go about doign that? for example, i'm now converting an svn repo with bzrsvn, can i bzr init-repo and somehow move the contents over? | 09:30 |
| gour | i found the recent version as the only tool able to migrate from darcs | 09:30 |
| Peng | berto-: I think you have to "bzr branch" into the new repo. | 09:31 |
| Peng | berto-: Note that all a shared repository is is a data storage optimization; it has no other meaning. | 09:32 |
| berto- | Peng: because it keeps one copy of common stuff between branches, right? | 09:34 |
| gour | berto-: right | 09:37 |
| berto- | ok, cool. i think i get it. :) | 09:38 |
| berto- | tailor may help me get stuff out of git. | 09:38 |
| Peng | berto-: You should check out bzr-fastimport for git (and hg). | 09:38 |
| berto- | peng: cool, checking it out. | 09:38 |
| gour | berto-: pick latest tailor if possible, it improved in many ways | 09:38 |
| Peng | berto-: (I'm not sure how production-ready it is, but in any case, it might work, and it's good stuff.) | 09:39 |
| LarstiQ | vcs-fast{export,import} seems to be the way of the future | 09:42 |
| gour | LarstiQ: with darcs, my experience of darcs-fast was darcs-SLOW-and-broken and that's why i used tailor | 09:43 |
| gour | see https://bugs.launchpad.net/bzr-fastimport/+bug/232177 | 09:45 |
| ubottu | Launchpad bug 232177 in bzr-fastimport "Better darcs support needed" [Undecided,New] | 09:45 |
| LarstiQ | gour: future, because things might not be there overall. The tailor author has lots of darcs experience, so I expect that to be rather good indeed. | 09:45 |
| gour | ymmv, though | 09:45 |
| LarstiQ | gour: interesting | 09:46 |
| Peng | Yeah, Tailor seems to be good for Darcs. | 09:46 |
| berto- | awesome, just got django via bzr. :) | 09:46 |
| berto- | finally got this working. took me forever to track down problems on my system | 09:47 |
| === weigon__ is now known as weigon | ||
| berto- | nite, all | 10:30 |
| === gour is now known as sportman|sleep | ||
| === sportman|sleep is now known as gour | ||
| lifeless | ok, b+tree querying up and running | 11:00 |
| lifeless | now for a repository format to use it | 11:00 |
| lifeless | spiv: ^ pushed too | 11:06 |
| === gour is now known as gour|afk | ||
| === emgent_ is now known as emgent | ||
| jelmer | lifeless, ping? | 13:44 |
| lifeless | hi | 13:44 |
| lifeless | lp:~lifeless/+junk/bzr-index2 | 13:44 |
| lifeless | toy^ play ^ enjoy | 13:44 |
| jelmer | lifeless, I've implemented item_keys_introduced_by() | 13:44 |
| lifeless | jelmer: cool | 13:44 |
| jelmer | lifeless, what branch of bzr-index should I try on a svn repo? | 13:44 |
| lifeless | jelmer: bzr-search; trunk | 13:45 |
| lifeless | jelmer: look for commits_only = True | 13:45 |
| lifeless | jelmer: change it to False, and it will try for texts | 13:45 |
| jelmer | lifeless: Hmm, bzr-index triggers svn to return new and interesting errors | 13:54 |
| lifeless | jelmer: :) | 13:55 |
| === guilhembi is now known as guilhembi|pause | ||
| jelmer | visik7, ping | 14:09 |
| weigon | how do I convert svn-tags into bzr-tags ? | 14:09 |
| visik7 | yes ? | 14:09 |
| jelmer | visik7: Any chance you can try the branch from django again with the latest version of bzr-svn? | 14:10 |
| jelmer | visik7: No hurry, I'm just wondering what is causing the breakage for you | 14:10 |
| jelmer | visik7: Can't reproduce it here, so it's pretty hard for me to fix those two bugs atm :-/ | 14:10 |
| visik7 | jelmer: I should upgrade bzr too latest bzr-svn doesn't work with 1.5 | 14:10 |
| jelmer | visik7: ah, yeah | 14:10 |
| jelmer | weigon: How do you mean? After importing a svn repository using bzr-svn? | 14:11 |
| weigon | yep | 14:11 |
| visik7 | actually I'm not setuped to keep bzr from bzr :) | 14:11 |
| weigon | I would like to get rid of the tags/ folder afterwards and use bzr-tags instead | 14:11 |
| jelmer | lifeless: bzr index completed >-) | 14:11 |
| weigon | this shall be a one-time operation, the svn tree will be abonded afterwards | 14:12 |
| jelmer | weigon: I believe somebody wrote a script to do that | 14:12 |
| jelmer | weigon: Something like this should also do it: | 14:12 |
| lifeless | jelmer: cool | 14:13 |
| lifeless | jelmer: I shall remove the hack then tomorrow | 14:13 |
| jelmer | lifeless: It was slow, but not unbearable | 14:13 |
| jelmer | (290 seconds for gnome-specimen) | 14:14 |
| lifeless | jelmer: bling bling | 14:14 |
| jelmer | visik7, :-) | 14:14 |
| weigon | jelmer: after branching from svn into bzr, applying the bzr-tags, removing tags/ and branches/ it makes sense to move trunk/ one level done into the basedir of the repo (like bzr move trunk/* .), right ? | 14:14 |
| jelmer | weigon: Sure, though you wouldn't use "bzr mv" for that (since the root of the repository is not a branch) | 14:15 |
| jelmer | lifeless: Now we only need tracker integration >-) | 14:16 |
| lifeless | jelmer: I looked at that | 14:16 |
| lifeless | jelmer: I'm not sure its a good fit. But openchange could use a search engine :P | 14:16 |
| lifeless | jelmer: also, new index layer, half-size indices for bzr; will probably make bzr-search much snappier | 14:17 |
| weigon | jelmer: you lost me: isn't $ bzr branch svn+ssh://.../ creating _one_ repo with 3 folders (tags/, branches/, trunk/) is in SVN ? | 14:17 |
| weigon | or are they already in shared-repo with 3 different repos ? | 14:17 |
| jelmer | weigon: You would use bzr branch on the trunk/ URL rather than on the repository | 14:17 |
| uws | jelmer: heh. it seems gnome-specimen has become a bzr/svn playground for a bunch of people :) | 14:17 |
| jelmer | weigon: "bzr svn-import" will import a repository (and create separate bzr branches for trunk, branches/*, tags/*) | 14:18 |
| weigon | *doh* thanks | 14:18 |
| weigon | that's what I was missing | 14:18 |
| jelmer | uws: yeah :-) It's a nice fit for testing since it's not too big but contains some regular and some bzr-svn commits | 14:19 |
| jelmer | weigon: I'll see if I can add a warning | 14:19 |
| jelmer | lifeless; 9-: | 14:20 |
| jelmer | s/9/( | 14:20 |
| jelmer | lifeless: So, now that I have this index, how do I use it? | 14:20 |
| lifeless | jelmer: 'bzr search' | 14:21 |
| jelmer | lifeless: I indexed a remote URL | 14:21 |
| lifeless | jelmer: or fire up loggerhead on this branch and then type in the search field (using a bzr-search integrated loggerhead of course) | 14:21 |
| lifeless | jelmer: you did something like: | 14:21 |
| lifeless | svn co foo bar | 14:21 |
| lifeless | cd bar | 14:21 |
| lifeless | bzr index | 14:21 |
| lifeless | right ? | 14:21 |
| jelmer | no, I did "bzr index svn://svn.gnome.org/svn/gnome-specimen/trunk" | 14:21 |
| lifeless | jelmer: ok, its probably indexed in ~/.bazaar/bzr-search/svn-lookaside/UUID | 14:22 |
| lifeless | jelmer: which is cool, I so didn't expect that to work :P | 14:23 |
| lifeless | jelmer: do a svn co of trunk | 14:23 |
| lifeless | jelmer: cd to it | 14:23 |
| lifeless | and do 'bzr search foo' | 14:23 |
| sabdfl | lifeless: where's the trunk of the search plugin? | 14:23 |
| jelmer | lifeless: Too late, I already started working on "bzr search -d" :-P | 14:24 |
| lifeless | sabdfl: lp:bzr-search | 14:24 |
| lifeless | sabdfl: (where else ? :) | 14:24 |
| sabdfl | it was the "bzr-search" bit I was looking for | 14:24 |
| lifeless | sabdfl: ah | 14:24 |
| sabdfl | we need bzr branch lp:+search/"bzr search plugin" ;-) | 14:24 |
| lifeless | sabdfl: that would be fun | 14:25 |
| lifeless | sabdfl: if you want something really shiny, run bzr index on launchpad | 14:25 |
| lifeless | sabdfl: then run beuno's bzr-search integrated loggerhead locally | 14:25 |
| lifeless | lp:~beuno/loggerhead/bzr-search_integration | 14:25 |
| lifeless | it needs python-simpletal, python-paste and python-sqlite installed | 14:26 |
| sabdfl | lifeless: it blows up on bzr.dec | 14:26 |
| sabdfl | v | 14:26 |
| lifeless | the serve-branches.py script is now used to run it - just give it the path to a branch | 14:26 |
| lifeless | sabdfl: indexing bzr.dev? | 14:26 |
| sabdfl | yes | 14:26 |
| lifeless | sabdfl: let me try | 14:27 |
| lifeless | sabdfl: are you running bzr.dev? or 1.6b2 ? | 14:27 |
| lifeless | beuno: btw, loggerhead is definitely returning bogus revisions in searches still; we need to track that down | 14:28 |
| lifeless | sabdfl: if you are running bzr 1.6b2, use lp:~lifeless/bzr-search/pre-1.6 instead | 14:29 |
| lifeless | its 50% through indexing bzr.dev from scratch for me, no errors | 14:29 |
| jelmer | lifeless: -d patch sent | 14:31 |
| lifeless | jelmer: ! nice. (With test?) | 14:31 |
| jelmer | lifeless: of course (-: | 14:31 |
| lifeless | sabdfl: yeah, I think you are running bzr 1.6b2, I had no trouble indexing bzr.dev | 14:33 |
| lifeless | sabdfl: let me know how you go, I'm crashing soon as this test completes; midnight! | 14:45 |
| sabdfl | lifeless: ./bzr index worked in bzr.dev | 14:45 |
| lifeless | sabdfl: ok cool | 14:46 |
| jelmer | lifeless: lp:~jelmer/bzr-search/debian | 14:54 |
| lifeless | jelmer: mail me I'm halt()ing | 14:56 |
| lifeless | gnight all | 14:56 |
| jelmer | lifeless: will do | 14:56 |
| jelmer | lifeless, goodnight | 14:56 |
| weigon | jelmer: the svn-import did the trick | 15:04 |
| liminal | Hi, I'm having problems with svn-push: it gives me a C++ assertion error. Can anyone help me? | 15:50 |
| liminal | Would the mailing list be a better place to get advice for this issue? | 15:57 |
| LarstiQ | liminal: did you check the bzr-svn buglisting? | 16:00 |
| liminal | I hadn't... just did a search for 'svn-push' and it doesn't seem to turn up anything | 16:01 |
| jelmer | liminal: Please file a bug | 16:01 |
| liminal | sure. in the meantime is there any other way to get a repo into svn? | 16:02 |
| jelmer | liminal: Probably easiest to see first if we can fix this bug | 16:02 |
| jelmer | Once you file the bug, I'll see how hard it would be to fix | 16:03 |
| liminal | ok, thanks. Should I let you know the bug # or anything? | 16:03 |
| jelmer | liminal, yeah, please paste it here | 16:08 |
| liminal | jelmer, the bug # is 244583 -- thanks | 16:19 |
| jelmer | bug 244583 | 16:21 |
| ubottu | Launchpad bug 244583 in bzr "Svn-Push Assertion Error" [Undecided,New] https://launchpad.net/bugs/244583 | 16:21 |
| jelmer | liminal, what version of bzr-svn is this? | 16:22 |
| liminal | http://d5190871.u44.websitesource.net/bzr-svn/bzr-svn-0.4.10-svn-1.4.6-setup-0.exe | 16:23 |
| jelmer | liminal: Ah, Windows.. | 16:32 |
| jelmer | liminal: Do you have a build environment available? If so, you may want to try the latest bzr-svn | 16:33 |
| jelmer | which no longer uses the patched Python subversion bindings | 16:33 |
| jelmer | I can't find that assertion that's being triggered in my copy of bzr-svn - it looks like yours has been patched | 16:33 |
| jelmer | s/bzr-svn/subversion/ | 16:34 |
| liminal | do you mean the development version of bzr-svn? on the project page it lists 0.4.10 as the latest | 16:35 |
| jelmer | liminal, yeah, the development version | 16:35 |
| === mtaylor_ is now known as mtaylor | ||
| liminal | I used the precompiled installer because all the instructions for deploying from source seem to assume running from linux | 16:36 |
| jelmer | yeah, compiling on windows may be a bit of a hassle | 16:37 |
| jelmer | It'd be happy to help get it to work (also so the instructions for building on windows can be updated) | 16:38 |
| liminal | ok, thanks for taking a look. It seems that this won't be simple to address. I'll work around this instead (commit latest version to svn and keep the current bzr repo in case I need past history) | 16:38 |
| liminal | thanks for the offer, but a colleague just came in and we need to focus on other stuff. Thanks again. | 16:39 |
| jelmer | k | 16:39 |
| liminal | jelmer, I saw your comment about adding a backtrace to my bug. How would I do that? | 17:20 |
| === mw__ is now known as mw | ||
| mrevell | james_w: Hi are you around> | 18:37 |
| james_w | hey mrevell | 18:37 |
| mrevell | james_w: unping, sorry :) | 18:38 |
| james_w | no problem | 18:38 |
| awilkins | Verterok: | 19:06 |
| guilhembi|pause | jam: hello! could you please post a progress note in support issue 2413? | 19:08 |
| jam | guilhembi|pause: I'm having the guys test some win32 installers right now | 19:10 |
| jam | Found a weird issue with a system lib getting bundled in the installer | 19:10 |
| jam | I can post that to tracker if you want | 19:10 |
| jam | I was waiting for them to give the "all clear" and post then | 19:10 |
| Verterok | awilkins: hi | 19:48 |
| === mw is now known as mw|food | ||
| awilkins | Verterok: Hi, I was going to discuss this SaveableEditorInput thing with you ; I'm going to see how Subversive does it first though | 20:13 |
| Verterok | awilkins: Ok that would be great, I looked a bit how subclipse is doing it. | 20:13 |
| awilkins | Verterok: Good to cover the bases :-) | 20:14 |
| Verterok | :) | 20:14 |
| Verterok | awilkins: it's ok if we start with this in a while, I'm not 100% available right now :( , maybe in a hour? | 20:15 |
| awilkins | Verterok: Sure, no problem | 20:15 |
| Verterok | awilkins: cool, thanks :D | 20:16 |
| tolstoy | Anyone have any docs on bzr_access? I can't figure out if it's supposed to be used on the client side, or the server side. | 21:02 |
| === mw|food is now known as mw | ||
| james_w | tolstoy: server side | 21:04 |
| james_w | it's supposed to go as the command in the authorized_keys file on the server. | 21:04 |
| === guilhembi|pause is now known as guilhembi | ||
| tolstoy | james_w: Hm. Okay. I think I get you. I'll try that out. | 21:24 |
| mkanat | mwhudson: I updated to tip, it's going fine so far. | 21:26 |
| mwhudson | mkanat: awesome | 21:26 |
| mkanat | mwhudson: I saw that you fixed webpath, too, and that seems to be working well. | 21:26 |
| mwhudson | oh yes | 21:26 |
| mwhudson | mkanat: the 100% cpu thing is still odd, i'd like to understand it | 21:26 |
| mwhudson | but if it's stopped happening, good enough for me | 21:27 |
| mwhudson | mkanat: is your loggerhead accessing some of the branches it's viewing over http? | 21:27 |
| mkanat | mwhudson: Nope. | 21:28 |
| mkanat | They're all local. | 21:28 |
| mkanat | mwhudson: Well, I'm not entirely sure it's stopped. :-) | 21:28 |
| mwhudson | heh, ok | 21:28 |
| mkanat | mwhudson: I just upgraded recently, we'll see how it goes. | 21:28 |
| mwhudson | please let me know either way | 21:28 |
| mwhudson | how's memory usage? | 21:28 |
| mkanat | Using 300m RES right now. | 21:29 |
| mkanat | Which seems better for its uptime. | 21:29 |
| mwhudson | good good | 21:31 |
| Peng | Hmm, no-op pulls over bzr+http are a definite improvement. It's about a dozen <85 byte requests (not counting headers), vs. a couple hundred KB of index requests. | 21:41 |
| mwhudson | oh, beuno is travelling isn't he | 21:44 |
| bartt | Any advise/pointers for using bzr as a local client to CVS? I'd like to use bzr as a 2 way client to a CVS repository. bzr then allows me to branch locally, experiment and merge back when ready to commit to CVS. | 21:59 |
| * mwhudson points at launchpad's code browsing, now running trunk loggerhead | 22:00 | |
| mwhudson | bartt: i'm not aware of anything like that | 22:00 |
| Peng | It's running both trunk bzr and Loggerhead? Spiffy. | 22:00 |
| mwhudson | Peng: well, it's not quite trunk bzr, it's r3508 | 22:01 |
| Peng | mwhudson: That's the trunk, just not the very latest. | 22:02 |
| mwhudson | Peng: i guess so yes | 22:03 |
| lifeless | moin | 22:07 |
| berto- | hello. i'm trying to build bzr-svn on a debian etch box using python2.4; i'm getting this error: http://paste.pocoo.org/show/78310/ any thoughts? | 22:11 |
| lifeless | which branch of bzr-svn are you trying to build ? | 22:14 |
| lifeless | berto-: I would unset your CFLAGS | 22:14 |
| jelmer | berto-: looks like 2.4 doesn't have Py_ssize_t | 22:15 |
| jelmer | I've added a typedef for it | 22:16 |
| jelmer | berto-, should work if you pull current 0.4 | 22:20 |
| berto- | jelmer: that did it, thanks! | 22:27 |
| berto- | jelmer: not sure if you saw my message to you last night; i got things working on os x and updated the bzrsvn wiki to reflect the new stuff. | 22:28 |
| jelmer | berto-: Ah, nice - thanks! | 22:29 |
| awilkins | jelmer : You appear to have traded spaces for tabs on your indents | 22:30 |
| jelmer | awilkins: yeah, in the c files | 22:30 |
| berto- | jelmer: in commit.py, line 716; is that py2.5 syntax ? | 22:35 |
| jelmer | probably | 22:35 |
| * jelmer fixes | 22:36 | |
| berto- | jelmer: i can do that one ... | 22:37 |
| berto- | jelmer: how do i send you a patch? | 22:38 |
| jelmer | berto-: bzr send <0.4-url> | 22:38 |
| awilkins | jelmer: Bah, you haven't changed that C99 syntax | 22:38 |
| jelmer | awilkins: no, sorry - havent had time for that yet | 22:38 |
| awilkins | jelmer: Is there a simple way of changing it that a C-idiot can grasp? | 22:39 |
| jelmer | awilkins: Yeah, I think so | 22:40 |
| jelmer | awilkins: look at object.h in the python development files | 22:40 |
| jelmer | PyTypeObject is defined there | 22:41 |
| jelmer | With C99 it's possible to assign a struct member using ".tp_<name> = foo," | 22:41 |
| jelmer | without C99, the members have to be specified in the right order | 22:41 |
| jelmer | (preferably one on each line, with a comment at the end of the line with the name, to keep things maintainable) | 22:42 |
| jelmer | I can convert an example one, if that helps | 22:42 |
| awilkins | jelmer: So this is the struct ending on line 345 of object.h? | 22:42 |
| jelmer | awilkins, yep | 22:43 |
| awilkins | jelmer: Do you need all the members or just the ones you are using? | 22:43 |
| berto- | jelmer: sorry, i'm *very* new to bzr. i get this: bzr: ERROR: No mail-to address specified | 22:43 |
| berto- | bzr send | 22:43 |
| berto- | Using saved location: http://people.samba.org/bzr/jelmer/bzr-svn/stable/ | 22:43 |
| awilkins | berto-: bzr send [target] --mail-to | 22:43 |
| jelmer | berto-: Please try again | 22:44 |
| jelmer | berto-: I forgot I removed the child_submit_to setting | 22:44 |
| jelmer | schierbeck, ! | 22:44 |
| schierbeck | jelmer! | 22:44 |
| schierbeck | hi :) | 22:44 |
| jelmer | awilkins: All members up to the last one we need to set explicitly | 22:45 |
| jelmer | awilkins: The members in between need to be set to 0 or NULL (depending on their type) | 22:45 |
| berto- | jelmer: ok, that worked. so you changed something on the server side, eh? where is child_submit_to set? | 22:45 |
| awilkins | pointers NULL, ints 0 | 22:45 |
| awilkins | Righto (blech). | 22:45 |
| jelmer | awilkins: yep, exactly | 22:45 |
| jelmer | schierbeck, hi (-: | 22:45 |
| jelmer | berto-: child_submit_to is set in .bzr/branch/branch.conf on the server side | 22:45 |
| berto- | ok, cool. | 22:46 |
| awilkins | jelmer: Some of these members sound like they need poitners but they are not declared with * | 22:46 |
| schierbeck | jelmer: i see you've been busy working on bzr-gtk -- nice! | 22:46 |
| lifeless | garh, needing too many keys for this test :( | 22:46 |
| schierbeck | i've been way too busy at work recently | 22:46 |
| awilkins | eg descrgetfunc tp_descr_get : 0 or NULL ? | 22:47 |
| jelmer | awilkins: yeah, the various things ending in func would be NULL | 22:47 |
| jelmer | the compiler will probably warn you as well if you try to assign 0 to a pointer or NULL to an integer | 22:47 |
| awilkins | Righto, off we go. | 22:47 |
| jelmer | schierbeck: yeah, among other things your signature work is enabled again now | 22:48 |
| schierbeck | jelmer: nice :) | 22:48 |
| schierbeck | although it doesn't seem to detect seahorse at all right now | 22:49 |
| schierbeck | perhaps an issue with dbus activation? | 22:49 |
| jelmer | schierbeck: yeah, I have to comment out the "if BUS_NAME not in bus_names:" bit | 22:50 |
| jelmer | otherwise it doesn't get activated | 22:50 |
| jelmer | that line only seems to work if seahorse already was triggered by some process | 22:50 |
| schierbeck | jelmer: i'm not sure what the canonical (hehe) way to do it is | 22:51 |
| vadi2 | How does one break a lock when bzr break-lock fails? we messed up our branch a bit and now can't access it: http://pastebin.com/m2480833e | 22:52 |
| schierbeck | jelmer: we've been through quite a bit of different approaches... | 22:53 |
| jelmer | schierbeck: yeah... | 22:53 |
| berto- | found another py2.4 incompatibility; just used bzr send again. | 22:53 |
| mcrael | vadi2: I am having trouble breaking a lock also. I hope someone here can point us in a good direction. | 22:57 |
| jelmer | berto-: did you send an email earlier? I haven't received anything yet | 22:58 |
| jelmer | schierbeck: sanest approach would probably be to just try to use seahorse and catch the possible exceptions that indicate it wasn't found | 22:59 |
| berto- | jelmer: thought so: just ran "bzr send" and figured that had some magic. | 22:59 |
| berto- | is there a file i need attach to an email somewhere? | 22:59 |
| schierbeck | jelmer: yup, think that's best | 22:59 |
| jelmer | berto-: bzr send should take care of sending the email for you | 22:59 |
| jelmer | and launch an email client, etc | 23:00 |
| berto- | hmm, might be the mail server on the machine i'm using ... 1 sec. | 23:00 |
| berto- | is there a way to have bzr send just give me a file i can attach? | 23:00 |
| jelmer | yeah, "bzr send -o <filename>" | 23:00 |
| berto- | boo, relaying denied. | 23:01 |
| berto- | ok, 1 sec. | 23:01 |
| vadi2 | mcrael: I think I'll just delete branch and make it again in my case, since it's a relatively new one | 23:01 |
| mcrael | vadi2: I may have to do the same. | 23:01 |
| berto- | jelmer: sent. | 23:02 |
| jelmer | mcrael/vadi2: try "bzr break-lock lp:~gufw-developers/gui-ufw/0.0.6" | 23:03 |
| jelmer | berto-, thanks | 23:03 |
| berto- | np. let me know if there is some naming convention you usually use. | 23:04 |
| vadi2 | jelmer, already remade the branch, but thanks for the reply | 23:04 |
| jelmer | berto-, Still nothing received.. | 23:12 |
| schierbeck | jelmer: i'm off to bed, g'night | 23:13 |
| jelmer | schierbeck: ok, see you later | 23:13 |
| berto- | jelmer: that's odd; jelmer-at-samba.org ? | 23:13 |
| jelmer | yep | 23:14 |
| jelmer | never mind | 23:14 |
| jelmer | looks like it was just slow | 23:14 |
| jelmer | berto-, thanks, merged! | 23:16 |
| === arjenAU2 is now known as arjenAU | ||
| berto- | how do i get the bzrsvn manual? just tried bzr help svn but that doesn't give me much. | 23:37 |
| lifeless | jelmer: ^ :P | 23:37 |
| jelmer | berto-: see the FAQ | 23:37 |
| lifeless | berto-: I believe much/all of it is on the wiki | 23:38 |
| lifeless | jelmer: do you see my point about people trying the inline help system | 23:38 |
| jelmer | lifeless: yes, I do get your point | 23:38 |
| jelmer | I just don't want to add a verbatim copy of the current files in the py files | 23:38 |
| lifeless | jelmer: sure, I got that | 23:39 |
| berto- | so getting my changes into the svn repo is just a matter of using "bzr push"? | 23:39 |
| jelmer | berto-: if you're pushing a new branch that isn't in svn yet, "bzr svn-push" | 23:39 |
| berto- | no just changes to trunk, so that should work, i suppose. | 23:40 |
| jelmer | yep | 23:44 |
| berto- | jelmer: svn-push failed while "Obtaining username for SVN connection" on a file:/// transport ? | 23:44 |
| NfNitLoop | berto-: is this a repo you checked out from SVN? | 23:45 |
| berto- | yep. | 23:45 |
| NfNitLoop | do bzr info. find what it says for "parent branch". | 23:45 |
| NfNitLoop | and just "bzr push" to that. | 23:45 |
| berto- | same problem | 23:46 |
| NfNitLoop | odd. | 23:46 |
| berto- | NfNitLoop: it is a repo accessed via file://, wonder if that's the problem. | 23:47 |
| NfNitLoop | try svn+file:// ? (just brainstorming here... been a while since I touched bzr-svn) | 23:47 |
| berto- | hmm, blew up another way. :) | 23:48 |
| berto- | SubversionException: ("Can't write to connection: Bad address", 14) | 23:50 |
| NfNitLoop | berto-: and you can "bzr pull" from that location OK? | 23:51 |
| berto- | yeah, just did about an hour ago. | 23:51 |
| jelmer | berto-: haven't seen that error before | 23:51 |
| jelmer | berto-: You're pushing to a remote location? | 23:51 |
| jelmer | berto-: That doesn't look like file:// at all.. | 23:52 |
| berto- | jelmer: it's a file:/// transport on the same machine. | 23:52 |
| berto- | jelmer: oh, right. that last one i used svn+ssh:// to come back to the same box. | 23:52 |
| jelmer | berto-: Anything in ~/.bzr.log ? | 23:52 |
| jelmer | berto-: Are you sure you typed the path correctly? | 23:52 |
| berto- | almost certain. | 23:52 |
| berto- | i grabbed it from bzr info | 23:53 |
| berto- | parent branch: /home/dev/repo.svn | 23:53 |
| jelmer | and you're pushing to /home/dev/repo.svn/trunk or something? | 23:53 |
| berto- | jelmer: oh, i should specify trunk ... | 23:55 |
| berto- | let me try that. | 23:55 |
| berto- | in bzr i'm in the trunk branch, then i push to svn's trunk branch and i get a "diverged" error. | 23:56 |
| berto- | i think i saw that one in the faq ... | 23:56 |
| poolie | hello | 23:56 |
| jelmer | berto-: You should push to the same location that you pulled from | 23:57 |
| jelmer | hey poolie | 23:57 |
| Verterok | hi poolie | 23:57 |
| berto- | jelmer: hmm, i was trying that and it wsn't working. merge is thinking right now, not sure what it's doing. | 23:57 |
| jelmer | berto-, what error did you get exactly when you did that? | 23:57 |
| berto- | jelmer: http://paste.pocoo.org/show/78324/ | 23:58 |
| jelmer | berto-: Any chance you can run that inside of gdb? | 23:59 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!