/srv/irclogs.ubuntu.com/2008/07/14/#bzr.txt

mathrickmwhudson: yeah00:00
cyberixstill imports the one from site-packages00:01
mwhudsoncyberix: what exactly are you doing?00:02
mwhudsoncan you pastebin a session?00:02
cyberixJust trying to run selftest on a vanilla "checkout" from lp:bzr00:03
mathrickmwhudson: it seems to be true for bzr+ssh:// as well00:04
Verterokcyberix: that's weird. try removing/not using your current PYTHONPATH, i.e: PYTHONPATH=/path/to/branch00:04
mwhudsonmathrick: i'm not surprised there00:04
mathrickwhy not?00:05
cyberixhttp://pastebin.com/d73a21e300:05
mwhudsonmathrick: because the code for bzr:// and bzr+ssh:// is basically the same at this level00:09
cyberixVerterok: That doesn't change anything00:09
mwhudsoncyberix: hm, seems to be loading the system plugins00:09
mwhudsonwhich is wrong, but less wrong than what you first said00:10
cyberixoh00:12
cyberixAny further suggestions?00:14
Verterokcyberix: you can use the --no-plugins option00:15
mwhudson./bzr --no-plugins selftest00:15
Verterokcyberix: also there is the BZR_PLUGIN_PATH env var, in the case that you want to include some plugins in the selftest00:16
mathrickmwhudson: ok, do you see a fix?00:24
mathrickI need to know if I should invest into making it work, or rather take care of the reading part of my app00:25
mwhudsonmathrick: not really looked yet00:25
mathrickaha00:25
mwhudsonmathrick: i wonder if i can trick spiv into fixing it00:25
mathrickhehe00:25
mwhudsonspiv: https://bugs.edge.launchpad.net/bzr/+bug/17557000:25
ubottuLaunchpad bug 175570 in bzr "bzr cat over bzr protocol fails" [Medium,Confirmed]00:25
mathrickI think he should feel morally obliged to fix it, he knew the bug number instantly when I mentioned it :)00:26
mwhudsonsmart server/remote branches is something he knows more than most about00:26
* mathrick wonders if that is a good thing00:27
cyberixthanks that helped00:28
spivmathrick: "instantly" is a bit of an exaggeration :)00:29
cyberixgoing to sleep now00:29
cyberixgood night00:29
spivI had to search Launchpad, but happily searching bugs.launchpad.net/bzr for "cat ObjectNotLocked" found exactly 1 bug.00:30
mathrickexcuses00:34
mwhudsonspiv: do you know about the locking thing off hand?00:51
spivlocking thing?00:59
mathrickspiv: the bug I ran into01:00
mwhudsonspiv: http://pastebin.ubuntu.com/27148/01:00
spivmwhudson: that has the same root cause as 175570, I believe01:03
spivThere's another related bug report or two, as well.01:04
mwhudsonspiv: well, i was more thinking that it could be the root cause for that bug01:04
spivmwhudson: well, that's a symptom, not a cause ;)01:05
mwhudsonspiv: ok01:05
spivThe cause is roughly that RemoteBranch.lock_read doesn't call lock_read on its repo.01:05
spivBut just simply doing that breaks other things.01:05
spivThere's a discussion of this on the list and/or this mysterious other bug report I'm alluding to.01:06
mwhudsonhm01:06
spivmwhudson: https://bugs.edge.launchpad.net/bzr/+bug/23706701:06
ubottuLaunchpad bug 237067 in bzr "RemoteBranch.lock_read() doesn't lock the underlying repository" [High,Confirmed]01:06
mwhudsonspiv: yay google01:07
mwhudson(i just found that too)01:07
CrashTest_Aha!  I was going to ask a good-ole' stupid question, but I found the answer!  sftp://myuser@domainname.com/~/svr/bzr/ works, sftp://myuser@domainname.com/svr/bzr does not :)  Silly little ~03:49
=== spiv_ is now known as spiv
lifelesswoo, 1.6Million key btrees , no memory _explosion_05:28
lifeless(and thats not the limit, that was just disk spilling when it blew up cause it exceeded the header size)05:29
=== elmo_ is now known as elmo
lifelessmegarepo test on b+tree indices:09:25
lifeless115M    .bzr/repository/indices09:26
lifelessdown from09:26
lifeless444M    backup.bzr/repository/indices/09:26
lifelesspoolie: oh yeha, hi :)09:26
=== wgrant_ is now known as wgrant
poolienight all09:55
pagenoarehi10:21
pagenoareanybody using bzrweb with bzr 1.5rc1? :D10:22
awilkinslifeless: But are b-trees Faster too?10:50
lifelessawilkins: igc mailed the list with some results11:28
lifelessawilkins: executive summary: much faster at some things; a bit slower at others, ~= on the rest.11:28
gabehi all12:00
gabewondering if someone might be able to help me out with a bzr related problem12:01
gabeget the following error: bzr: ERROR: [Error 32] ╧ЁюЎхёё эх ьюцхЄ яюыєўшЄ№ фюёЄєя ъ Їрщыє,12:01
gabe ╧ЁюЎхёё эх ьюцхЄ яюыєўшЄ№ фюёЄєя ъ Їрщыє, is unreadable meaningless heap of letters!12:01
gabereported it on https://bugs.launchpad.net/bzr/+bug/23730512:01
ubottuLaunchpad bug 237305 in bzr "bzr: ERROR: [Error 32] " [Undecided,Incomplete]12:01
Odd_Blokegabe: What OS are you using?12:04
=== Cael is now known as Splodge
gabethat's on windows vista with bzr 1.512:11
Odd_BlokeHmm, I don't really know enough about Windows to be able to help you debug. :(12:13
gabei know enough about Windows not to use it!12:13
Odd_Blokegabe: That said, attaching the relevant part of .bzr.log to the bug report would probably be helpful.12:13
gabeit's actually a russian friend with the problem12:13
gabetrying to help him solve it..12:13
gabei'll see if i can get hold of bzr log12:14
SplodgeHi, I'm hoping somebody here can help me: is it possible to compare two branches in bzr?12:24
SplodgeI have a trunk on the server which I've 'branch'ed to my PC. Then, to test things, I updated some files in the working tree and committed them to the local copy of the branch (what's the proper term for this - local mirror?). The question is, is it possible to compare the local copy containing the commits, to the branch on the server in a nice, simple way? Or am I approaching development...12:24
Splodge...with bzr incorrectly?12:24
Kinnisoncd local-branch12:25
Kinnisonbzr diff http://path/to/remote/branch12:25
bob2'bzr missing' will show the different commits on each, or you can use bzr diff to show diffs12:25
lifelessgabe: sounds liek the error isn't encoding correctly on output12:28
Splodge Ah I see.12:31
Splodge'diff' doesn't show anything for me, but 'missing' does list the extra revisions I have locally.12:31
SplodgeAnd the --verbose item will show extra details on the changes to files etc.12:31
SplodgeThat's just what I was looking for. Thank you.12:31
gabethanks12:34
gabeI got a section of the bzr log attached to the bug report, it's here... http://launchpadlibrarian.net/16008570/bzr.log12:35
=== emgent_ is now known as emgent
lifelessgabe: thanks13:02
=== andrea-bs_ is now known as andrea-bs
=== cody-somerville_ is now known as cody-somerville
awilkinsgabe: ERr 32 is an IO error ; probably a file being held open by another process13:17
awilkinsgabe: Which shell are you using? THe error text looks like it's in unicode or something13:18
=== jaypipes_mysql is now known as jaypipes
awilkinsgabe: Looks like an eastern European error message for err 32. Your local encoding is cp866 so I presume you are cyrillic by nature...13:36
gabeyeah it's actually a russian friend I am asking on behalf of13:41
gabewhat info do you need?13:41
awilkinsgabe: Well, it's an IO error during a tree transform ; I would suspect that another process has a lock on one of those files13:43
lifelesshmm, I was going to say bzr --version13:43
lifelessbut it doesn't include the encoding13:43
lifelessgabe: does your friend see a readable error?13:43
gabewhat he sees is what I pasted here13:43
gabeerror 32 etc13:43
gabeand some unreadable junk too13:43
lifelessgabe: if what he sees is correctly encoded cp866 he will be able to read it even though we can't13:44
gabehe's used bzr for a while13:44
gabeno problem13:44
lifelessthats the nature of encoding13:44
gabeyeah but he said it is junk13:44
gabeunreadable even to him13:44
lifelessgabe: so I'm tryingt o understand if *he* can read it, not if the copy and pasted stuff is unreadable13:44
lifelessok13:44
lifelessso there are two issues: why the error, and the error being unprintable13:44
gabehe has a checkout of a branch13:44
gabeand been doing about 25 --local commits13:44
lifelessas for why the error, does he have an editor open on a file or something?13:44
gabethen wanted to commit back to the repo13:45
gabebut it said he needed to bzr up13:45
gabeso he did bzr up and got this13:45
=== thekorn_ is now known as thekorn
jelmerhey *13:45
gabesome conflicts13:45
gabeand errors13:45
awilkinsHe has a file open13:45
lifelessgabe: I would guess an editor open on a file13:45
gabeok13:45
awilkinsIt's during a rename13:45
lifelessjelmer: hi13:45
gabei'll make sure he quits any editors and tries again13:45
awilkinsWindows ia waaay more picky about files being open when it writes over them13:45
beunomornin' all13:46
jelmerlifeless: How were things at GUADEC?13:46
lifelessjelmer: intense :)13:46
lifelessmany positive discussions, some rather more neagative13:46
beunolifeless, any guesses on what the outcome for VCS choice will be?13:47
jelmerlifeless: what in particular were the negative ones about?13:47
lifelessjelmer: some folk felt that canonical was pushing bzr (rather than us being there because gnome devs *wanted* support for bzr)13:49
lifelessjelmer: and there were some rather opinionated folk that didn't want a dialogue, but instead wanted to tell me how stupid it was to even hack on bzr given that git exists13:49
jelmerlifeless: wow, ok13:50
lifelessbeuno: no idea yet13:50
KinnisonThe number of people who think that git is the be-all-and-end-all, perfect, etc. does surprise me13:51
Kinnisonesp. given how I cannot get on with it no matter how hard I try13:51
lifelessKinnison: the number of them that have used bzr in anger appears to approach zero13:51
Kinnisonlifeless: surprise surprise.13:51
* Kinnison wishes git was easier and nicer13:51
* Kinnison gave up and did his kernel module dev in bzr and supplied a patch to the kernel guys13:52
Kinnisonbecause I just can't get git to be of any use to me13:52
jelmerlifeless: Thanks for the update13:52
lifelessjelmer: should have a interseting ssvn bug for you soon13:53
jelmerI'm looking forward to it ;-)13:53
pborlifeless: did you persuade any gnomers (that currently use svn/git) to at least try bzr?13:54
lifelesspbor: yes13:54
pborcool13:54
lifelessrob taylor from codethink appears quite excited :)13:54
asabillifeless: are you serious ?13:54
lifelessJc2k: how's your head? recovering from guadec?13:54
lifelessasabil: about what?13:54
asabilabout rob taylor13:54
pborgetting people to actually try it is the only way to gain user base :-)13:54
lifelessasabil: yes13:55
asabilwow !13:55
Jc2klifeless: my brain is at about 25% usefulness13:55
asabillast time I talked to him (a year ago), he was worshiping git13:55
lifelessasabil: he's had Jc2k hammering on him way before guadec :) I just added the straw I think13:55
* Jc2k nods13:55
asabillol :)13:55
Jc2knot just that though13:55
asabilwell done Jc2k ^^13:55
Jc2khe's been poking the Git source code for his project13:56
asabilwe need more of you13:56
Jc2kand Git source would finish anyone of13:56
Jc2kf13:56
Jc2kits horrible in there.13:56
pborhaha13:56
asabilI think bzr developers maybe should start blogging code snippets from git's source code13:57
asabilmaybe that would shed some light on the evil dark corners of git :p13:57
beunojelmer, btw, which BB are we using for bzr-gtk?  it seems we have 2 fighting over it now13:58
jelmerbeuno, vernstok.nl is still the primary one13:58
jelmeruntil the one on Aarons machine has the right details13:58
beunojelmer, cool, I'm back home now, so I should be able to go through the remaining reviews, and merge some of them13:58
jelmercool13:58
beunosorry I've been so unresponsive, but I've had a few unusual weeks  :)13:59
fullermdHeck, I've had a few unusual _months_...14:00
awilkinsvila: Ping?14:05
mtaylorguys, I love you all, but this: bzr: ERROR: Repository KnitPackRepository() is  not compatible with repository KnitPackRepository()14:10
mtayloris quite possibly the worst error message in the history of mankind14:10
lifelessmtaylor: totally14:10
jelmermtaylor: Couldn't agree more14:11
lifelessmtaylor: and I'm embarrased14:11
mtaylorok.14:11
lifelessjelmer: so patch it up :)14:11
mtayloras long as you're embarrassed14:11
lifelessjelmer: add the rich root etc stuff to str()14:11
mtayloralso, let me verify...14:11
mtaylorrich-root-pack is required for former svn repos... but is not recommended at this point for normal use of large projects, say, like the mysql trees?14:12
jelmerlifeless: Maybe once I finish browsing through the bzr-svn bugs from the last 5 days...14:12
lifelessjelmer: :)14:12
lifelessmtaylor: its a one way trap door; shouldn't be performance implications14:12
lifelessholy cow14:26
lifelessthis index is a 5-level B+Tree14:27
lifeless2.9Million keys14:27
awilkinslifeless: Did you think about incredibly-scary-judy-arrays ?14:29
lifelessawilkins: yes14:33
awilkinsI never tried them personally, but the papers read really impressively :-)14:34
lifeless5 IO's per key -> not ideal. But hey, its all of ubuntu.14:34
lifelessjelmer: https://bugs.edge.launchpad.net/bzr-svn/+bug/24840615:05
ubottuLaunchpad bug 248406 in bzr-svn "Import of SVK modified SVN repositories" [Undecided,New]15:05
=== mw|out is now known as mw
gabeok my russian friend closed his editor15:32
gabedid bzr up15:32
gabethis is what he said:15:32
gabei've closed editor and run bzr up and it completely removed all my changes15:32
gabeall 26 local commits are disappeared15:32
gabewhy did it do that!?15:32
lifelessgabe: bzr st will show you a pending merge15:35
lifelessgabe: and he should now 'bzr commit' to record it and put it in the repository15:35
gabeoh15:35
gabelifeless: thanks for your continued assistance15:36
gabei'll check on the bzr st15:36
lifelessgabe: if he reverted or something then it will have become a dead head and he can do 'bzr heads --dead' or whatever to find the id etc.15:36
gabeer15:36
gabethis is what his bzr st shows15:36
lifelessgabe: check on bzr st :)15:36
gabeD:\xampp\htdocs\eastwestfilms\hungerseason>bzr st15:36
gabeunknown:15:36
gabe  .project15:36
gabeno merges :(15:37
lifelessgabe: bzr heads --dead-only15:37
lifelessgabe: he will need bzrtools installed15:37
gabehe had a whole bunch of about 25 --local commits15:37
gabelifeless: he has been using bzr for a while without problem? Is he really missing bzr tools?15:37
lifelessgabe: the heads command is in bzrtools15:37
lifelessgabe: I don't know if he is missing it or not, but to find the id of the commits that he reverted we need bzrtools15:38
Splodgecan anyone tell me how to revert a 'branch'ed that has had some commits made back to the trunk version? a 'revert' only reverts the working tree to the branched copy. do I need to do something with 'pull' or provide some optional parameter. googling has turned up unless i'm just looking in the wrong places... (apologies if it is a stupid question)15:38
gaberight, i'll make sure he has it installed.15:38
lifelessgabe: its there in his repository, we just need to pull it back into his tree15:38
lifelessgabe: try the command, if it's unknown command install bzrtools/upgrade bzrtools15:38
lifelessSplodge: pull --overwrite15:39
gabetry this command? zr heads --dead-only?15:39
lifelessgabe: yes15:39
gabebzr heads --dead-only15:39
gabewhat will it do?15:40
Splodgelifeless: Thanks! You guys are good ;)15:40
lifelessgabe: report on the name of the stuff he reverted15:40
gabeok i asked him to try15:40
gabelifeless: you are right, unknown command15:40
gabeso install bzr tools15:40
lifelessgabe: yes15:41
lifelessabentley: ping15:41
abentleylifeless: pong15:41
lifelessabentley: nevermind, something stranger than I considered15:42
lifelessabentley: I have an epic fail on my mega repo; with bzrlib.errors.RevisionNotPresent: Revision {('zopezver.init.in-20080520144343-w8u8nix52axlkvgg-19', 'liw@gytha-20080520144343-7pdk3g344utm17vz')} not present in "<bzrlib.knit.KnitVersionedFiles object at 0x2ac7674f8810>".15:42
lifelessabentley: but the repo has single commits everywhere so it should be impossible15:42
abentleylifeless: This is with B+ trees?15:43
lifelessabentley: yes, though I think that that is orthogonal15:43
=== Splodge is now known as splodge
lifelessI know what is happening15:45
lifelessbug in my bug fix15:45
lifelessabentley: so yes, it was B+trees15:50
abentleylifeless: Glad you found it.15:50
gabehow to install bzrtools15:52
lifelessabentley: I was handling far right hand end nodes wrong if the node had only one child15:55
Odd_Blokeabentley: BB doesn't seem to be picking up on when patches have been merged into PQM's trunk (http://bundlebuggy.aaronbentley.com/project/pqm/request/%3C20080710071152.05c913e0@lapbert%3E is the only example ATM).15:56
abentleyOdd_Bloke: Okay, I'll look into it.15:57
Odd_Blokeabentley: Thanks. :)15:58
abentleyOdd_Bloke: Could you file a bug report, please?15:58
Odd_Blokeabentley: Sure.16:01
gabeok my friend has bzr tools installed16:01
gabethis is the result of bzr heads --dead-only16:01
gabeHEAD: revision-id: kos@pixeco.com-20080714080119-60tpfuob57h4zma4 (dead)16:01
gabe  committer: Kos16:01
gabe  branch nick: hungerseason16:01
gabe  timestamp: Mon 2008-07-14 14:01:19 +060016:01
gabe  message:16:01
gabe    Added sIFR for images caption16:01
lifelessgabe: ok, you can now do 'bzr merge -r revid: kos@pixeco.com-20080714080119-60tpfuob57h4zma4'16:01
gabeoooh ok16:02
lifelessgabe: and then 'bzr commit'16:02
gabethat's very precise :)16:02
lifelesserm, thats revid:kos...16:02
lifelessI added a space by mistake16:02
lifelesslike so:16:02
lifeless'bzr merge -r revid:kos@pixeco.com-20080714080119-60tpfuob57h4zma4 .'16:02
gabeok cheers16:02
lifelessthat will resurrect his patches16:02
gabeD:\xampp\htdocs\eastwestfilms\hungerseason>bzr merge -r revid:kos@pixeco.com-20080714080119-60tpfuob16:03
gabe57h4zma416:03
gabebzr: ERROR: No location specified or remembered16:03
gabeis that bad news?16:04
lifelessgabe: add the '.' :)16:04
jamgabe: there is a hard to see '.' after the revid16:04
jamyou could alternatively change the order16:04
jambzr merge . -r revid:.....16:04
jamlifeless: are you still in Europe?16:05
gabelifeless: yep, quite right!16:05
lifelessjam: London indeed16:05
lifelessgabe: happy to help, sorry it took up your friends time16:05
Odd_Blokeabentley: https://bugs.launchpad.net/bundlebuggy/+bug/24842216:05
jamlifeless: how long before you head back to AU? (Just curious how much time you'll be awake when I am :)16:05
ubottuLaunchpad bug 248422 in bundlebuggy "Merging of patches to PQM trunk not detected" [Undecided,New]16:05
abentleyOdd_Bloke: Was the patch merged after BB started tracking PQM?16:06
lifelessjam: 1 week16:08
gabelifeless: we're still working on that last command16:09
gabeseems he gets16:10
gabe"'bzr" is not recognized as an internal or external command,16:10
gabeoperable program or batch file.16:10
lifelessgabe: well, how does he run bzr normally ? :)16:10
gabeis that because windows doesn't recognise the quotes around the command?16:10
lifelessgabe: you shouldn't copy the quotes, they were to show you what to copy :)16:10
gabehe uses the bzr command but not with quotes around it I guess16:10
gabeoh woops16:10
gabethat worked16:12
gabelifeless: when I work on a checkout make local commits, when I want to commit to repo sometime I need to bzr up, but then it wipes all my changes too - why does this happen?16:13
lifelessgabe: it does not wipe them away; you have to run 'bzr revert' to wipe them away16:13
gabeso what does it do with my local commits then?16:13
gabeand why are they 'taken away'?16:13
lifelessit puts them into a pending merge16:14
lifelessso that after the update, when yo commit they go into the master16:14
lifelessand they are taken away when you run 'bzr revert' because bzr revert removes pending merges16:15
Odd_Blokeabentley: I _think_ so, but I'll go and check timestamps.16:15
gabebut bzr st doesn't show them?16:15
lifelessgabe: bzr st will show them16:16
gabei mean i thought merges didn't really happen with checkouts16:16
lifelessgabe: I assure you, he ran - 'bzr up' and then 'bzr revert'16:16
lifelessgabe: checkouts can totally do merges16:16
gabeok, so in the future, when my local revisions appear to have been nuked what should be be looking at doing?16:16
lifelessgabe: dont run bzr revert after an update and they will never appear to have been nuked16:16
gabemmm ok16:17
Odd_Blokeabentley: You sent the message to the ML about PQM now being managed by BB on the 9th, the merge happened on the 10th.16:17
lifeless'bzr update && bzr revert' is guaranteed to give you a tree the same as the thing you have a checkout of.16:17
lifelessgabe: (&& means followed by)16:17
gabeah ok16:17
gabeand then what did you do to fix that? merge the current tree with a previous version that included local commits?16:18
lifelessbzr update && bzr commit is guaranteed to commit your local edits to the thing you have a checkout of.16:18
lifelessyes, the use of heads --dead-only, and merge, is how we reinstated the local commits.16:18
abentleyOdd_Bloke: I'm not sure when the last tweak of the merge-detection code happened.  It may have been afterward.16:19
lifelessjam: I am going to make the last node in a row be variable-sized16:22
lifelessjam: using b+tree indices in bzr search.. hurt16:22
jamlifeless: I understand your desire, but isn't that the last node in the *last* row only?16:23
lifelessjam: yes16:23
gabei need to find out about bzr heads16:23
gabebzr heads16:24
gabebzr: ERROR: unknown command "heads"16:24
gabeeven after doing:  sudo ./setup.py install16:24
lifelessjam: its actually really the use of many tiny indices *I think*16:24
gabein the bzrtools extraction dir16:24
lifelessgabe: what path did it install into16:24
jamlifeless: you realize, that is probably sub-optimal from an FS perspective anyway16:25
gabeWriting /Library/Python/2.5/site-packages/BzrTools-1.5.0-py2.5.egg-info16:25
jamconsidering most FS have a minimum 4k page16:25
lifelessjam: they are in a pack16:25
jamlifeless: you are putting the indexes into a pack file... ok, I guess16:25
lifelessjam: better than 100000 files on disk :)16:26
lifelessjam: ask mtaylor how long the earlier editions took to delete an index :)16:26
mtaylorjam: oit was not pretty :)16:26
jamlifeless: because deleting required re-packing everything?16:27
jamsounds like a flag "deleted" case :)16:27
lifelessjam: no, because ext3 doesn't handle hundred's of thousands of files in a single directory gracefully16:27
lifelessjam: bzr-search doesn't delete stuff anyway16:28
jamah, before the packing16:28
jamyeah, I seem to remember running into that in the past16:28
jamwhen we were working on medical images and dumped 100k files in a directory16:28
jamI had to write a custom script that used the raw C files to move them out16:28
jamthe raw C *functions*16:29
jambecause 'ls *' or python listdir() would just take forever to finish16:29
gabels /Library/Python/2.5/site-packages/bzrlib/plugins/bzrtools/16:30
gabe__init__.py             dotgraph.pyc            rspush.py16:30
gabeetc16:30
gabeseems to be there16:30
jamgabe: I would double check that "bzr --version" lists /Library/Python/2.5/site-packages/bzrlib as its bzrlib location16:30
gabeha no16:31
gabeit doesn't16:31
gabebest fix that16:31
jamOdd_Bloke: still getting your random commits on the commit list16:34
jamhttp://bzr.daniel-watkins.co.uk/pqm/work/foo "renamed 'foo' => 'bar'"16:34
meteoroidi initialized a repository from generated code, added everything, committed, then branched to a remote bzr+ssh url.  this location on the server only ended up with a .bzr subfolder, and is smaller, significantly, than a branch made from it locally, eg. 'bzr branch main dev'16:35
meteoroidclearly there is something basic i don't understand, anyone care to proffer a link or something?16:35
Odd_Blokejam: Ah, thanks.16:35
jammeteoroid: I'm guessing on your server you don't have a working tree, which is standard for places that we can't access the wt directly16:36
jamyou should still have all the revision data16:36
jamjust no working files16:36
Odd_BlokeIf I have a lightweight 'work' checkout which is bound to a branch, which location's settings will be used from locations.conf?16:36
meteoroidjam: ah ok, that's what i figured, is there some command i run to turn a branch into a wt?16:36
jamOdd_Bloke: are you saying light weight => branch => other_branch ?16:36
jammeteoroid: 'bzr co'16:36
jambut the WT won't be updated by default either16:37
jam(there are some workarounds for this)16:37
meteoroidhm16:37
meteoroidwell i shouldn't use the 'master' i set up as a wt anyway16:37
meteoroidactually i was kinda curious why the other branches were bigger16:37
meteoroidi guess i want to branch remotely16:37
meteoroidstill have yet to set up http :/16:38
Odd_BlokeI have 'pqm/work' bound to 'pqm/foo'.  When I commit in 'pqm/work' (and so in 'pqm/foo') which config in locations.conf will be used, 'pqm/work's or 'pqm/foo's?16:38
Odd_Blokejam: ^16:38
jamOdd_Bloke: that isn't a lightweight checkout...16:39
jambut I would guess if you have a bound 'work' => 'foo' then 'work' still gets used for the bound branch16:39
gabelifeless: thanks ever so much for your help16:39
jamI'm not sure that all functions agree on this, though16:39
lifelessdato: ping16:39
gabemy friend is so relieved to have all his work back and is very grateful to you :)16:39
lifelessgabe: no probs16:39
gabewhat is a revision that doesn't have descendents and is dead?16:40
lifelessgabe: a dead revision is one that no branch refers to16:41
lifelessgabe: a revision with no commits that build upon it is a head16:41
Odd_Blokejam: It _is_ a lightweight checkout, I presumably didn't mean 'bound to'. :)16:41
jamOdd_Bloke: lightweight will use the target16:41
gabeand that is what you get if you do bzr up &&  bzr revert ?16:41
jamthat I'm sure of16:41
jamwhen we open a light checkout, it instantly redirects to open the target branch16:42
jamso we don't really ever *see* the lightweights fake branch16:42
jamand almost all config is done at the Branch level, not the WT level16:42
lifelessgabe: yes16:42
jamlifeless: for the 'failure during deep copy' do you have any hints as to what happened?16:48
jamDid it just fail *to* deepcopy?16:48
jam(I'm testing with python 2.4.5 and things seem to work)16:48
lifelessit just failed to copy16:48
lifelessit was 2.4.416:48
lifeless(manganese)16:48
jelmerlifeless, Odd_Bloke: Are you going to be around for some sprinting before saturday?16:50
lifelessjelmer: I'm in London, get to wolverhampton 9pm friday16:50
jelmerI'm in Dublin atm and trying to decide whether to go home for a day or two or to go there directly16:50
jelmerlifeless, ah, ok16:50
lifelessjelmer: if you wanted to come to London for a bit I'm sure that would be ok16:51
jamlifeless: well, the trivial "a = array.array(...); b = copy.deepcopy(a)" works on manganese :(16:53
lifelessjam: I was running 'bzr upgrade --btree-plain' with blooms enabled16:53
lifelessjam: and this made it fall down go boom16:54
jelmerlifeless, That may be a nice idea16:54
lifelessjelmer: let me confirm then16:54
jamI wonder if it might have been an OOM error16:54
Odd_Blokejelmer: I'm in Coventry (at home) ATM.16:55
lifelessjelmer: yes, wouldn't be a problem for you to drop into the office; ned to know the days in advance though :)16:58
lifelessjam: don't think so16:58
lifelessjam: it had _much_ more meory problemms earlier when it was digging GB's into swap16:58
jelmerlifeless: cool, thanks. I'll see if I can figure out the travel17:00
Odd_Blokejelmer: I don't have any solid committments this week, though, so I'm available for sprinting.17:00
jamlifeless: that is where you are testing the 1M keys ?17:00
lifelessjam: yeah, I have it in btree-plain now17:01
jamand if there is memory fragmentation, it is *possible* for it still to die if array's require contiguous memory17:01
lifelessjam: it was something about number pof parameters to a method I think17:01
lifelessjam: its 2.9M keys btw17:02
lifelessjam: look in ~robertc/megarepo/.bzr/repository/indices :)17:02
jamlifeless: we seem to have a 16GB pack file in there. I'm kind of happy to see that we support >4GB files :)17:04
jamthough I wonder if we *really* want to :)17:04
lifelessjam: yes, otherwise latency++++17:05
jelmerOdd_Bloke: Ah, cool - how far are you from Wolverhampton?17:06
jamlifeless: so that is just an aggregate repo of a bunch of different projects, right?17:06
lifelessjam: oh, it was 2.5 that blew up17:06
lifeless    selected = min(candidates, key=getter)17:07
lifelessTypeError: min() takes no keyword arguments17:07
lifelessthats on 2.417:07
Odd_Blokejelmer: About an hour by train.17:07
lifelessjam: getting content out:17:08
lifelesstime python2.5 bzr/bzr branch megarepo/pool/main/libj/libjpeg6b/17:08
lifelessreal    0m5.365s17:08
lifelessthen17:08
lifelessreal    0m1.380s17:08
lifelessreal    0m2.433s17:08
lifeless(the machine is being hammered right now :))17:08
jamlifeless: well, the 1.8G resident is a bit of an issue17:09
lifelessjam: thats the bzr search task17:09
lifelessjam: which is using GraphIndex still (see the 4K page thing I mentioned :))17:09
jamjames_w: by the way, thanks a *ton* for doing all the work you've been doing on managing the bug tracker, it is really nice to have someone on top of it17:13
james_wno problem, I think there's quite a bit more to do to get importance/status assigned.17:14
lifelessmtaylor: ping17:15
mtaylorlifeless: pong17:15
lifelessmtaylor: you were working on server-side email right?17:15
mtaylorlifeless: was looking at it17:15
lifelessmtaylor: the savannah folk are looking for that : if you could put your branch up that would rock :)17:15
mtaylorlifeless: I settled on a modification of bzr-email though17:15
mtaylorlifeless: so I have nothing for them :(17:16
lifelessoh17:16
lifelessnuts :)17:16
mtayloryeah17:16
mtaylorsorry17:16
lifelessis your modifcation general purpose? you could put it up anyhow :)17:16
Odd_Blokejelmer, lifeless: I'm going out for the evening, let me know if anything transpires sprint-wise and I'll respond when I get back. :)17:56
lifelessOdd_Bloke: its up to jelmer really :)17:57
Odd_Blokejelmer: Let me know. :)18:42
agoebelis there a way to have the webdav plugin handle authentication?19:32
abentleylifeless: ping19:53
vilaagoebel: the webdav plugin handles authentication by relying on bzr http client implementation handling authentication :)19:56
* vila ducks19:57
agoebelin which case why am I getting a "can't handle 401 auth required" response?19:57
vilaeither because you didn't specify user in url (http://user@host) or your password is wrong19:59
agoebelah, missed the user20:00
agoebelfigured it would give my a prompt20:00
agoebelthanks20:00
vilaalternatively you can also use authentication.conf to provide user and/or password20:00
LarstiQhaving it prompt would be real nice20:00
vilabug already filed (can't remember it right now, and I'm gone anyway :)20:01
jelmerOdd_Bloke, will do20:17
datolifeless: pong20:22
jelmerlifeless, ping20:34
colbracjelmer: Currently from olive pressing the push button in the push dialog succesfully pushes, but also gives a bzr-gtk error 'int argument required'20:43
colbracjelmer: Any clue?20:43
jelmercolbrac: bzr-gtk probably expects the push function to return an integer20:43
jelmerwhereas it returns an object these days20:44
jelmerPushResult I think20:44
jelmerSee bzrlib.branch.Branch.push20:44
colbracI see a 'rev = 0' a few lines higher yes20:45
colbracwhere later try: rev = dopush()20:45
jelmerright, rev would actually be a PushResult object rather than the number of revisions pushed20:45
colbracso, in the final lines of that method an info dialog is made with revs as the number of revs pushed20:48
colbrachow can I get that number from PushResult?20:49
colbrac(if you happen to know by heart) :)20:49
colbracjelmer: The push you are pointing at says 'raise NotImplementedError(self.push)'20:50
colbrac:P20:50
jelmercolbrac: Well, that should have the API description20:50
jelmerSee bzrlib.branch.PushResult for the object that's returned by push()20:51
colbrachmm.. has deprecated all over it.. but should return the revno on initiation.. :/ Maybe not initiated anymore in bzr trunk?20:53
jelmerI don't see any deprecated stuff there20:56
jelmerwhat in particular are you referring to?20:56
colbracI'm looking in bzr/trunk/bzrlib/branch.py line 2230: class PushResult20:57
colbracBut on a closer look of bzr-gtk/trunk/push.py, I don't see any bzrlib.branch imports20:58
colbracbzr trunk as of yesterday20:58
colbracbzr-gtk rev 53120:58
jelmercolbrac: that's because it already has a branch instance20:59
jelmerthat gets passed to it20:59
jelmerthere's no need for imports20:59
colbracso.. if I read that do_push function correctly, the count var that is returned is not set when a correct branch_to location is given from the start?21:03
colbracwhich explains the lack of an int21:04
colbracjelmer: The count var is not set in do_push when the first try is succesfull21:07
colbracjelmer: push to '../folder-that-didnt-exist' doesn't give the error, and a PushResult is returned21:14
jelmercolbrac: it is, see the "else:" clause21:28
=== davi__ is now known as davi
jelmerthe problem is the fact that br_to.pull() no longer returns an integer21:29
colbracbut check.. it does br_to.pull21:29
colbracI saw21:29
jelmerOdd_Bloke,lifeless: I'll arrive on wednesday in London21:30
jelmercolbrac: Yeah, that's correct21:31
lifelessdato: I wanted to chat with you about the use of the index in git and what we might do similarly23:29
lifelessdato: but its way late for me now; perhaps tmorrow?23:30
lifelessnight all23:30
beunog'night lifeless23:30
datolifeless: it's late here too :)23:30
datobut I'm only available evening UTC23:30
* ToyKeeper would love to hear about that too23:32
agoebeldoes anyone have the trunk of bzr-gedit working with gedit 2.22.3?23:38
=== mw is now known as mw|out
=== mwhudson_ is now known as mwhudson

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