=== bitmonk [n=justizin@adsl-76-192-203-38.dsl.pltn13.sbcglobal.net] has joined #bzr | ||
=== hsn_ [n=radim@234.114.broadband5.iol.cz] has joined #bzr | ||
=== fog [n=fog@debian/developer/fog] has left #bzr [] | ||
=== herzel [i=herzel@gateway/tor/x-d786922d2c2160b5] has joined #bzr | ||
=== igc [n=igc@ppp59-167-96-213.lns3.bne1.internode.on.net] has joined #bzr | ||
igc | morning | 01:21 |
---|---|---|
NfNitLoop | evening! | 01:24 |
NfNitLoop | :) | 01:24 |
=== BasicOSX_ [n=Basic@fortress.tanners.org] has joined #bzr | ||
poolie | hello | 01:27 |
=== dhon__ [n=dhon@60-240-97-109.static.tpgi.com.au] has joined #bzr | ||
lifeless | hi | 01:29 |
jelmer | 'morning igc, NfNitLoop, poolie, lifeless | 01:32 |
poolie | hi | 01:33 |
igc | morning jelmer | 01:33 |
=== jml [n=jml@203-113-250-169-static.TAS.netspace.net.au] has joined #bzr | ||
=== Admiral_Chicago [n=FreddyM@st074039212101.monm.edu] has joined #bzr | ||
=== mw is now known as mw|out | ||
=== dhon__ is now known as dhon_ | ||
=== spiv [n=andrew@canonical/launchpad/spiv] has joined #bzr | ||
lifeless | wow | 01:57 |
lifeless | so much wiki spam | 01:57 |
poolie | yeah, sucks | 01:58 |
poolie | lifeless, i'm reading your commit overhead patch | 02:01 |
=== keir [n=keir@76-10-155-93.dsl.teksavvy.com] has joined #bzr | ||
lifeless | poolie: ... | 02:04 |
poolie | ? | 02:05 |
lifeless | you said you're reading the patch | 02:05 |
lifeless | and then nothing | 02:05 |
poolie | i voted +1 | 02:05 |
poolie | for 0.91 | 02:05 |
lifeless | ok | 02:05 |
keir | lifeless, did you end up pulling my branch? | 02:06 |
lifeless | keir: sorry no I haven't yet | 02:07 |
lifeless | I *meant* to but ended up tweaking performance of commit more | 02:07 |
lifeless | igc: shall we chat shortly about how we combine branches? | 02:08 |
igc | yes - I call in 10 minutes? | 02:08 |
keir | lifeless, no problem; i fixed some idiocy in it on the bus | 02:09 |
lifeless | igc: please | 02:09 |
poolie | lifeless or igc, would you please look at http://bundlebuggy.aaronbentley.com/request/%3Cm2wsuyzoy3.fsf@free.fr%3E | 02:11 |
lifeless | igc: I don't think my patch needs to change, I've replied with why. | 02:13 |
lifeless | igc: would appreciate you checking back on it so I can merge for 0.91 as per poolies ok. | 02:14 |
igc | lifeless: I'll look now | 02:14 |
=== cprov [n=cprov@canonical/launchpad/cprov] has joined #bzr | ||
igc | lifeless: no email reply through yet btw | 02:15 |
lifeless | poolie: I've looked at it | 02:17 |
poolie | i was not disagreeing with igc's comment about naming, btw | 02:17 |
poolie | i have not seen your reply yet | 02:18 |
lifeless | poolie: its already +2 AFAICT, but it looks fine to me, I agree with your comment on the review | 02:18 |
lifeless | poolie: igc: the reply just got through now | 02:20 |
igc | just got it | 02:20 |
lifeless | can we get a captcha on the wiki add-user page ? | 02:23 |
igc | so lifeless, if you add a comment above the call to add_lines_with_ghosts explaining what it's being called instead of add_lines, I'd appreciate it | 02:23 |
igc | s/what/why/ | 02:23 |
lifeless | igc: so there are two reasons; | 02:23 |
lifeless | one is that its the right api to use, because it supports committing with ghosts | 02:23 |
igc | I got the reasons ... | 02:23 |
lifeless | the other is that its a slightly cheaper call | 02:23 |
igc | I just want it in the code | 02:23 |
lifeless | sure | 02:23 |
lifeless | I'm just noting that I didn't mention the former in the patch at all | 02:23 |
igc | ok | 02:24 |
igc | poolie: do you need more feedback on Vincent's patch? | 02:24 |
lifeless | It seems a strange thing to comment on is all I guess | 02:24 |
lifeless | kindof like saying 'we use .readlines() because it gives us the file lines with \n' | 02:25 |
lifeless | its true, but redundant | 02:25 |
igc | not IMO ... | 02:25 |
igc | the name _with_ghosts suggests ghosts :-) | 02:26 |
lifeless | its a convention across the code base for apis that support ghosts | 02:26 |
lifeless | and this api supports ghosts | 02:26 |
igc | ok - merge it and we'll move on | 02:27 |
igc | ping me when that's done and I'll call you | 02:28 |
igc | poolie: anything else you want from me before I call lifeless? | 02:28 |
lifeless | did my knits patch seem ok for 0.91 ? | 02:29 |
igc | lifeless: I didn't review it because abentley had concerns on IRC | 02:30 |
igc | if those concerns are resolved, I'll look closer | 02:31 |
igc | it looked ok at first glance yesterday | 02:31 |
lifeless | I don't think they are resolved | 02:32 |
lifeless | abentley: care to reply to my knits patch ? | 02:32 |
lifeless | igc: the patch is away with a comment added | 02:32 |
igc | thanks | 02:33 |
lifeless | so ring anytime | 02:35 |
igc | Right now. Some quick feedback on your other patch emailed just now. | 02:37 |
=== mthaddon [n=mthaddon@canonical/launchpad/mthaddon] has joined #bzr | ||
ubotu | New bug: #138787 in bzr "revspec paths don't interpret user refs" [Low,New] https://launchpad.net/bugs/138787 | 02:55 |
=== herzel [i=herzel@gateway/tor/x-774022787152769d] has joined #bzr | ||
lifeless | === modified file 'bzrlib/repofmt/pack_repo.py' | 03:13 |
lifeless | --- bzrlib/repofmt/pack_repo.py 2007-09-09 23:45:05 +0000 | 03:13 |
lifeless | +++ bzrlib/repofmt/pack_repo.py 2007-09-10 07:11:39 +0000 | 03:13 |
lifeless | @@ -1032,7 +1032,8 @@ | 03:13 |
lifeless | return knit.KnitVersionedFile('text:' + file_id, None, | 03:13 |
lifeless | None, | 03:13 |
lifeless | index=knit_index, | 03:13 |
lifeless | - access_method=self.repo._text_knit_access) | 03:13 |
lifeless | + access_method=self.repo._text_knit_access, | 03:13 |
lifeless | + factory=knit.KnitPlainFactory()) | 03:13 |
lifeless | igc: ^ | 03:13 |
=== NamNguyen [n=namnt@203.162.163.50] has joined #bzr | ||
igc | thanks lifeless | 03:17 |
lifeless | like I say, trivial :) | 03:19 |
=== gldnspud [n=gldnspud@72.171.93.139] has joined #bzr | ||
=== yminsky [n=yminsky@user-0cevcqv.cable.mindspring.com] has joined #bzr | ||
=== yminsky [n=yminsky@user-0cevcqv.cable.mindspring.com] has joined #bzr | ||
=== AfC [i=andrew@office.syd.operationaldynamics.com] has joined #bzr | ||
=== yminsky [n=yminsky@user-0cevcqv.cable.mindspring.com] has joined #bzr | ||
=== gldnspud [n=gldnspud@72.171.93.139] has joined #bzr | ||
=== marianom [n=marianom@ubuntu/member/marianom] has joined #bzr | ||
=== Verterok [n=Verterok@184-220-114-200.fibertel.com.ar] has joined #bzr | ||
=== igc food | ||
=== jml [n=jml@ppp108-61.static.internode.on.net] has joined #bzr | ||
=== herzel [i=herzel@gateway/tor/x-563e1ce750b0d706] has joined #bzr | ||
=== ionstorm [n=ion@71-36-164-32.phnx.qwest.net] has joined #bzr | ||
lifeless | poolie: ping | 04:42 |
poolie | pong | 04:43 |
lifeless | you seem to be marking bugs as fix released before they are in a release | 04:43 |
lifeless | our convention documented on the wiki is fix committed until its actually in a release, isn't it ? | 04:43 |
poolie | is it? | 04:44 |
poolie | i thought we had decided to mark them FR when they were merged, because there is no way to bulk update them | 04:44 |
lifeless | oh, I'm confused | 04:44 |
lifeless | yes you are right, bzr.dev == FR | 04:44 |
poolie | i would much prefer to do it the other way but it's not feasible atm | 04:45 |
poolie | well, i guess we could write a script that would generate status-changing mails | 04:45 |
fullermd | Is it a bug that bzr rm'ing a file/dir with conflicts doesn't resolve the conflicts (nor does 'resolve' auto-resolve them)? | 04:45 |
poolie | yes, but it may not be a known bug | 04:45 |
=== orospakr [n=orospakr@bas4-ottawa23-1177612214.dsl.bell.ca] has joined #bzr | ||
poolie | fucking spammers | 04:46 |
lifeless | you can update many bugs with one mail | 04:47 |
lifeless | poolie: can we get a captcha on the wiki user creation page ? | 04:47 |
fullermd | Mmm. Don't see it. | 04:47 |
poolie | s/mails/mail | 04:47 |
=== bitmonk wonders if anyone has tested bzr with alternative python implementations at all | ||
fullermd | Search does bring bug 5140 though. I'm not sure that should be on bzr... bzr-email, maybe. | 04:48 |
ubotu | Launchpad bug 5140 in bzr "Merge emails blow my mind" [Wishlist,Confirmed] https://launchpad.net/bugs/5140 | 04:48 |
lifeless | poolie: also, I think we want more grnularity than lp offers | 04:49 |
Verterok | bitmonk: I tried with Jython and Jythonx (now dead). but no even closer to do a; import bzrlib :( | 04:50 |
bitmonk | worth a try with pypy, i suppose.. | 04:51 |
lifeless | as if bzr isn't slow enough already | 04:51 |
poolie | lifeless, more granularity in bug state? | 04:53 |
poolie | or ironpython | 04:53 |
lifeless | poolie: yeah, fix in my branch, fix in bzr.dev, fix in tarball | 04:54 |
fullermd | Funny. You can notice how much faster commit has gotten the last few versions, even on tiny branches, when writing and testing bug reproduction scripts. | 05:01 |
fullermd | Obviously, we need more bugs, so the speed improvements are visible :] | 05:01 |
=== bigdo1 [n=scmikes@72-197-8-8-arpa.cust.cinci.current.net] has joined #bzr | ||
beuno | anyone up to helping me solve a small glitch in a feature I'm trying to add to xml-output plugin? I want to capture some of the output from 'bzr missing' to put it into the XML, but I can't seem to figure out how to capture the 'Using last location:' bit | 05:04 |
ubotu | New bug: #138802 in bzr "tag deletion does not propagate" [Medium,Triaged] https://launchpad.net/bugs/138802 | 05:05 |
ubotu | New bug: #138803 in bzr "rm'ing conflicted files doesn't resolve conflicts" [Undecided,New] https://launchpad.net/bugs/138803 | 05:05 |
fullermd | beuno: I would presume it's going to stderr... | 05:05 |
beuno | fullermd, sorry if the questions are a bit too obvious, I'm still finding my way around python (and bzr code). I'd have to capture that differently then I capture the revision info? (I'm currently wraping that fine) | 05:07 |
fullermd | Oh, well, I dunno anything about catching it in python. There's probably a standard arg for however you capture stdout to cram stderr in with it, or at least a way to access the fd. | 05:10 |
lifeless | beuno: how are you hooking into the command ? | 05:11 |
beuno | lifeless, builtins.cmd_missing | 05:13 |
beuno | http://codebrowse.launchpad.net/~beuno/bzr-xmloutput/xml-beuno/annotate/argentina%40gmail.com-20070902215621-wiq1c4ssihnfestz?file_id=__init__.py-20070406035637-ac26bagfmjgniyko-1 | 05:13 |
beuno | line 96 is the function | 05:13 |
beuno | or class :D | 05:14 |
lifeless | ok | 05:17 |
lifeless | the thing you want to output is not partof the log | 05:17 |
lifeless | you just need to do it yourself | 05:17 |
poolie | fullermd, thanks for the bug updates | 05:18 |
lifeless | you will probably want to file a patch for bzrlib to make it easier | 05:18 |
lifeless | e.g. a helper method to factor out that logic | 05:18 |
poolie | lifeless, i crave your review of my tag bug patch | 05:19 |
beuno | lifeless, I was suspecting that was where it would en up... :/ Because antoher option would be not to display that for now, since it breaks the XML, but do I have a way to do that? | 05:19 |
lifeless | beuno: yes, copy the body of the bzrlib method and change it | 05:20 |
lifeless | beuno: I recommend giving us a patch ;) | 05:20 |
=== bitmonk_ [n=justizin@adsl-76-192-203-38.dsl.pltn13.sbcglobal.net] has joined #bzr | ||
poolie | lifeless, trust you to know of the http Warning header | 05:20 |
lifeless | poolie: ok, will lunch first | 05:20 |
lifeless | poolie: :) | 05:20 |
poolie | i have never encountered such a athing | 05:20 |
beuno | lifeless, argh, you're going to make me fly away into crazy bzr/python world for the next two days... | 05:20 |
lifeless | I'm not aware of any client that actually shows it; though I haven't tested in about 3 years | 05:20 |
beuno | I never pick the easy stuff... :p | 05:21 |
lifeless | beuno: you could start by filing a bug | 05:21 |
lifeless | maybe a python dev will be kind to you | 05:21 |
poolie | lifeless, let's talk after that? i might go for a ride in the meantime | 05:21 |
lifeless | k | 05:21 |
beuno | lifeless, ok, I'll file a bug and try and approach it until I run everyone here out of patience :D | 05:22 |
lifeless | poolie: ok | 05:23 |
=== marianom [n=marianom@ubuntu/member/marianom] has left #bzr [] | ||
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
sabdfl | evening all | 06:01 |
beuno | evening sabdfl | 06:01 |
lifeless | hiya | 06:02 |
igc | evening sabdfl | 06:05 |
beuno | lifeless, I'm going to go ahead and reimplement missing in the plugin itself, and then see how we can improve it in bzrlib itself | 06:06 |
lifeless | poolie: ring me at your convenience | 06:17 |
lifeless | igc: repository branch fixen pushed | 06:24 |
lifeless | 2759 | 06:24 |
igc | great - thanks | 06:24 |
lifeless | not entirely failure free; | 06:25 |
lifeless | but enough to benchmark reliably again | 06:25 |
igc | understood | 06:25 |
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
=== g0ph3r [n=g0ph3r@p57A0B3ED.dip0.t-ipconnect.de] has joined #bzr | ||
=== orospakr [n=orospakr@bas4-ottawa23-1177612214.dsl.bell.ca] has joined #bzr | ||
=== AfC [i=andrew@office.syd.operationaldynamics.com] has joined #bzr | ||
=== michelp [n=michelp@69-30-72-119.dq1sf.easystreet.com] has joined #bzr | ||
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
abentley | lifeless: I've decided to abstain. If someone else reviews it and decides the tradeoff is worth it, that's fine by me. | 06:58 |
ubotu | New bug: #138812 in bzr "no tag --local operation" [Undecided,New] https://launchpad.net/bugs/138812 | 07:00 |
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
lifeless | abentley: did any of the compromises we chatted about seem reasonable ? | 07:11 |
abentley | Enabling the tests during test suite runs seems like an improvement. | 07:13 |
keir | lifeless, does the transport layer buffer reads automatically? when i read the preamble, i'm reading in 2 chunks, then finally a larger chunk | 07:14 |
keir | if the transport would go ahead and grab 4k after the first read, and then i didn't have to deal with buffering that data, that would be great. | 07:14 |
abentley | That would mean that a careful tester would catch bugs in this area. | 07:14 |
abentley | I think I could live with that. | 07:15 |
lifeless | keir: transports have no buffering in general | 07:16 |
keir | so i have to implement my own buffering layer? | 07:17 |
lifeless | so if you want 4K + preamble, guess at the largest size of preamble and read preamble + 4K | 07:17 |
lifeless | well | 07:17 |
lifeless | buffering is one way of doing it | 07:17 |
lifeless | but buffering on local disk has very different tradeoffs to dealing with a tcp connection | 07:17 |
keir | alright. for now i'll just leave it. 1 extra round trip per index is not a big deal | 07:18 |
keir | i have single-item get working with caching | 07:18 |
keir | but it does a single readv() on every miss | 07:19 |
keir | so next i'm going to do fetch-many-keys lookup, which iterates between passes which readv() blocks, and descends them | 07:19 |
abentley | keir: On your structure, is it expensive to determine that a key is not present? | 07:20 |
keir | no different than if it is | 07:21 |
keir | actually, it may be cheaper | 07:21 |
keir | depending on the key | 07:21 |
keir | but i suspect in most cases checking if a key is present is the same as if it's there | 07:21 |
keir | for most packs, i expect it to be only one tree lookup + another 4k block fetch | 07:21 |
keir | abentley, is that a very common check? | 07:22 |
abentley | I'm not sure. I just realized it wasn't something we'd discussed. | 07:24 |
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
keir | generators are wacky. i think i'm going to use them to accumulate read vectors. are they slow? | 07:30 |
fullermd | Oh look, no useful header to filter launchpad's blueprint mailings on. | 07:36 |
abentley | keir: generator iteration is faster than function calls, but slower than a tight loop. | 07:39 |
abentley | They are typically a good choice, but if every last drop of performance matters, doing it all in a loop may be better. | 07:40 |
abentley | As always, profile. | 07:40 |
keir | in the end, i'm using recursion *ducks!* | 07:42 |
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
=== Verterok [n=Verterok@184-220-114-200.fibertel.com.ar] has left #bzr [] | ||
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
=== hdima [n=hdima@idealer.cust.smartspb.net] has joined #bzr | ||
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
lifeless | poolie: done | 08:24 |
=== ionstorm [n=ion@71-36-164-32.phnx.qwest.net] has joined #bzr | ||
=== Steve____ [n=chatzill@mail.pfxcorp.com] has joined #bzr | ||
=== Steve____ is now known as Stevage | ||
lifeless | poolie: your branch is made | 08:32 |
Stevage | hello everyone | 08:36 |
Stevage | could someone answer a couple of questions for me? | 08:36 |
=== Odd_Blok1 [i=oddbloke@compsoc.sunion.warwick.ac.uk] has joined #bzr | ||
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
=== sii [n=sii@tranquillity.sii.se] has joined #bzr | ||
=== luks [i=lukas@unaffiliated/luks] has joined #bzr | ||
beuno | Stevage, sure, we'll try | 08:45 |
Stevage | coolies - I'm evaluating using bzr for work | 08:46 |
Stevage | is it possible to checkout a single file, and not a whole directory? | 08:46 |
lifeless | ciao | 08:47 |
Stevage | eg, file /docs/doc1.txt - I just want to checkout doc1.txt into a normal directory | 08:47 |
lifeless | no but you can cat it - bzr cat url/docs/doc1.txt | 08:47 |
igc | lifeless: ping | 08:48 |
igc | lifeless: some quick Qs re your branch ... | 08:48 |
igc | content_summary is always returning a sha of None ... | 08:49 |
lifeless | ring my mobile in 2 mintues please | 08:49 |
igc | because it's running the one in workingtree, not workingtree4 | 08:49 |
igc | cool | 08:49 |
Stevage | ah interesting | 08:50 |
Stevage | so I can do a kind of one way check out | 08:50 |
Stevage | but then not check any changes back in | 08:50 |
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
Stevage | ok next question: say I have a file (versions.h) that is used by two different projects, and should be checked out by both of them. how can I set that up? | 08:55 |
jamesh | Stevage: "bzr cat" is roughly equivalent to "cvs update -p" | 09:02 |
=== vila [n=vila@lec67-4-82-230-53-244.fbx.proxad.net] has joined #bzr | ||
jamesh | Stevage: for the second question, Bazaar's answer would probably be nested trees | 09:07 |
jamesh | the shared files would be in their own branch, and that branch would be nested in the two projects' branches | 09:08 |
Stevage | how do I nest? | 09:08 |
Stevage | I tried doing it with a checkout, but those files didn't get added to the parent branch | 09:09 |
Stevage | as in, I created /shared and /proj1 and in /proj1 did bzr checkout ../shared | 09:09 |
Stevage | so then I have /proj1/shared - good. but when I update /work1 which is bound to /proj1, it didn't pull in /shared | 09:09 |
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
jamesh | I am not sure how much of the nested tree stuff is in mainline yet | 09:12 |
jamesh | so at present you need to do it manually (this will likely change in the future) | 09:13 |
Stevage | yeah looking at ConfigManager atm | 09:15 |
Stevage | I'm on windows, so looks like a pain to build | 09:15 |
jamesh | or use ConfigManager | 09:15 |
jamesh | Stevage: the version of ConfigManager you want is written in Python | 09:15 |
jamesh | grab the branch listed here: http://bazaar-vcs.org/3rdPartyDownloads | 09:16 |
Stevage | yeah?L | 09:16 |
Stevage | that one is C++ | 09:16 |
Stevage | with a python wrapper | 09:16 |
jamesh | the branch contains both the old C++ implementation (which doesn't support bzr, iirc) and the new Python implementation | 09:17 |
Stevage | oh yes there is some code in /lib | 09:18 |
Stevage | have you tried setting it up on windows? | 09:18 |
jamesh | nope. | 09:18 |
jamesh | do "bzr branch http://www.robertcollins.net/config-manager/trunk/ config-manager" to download it | 09:19 |
jamesh | the files you see when browsing it in a web browser are likely out of date | 09:19 |
Stevage | sweet | 09:20 |
=== mvo [n=egon@p54A67B1B.dip.t-dialin.net] has joined #bzr | ||
Stevage | will I need to install python then? | 09:22 |
Stevage | bzr comes with the python dll but that's all I have | 09:22 |
=== ddaa [n=david@canonical/launchpad/ddaa] has joined #bzr | ||
=== gabe_ [n=gabriel@91.84.56.254] has joined #bzr | ||
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
jamesh | Stevage: no idea. | 09:32 |
jamesh | Stevage: but probably. | 09:32 |
Stevage | ok | 09:34 |
Stevage | might actually be simpler for me to just hack up a couple of batch files that do the job | 09:34 |
Stevage | do you know if it's possible to commit several files at once, specifying individual commit messages for each one? | 09:35 |
jamesh | Stevage: commits are tree wide, so it isn't possible to do separate messages for separate files within a commit | 09:37 |
fullermd | Is there some reason we don't have a Branch.open_containing_from_transport? | 09:46 |
poolie | fullermd, it would seem reasonable to have one | 09:47 |
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
=== AfC [i=andrew@office.syd.operationaldynamics.com] has joined #bzr | ||
fullermd | It'd need direct tests, wouldn't it... | 09:48 |
=== sverrej_ [n=sverrej@tul-1x-dhcp017.studby.uio.no] has joined #bzr | ||
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
=== markvandenborre [n=mark@ubuntu/member/markvandenborre] has joined #bzr | ||
=== sverrej [n=sverrej@tul-1x-dhcp017.studby.uio.no] has joined #bzr | ||
igc | night all | 10:09 |
=== matkor [n=matkor@EUROCZESCI.wbs.ssh.gliwice.pl] has joined #bzr | ||
matkor | Hi ! | 10:10 |
matkor | >>> local_branch.missing_revisions(parent_branch) -> bzrlib.errors.DivergedBranches: These branches have diverged. Use the merge command to reconcile them | 10:10 |
matkor | How can I get information what revisions are missing on both branches ? TIA | 10:11 |
spiv | matkor: bzr missing | 10:12 |
spiv | matkor: you can see the implemenation of that command in bzrlib.builtins.cmd_missing | 10:13 |
matkor | spiv: Thanks | 10:14 |
=== RichardL [n=Skippy@78.32.35.169] has joined #bzr | ||
vila | fullermd: the reason should be historical, the _from_transport methods began to be added when we tried to avoid multiple connections | 10:16 |
vila | fullermd: where do you encounter the need for it ? | 10:17 |
=== hsn_ [n=radim@234.114.broadband5.iol.cz] has joined #bzr | ||
=== mrevell [n=matthew@canonical/launchpad/mrevell] has joined #bzr | ||
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
matkor | Can I browse recent bzr source on web somewhere ? http://starship.python.net/crew/mwh/bzrlibapi/bzrlib.builtins.cmd_missing.html does not give hints and I have only pyo/pyc files installed ... | 10:24 |
mwh | matkor: http://codebrowse.launchpad.net/~bzr/bzr/trunk/files | 10:24 |
matkor | mwh: thanks ! | 10:25 |
=== Zindar [n=erik@stockholm.ardendo.se] has joined #bzr | ||
=== jml [n=jml@ppp121-44-221-92.lns1.hba1.internode.on.net] has joined #bzr | ||
fullermd | vila: Well, I was trying to fix up pull to be more forgiving, but that's sounding like a lot bigger bite than I can chew. | 10:38 |
vila | fullermd: bug ref ? More forgiving about ? (can't relate that to a recent topic, please refresh my memory :) | 10:40 |
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
fullermd | Well, just what you'd expect an open -> open_containing switch; more forgiving about being given a location other than a branch root. | 10:41 |
fullermd | No bug ref or topic I recall; just something I ran into earlier tonite and thought (erroneously, perhaps) might be simple enough that I could pull through. | 10:41 |
matkor | Is remote_branch.lock_read() expensive ? 2) What may happen if I operate over unlocked branch ? 3) How it is done over http ? | 10:42 |
vila | fullermd: hmm, Branch already have an open_containing method | 10:44 |
vila | this method already offers a 'possible_transports' parameter so _from_transport should not be needed | 10:45 |
fullermd | Well, pull uses open_from_transport() now. I'm far too wildly unknowledgeable about the differences between funct... er, methods, and data struc.... er, objects, to have any clue how/if I can turn one into another. | 10:46 |
vila | fullermd: b.open_from_transport(location_transport) ~= b.open_containing(location, possible_transports=[location_transport] ) | 10:48 |
vila | fullermd: for fuzy values of ~= | 10:49 |
fullermd | Right, see, I have no business being involved in fuzzy :p | 10:49 |
fullermd | I don't have any business being involved in sharp and clear either, but I like living on the edge. | 10:49 |
vila | even with a single 'z' which implied less fuzzyness ? :D | 10:49 |
fullermd | Sounds to me like having one eye poked out instead of two :| | 10:52 |
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
=== Demitar [n=demitar@c-212-031-190-120.cust.broadway.se] has joined #bzr | ||
=== gabe_ [n=gabriel@91.84.56.254] has left #bzr [] | ||
fullermd | Holy squat, bundle is fast now. | 11:11 |
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
matkor | Hmm. One can't add '@" to info_dialog content message ? | 11:21 |
dato | AfC: re the scm-gnome thread, I think it'd be better to give each project an independent shared repo, where trunk and branches are kept. | 11:22 |
AfC | dato: yeah, duh that makes sense - above that level, revisions are never going to be shared | 11:23 |
dato | right. | 11:24 |
AfC | [at least, not until we go WAY further down the nested branch and my project uses your project's sources paths] | 11:24 |
AfC | dato: [please do point that out in an email] | 11:24 |
dato | AfC: okay | 11:24 |
=== nir [n=nir@moinmoin/fan/nir] has joined #bzr | ||
=== jml [n=jml@ppp121-44-221-92.lns1.hba1.internode.on.net] has joined #bzr | ||
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
=== mrevell is now known as mrevell-tea | ||
=== mrevell-tea is now known as mrevell | ||
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
matkor | jelmer: Could you please review and merge olive-gtk bugfix from https://code.launchpad.net/~matkor/bzr-gtk/trunk-matkor ? TIA | 11:54 |
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
=== cfbolz [n=cfbolz@p54ABC515.dip0.t-ipconnect.de] has joined #bzr | ||
=== NamNguyen [n=namnt@cm246.delta196.maxonline.com.sg] has joined #bzr | ||
=== gabe_ [n=gabriel@91.84.56.254] has joined #bzr | ||
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
=== pygi [n=mario@83-131-18-207.adsl.net.t-com.hr] has joined #bzr | ||
=== Demitar [n=demitar@c-212-031-190-120.cust.broadway.se] has joined #bzr | ||
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
=== Enquest [n=Enquest@d54C28B91.access.telenet.be] has joined #bzr | ||
=== NamNguyen [n=NamNguye@cm246.delta196.maxonline.com.sg] has joined #bzr | ||
=== Odd_Blok1 is now known as Odd_Bloke | ||
=== mrevell is now known as mrevell-lunch | ||
=== fog [n=fog@debian/developer/fog] has joined #bzr | ||
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
=== markvandenborre [n=mark@ubuntu/member/markvandenborre] has left #bzr ["Ik] | ||
jelmer | matkor: I'll have a look this evening | 01:06 |
matkor | jelmer: Szilvester is testing it right now, but more eyeballs - the better ... | 01:09 |
Enquest | If I want to delete a branch in my repo how do I do this? | 01:09 |
Enquest | rm -R branch ??? | 01:10 |
dato | Enquest: yes, knowing that revisions belonging to that branch will stay unreferenced in the repo | 01:10 |
Enquest | dato and is there a more clean way ?? | 01:10 |
Enquest | I made some big mistakes starting a branch... And want to start a new | 01:11 |
dato | not at the moment. | 01:11 |
Enquest | a new branch same name | 01:11 |
dato | Enquest: but I think rm -r it's okay, unless you committed some very big files or something. | 01:11 |
Enquest | so rm -R is realy ok! | 01:11 |
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
=== ddaa [n=ddaa@nor75-18-82-241-238-155.fbx.proxad.net] has joined #bzr | ||
=== ddaa_ [n=david@canonical/launchpad/ddaa] has joined #bzr | ||
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
=== mrevell-lunch is now known as mrevell | ||
jelmer | matkor: I don't run olive myself but am happy to review | 02:07 |
=== ddaa [n=ddaa@nor75-18-82-241-238-155.fbx.proxad.net] has left #bzr [] | ||
=== niemeyer [n=niemeyer@200-103-134-216.ctame705.dsl.brasiltelecom.net.br] has joined #bzr | ||
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
=== mw|out [n=mw@189.146.24.28] has joined #bzr | ||
mwhudson | crap | 02:17 |
=== asabil [n=asabil@62.70.2.252] has joined #bzr | ||
mwhudson | jelmer: bzr-svn just did this to me http://rafb.net/p/FGNzoK46.html | 02:19 |
asabil | hi all | 02:19 |
asabil | what is the bzr commit --fixes for ? | 02:20 |
asabil | is it for bugzilla integration ? | 02:20 |
Odd_Bloke | asabil: Launchpad integration, certainly. I don't know about Bugzilla. | 02:21 |
asabil | ok thanks | 02:21 |
luks | it isn't integrated with launchpad at the moment, though | 02:22 |
luks | http://doc.bazaar-vcs.org/latest/en/user-guide/bug_trackers.html | 02:24 |
Enquest | how do I rename a dir with bzr | 02:26 |
luks | bzr mv | 02:26 |
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
Odd_Bloke | Enquest: Or if you've already renamed it, 'bzr mv --after'. | 02:27 |
Enquest | thanxs | 02:29 |
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has left #bzr [] | ||
=== pete__c [n=pete@032-463-246.area7.spcsdns.net] has joined #bzr | ||
=== bwinton [n=bwinton@mail.phantomfiber.com] has joined #bzr | ||
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
=== cfbolz_ [n=cfbolz@p54ABA03B.dip0.t-ipconnect.de] has joined #bzr | ||
=== joe99 [n=joe@146-115-30-99.c3-0.wtr-ubr1.sbo-wtr.ma.cable.rcn.com] has joined #bzr | ||
AfC | Enquest: (you use that to rename {,after} files as well) | 03:09 |
Enquest | thxs | 03:10 |
=== RichardL [n=Skippy@78.32.35.169] has joined #bzr | ||
AfC | Enquest: watch out for moving symlinks though... as I recall, it might choke on those. You might have to remove/add still. [Maybe that's been fixed] | 03:10 |
Enquest | no symlinks in this | 03:11 |
Enquest | I'm just starting with bazaar | 03:11 |
=== cprov [n=cprov@canonical/launchpad/cprov] has joined #bzr | ||
jelmer | mwhudson: hmm, will have a look this evening | 03:13 |
mwhudson | jelmer: okidoke | 03:15 |
mwhudson | jelmer: path is a bytestring path with non-ascii characters btw | 03:15 |
mwhudson | 'pypy/extradoc/talk/22c3/speaker-beatriced\xc3\xbcring.txt' | 03:17 |
mwhudson | in fact | 03:17 |
mwhudson | (which looks like utf-8 to me) | 03:18 |
=== cfbolz_ is now known as cfbolz | ||
=== hsn_ [n=radim@234.114.broadband5.iol.cz] has joined #bzr | ||
=== marianom [n=marianom@ubuntu/member/marianom] has joined #bzr | ||
matkor | During bzr update of checkout of branch: sftp: I have to provide password three times ... is it bug ? | 03:32 |
=== netjoined: irc.freenode.net -> kubrick.freenode.net | ||
=== mw|out [n=mw@189.146.24.28] has joined #bzr | ||
=== jrydberg [n=johan@213.115.45.46] has joined #bzr | ||
=== BjornT [n=bjorn@canonical/launchpad/BjornT] has joined #bzr | ||
=== _logger [n=_logger@adsl-75-51-62-134.dsl.chcgil.sbcglobal.net] has joined #bzr | ||
=== ryanakca [n=ryan@ubuntu/member/ryanakca] has joined #bzr | ||
AfC | Hm. In bad old CVS land, if you have a repository with 20 modules, and you do a change (simple refactoring, say) in each one, does that imply the need to do 20 independent commits? I believe so. Anyone remember? | 03:34 |
LeoNerd | Noy really | 03:35 |
LeoNerd | *Not | 03:35 |
LeoNerd | CVS considers each file individually, nothing bigger. | 03:35 |
LeoNerd | If you've changed 20 files, you need to commit 20 files. | 03:35 |
=== Odd_Bloke is too young to have used CVS. :D | ||
LeoNerd | Either 20 individual "cvs commit" commands, or one, or whatever. | 03:35 |
AfC | LeoNerd: yeah yeah... but if you're in a given checkout, and you type naked `cvs commit` it storms off recursively, right, same as every other VCS tool. But there's no `cd .. ; cvs commit` that would recurse across 20 directories that happen to be modules from the same repository, is there? | 03:38 |
LeoNerd | Not normally, no... | 03:38 |
LeoNerd | I don't know about most people, but I have a whole tonne of wrapper scripts for that though | 03:38 |
LeoNerd | cvs eachroot commit -m "Here's some changes" would do that for me ;) | 03:38 |
=== mw|out is now known as mw | ||
=== bwinton [n=bwinton@mail.phantomfiber.com] has left #bzr [] | ||
=== orospakr [n=orospakr@132.213.238.4] has joined #bzr | ||
=== tchan [n=tchan@lunar-linux/developer/tchan] has joined #bzr | ||
=== joe99_ [n=joe@146-115-30-99.c3-0.wtr-ubr1.sbo-wtr.ma.cable.rcn.com] has joined #bzr | ||
=== metze is now known as metze_away | ||
=== hsn_ [n=radim@234.114.broadband5.iol.cz] has joined #bzr | ||
=== cpro1 [n=cprov@201-68-28-217.dsl.telesp.net.br] has joined #bzr | ||
=== quicksil1er [n=jules@212.69.38.59] has joined #bzr | ||
=== quicksil1er is now known as quicksilver | ||
=== Mez [n=Mez@ubuntu/member/mez] has joined #bzr | ||
=== RichardL [n=Skippy@78.32.35.169] has joined #bzr | ||
=== mthaddon [n=mthaddon@canonical/launchpad/mthaddon] has joined #bzr | ||
=== cpro1 is now known as cprov | ||
=== herzel [i=herzel@gateway/tor/x-1633a69815ab2cb8] has joined #bzr | ||
=== cprov is now known as cprov-lunch | ||
=== bitmonk [n=justizin@adsl-76-192-203-38.dsl.pltn13.sbcglobal.net] has joined #bzr | ||
=== dhon [n=dhon@60-240-97-109.static.tpgi.com.au] has joined #bzr | ||
=== sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
=== fog [n=fog@debian/developer/fog] has left #bzr [] | ||
=== p4tux [n=p4tux@189.169.83.121] has joined #bzr | ||
=== AfC [i=andrew@office.syd.operationaldynamics.com] has joined #bzr | ||
=== Mez_ [n=Mez@ubuntu/member/mez] has joined #bzr | ||
=== poolie_ [n=mbp@ppp112-44.static.internode.on.net] has joined #bzr | ||
=== khatsalano [n=khatsala@dsl195-38-110-224.pool.tvnet.hu] has joined #bzr | ||
=== cprov-lunch is now known as cprov | ||
=== Mez_ is now known as Mez | ||
corporate_cookie | I'm having some issues installing bzr 0.90 The problem lies with importing paramiko which i've recently attempted to install. I downloaded paramiko's src and ran python setup install ..which executes without error. However when I run paramiko's test.py i get an error. I also get an error when I run python -c "import paramiko" | 06:46 |
corporate_cookie | ...this is on a Red Hat ES4 server running Python 2.5.1 and paramiko 1.7 | 06:46 |
corporate_cookie | any ideas ? | 06:46 |
NfNitLoop | corporate_cookie: on what platform? .. | 06:46 |
NfNitLoop | aah. | 06:47 |
NfNitLoop | do you have pycrypto installed? | 06:47 |
corporate_cookie | i do | 06:47 |
corporate_cookie | python -c "import Crypto" yields no error | 06:47 |
NfNitLoop | what is the "problem" you get when you do python -c import paramiko? | 06:47 |
corporate_cookie | File "<string>", line 1, in <module> | 06:48 |
corporate_cookie | File "/usr/local/lib/python2.5/site-packages/paramiko/__init__.py", line 69, in <module> | 06:48 |
corporate_cookie | from transport import randpool, SecurityOptions, Transport | 06:48 |
corporate_cookie | File "/usr/local/lib/python2.5/site-packages/paramiko/transport.py", line 36, in <module> | 06:48 |
corporate_cookie | from paramiko.compress import ZlibCompressor, ZlibDecompressor | 06:48 |
corporate_cookie | File "/usr/local/lib/python2.5/site-packages/paramiko/compress.py", line 23, in <module> | 06:48 |
corporate_cookie | import zlib | 06:48 |
corporate_cookie | (pardon the mess) | 06:48 |
NfNitLoop | is that all of it? The last lines would probably be the most relevant. | 06:49 |
dato | seems some line is missing | 06:49 |
corporate_cookie | pardon me ... the last line is | 06:49 |
corporate_cookie | ImportError: No module named zlib | 06:49 |
NfNitLoop | well, there ya go. | 06:49 |
corporate_cookie | which is also strange ..as zlib is up2date | 06:49 |
NfNitLoop | Oh. | 06:50 |
NfNitLoop | Yeah, that is strange. | 06:50 |
thatch | did you build python yourself since it's in /usr/local ? | 06:50 |
NfNitLoop | wait, the zlib rpm? you probably want something like python-zlip. | 06:50 |
dato | corporate_cookie: the zlib module is provided by python itself | 06:50 |
NfNitLoop | Aaah. | 06:50 |
dato | corporate_cookie: so something's broken in your python instalation | 06:50 |
thatch | ...when you compile python with --with-zlib | 06:50 |
dato | thatch: good catch | 06:50 |
corporate_cookie | ah .. i did not compile python with the --with-zlib option | 06:51 |
corporate_cookie | thanks : ) | 06:51 |
=== gldnspud [n=gldnspud@72.171.93.139] has joined #bzr | ||
=== cprov [n=cprov@canonical/launchpad/cprov] has joined #bzr | ||
=== cfbolz [n=cfbolz@p54ABA03B.dip0.t-ipconnect.de] has joined #bzr | ||
=== dpm [n=dpm@p54A13579.dip0.t-ipconnect.de] has joined #bzr | ||
=== ubotu [n=ubotu@ubuntu/bot/ubotu] has joined #bzr | ||
=== mrevell is now known as mrevell-dinner | ||
=== jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr | ||
=== matkor [n=matkor@ip83-230-19-175.e-zabrze.pl] has joined #bzr | ||
=== asak [n=alexis@201-1-200-117.dsl.telesp.net.br] has joined #bzr | ||
=== cprov [n=cprov@canonical/launchpad/cprov] has joined #bzr | ||
=== jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr | ||
=== joe99 [n=joe@146-115-30-99.c3-0.wtr-ubr1.sbo-wtr.ma.cable.rcn.com] has joined #bzr | ||
=== nir [n=nir@moinmoin/fan/nir] has joined #bzr | ||
=== bigdog [n=scmikes@72-197-8-8-arpa.cust.cinci.current.net] has joined #bzr | ||
=== herzel [i=herzel@gateway/tor/x-85f1ee9272e844a4] has joined #bzr | ||
=== asak_ [n=alexis@201-26-116-209.dsl.telesp.net.br] has joined #bzr | ||
=== asak_ is now known as asak | ||
=== asabil [n=asabil@ti0035a340-0802.bb.online.no] has joined #bzr | ||
asabil | hi all | 09:02 |
asabil | how do you benchmark bzr ? | 09:03 |
=== jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr | ||
=== bialix [i=chatzill@77.109.20.144] has joined #bzr | ||
Odd_Bloke | asabil: How do you mean? You could use the 'time' command if you're running GNU/Linux... | 09:15 |
asabil | Odd_Bloke: I wanted to run the benchmarking test suite | 09:16 |
Odd_Bloke | asabil: OK, I'm not sure how to do that. | 09:17 |
Odd_Bloke | Sorry. :( | 09:17 |
asabil | bzr selftest --benchmark | 09:17 |
=== michelp [n=michelp@70.103.91.130] has joined #bzr | ||
asabil | is it possible to run only the commit benchmarking ? | 09:30 |
Odd_Bloke | asabil: Try 'bzr selftest --benchmark commit'? | 09:31 |
Odd_Bloke | That's how you'd run only the commit tests... | 09:31 |
asabil | :D thanks | 09:31 |
asabil | I didn't see that | 09:32 |
=== BjornT [n=bjorn@canonical/launchpad/BjornT] has joined #bzr | ||
=== mrevell-dinner is now known as mrevell | ||
james_w | siretart: hi. Are you around? | 09:47 |
siretart | james_w: yes. how you're doing? | 09:48 |
james_w | good thanks. How are you? | 09:49 |
siretart | fine, too! (well a bit tired from work, but anyway..) :) | 09:49 |
siretart | hmm.. bzr: ERROR: Repository KnitRepository('file://....') is not compatible with repository SvnRepository('svn+ssh://...') | 09:50 |
siretart | what repository would be compatible? | 09:50 |
james_w | siretart: may I /msg you, my question is not really on topic for this channel. | 09:50 |
siretart | sure! | 09:50 |
james_w | as for the error have you just updated bzr-svn to the .4 branch? | 09:51 |
siretart | I just upgraded bzr and bzr-svn, not the branch | 09:51 |
luks | siretart: `bzr upgrade --dirstate-with-subtree` on the local repo is probably what you need | 09:51 |
james_w | and probably bzr svn-upgrade as well, but this is a watershed change for the branch. | 09:52 |
james_w | though with-subtree is as well I think. | 09:52 |
siretart | hm. I see | 09:53 |
=== ddaa [n=ddaa@nor75-18-82-241-238-155.fbx.proxad.net] has joined #bzr | ||
siretart | this means with the newer bzr-svn the dirstate-with-subtree repo format is mandatory? | 09:53 |
=== ddaa [n=ddaa@nor75-18-82-241-238-155.fbx.proxad.net] has left #bzr [] | ||
=== ddaa [n=ddaa@nor75-18-82-241-238-155.fbx.proxad.net] has joined #bzr | ||
luks | yes, afaik | 09:54 |
james_w | yeah I believe so. I think jelmer added svn:externals support using subtrees, but I guess it is mandatory rather than as-needed. | 09:54 |
NfNitLoop | siretart: No, but if someone has created a repository with that dirstate, you have to use it to be compatible. | 09:54 |
NfNitLoop | Oh, yeah, it's mandatory with bzr-svn. | 09:54 |
=== poolie__ [n=mbp@ppp112-44.static.internode.on.net] has joined #bzr | ||
=== jamesh [n=james@203.59.139.14] has joined #bzr | ||
asabil | can a bzr plugin add some option flags to an existing command ? | 10:11 |
beuno | asabil, sure it can | 10:12 |
luks | by overwriting the original command | 10:12 |
beuno | yeap, you can override the current one | 10:12 |
asabil | let's say I want to add --with-feature-x to the existing commit command | 10:12 |
asabil | is that possible ? | 10:12 |
beuno | asabil, yeap | 10:12 |
asabil | awesome | 10:12 |
beuno | you could probably check if that parameter exists, and run X function, and if it doesn't, run the original | 10:13 |
beuno | that's what we do on the xmloutput plugin | 10:13 |
ddaa | Is there a way to create BranchReference with bzrlib without opening it? | 10:14 |
ddaa | I mean, a branch reference on disk, not the object. | 10:14 |
=== beuno steps aside and lets the pro's answer this one :D | ||
james_w | ddaa: I don't see such an object in bzrlib. | 10:18 |
ddaa | bzrlib.branch.BranchReferenceFormat | 10:19 |
=== jrydberg_ [n=Johan@c80-216-246-123.bredband.comhem.se] has joined #bzr | ||
ddaa | there's actually no BranchReference object, it's just a format | 10:19 |
ddaa | as I said, I do not care about the actual object, but about the filesystem data. | 10:20 |
james_w | ah, they should be easy to create. | 10:20 |
ddaa | my problem is that BranchReferenceFormat.initialize opens the created reference | 10:22 |
ddaa | and for the Launchpad test suite I need to create branch references that point to example.com... | 10:22 |
james_w | ah, ok. Sorry, I thought you just wanted to create a one-off reference with your editor. | 10:23 |
ddaa | I know how to do this :) I wrote the "bzr switch" command. | 10:23 |
=== hsn_ [n=radim@234.114.broadband5.iol.cz] has joined #bzr | ||
james_w | I guess you will have to carry a subclass, or ask for a initialise_without_opening method. | 10:24 |
ddaa | right | 10:24 |
ddaa | I wanted to check first before filing a bug. | 10:24 |
james_w | well, I can't speak for the project, but the code offers no way to do so. I would go ahead and file it. | 10:25 |
ddaa | creating a subclass that overrides open() for this purpose is NOT going to pass the Launchpad code review :) | 10:25 |
ddaa | Thanks. | 10:26 |
=== ddaa heads off | ||
=== Gwaihir [n=Gwaihir@ubuntu/member/gwaihir] has joined #bzr | ||
=== jelmer_ [n=jelmer@157pc196.sshunet.nl] has joined #bzr | ||
=== jelmer_ is now known as jelmer | ||
=== jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr | ||
=== khatsalano [n=khatsala@dsl195-38-110-224.pool.tvnet.hu] has left #bzr ["Leaving"] | ||
lifeless | ddaa: bzrdir.get_branch_reference? | 10:58 |
lifeless | ddaa: didn't we have this discussion already? | 10:58 |
asabil | is there any bookmarking system for bzr branches ? | 11:00 |
asabil | so that I can give names to the different pushing locations ? | 11:01 |
asabil | something like | 11:02 |
asabil | bzr push location://stable-branch ? | 11:03 |
james_w | asabil: no that's not available. | 11:08 |
asabil | ok thanks | 11:08 |
asabil | you suggest I implement that as a plugin ? | 11:08 |
james_w | It shouldn't be too hard to add. You could file a bug if there is not one already. | 11:09 |
james_w | a plugin would also be easy. | 11:09 |
asabil | ok :) | 11:09 |
james_w | I can give you some pointers if you would like. | 11:09 |
NfNitLoop | I'd love it if someone did that as a plug-in. | 11:09 |
asabil | yeah, that would definitely help | 11:09 |
lifeless | ddaa: meh, sorry, I see - you want to create a pointer to a non-existent reference. | 11:09 |
lifeless | ddaa: you could use a mock branch to do that | 11:10 |
lifeless | ddaa: subclass branch to give you a branch you can construct with a url that you can't normally open | 11:10 |
ddaa | I believe there was a specific test for which I needed to go through the whole stack, not use a mock. | 11:11 |
lifeless | you can use the mock to setup the test | 11:11 |
ddaa | but I cannot remember which right now and I am off work | 11:11 |
ddaa | uh | 11:11 |
lifeless | ofter that you will have a regular branch reference on disk and not be using your mock | 11:12 |
lifeless | so it will fail to open the reference if you try to open it | 11:12 |
lifeless | etc. but as you say, you're done for the day. | 11:12 |
ddaa | I cannot see how you can use a mock object to make BranchReferenceFormat create a reference that it cannot open... | 11:13 |
ddaa | especially because it does "real_bzrdir = bzrdir.BzrDir.open(location)" | 11:14 |
=== herzel [i=herzel@gateway/tor/x-cf6725436c45a3ce] has joined #bzr | ||
lifeless | hmm | 11:14 |
lifeless | I suggest, if you don't want to talk work after-hours, that you drop a mail to the list and we can have an async discussion on this | 11:15 |
ddaa | I'll look at the code again it might be that I do not need to create unopenable branch reference anymore | 11:15 |
ddaa | since I needed to create a proxy method for get_branch_reference anyway for testing. | 11:16 |
ddaa | Thank for making me question my assumptions :) | 11:16 |
lifeless | lol, np | 11:17 |
lifeless | abentley: ping | 11:20 |
=== jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr | ||
=== herzel [i=herzel@gateway/tor/x-f70c9a7dac1fa5cf] has joined #bzr | ||
=== jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!