/srv/irclogs.ubuntu.com/2009/03/17/#bzr.txt

pooliei'm going to merge Proposal to merge branch <https://code.edge.launchpad.net/~mbp/bzr/doc/+merge/4088> as trivial00:05
lifelesspoolie: +100:09
lifelesspoolie: are you starting to use merge proposals rather than BB ?00:09
pooliei'm in kind of toe in the water mode00:09
pooliehaving two todo lists is obviously not so desirable00:10
lifelessindeed00:10
lifelessI think lp is close00:10
poolieyeah i'd say they have roughly equal good and bad points atm00:10
lifelesslp crashes less :P BB is way faster00:11
poolielp lets people comment without prior permission00:13
poolieand kindof has the proposals linked to bugs etc00:13
lifelessBB has bug links00:13
pooliedo you know this snoxracer337 guy?00:14
pooliethat's true but only unidirectionally unless you manually create them00:14
poolieas i generally do00:14
lifelessthe nick isn't known to me; context?00:14
pooliewants to join bzr-core00:14
lifelesslooking00:15
lifelessnot clearly bzr related00:15
lifelesshttps://edge.launchpad.net/%7Emike337/+participation00:15
lifelessI'd say your normal 'please get involved in the community first' message is appropriate00:16
lifelessIt might be nice to have that as a template somewhere :P00:16
poolieyeah00:17
pooliei just wondered if it was a case like johnf00:17
pooliecf bug 497600:18
ubottuLaunchpad bug 4976 in launchpad-registry "When trying to join a team, user should be able to give comment" [Low,Triaged] https://launchpad.net/bugs/497600:18
pooliespeaking of slow i think i saw the subscriber portlet load asynchronously00:18
pooliethat's nice00:19
lifelesswell00:19
bob2lifeless: be nice00:20
lifelessbob2: awwww00:20
luke-jrjelmer: is it known problem that you can't branch a svn repo root?00:20
igclifeless,poolie: Are we expecting chk formats to have both an inventories index and a chk_bytes one? Long term?00:20
igcI'm tracking down why send is slower on chk formats00:21
lifelessigc: either they will, or we'll inline  the inventory root into the inventory00:21
luke-jractually, might just be this repo: http://repos.labjack.com/public/00:21
igcand it seems get_parent_map() has more indices to walk00:21
lifelesss/inventory$/revision/00:21
igclifeless: do we have a nice way now of finding uncommon history?00:22
igcthe send code does 2 X repo.get_ancestory() and then diffs the answers00:22
lifelessigc: get_parent_map should have identical index behaviour because parents of chk nodes are not asked for - or shouldn't be during bzr send00:23
lifelessyes, there is stuff in graph00:23
lifelessbut it may still have a bug00:23
igclifeless: can you take a look at BundleWriteOperation.__init__() - line 267 of bzrlib/bundle/serializer/v4.py?00:27
igcabentley: ^^^00:27
lifelessigc: as you say it does a full graph op00:28
lifelessigc: but thats on the revision graph, chk doesn't alter this00:28
lifelessigc: its more likely, IMO, that the gc cache is being thrashed00:28
igclifeless: if I'm reading the profiling info right, get_parent_map is running on a combined index?00:29
lifelessyes, always00:29
igcin 1.9 format, index.iter_entries() gets called 25K times while it's 49K under brisbane-core00:30
lifeless.revisions is a KnitVersionedFiles, which has a KnitGraphIndex which holds a single GraphIndex, and that GraphIndex is a CombinedIndex with a list of the backing BTreeGraphIndices from the repo00:30
lifelessigc: from get_parent_map? or overall00:31
igcfrom get_parent_map()00:31
lifelessthats...odd00:31
igcI thought so too00:31
lifelessI suspect a hidden cause00:31
igcyou explanations makes me even more curious00:32
igcI'll go digging a bit more now I understand what's happening better00:32
lifelessok00:33
igclifeless: but before I do, what graph calls should I look at to improve BundleWriteOperation.__init__()?00:33
lifelesssomething on Graph, I don't recall the names00:33
lifelessthere is one that looks perfect but is buggy. Beware.00:34
igcok00:34
lifelessanyhow, I'd expect send to be slower due to inventory stuff, not index load from ancestry checks :P00:34
igclifeless: right. I've never looked hard at the send code before so I'm just going from what the profiling data is telling me00:36
igclifeless: graph.find_difference() looks like the obvious method?00:41
igclifeless: can you recall how it's buggy?00:41
=== verterok is now known as verterok|away
lifelessigc: it doesn't return accurate results under some cases00:44
lifelessits documented in tests and the docs I think00:44
lifelessigc: in short - you're welcome to fix it :P00:44
igclifeless: thanks :-)00:44
jfroyhey00:54
jfroyIs it just me or the 1.13 distribution archive doesn't have the pre-generated .c extension modules?00:54
jfroyINSTALL clearly states that they should be bundled.00:55
jelmerluke-jr: you can branch a svn root01:07
jelmerluke-jr: how is it failing?01:07
luke-jrjelmer: nm, they rearranged stuff01:09
lifelessjfroy: I haven't checked, if they are missing then thats more serious than the wrong NEWS entry, so we may want to spin a 1.13.1 with the .c files and the NEWS teaks01:14
jfroylifeless: they are missing, except _patiencediff_c.c01:20
jfroyjust checked the tar.gz and the zip01:21
wbyounghey, i was wondering if there was anyone who could help with trying to set something up similar to svn:externals01:30
tedgSo, I really want this bug fixed, bug 336749.  How do I run with BZR_PDB ?01:33
ubottuLaunchpad bug 336749 in bzr-svn "reconcile raises a KeyError on a fresh branch" [High,Invalid] https://launchpad.net/bugs/33674901:33
wbyoungit seems i can get join --refernece to work with a pack-0.92-subtree, but when trying to commit the join, I get the following error: bzr: ERROR: already in a write group01:35
spivHooray, all Inter*Remote* are now gone, and so repository.py no longer imports bzrlib.remote :)01:39
spiv(Well, once my next patch is accepted by PQM.)01:39
pooliespiv way to go01:40
poolietedg, do01:40
poolieexport BZR_PDB=101:40
pooliethen run it01:40
spivIt's nice to be deleting >100 lines of code for once...01:40
pooliepah01:40
pooliei've just sent a deletion of many more :)01:40
pooliebut yes i agree01:40
pooliehttps://code.edge.launchpad.net/~mbp/bzr/deprecation/+merge/4432 -- look at all that red01:41
poolietedg: i guess actually you need to get lifeless's attention01:41
tedgpoolie: Thanks, I realized I deleted the data, so I'm regrabbing it for the PDB.01:45
spivpoolie: that is pretty nice :)01:45
tedgAlso, I'll note that it's quite annoying to get a crash dialog everytime I log in from bug 28329401:46
ubottuLaunchpad bug 283294 in bzr-gtk "bzr-notify crashed with RuntimeError in add_signal_receiver()" [Undecided,New] https://launchpad.net/bugs/28329401:46
lifelessjfroy: please file a bug01:51
lifelesstedg: BZR_PDB=1 bzr foo01:51
lifelesstedg: then you use your knowledge of bzr internals to explore01:52
tedglifeless: Does this dump something, or give me a command line?01:53
SamBlifeless: where do you get one of those?01:55
SamBis there one I can download somewhere?01:55
lifelessSamB: one of what?01:58
lifelesstedg: it drops you into pdb, the python debugger01:58
SamBlifeless: knowledge of bzr internals01:58
lifelesstedg: its almost certainly a waste of time for you to do this; jelmer needs to, or I need a test repo that has the issue I can do it on01:58
lifelessSamB: reading the internals :P01:59
SamBhmm.01:59
tedglifeless: It happens on the Inkscape repository.  Basically check it out and then do any action on it.  You can see the commands and the log file in the duplicate bug 332582.02:01
SamBthere isn't some kind of direct NNTP-feed-to-my-brain or something?02:01
ubottuLaunchpad bug 332582 in bzr "BzrCheckError: Internal check failed: Newly created pack file <bzrlib.repofmt.pack_repo.NewPack object at 0xa42ec6c> has delta references to items not in its repository (dup-of: 336749)" [Undecided,New] https://launchpad.net/bugs/33258202:01
ubottuLaunchpad bug 336749 in bzr-svn "reconcile raises a KeyError on a fresh branch" [High,Invalid] https://launchpad.net/bugs/33674902:01
tedgUnfortunately the log isn't that clear as I was doing several things in different instances of Bazaar while it was running.02:02
lifelesstedg: I want a copy of the failing data, for various reasons02:02
lifelessSamB: sorry no :(02:02
lifelesstedg: rather than instructions for possibly recreating it anew02:02
tedglifeless: I'm downloading it now, I'll make a tarball and attach it to the bug.  Will that work?02:02
lifelesstedg: yes02:03
SamBlifeless: I suppose that's just as well, as I lack the necessary hookups in any case02:03
lifelesstedg: note that its not high on my stack at the moment; AFAIK jelmer is looking at it02:03
tedglifeless: Oh, it was my understanding from the comments that he'd given up.02:03
lifelessjelmer: ^02:04
tedgAh, getting that data together is going to take a bit... I deleted the branch, and the old SVN branches don't seem to be compatible with the new ones.02:05
jelmerlifeless, tedg: I'm not working on that bug at the moment02:07
jelmerlifeless: I tried storing only the parents that were present02:09
jelmerbut that caused bzrlib to blow up when I fetched again with more parents02:09
lifelessjelmer: hmm02:16
lifelesslunching02:20
gotgenesbzr doesn't have to be installed on a server to host the repository, does it?02:25
jamlifeless: .children() is slow because the lookup key by prefix code has to walk the entire _items dict for every lookup02:25
jamso if you have 1 prefix02:25
jamput another way02:25
jamlooking up 100 children 1 at a time takes forever02:25
jamas it is 100x100 prefix comparisons02:25
jamAt least,from what I could tell from 'iteritems()' returning 20k entries02:26
jambut having 600k calls to set()02:26
jamigc ^^02:26
SamBlifeless: you eat lunch at odd times!02:26
lifelessjam: that sounds like a bug to me02:33
lifelessjam: its meant to be stored by hash(item[0]) + hash(item[1])02:34
lifelessSamB: not odd for me :P02:34
lifelessgotgenes: no, it doesn't. If it is you can get better performance though02:34
jamlifeless: iteritems(key_filter=[file_id1]), iter_items(key_filter=[file_id2])02:35
jamhas to do iteritems N times for N file ids02:35
jamand inside it iterates over the full items dict02:35
jamso N^2 behavior02:35
jamI didn't see an obvious reason why in  def children()02:36
gotgeneslifeless: Thanks.02:36
jamsince it does seem to grab all the child_keys based on a single parent_id prefix in the container02:36
lifelessjam: huh, should be one iteritems per directory entry02:36
jamWell, I see 20k calls to iteritems() (as a generator it yeilds 20k entries)02:37
jamand I see 654,845 calls to set()02:37
lifelessjam: (to get the children ids), and one to populate the children entries, or perhaps one per child, which is still only 2N02:37
jamso that is about 32:102:37
lifelessjam: so, see under bug02:37
jamwhich is probably the 32 keys in each leaf node02:37
jam255 leaf nodes to check02:38
jamnot sure02:38
lifelessI should rephrase I guess02:38
jam6k calls to items(), + 6k calls to iteritems...02:38
lifelesswe have a datastructure which should allow children to be cheap, if its not there is definitely an issue02:38
lifelessI agree that it may not 'be cheap'02:39
lifelessI'm asserting that it should be possible for it to be cheap02:39
jamI do see "718" calls to LeafNode.deserialise, which is a bit more than I think we should see....02:39
jamhmm... maybe with p_id + id_to_entry?02:39
jamlifeless: so if you have hash(file_id), and a given directory has 43 items, isn't that likely to go to 43 different pages?02:44
jamwhich means that we have a 43*num_entries_on_leaf02:44
lifelessjam: no, because its a tuple key - its pid + basename02:44
jamlifeless: not in that one02:45
jamin the one that gets the bytes for the entry02:45
jamthe parent_id_basename_to_file_id is cheap, yes02:45
jamit is about 3x faster than the id_to_entry lookupps02:45
lifelessoh yes, but because we're using the main object, it should be parsing and caching all of those pages02:45
=== abentley1 is now known as abentley
jamlifeless: I would guess the pages themselves are cached02:45
jambut it still is a double loop02:45
jamof for key, bytes in items: for lookup in lookups:02:46
jamwhere the outer is N entries on a page02:46
jamand the inner is the M children of a directory02:46
lifelesspossibly iterentries isn't skipping enough pages?02:46
jamnow... maybe we are making the mistake of not filtering our keyfilter02:46
jamas in02:46
jamwe find the N pages underneath that match02:46
jambut we don't know which keyfilter matched which  subpage02:46
jamso for all M children of a directory that match in one of M leaf nodes02:47
lifelessright, we should only be inspecting the filter items that matched02:47
jamwe then compare all N leaf entries against all M keys02:47
jamwhen we should be only matching against the one of M keys that hits that leaf node02:47
jamI still feel like we are doing a prefix match against all items in a dict02:49
jamwhen we *should* be doing a simple self._items[key] lookup02:49
jambut I'm not sure if that can be adequately expressed yet02:49
jamlifeless: Am I wrong in saying that id_to_entry.iteritems([(file_id,)]) should always match exactly 1 entry?02:49
jam(consider you could have file_id1 = 'foo', and file_id2 = 'foo-bar')02:50
jamhmm... the code really isn't set up for what I want to do... which is to split up the key_filter based on which part of the filter matched which child page02:51
jamiter_nodes is done very independently of iteritems(), not to mention it shortcuts the comparison, so we wouldn't know all the keys which would have matched. Though we could remove that shortcut02:52
lifelessjam: tuple keys should only ever match once in id_to_entry02:53
lifelessjam: parent_to_basename they can multimatch - [('parent',)] -> list of children02:54
jamI'm pretty sure with the current construct that doesn't end up holding true02:54
jamas you just look at 'prefix[:length]'of the serialized from02:54
jamform02:54
lifelessperhaps this just needs updating like you did the rest to handle hashed keys better?02:55
jamwe can certainly change that02:55
jamwell, it sounds like prefix[:] should only really be splitting on end-of-internal width or NULL02:55
lifelesspoolie: so progress03:20
lifelesspoolie: I filed a bug today/yesterday about it showing inappropriately03:20
lifelessandrew and I have ensured that setUp() is being called everywhere and it still shows during selftest.03:20
* igc lunch03:21
mattdoranTypically, how long after a release do the windows builds get posted?04:55
BasicOSXThe generic answer (not to be rude) is when the windows people have time :-)04:57
mattdoranI understand completely ... I didn't mean to sound impatient either.04:58
mattdoranwas just wondering whether there was a ballpark.  e.g. typically within a week.   No big deal though04:59
lifelessmattdoran: within a week yes05:03
lifelessits sometimes longer, the windows build process is ... fragile05:03
mattdoran:) gotcha ... thanks05:03
=== mnepton is now known as mneptok
igcpoolie: if you have time soon, can you please re-review the dirstate patch jam & I worked on last week?05:42
lifelessspiv has headed off, I'm going to land one more branch [I hope] and be gone myself06:11
fullermdHm.06:20
fullermdbzr-1.13.tar.gz doesn't include the pyrexified .c files.06:20
* fullermd frowns.06:23
fullermdOr a couple others either.06:23
fullermdThe only one in it is _patiencediff_c.c.06:23
lifelessok, streaming pull from stacked branches submitted06:25
lifeless-> done, modulo sheparding it though06:25
lifeless*through*06:25
bob2spiffy06:29
lifelessand I'm done for the day06:29
igcseeya lifeless06:31
mwhudson<lifeless> ok, streaming pull from stacked branches submitted07:00
mwhudsonyay!07:00
poolieigc, i'll read it now, promise07:23
poolielifeless: if you're talking about activity coming up during selftest07:23
pooliethen yes, i've seen it and i know why it's happening07:23
pooliebasically because nothing turns it off :)07:24
lifelesspoolie: but it should be controlled by the SilentUI surely07:27
lifelesspoolie: and that is installed by setUp07:27
lifelesspoolie: also, streaming-from-stacked has landed07:27
lifelesssay 'hallelujah'07:27
lifelessanyhoo, gone07:28
vilahi all07:30
igchi vila07:30
vilaHi Ian :)07:30
poolielifeless: the problem is that the overall testrunner uses a progress bar07:34
poolieat least in non-verbose mode07:34
poolieactually it is a bit interesting that the lower level transports aren't talking to the silentui07:34
Peng_With the streaming-from-stacked stuff, is it just me, or is is_empty's docstring wrong? It says it returns true if it's *not* empty.07:34
pooliehi vila07:34
vilahi poolie !07:35
* igc dinner08:00
lifelesspoolie: the silent ui should have its own pb stack, so they should not interact08:16
lifelessPeng_: probably :P08:16
poolieso that suggests either the silent ui is passing notifications through to the higher level progress view08:16
poolieor, the transports are somehow talking to the real ui object08:16
poolieeither is possibly08:16
pooliepossible*08:16
poolieshould not be very hard08:16
lifelesssure;I'm hoping you'll find time to track it down, asyou know the new stuff best :)08:18
lifelessthe test improvements today should make it easier; test_remote is a small test regex that will trigger the behaviour08:18
* lifeless goes again08:18
lifelesschat with you tomorrow08:18
=== serg_ is now known as serg
poolieoh thanks for the tip08:31
sabdfl1hi folks08:46
=== sabdfl1 is now known as sabdfl
sabdflanybody building bzr.dev on jaunty?08:46
=== fta_ is now known as fta
RAOFsabdfl: Isn't there a bzr nightly PPA?08:55
RAOFhttps://edge.launchpad.net/~bzr-nightly-ppa/+archive/ppa would be it, yes.08:55
* eMBee needs to find out where it is09:06
eMBeeooops09:06
stubDoes the smartserver benefit from running over a compressed link, or should I disable SSH compression to bazaar.launchpad.net?09:22
stubHmm... 1.13 released but no packages in either https://launchpad.net/~bzr/+archive/ppa or https://launchpad.net/~bzr-beta-ppa/+archive/ppa09:27
pooliestub:  it will benefit a bit09:39
pooliesabdfl: i use it on jaunty all the time09:39
poolieto the vast amusement of those with working laptops :)09:40
* AfC assumes poolie is referring to some kind of inside joke09:41
pooliejust that people who install alpha releases get what they expect/deserve :)09:42
poolieit's all part of the fun09:42
poolieand the point of testing it09:42
stubpoolie: I wonder. I just checked the CPU utilization graphs and CPU is running at capacity.09:42
stubpoolie: Oops... misread09:43
pooliein that case compression may be slowing you down09:43
stubLots of capacity :-)09:43
poolieit's probably within \epsilon either way: it won't compress much, probably, but zlib is cheap too09:44
pooliestub there should be rc1 packages and the final should be up in a bit09:44
stubYer - had to downgrade from rc1 due to being unable to my push not using stacking.09:45
poolieand you're told this is fixed in final?09:46
stubYes - lifeless said it had been fixed and would be in final.09:47
Lieven1hi09:57
Lieven1I'm trying to pull from an svn repo, that requires authorization, and that gives an error that authorization is required (obviously:))09:57
Lieven1but I tried to google on how to specify your authorization, but couldn't find anything09:58
Lieven1so does anyone know how to do that/09:58
bob2include the username in the url09:58
Lieven1thx, trying it out now:)10:01
Lieven1hmm.. my original url is sth like:   http://subversion.company.local/svn/HEAD10:06
Lieven1so then it should become this, right: http://username@subversion.company.local/svn/HEAD10:06
igcpoolie: did you want the class or methods renamed to use SHA? I'm pretty sure the methods in osutils are 'sha' - all in lowercase10:07
igcs/methods/functions/10:08
sabdflpoolie: i'm getting an error on make:10:14
sabdfl  Cannot build extension "bzrlib._groupcompress_pyx".10:14
sabdfl  Use "build_ext --allow-python-fallback" to use slower python implementations instead.10:14
sabdflnot sure what's causing that10:14
=== sabdfl1 is now known as sabdfl
fullermdOh, nice.11:50
* fullermd does his first push to a 1.13 smart server.11:50
bob2nice progress dealy12:07
Takvila: reping12:11
=== verterok|away is now known as verterok
vilaTak: pong13:17
Takhi! is there any way to get the sftp transport to use authentication.conf for user/pass credentials?13:19
vilaTak: only for user, trying to use it for passwords should issue a warning13:19
vilaTak: the rationale being that ssh provides better means for passwords/keys and is more secure than whatever we can come with13:20
Takok13:20
Takit doesn't seem to be issuing a warning for me on 1.13rc113:20
vilaTak: and also .ssh/config is already more powerful13:20
vilaTak: try using -Dauth and look into .bzr.log13:21
vilathere should be messages regarding which sections are used (or not)13:21
Tak-Dauth as a bzr arg?13:21
vilaTak: yup. as in 'bzr push -Dauth'13:22
vilaor whatever command needing credentials from authentication.conf13:22
Takhmm, it tries public key, then it prompts for password on stdout, but no warning on stdout or in log13:24
jamsabdfl: if you are still around, it might be an issue with pyrex versions. We might be doing something like "+=" which isn't supported by pyrex 0.9.6 (you need 0.9.8+, IIRC).13:31
jamI'll try to check13:31
jamvila: good morning13:31
vilaTak: who is prompting for password ?13:31
vilajam: hi !13:31
jamsabdfl: alternatively, you may need to install 'zlib1g-dev' since we now directly access some zlib functions.13:32
jamvila: my guess is openssh13:32
sabdflthanks jam13:34
Takit's paramiko13:41
vilaTak: what is your problem exactly ?13:43
jamvila: he's trying to use authentication.conf for sftp13:43
vilajam: I got that, but for which part ? user (should work) ? password (will never work) ?13:43
Takok13:44
TakI /was/ asking if/how it worked for password13:44
jamvila: I thought password might work with paramiko, since we were controlling things there13:44
Takyou told me it won't, ok13:44
jamit certainly would never work for openssh13:44
Takyou also said it would print a warning, which it is not13:45
vilaTak: if it doesn't show a warning, most probably the section doesn't match13:45
Takso then you asked me to run with -Dauth and look at the log, which still doesn't13:45
vilascheme should be 'ssh' not 'sftp' ?13:45
Takwhat does it...ahh13:46
Takok, with 'ssh' scheme, the warning prints13:46
vilaTak: http://doc.bazaar-vcs.org/bzr.dev/en/user-reference/bzr_man.html#authentication-settings13:47
Takyeah, I was parsing the url and dumping the transport in as the scheme13:48
vilaTak: both caveats are documented there (use 'ssh' as scheme, no password handling for ssh)13:48
Takok13:49
Taknow I need to set up a different scheme for testing13:49
vilaTak: testing as in 'writing unit tests' or as in 'setting up some bzr server' ?13:50
Takheh, testing as in 'connecting using my auth-populating mechanism to make sure I'm doing it right'13:54
vilaTak: if you populate authentication.conf by programmatic means, I'd very interested as the actual mechanism will certainly evolve in the future.13:57
Takright now, I'm using AuthenticationConfig.set_credentials()14:00
thropehi - how can I add a filename with spaces to .bzrignore? I tried quoting or backslash escape but it doesnt seem to work14:08
thropeah nothing14:09
thropeno quotes, escape... guess I should hav etried that first14:09
phinzeokay so i have a coworker who did Something Bad to one of our shared project branches .. and the Bad Thing is in one of his subcommits14:27
phinzedo i have the information to revert a subcommit from the shared branch or does the delta only reside on his local work branch14:27
fullermdThe rev is there.14:28
fullermd"subcommit" is a UI fiction; a revision is a revision underneath.14:28
phinzeahh good14:29
beunouser interface fiction?14:29
phinzebut... $ bzr diff -r2320.1.12..2120.1.1314:29
phinzebzr: ERROR: Requested revision: u'2120.1.13' does not exist in branch:14:29
phinzeoh jeez14:29
phinzeit was just a typo14:29
fullermdYou sure you don't mean 2130.1.13?  ;)14:29
phinzethere it is14:29
fullermd`bzr diff -c2130.1.13` is shorter to type.14:29
fullermdWow, 2320.  Obviously neither of us can type   8-}14:30
phinzehehe14:30
phinzeah that -c is nice14:30
phinzeso i can reverse merge that guy with no problems then14:30
phinzecool14:30
fullermdNote that you can use 'merge' for that too, though it doesn't do anything you can't do with diff.14:31
fullermdThough it's easier than manually handling renames etc if there are any in that particular rev.14:31
phinzeyeah i was just doing diff to see what i would be doing with merge14:31
phinzei always think of it as bzr merge *does* what bzr diff *shows*14:31
fullermdMe, I often just diff | patch -R.  I usually don't undo things far enough back that patch's fuzz-handling won't keep up.14:32
fullermdAnd I'm lazy.14:32
phinzethat works too :)14:33
phinzefullermd: so do you have a fancy short way to reverse the merge or am i doing bzr merge -r 1234..123314:44
phinzeahh nm14:44
phinzeyou use patch -R14:44
Odd_Blokephinze: You can 'bzr merge -r 1234..1233 .'.14:47
phinzeOdd_Bloke: yeah that's what i'm doing... didn't know if there was a shorthand for that14:47
phinzelike bzr merge -R1234 . or something... the other way is short enough though :)14:48
fullermdWell, -c123 does it 'forward'.  So if you type in -c123 upside-down, it does it backward.14:54
fullermdMost keyboards don't handle that, though...14:54
Odd_Bloke"bzr ɯǝɹƃǝ -c123"15:01
gnomefreakwhat does the following error mean and how to i get past it when trying to pull a branch? bzr: ERROR: Server sent an unexpected error: ('error', 'iteration over non-sequence')15:01
jelmergnomefreak: sounds like an exception happened in the server15:02
jelmergnomefreak: most likely a bug15:02
gnomefreakjelmer: so its not me15:02
jelmergnomefreak: no, it really is something wrong happening server-side15:03
jelmergnomefreak: using sftp:// should fix it, if you're able to (but it'll be slower, obviously)15:03
jelmergnomefreak: a bug report would be much appreciated, particularly if this can be reproduced with public branchres15:03
gnomefreakjelmer: jelmer ok will test more and file one or find one15:04
flacostei upgraded bzr-svn and now i'm having problems with my existing branches15:08
jelmerflacoste: see UPGRADING15:08
flacostejelmer: i did and I ran bzr svn-upgrade15:09
flacostebut after that, i had to use a push --overwrite to update the LP version of the branch15:09
flacosteand now all branch that were merging that one cannot merge anymore15:09
flacosteand I don't know how to fix these, since bzr svn-upgrade doesn't do anything on them15:09
jelmerflacoste: yes, you'd have to upgrade those other branches as well15:09
flacostehow?15:10
jelmerrunning bzr svn-upgrade in those branches15:10
flacostebzr: ERROR: Repository at bzr+ssh://bazaar.launchpad.net/%7Eflacoste/windmill/windmill-launchpad/.bzr/ is not a foreign repository.a15:10
jelmerflacoste: you have to specify the URL of the svn repository15:11
flacosteok15:11
flacostebzr: ERROR: No repository present: "http://svn.getwindmill.com/trunk/"15:11
flacostebut this is the URL used on the main branch15:12
jelmerflacoste: the repository root, so probably http://svn.getwindmill.com/15:12
flacosteok, seems to work :-)15:12
flacostejelmer: all good, thanks a lot!15:12
flacostei was able to merge now!15:13
jelmerflacoste: np15:13
fm_how is user managment done with a bazaar server?15:23
vilafm_: so far with what the protocol after the '+' offers, be it ssh or http15:25
fm_vila: ok, so suppose i am running "bzr serve --port=localhost:1234 --directory=/srv/bzr/repo" on server example.com, how do i access this by bzr+ssh?15:28
vilafm_: you don't, you're using the only form of bzr server that doesn't have user management so far :)15:29
fm_hm that's sad15:29
fm_so what is the suggested configration, i did not want to create shell accounts for the users ...15:29
vilathere is a bug filed for that, but I can't find it right now15:30
vilafm_: you can either use ssh keys and bzr+ssh or bzr+http and use whatever authentication your web server already propose15:30
fm_but bzr+http is readonly i suppose, and for bzr+ssh i need to create system accounts ...15:32
vilabzr+http is not read-only it can perfectly do write operations15:32
vilafm_: subscribe to bug #126911 in the long term15:33
ubottuLaunchpad bug 126911 in bzr "Smart server has no built in authentication" [Medium,Triaged] https://launchpad.net/bugs/12691115:33
vilafm_: And you don't need to create system accountS, you can create a single one for bzr usage and add whatever keys you want in its .ssh/authorized_keys15:34
fm_vila: and how do i identify the commiter?15:37
fm_i guess bzr whoami is used, but then every name could be set there ...15:38
fullermdThe commit process sets that; the bzr+ssh or whatever account is just used for the uploading.15:39
fm_and i'd like to give special pernmission for dfferent directories. i.e some people have just read access and others are allowed to write ...15:39
vilafm_: You can server via pure http for read-only access and use bzr+ssh for write access15:40
vilafm_: You can serve via pure http for read-only access and use bzr+ssh for write access15:40
fm_but not on per directory basis ;)15:41
vilafm_: you may also have a look in the contrib directory where various attempts have produced various scripts15:42
* vila handwaves a bit to mask its incomplete knowledge of contrib content :-)15:43
vilafm_: bzr_access may be what you're after15:43
vilafm_: yup, sounds like a solution with a single system account and rights defined based on authorized keys15:44
fm_vila: https://bugs.launchpad.net/bzr/+bug/29088715:45
ubottuUbuntu bug 290887 in bzr "Docs should cover how to use bzr_access (or similar?) with OpenSSH to make a bzr-only SSH account." [Undecided,New]15:45
fm_that is exacly my bug i guess15:46
vilafm_: ? Did you *read* the doc string ?15:46
vilafm_: sorry, I thought you just filed the bug15:46
vilayou're perfectly right, we still miss the link that should help you find that script15:47
fm_and may ask where to find the documentation? ;)15:48
vilaThe script itself contains some, if you're able to address your needs with it, feedback on how you did that on what could have made it easier will be greatly appreciated ;-)15:49
vilas/on/and/15:50
vilas/on what/and what/ grr15:50
=== beuno_ is now known as beuno
=== schmicha1l is now known as schmichael
cody-somervilleIs it possible to merge in a single revision from another branch?16:16
fullermdYes and no.16:17
fullermdWhich is to say, merge will do the work of merging that single rev in.16:19
fullermdBut it doesn't do any recording of what you do (presuming the rev doesn't fully connect in anyway), so historically speaking it's no different than diff | patch.16:19
zookoHey folks: a project of mine is applying for Google Summer of Code, and one of our ideas for what a student could do this summer is to integrate with a distributed revision control too: http://allmydata.org/trac/tahoe/wiki/GSoCIdeas16:22
Takhm, that's pretty cool16:26
luke-jr"No module named foreign"  "Unable to load plugin 'svn' from '/usr/lib/python2.5/site-packages/bzrlib/plugins'"16:26
zookoTak: you mean bzr on top of a secure, distributed p2p disk-sharing thing?  :-)16:27
Takwell, both the secure, distributed p2p disk-sharing thing; and bzr on top of it16:28
=== kiko is now known as kiko-fud
Takof course, if somebody implemented the FUSE integration, that would kind of make it a moot point wrt linux ;-)16:29
Odd_Blokeluke-jr: Sounds like you're using an old version of bzr.16:31
luke-jrOdd_Bloke: I'm using probabyl the minimum version bzr-svn depends on16:31
Odd_Blokeluke-jr: What version of bzr and what version of bzr-svn?16:32
luke-jrbzr 1.1016:33
luke-jr1.9, sorry16:33
luke-jrbzr-svn 0.5.316:33
jelmerluke-jr: you need bzr 1.13 for bzr-svn 0.5.316:34
jelmerit will give a proper error message as long as you're running 1.10 or higher I think16:35
luke-jrjelmer: it should depend on that16:35
* Odd_Bloke just made the mistake of trying to answer a bzr-svn question without just pinging jelmer. :p16:35
jelmerluke-jr: it depends on that16:35
Odd_Blokeluke-jr: How did you install it?16:36
jelmerluke-jr: well, the Debian/Ubuntu package does at least16:36
luke-jrOdd_Bloke: emerge -vauDN world16:36
Odd_BlokeWho does the Gentoo packaging?16:37
luke-jrwhoever maintains the bazaar overlay?16:38
Odd_Blokeluke-jr: https://edge.launchpad.net/bzr-gentoo-overlay ?16:39
Takanyone seen segfault when interacting with a svn repo using bzrlib via libpython?16:40
luke-jrI think16:40
zookoTak: I'm not sure about that.  I'll think about it while writing some notes about the project ideas.16:44
=== beuno_ is now known as beuno
Takwell, if you get a fuse frontend, then to bzr (or anything using it), it'll just look like a filesystem ...16:45
jelmerTak: do you have a (C) backtrace with debugging symbols?16:48
zookoThat is true, but there might be advantages in terms of distributed security if the revision control tool is more aware of the Tahoe namespace.  I'm not sure yet.16:49
TakI have a mono backtrace with no debugging symbols... ;-)16:50
zookoTak: writing this Project Idea, I realized that Tahoe already has a working command-line which accomplishes the same thing, in batch mode.17:06
zookoTak: http://allmydata.org/trac/tahoe/ticket/663 # integrate a distributed revision control tool with Tahoe17:13
=== kiko-fud is now known as kiko
=== kiko is now known as kiko-afk
dashhi. trying to understand version dependencies for bzr-svn -- i've created a repo from the Twisted svn repo using the latest revisions of bzr and bzr-svn (using svn-import); will this interoperate ok with clients using bzr 1.12 and bzr-svn 0.5?19:04
jelmerdash: yes19:05
jelmerdash: 0.5.x interoperates with 0.5.x19:06
dashok, great.19:06
mwhudsonPeng_: ping?19:13
jfroylifeless: https://bugs.launchpad.net/bzr/+bug/34446519:18
ubottuUbuntu bug 344465 in bzr "Distribution archives for 1.13 do not contain generated C extension modules" [Undecided,New]19:18
jfroyjelmer: any idea about https://bugs.launchpad.net/bzr-svn/+bug/342065/? It's kind of crippling not being able to get diffs :/19:45
ubottuUbuntu bug 342065 in bzr-svn "KeyError due to missing file id while running bzr check on SVN repository" [Undecided,Incomplete]19:45
=== abentley1 is now known as abentley
mwhudsonabentley: hi20:03
abentleymwhudson: hi20:03
jelmerjfroy: no, not yet20:03
mwhudsonabentley: i have this memory that ages and ages ago you complained about not liking the way loggerhead split the list of files changed in a revision into added/renamed/removed/modified20:04
scgtrpi'd like to have my own branch of my project, available on the same server as the main branch, but i'd also like to be able to commit to it when i'm offline. is there any way to do that besides branching to another dir on the server then branching again locally?20:04
jelmerjfroy: It'd require some analysis of the repository again, and I don't have time for that atm20:04
jelmerjfroy: maybe later this week, sorry20:04
abentleymwhudson: Yes, I prefer status --short output.20:04
jfroyjelmer: interestingly, I just updated bzr-svn, wiped the svn cache, re-checked out from svn, and I haven't hit the exception again. Will continue testing...20:04
mwhudsonabentley: what i don't remember is what you would have preferred to see20:04
jfroyjelmer: no worries20:04
abentleymwhudson: ^^20:04
mwhudsonah20:04
* mwhudson doesn't know what status --short looks like20:05
mwhudsonoh20:05
mwhudsonM file20:05
abentleyYes, that kind of thing.20:05
mwhudsonRM old_path => new_path20:05
abentleyIn loggerhead, it could be graphical of course.20:05
mwhudsonyeah20:05
* mwhudson does wonder slightly how loggerhead would cope with e.g. a kind change at the moment20:06
mwhudsonnot well, i suspect20:06
mwhudsonabentley: i'm not really sure what 'being graphical' would mean here20:08
mwhudsonif you could come up with nice icons for each of the letters status can spit out that would be cool20:09
mwhudsonbut i'm not even sure what icon "M" would need20:09
abentleymwhudson: That's what I meant by being graphical.20:09
mwhudsonabentley: in other news, i'm thinking of moving away from tree.changes_from and so TreeDelta20:10
abentleymwhudson: I don't know what all the icons would be, but tools such as Meld have tried to show this kind of thing-- might be interesting to investigate.20:10
mwhudsonabentley: probably to iter_changes() -- does that sound sane?20:10
abentleymwhudson: Yes, and very amenable to status --short output.20:10
abentleyI think "new" is usually signified by a gleam, and deleted by an X or trash can.20:11
mwhudsonabentley: cool20:11
mwhudsonthe fact that TreeDelta has an "unchanged" attribute just seems gratuitously silly for my usage20:12
abentleymwhudson: I wrote the original iter_changes, so I'm all about that.20:12
abentleymwhudson: You'll probably want to just implement your own ChangeReporter, which is a pretty simple interface.20:17
mwhudsonok, i was wondering if there was something like that20:18
Peng_mwhudson: Pong, if it's quick.20:19
mwhudsonPeng_: just wondering if you wanted me to land your branch or if you would20:20
Peng_mwhudson: Which one?20:21
Peng_Oh.20:21
mwhudsonget_apparent_authors20:21
Peng_mwhudson: I dunno. I can do it right now.20:24
mwhudsonPeng_: go for it20:24
Peng_mwhudson: Alright. Thanks for the review. :)20:24
mwhudsonabentley: the _ChangeReporter.report interface looks pretty nice, thanks for the hint20:25
abentleymwhudson: np20:25
mwhudsonPeng_: np, it took me a while to get to it20:25
Peng_mwhudson: Done.20:34
Peng_Boy, pushing to an old pack repo feels slow. Btrees have really spoiled me.20:34
mwhudsoni guess we should update to 1.9 at some point20:41
beunothat would be nice20:42
beunoI'm a big fan of 1.920:42
mwhudsonPeng_, beuno: done20:46
beunoawesome20:46
exarkun`bzr svn-import --incremental´ takes 8 or 9 seconds on this repository.  Any chance it will be faster soon?20:53
mwhudsoni wonder if the # of branches in the twisted repo is the problem20:54
exarkunDo you think it would be the number of branches at HEAD or the number of branches ever?20:55
mwhudsonat HEAD i hope20:56
exarkunThere's 541 branches at head20:56
exarkunI could probably delete a few hundred of them :)20:56
mwhudsonjust wildly speculating of course20:56
mwhudsonthat's probably more than jelmer expected :)20:56
* exarkun nods20:56
exarkunI haven't written the program that automatically finds branches associated with closed tickets and deletes them, yet, though.20:56
exarkunMaybe I'll try that now.20:56
exarkunAnd then compare the times20:57
Peng_mwhudson: Oh, cool.21:00
Peng_mwhudson: Thanks. :)21:01
mwhudsonnp21:01
mwhudsonthere certainly is some O(branch count) stuff in svn-import21:03
mwhudsonno idea how expensive it is for the no-change case21:04
Peng_mwhudson: You said the pretty-url branch is ready to land, aside from the merge conflicts, right? I just fixed them. What do you want me to do?21:07
mwhudsonPeng_: where is your branch?21:07
Peng_mwhudson: Ehh, didn't register it on LP yet, but http://bzr.mattnordhoff.com/loggerhead/loggerhead/pretty-url/21:08
bignosewhere do I set a user-specific ignore pattern that should apply for every branch that user works in?21:15
bignoseI expected to find this in the documentation for “configuration” and “ignore”, but it's not in either of those.21:15
LarstiQbignose: ~/.bazaar/ignore21:16
bignoseLarstiQ: thanks. Where would I have found that documented?21:16
LarstiQbignose: I agree those two should mention it.21:17
LarstiQbignose: unfortunately, I know too much.21:17
LarstiQbignose: I was curious, how did you write the rst for the builddeb Debian manpage, entirely from scratch?21:18
Peng_mwhudson: Hmm, pretty-url seems to break +revlog. Hold on.21:19
bignoseLarstiQ: no, I wrote it in reStructuredText21:20
bignoseLarstiQ: or do you mean, how did I write the reST?21:20
bignosethe reST I wrote mainly by copy-and-paste.21:20
LarstiQbignose: that's what I meant21:21
mwhudsonPeng_: it seems to break rather a lot21:21
LarstiQbignose: ah :)21:21
LarstiQbignose: I'm still impressed though ;)21:21
Peng_mwhudson: Indeed.21:21
mwhudsonPeng_: like "all links"21:21
mwhudsonhttp://localhost:8080/http%3A//localhost%3A8080/revision/1243 don't look right to me21:21
bignoseLarstiQ: but generating reST would be (I presume, with the confidence of the ignorant) simple for someone who understands the Bazaar help system21:22
Peng_mwhudson: Yeah.21:22
Peng_Um.21:22
LarstiQbignose: reST itself is no problem.21:22
bignose(just realised that your original question did ask about the reST and I missed it)21:23
* LarstiQ looks at it again to recall what he was impressed about21:23
bignoseyay for IRC encouraging rapid response over careful reading :-)21:23
* LarstiQ grins21:24
mwhudsonPeng_: has the branch always done this, i wonder?21:24
LarstiQbignose: I think it's a combination of it seeming like a clear document to me, and clearing my backlog making it appear like it appeared instantly.21:25
Peng_mwhudson: Dunno.21:25
bignose:-)21:25
Peng_mwhudson: Yes, it has.21:25
bignoseI'm happy to leave that illusion unchallenged21:25
mwhudsonPeng_: oops21:25
LarstiQbignose: thank you :)21:26
Peng_mwhudson: Stupid question: What's static_url used for?21:26
Peng_Oh, duh.21:26
mwhudsonPeng_: images, css, javascript21:26
Peng_mwhudson: OK, if you stop it from escaping BranchWSGIApp.url, it seems to work, but I don't know if all of the other changes make sense, or if I'm just lucky because I have simple URLs.21:28
trondnI have heard that the bzr revno may go up and down.. is there another id i can get and use to get a log of everything I just pulled?21:29
mwhudsonPeng_: i think perhaps rejection is in order21:29
LarstiQtrondn: revision ids are stable, revnos are indeed derived.21:29
mwhudsoni don't hate %7E in urls _that_ much21:29
trondn(ex. I just pulled lp:drizzle/mordred and had rev 942.. after a pull I got revno 939.. the bzr log -v -r 942..939 fails)21:30
LarstiQtrondn: for looking at what I just pulled, I usually use `bzr pull -v`, does that help?21:30
trondnLarstiQ: how do I get the revision id?21:30
LarstiQtrondn: bzr log --show-ids outputs them for example21:30
mwhudsontrondn: ugh, tell people to not do things like that do their branches :)21:31
mwhudsonif it's an 'integration branch' you should integrate by merging in new things and committing21:31
trondnis there a shorthand for the latest revision??? on mercurial I may use -r tip ???21:31
mwhudsontrondn: -r -121:31
Peng_mwhudson: I think at least some of the changes are probably a good idea -- like using urlutils instead of urllib, and maybe running unescape_for_display over served_url.21:32
trondnmwhudson: I'm modifying a hudson plugin ;)21:32
mwhudsontrondn: haha21:32
Peng_trondn: Alternately -r head:21:32
mwhudsonthreads about hudson always weird me out21:32
trondnmwhudson: well, the bazaar plugin for hudson didn't work in a "master-slave" configuration, so I'm rewriting it... right now I'm trying to get the log there...21:33
mwhudsonPeng_: if you say so :-p21:36
Peng_mwhudson: I'm just saying, if it didn't completely break everything, this branch might be worth merging. :D21:36
phinzesigh, so i just had the bazaar-hookless-email script bring one of my group's dev servers to its knees21:37
LarstiQphinze: eek21:37
LarstiQphinze: how so?21:37
phinzei had foolishly set it to crontab every 5 minutes21:38
LarstiQand it didn't complete within 5 minutes?21:38
phinzeand apparently an instance of it started spinning off longer than 521:38
phinzeand the next one started21:38
LarstiQright21:38
phinzeand the next one21:38
LarstiQphinze: any reason you're not running it in daemon mode?21:38
phinzeLarstiQ: mostly because it was the fastest solution to the problem at hand (i wanted to keep an eye on the commit stream of several branches, as i'm usually the guy called in to resolve bzr problems)21:39
phinzeLarstiQ: do you think daemon mode would prevent it from eating up all the server's resources?21:39
phinzei'm trying to think of what would cause it to spin off at 100% like it's doing21:41
LarstiQphinze: I'm not going to guarantee that :)21:41
phinzejust chugging through a big diff maybe?21:41
LarstiQphinze: but it's what we run21:41
Peng_mwhudson: Mind if I vote resubmit?21:41
LarstiQphinze: also, you're not fork bombing21:41
LarstiQphinze: although for cron it should check if there is a previous instance and bail out if that is the case21:42
phinzeLarstiQ: right that is what i should have done from the get-go21:42
LarstiQphinze: 5 minutes running time sounds like a lot evenso, so if you can figure out where that time went that would be great21:43
phinzeLarstiQ: yeah i'm looking into it -- running it in foreground and it just chugs at 100% until i get scared and kill it21:45
phinzeLarstiQ: trying to figure out how to get it to give me some better output21:46
Peng_mwhudson: Well, I just did. :P21:46
LarstiQphinze: it has a log output option, though not overly verbose21:46
LarstiQphinze: strace?21:46
phinzeLarstiQ: not installed on the server :(21:48
* LarstiQ blinks21:48
mwhudsonPeng_: thanks21:48
LarstiQphinze: other diagnostic tools?21:48
phinzeLarstiQ: it's an old crufty box that is long overdue for a rebuild21:49
phinzeLarstiQ: i might be able to get strace on there though21:49
phinzehmm wait21:50
phinzei can just tar up the repo21:50
phinzeonly 115M21:50
LarstiQphinze: smart thinking :)21:51
LarstiQevening jfroy_21:51
jfroy_LarstiQ: yo21:52
=== jfroy_ is now known as jfroy
phinzealllright, here comes strace and here goes my local machine's performance21:57
phinze:)21:57
LarstiQphinze: it's for the greater good, godspeed! :)22:00
phinzeLarstiQ: okay 1m41s running time locally w/ strace22:05
phinze100% during, but it does stop22:05
phinzewhat's this about "The program doesn't like to watch empty branches.22:05
LarstiQI don't recall that string.22:06
phinzeREADME:11122:07
LarstiQoh22:07
phinzeit's a rather vague and ominous statement22:07
LarstiQyeah, makes sense.22:07
LarstiQphinze: sorry :)22:08
phinzeahh did you write it?22:08
LarstiQphinze: when there are zero revisions in a branch, you get into corner cases.22:08
LarstiQphinze: I didn't touch the README, but my fingers are over some of the code, yes.22:08
BasicOSXSubmitted [merge], bundle buggy did it's job, 2 core developers approved, do I need to ask someone to merge or can I submit to PQM?22:09
phinzeahh cool, well thanks for your work on it; it fills a very important need22:09
phinzei don't think we have any branches with zero revisions22:10
phinzewell i've got to run22:11
phinzei'll continue to look into this22:11
phinzeLarstiQ: thanks for your help; i'll keep you posted22:11
LarstiQBasicOSX: without more context, you could submit it, if I'm still up to date on the process.22:12
LarstiQphinze: cool22:12
BasicOSXLarstiQ:  Bundle Buggy is just a communication tool, has nothing to do with PQM ?22:13
LarstiQBasicOSX: there is some judgement involved, say with possibly contentious patches and not everyone has had a chance to vote yet22:13
LarstiQBasicOSX: right22:13
BasicOSXMine is a simple documentation change :-)22:13
LarstiQBasicOSX: that sounds relatively safe :)22:14
LarstiQBasicOSX: which one is it?22:14
BasicOSXBug #343928 gnu changelog was documented incorrectly22:14
ubottuLaunchpad bug 343928 in bzr "GNU ChangeLog output can now be produced by bzr log --format gnu-changelog is incorrect" [Undecided,Fix committed] https://launchpad.net/bugs/34392822:14
LarstiQBasicOSX: yeah, I'd go ahead22:15
BasicOSXLarstiQ:  first PQM to bzr.dev, what's the location.conf's submit_branch? http://bazaar-vcs.org/bzr/bzr.dev/ ?22:19
lifelesshttp://bazaar-vcs.org/bzr/bzr.dev22:20
Kobaztrying to start the latest version of loggerhead: ImportError: No module named simplejson22:20
Kobazwhere would i get simplejson?22:20
mwhudsonKobaz: oh oops22:21
BasicOSXKobaz:  pypi?22:21
mwhudsonit's included with python2.5, but under a different name i think22:21
mwhudsonKobaz: what version of python are you running?22:21
Kobaz2.522:21
mwhudsonKobaz: one moment22:21
Kobazii  python2.5                        2.5.2-1422:22
mwhudsonah, nuts, json is only in 2.522:22
mwhudsonKobaz: oh, if it's debian/ubuntu "apt-get install python-simplejson'22:22
mwhudsonah, nuts, json is only in 2.622:22
mwhudsonis what i meant to say...22:23
Kobazpython-simplejson - Simple, fast, extensible JSON encoder/decoder for Python22:23
Kobazi guess i need that?22:23
mwhudsonyes22:23
Kobazheh22:23
Kobazi <3 debian22:23
Peng_mwhudson: The new dependency should be added to the documentation.22:25
mwhudsonPeng_: good point22:25
Peng_Not that I'm volunteering. ;-)22:25
Kobazokay so22:27
Kobazi have https://bzr.local/webbzr/22:27
Kobazi have a few directories in the base (not repo's)22:27
Kobazand then i click on one... and the link goes to /webbzr/directory22:28
Kobazbut then it redirects to /directory22:28
Kobazwhich isn't found... of course... since the base directory of loggerhead is /webbzr22:28
mwhudsondo we think easy_install simplejson will work?22:28
Kobazwhy is it doing the redirect?22:28
mwhudsonKobaz: did you start loggerhead with the --prefix option?22:28
Kobaznope22:29
Peng_mwhudson: Well, it's on PyPI, so it should...22:29
mwhudsonPeng_: good enough for me :)22:29
mwhudsonKobaz: well you should :)22:29
Kobazheh22:29
Kobazk22:29
mwhudson./serve-branches --prefix webbzr22:30
Kobazooo22:30
Kobazyeah22:30
Kobazthat worked22:30
Kobazoh that works much better22:30
KobazTo get this branch, use:22:31
Kobazbzr branch http://bzr.local/webbzr/project/base/trunk22:31
Peng_mwhudson: You're updating the README, then?22:31
Kobazthat's not my branch url22:31
Kobazhow would i set that?22:31
mwhudsonPeng_: just did yeat22:31
Kobazthe branch url is http://bzr.local/bzr/project/base/trunk22:31
mwhudsonKobaz: you need to hack sourcecode at the moment :/22:32
Kobazaww22:32
Kobazi have auto_publish_folder set22:32
Kobazi guess it doesn't use that?22:32
mwhudsonum22:32
mwhudsonif you're using serve-branches22:32
mwhudsonloggerhead.conf is entirely ignored22:32
Kobazyeah i'm using serve-branches22:32
Kobazoh22:32
mwhudsonmmm22:32
mwhudsoni guess loggerhead really should use the public location of the branch, if that's set22:33
Kobazhmm22:33
Peng_Hmm, I don't think I set the public location of my branches.22:33
Kobazbut the only way to serve multiple branches is via serve-branches right?22:33
Peng_Kobaz: start-loggerhead can serve multiple branches, but you should use serve-branches.22:33
Kobazheh22:34
Kobazmm, i broke it22:34
Kobazas soon as i view a directory containing versioned files... it completely dies22:36
mwhudsonas in, exits?22:37
Kobaztrunk/files22:37
Kobazthat works22:37
Kobazand then..22:37
KobazThough the site seems valid, the browser was unable to establish a connection.22:37
Kobaz* Could the site be temporarily unavailable? Try again later.22:37
* mwhudson wonders if http://pastebin.ubuntu.com/132731/ makes sense22:37
Kobazetc etc22:37
Peng_mwhudson: Mind if I change it to import json if simplejson isn't available?22:37
mwhudsonPeng_: not at all, does loggerhead work at all with 2.6 though?22:38
lifelessjam: mail for you re: bbc22:38
Peng_mwhudson: ...I have no idea, but it won't hurt.22:38
lifelesswe really must stop PackRepository being a subclass of KnitRepository some day22:38
Kobazooooh22:39
Kobazit's redirecting to http://22:39
Kobazmy loggerhead is on https22:39
Kobazand the links are going to http22:39
mwhudsonKobaz: oh right22:39
mwhudsonKobaz: there's a bug about that22:40
Kobazhehe22:40
Kobazanyways22:40
mwhudsonbasically there's no way for serve-branches to know it's being run behind https22:40
Kobazdinner time22:40
Kobaztime to bust out of the orfice22:40
Kobazwell. maybe make a setting to either prefix http or https22:40
mwhudsonKobaz: right22:41
Peng_mwhudson: So do you mind if I push trivial changes like this straight to lp:loggerhead without review?22:41
Kobazwell22:41
Kobazactually22:41
Kobazyou shouldn't do the full url22:41
mwhudsonPeng_: go for it22:41
Kobazdo relative urls... and that would fix it22:41
mwhudsonKobaz: probably that too22:41
Kobazdon't make links with http://servername22:41
Kobazdo /prefix/dir/file22:42
Kobazthat's what i always do and https/http is never an issue22:42
Peng_mwhudson: Alrighty.22:42
mwhudsonKobaz: i believe redirects need to be absolute urls22:42
Kobazthey dont22:42
Kobazatg least in firefox22:42
Kobazanyways22:42
Kobazbustin out22:42
mwhudsonthey do in rfc2616 though22:45
* igc breakfast22:48
lifelessbreakfast22:49
lifelessand then commit for a bit22:49
lifelessigc: talk with zooko: re gsoc, may be something in common23:16
igczooko: I've added http://allmydata.org/trac/tahoe/ticket/663 to http://bazaar-vcs.org/SummerOfCode200923:28

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!