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

pooliemore seriously i think it will create more of an impression that this is actually something that's going to happen as an ongoing custom00:00
poolienot just you randomly doing reviews00:00
dOxxxpoolie: just read your reply about outf and the UIFactory stuff00:01
pooliei'll put up the branches soon00:01
pooliethat'd be better than describing them00:01
dOxxxpoolie: cool. code is good :)00:01
dOxxxI think once I've adapted my changes to the updated UIFactory, I'm definitely going to need a review of what should be going through the normal message methods vs make_output_stream. Some of it is obvious like diff and log, but for others it's more of a grey area.00:03
dOxxxdo the blackbox tests run out-of-process?00:04
lifelessdOxxx: some do00:06
lifelessdOxxx: most don't, too slow.00:06
lifelessdOxxx: run_bzr is in process. run_bzr_subprocess is out of process00:06
dOxxxgotcha00:06
dOxxxI had to do a lot of tweaking of the tests for my initial set of changes because quite a few of the messages moved from stdout to stderr as a result of using trace.note00:07
lifelessdOxxx: what were you changing?00:07
lifelessdOxxx: by which I mean, generally, we've chosen stdout or stderr, so that sounds like a set of bugs.00:07
dOxxxlifeless: I started out fixing a bug for the mv command not obeying the --quiet option00:07
dOxxxlifeless: when I noticed that a lot of the other commands were using self.outf.write directly instead of trace.note and thus ignoring the --quiet option too00:08
dOxxxlifeless: so I thought I would clean it up and make sure everything that wasn't bulk data, as poolie describes it, was using trace.note00:08
lifelessso, its not 'bulk data' but rather 'the output of the command'00:08
lifelessthat should be using outf.write00:09
dOxxxyeah00:09
lifelessbzr 2>/dev/null should never hide data the user needs00:09
dOxxxlike the output of log or diff00:09
lifelessor the list of files moved00:09
dOxxxnow that's where I'm talking about grey areas00:10
dOxxxthe purpose of the mv command is not to output a list of moved files. it's to actually move the files. the list of moved files is incidental to it's actual purpose.00:10
lifelessmmm00:10
dOxxxbut I don't feel like I have the right to make those sorts of judgement calls :)00:10
lifelessdOxxx: so, a progress bar would be definitely incidental00:13
dOxxxyes00:13
lifelessdOxxx: the list of files moved is more important, to me.00:13
dOxxxhmm00:13
lifelessits the return value00:13
lifelessif you think of mv as a function call00:14
dOxxxperhaps it's the difference between the primary output of the command and out-of-band information00:14
lifelessthats right, we use stderr for out of band00:14
dOxxxhmm00:14
lifelessstuff that isn't needed for scripting00:14
lifelessor capturing00:14
dOxxxyeah00:15
pooliedOxxx: btw did you do the contributor agreement http://www.canonical.com/contributors00:20
dOxxxOh, no I haven't.00:21
dOxxxI'll have a look at that now.00:21
dOxxxhmm legalese :P00:22
dOxxxI'm glad #11 is in there ;)00:22
=== dOxxx is now known as dOxxx_
=== dOxxx_ is now known as dOxxx
dOxxxpoolie: agreement signed and emailed00:57
maxbThere doesn't seem to be any command for "just merge the WT back to r9"01:34
maxber, ignore me, scrollback fail01:34
* maxb was attempting to jump into a conversation from 3 and a half hours ago01:34
* igc lunch01:37
spivdOxxx: still around?  I like the sound of a more general fix, but in the meantime how about just changing cmd_mv to check is_quiet as some other commands already do?01:38
dOxxxspiv: I was just about to reply that I agree. For the purposes of fixing that bug, I'll change it back to use self.outf.write but check is_quiet first.01:39
spivdOxxx: great.  Thanks!01:39
dOxxxspiv: what should I do about your added bits? do I just apply that patch to my own branch?01:39
spivdOxxx: you can either 'bzr merge lp:~spiv/bzr/271790 && bzr commit -m "Merge from spiv."', or just build on your own and I'll merge them before I land.01:42
lifelessspiv: I was a little surprised you'd sent merge 14812 to pqm01:43
lifelessspiv: given it only had one core review01:43
maxbIs there any way to ask bzr to diff against the pending merge tip?01:52
maxbor indeed, any way to get the revid of the pending merge tip01:52
lifelessvia python01:55
lifelesswe need a rev spec01:55
fullermdI'm kinda grumpy that stat --show-ids doesn't show 'em...02:01
lifelessfullermd: patchit :P02:04
fullermdRight, in my CFT   :p02:06
maxbHrm. The Ubuntu Distributed Development initiative seems to be a great way to run straight into file-id conflict nightmares.02:06
* maxb wishes for bzr diff --ignore-file-ids02:07
=== dOxxx is now known as dOxxx_
elnovato1Help!!02:13
elnovato1different rich-root support  << i got this error when i push02:13
bob2what are you pushing, and to where?02:13
spivlifeless: well, it looked so simple...02:16
lifelessspiv: Personally,  I'd only submit something without 2 core +1s if I'd be willing to do it with no other review at all02:17
spivlifeless: and the patch had been lingering for several days.02:17
lifelessspiv: sure; thats nag for a review space isn't it?02:17
spivWell, it looked safe enough when I reviewed it and tested it.  PQM proved me wrong, of course.02:18
lifelessspiv: I'm not talking about safety per se02:19
spivWell, by "safe" I guess I mean "trivial"02:20
lifelesswell, +1 for experience :)02:20
spiv:)02:20
lifelessall the same, I think the only things I'd land that have only one core review would be docstring and whitespace fixes.02:22
lifelessbecause anything else that I wrote, I'd want a second eyeball on.02:23
lifelessand I don't trust folk that aren't core to have the experience of the library etc to catch corner concerns in a review.02:23
spivelnovato: what are you pushing, and to where?02:25
elnovatogot it, they are diff versions02:26
jdubis it possible to get loggerhead to dump tracebacks if it dies?03:04
jdubevery now and then the process barfs, would love to file bugs03:05
lifelessin principle yes03:09
lifelessthere is wsgi stuff around03:10
* jdub just flicked his eyes over this window and read "barFS"... oh dear.03:10
AfCjdub: you need to get out more, mate03:36
AfC[but if you do come up with a bar-fs, I want to use it for my /home partition]03:36
dOxxx_spiv: are you around?03:57
=== dOxxx_ is now known as dOxxx
dOxxxwell maybe somebody else knows this... I've made some changes in my branch as suggested in a review of my merge proposal and I've pushed these changes up to the branch I made the proposal for. Do I use the Resubmit proposal link or is it handled automatically?03:58
spivdOxxx: I am03:58
dOxxxhmm03:59
dOxxxok it seems to have updated  by itself04:00
spivdOxxx: the diff will be automatically updated, but I think use resubmit if it needs a fresh round of review.  In this case I don't think it's necessary, because I'll just send it in now.04:00
dOxxxok04:01
spivAlthough I'll have to fix the NEWS conflict, but that's easy.04:01
dOxxxyeah I just noticed that04:01
dOxxxI suppose I should get into the habit of pulling before I push :)04:02
dOxxxI've just dealt with the conflict locally. If you haven't done it yet, I can push it up.04:04
fullermdWell, if you wait 5 minutes, NEWS conflicts un-resolve themselves again   :p04:06
spivdOxxx: Ah, thanks, I already did that, just waiting for PQM now. :)04:06
spivAh, there it is: http://pqm.bazaar-vcs.org/04:06
dOxxxthanks, I'll get the hang of this :)04:06
pooliespiv, nice work with the patches04:12
dOxxxhe's been very helpful :)04:16
spivpoolie: Thanks.  Next one I'm dealing with is https://code.edge.launchpad.net/~slyguy/bzr/bug-440952-bzrdir/+merge/13431, which I'd actually promised to finish off a while ago before we thought of patch pilots, just because the submitter had obviously put a bunch of good work in that I didn't want to waste.04:17
pooliek04:17
spivThat's part of why I volunteered, so I'd have a good excuse to get to it sooner rather than later :)04:17
poolie:)04:17
poolieyou can ask me or others for help too04:17
pooliethough i wouldn't recommend asking me in particular today :)04:18
spiv:)04:18
dOxxxbzr has an astounding number of tests.04:23
dOxxxI wish the --parallel selftest option worked on windows.04:24
spivdOxxx: patches welcome :)04:26
dOxxxhehe04:26
dOxxxmaybe I will have a look04:26
dOxxxdo I need to install testtools into my python site-packages?04:29
spivYes, I think so.04:34
dOxxxah, subunit is the problem. not ported to windows I guess?04:35
jelmer_dOxxx, at least the python bits of subunit should work without problems on Windows I think04:36
dOxxxjelmer_: but aren't they just bindings into the c library?04:36
jelmer_dOxxx, no, they don't rely on the C library in any way04:37
dOxxxoh!04:37
pooliehi jelmer04:37
* poolie tries to fix doc builds again04:41
jelmer_moin poolie04:44
* jelmer_ waves from UDS04:44
mwhudsonhello jelmer_04:45
pooliehello04:45
pooliedid you get my pm?04:45
jelmer_hey mwhudson04:45
jelmer_poolie: mwhudson or me?04:46
mwhudsonjelmer_: you i presume :)04:46
poolieyou04:46
poolieyou, jelmer04:47
dOxxxlifeless: are you here?04:47
lifelesssomewhat04:51
lifelessdon't ask to ask, just ask ;)(04:51
dOxxxheh ok04:52
dOxxxlifeless: I was wondering if there was any particular reason why reinvoke_for_tests manually executes bzr instead of reusing the run_bzr_subprocess code?04:53
lifelessnot offhand; possibly trust issues04:57
RenatoSilvadOxxx: hi04:57
dOxxxRenatoSilva: heya04:57
dOxxxlifeless: right...04:58
RenatoSilvadOxxx: is bug 398997 really fixed? it's more than one test error...04:58
ubottuLaunchpad bug 398997 in bzr-xmloutput "Test failures and errors on Windows" [Medium,Fix committed] https://launchpad.net/bugs/39899704:58
dOxxxRenatoSilva: when I was testing it, I was only getting the test_version failure04:59
dOxxxRenatoSilva: are you still getting errors?05:00
RenatoSilvadOxxx: will pull the changes and check, but I can't recall how to run it :(05:01
dOxxxRenatoSilva: if you have it in the correct location to be picked up as plugin by bzr, 'bzr selftest xmloutput' should do it05:02
RenatoSilvadOxxx: error: QtHelp4.dll not found05:03
dOxxxRenatoSilva: Hmm...05:03
RenatoSilvaAnyone knows how to solve this?05:07
spivRenatoSilva: I wish I did05:07
RenatoSilvathere's the bug 448389 about it05:08
ubottuLaunchpad bug 448389 in bzr "[win] 2.0 selftest fails, missing Qt dll" [Undecided,New] https://launchpad.net/bugs/44838905:08
dOxxxyes, I see that too05:09
dOxxxI thought it was just a screwed up setting in my environment05:09
dOxxxRenatoSilva: but otherwise, that bug is fixed as far as I can tell.05:10
RenatoSilvadOxxx: I have to confirm that05:12
RenatoSilvadOxxx: after clicking ok in the qt error message, the test go on, and I'm getting a lot of errors here :(05:16
RenatoSilvadOxxx: Ran 82 tests in 49.125s, FAILED (errors=14, known_failure_count=1)05:16
dOxxxRenatoSilva: wow...05:17
dOxxxRenatoSilva: could you pastebin the errors?05:18
RenatoSilvadOxxx: do you get the QT dll error too? winXP?05:18
dOxxxRenatoSilva: yes I do. on vista 64.05:19
dOxxxRenatoSilva: I suspect it's something introduced with bzr 2.0.205:19
RenatoSilvadOxxx: so you get the qt error, click on, then all tests pass?05:20
dOxxxyes05:21
RenatoSilvadOxxx: there is stdout and stderr, will paste stdout05:22
RenatoSilvadOxxx: http://pastie.org/702167.txt05:24
RenatoSilvadOxxx: same errors of bzr-java-lib tests...05:24
RenatoSilvadOxxx: I think it's a bug with bzr in Windows05:24
dOxxxRenatoSilva: yeah... I think you've got something wrong with your environment.05:24
RenatoSilvadOxxx: I think something wrong with bzr, I tried everything possible to solve this problem05:25
RenatoSilvadOxxx: do you have wXP or some vm there?05:26
RenatoSilvadOxxx: I would like at least to understand what happens exactly, beyond "something regarding locks"05:27
RenatoSilvadOxxx: if I knew bzr internals maybe I could undertsand better the error and be working on a fix05:27
dOxxxRenatoSilva: my guess would be that it has something to do with non-ascii characters in the paths05:28
lifelessRenatoSilva: you have a locked working tree05:28
RenatoSilvadOxxx: what paths?05:28
lifelessthats not getting unlocked.05:28
dOxxxRenatoSilva: the paths to the temp dir05:29
RenatoSilvalifeless: hi, in bzr-java-lib I used procmon to get track of the problem. I watched bzr.exe and found one access denied error about lock/held file/dir (mentioned yesterday here, don't know if you saw). The most interesting thing in that line is that in the details column, there's a random text about another file, lock/*.tmp05:31
RenatoSilvadOxxx: if it was non-ascii paths, the problem would be fixes with changing it, and it is not05:31
RenatoSilva*fixed05:31
RenatoSilvalifeless: I would like to understand why the xxx.tmp file is randomly reported as detail for the access denied in lock/held05:32
dOxxxRenatoSilva: I do use bzr at work on winxp sp3 box05:32
RenatoSilvadOxxx: can you test now?05:33
lifelessRenatoSilva: I don't understand why you say its random05:33
RenatoSilvalifeless: random because it does not explain the relation05:33
lifelesswe use temporary files a lot, because many network file systems don't have an atomic write to a file05:33
dOxxxgimme a few minutes, gotta vpn and it breaks my net connection here05:33
RenatoSilvalifeless: random like saying the sky is blue in details column for a given error05:33
lifelesswhat details column, you've lost me05:33
RenatoSilvalifeless: there's a too called procmon for windows05:34
RenatoSilvalifeless: you can watch what a process does05:34
RenatoSilvahttp://technet.microsoft.com/en-us/sysinternals/bb896645.aspx05:34
RenatoSilva* tool05:34
lifelessRenatoSilva: I don't have windows05:35
RenatoSilvalifeless: I tell the full to watch bzr.exe, and the I run the test in bzr-java-lib that fails randomly05:35
RenatoSilvaI tell the *tool05:35
RenatoSilvalifeless: it lists all files accessed, dlls loaded, registry keys accessed, all the bz.exe activity, including the files in the temp dirs for the tests05:36
spivRenatoSilva: the lockdir code will attempt to perform operations like "rename RANDOM.tmp held" and "rename held releasing.RANDOM.tmp"05:36
RenatoSilvalifeless: there's one entry saying that there was an access denied in lock/help05:36
lifelesswell, that could well cause problems in the tests05:36
RenatoSilvalifeless: and there's a detail column for that where you expect to hrrr get details about it05:37
spivRenatoSilva: where "RANDOM" is a string of random letters and digits, obviously.05:37
spivRenatoSilva: perhaps that's what procmon was reporting?05:37
RenatoSilvalifeless: now imagine the detail column says "nice day today", it doesn't give detail about anything right? the same way, the actual text there in just the file path to lock/*.tmp05:38
RenatoSilvaspiv: oh so the error was about renaming files, hum...05:38
spivRenatoSilva: so, it appears it is giving relevant detail :P05:39
RenatoSilvaspiv: at least for me that had no idea :P05:39
dOxxx1RenatoSilva: I don't get the permission errors running the xmloutput tests on winxp05:40
dOxxx1RenatoSilva: sorry to say but I think it's just you :P05:40
RenatoSilvadOxxx1: is it updated?05:40
RenatoSilvadOxxx1: what's your antivirus05:40
dOxxx1RenatoSilva: symantec corporate thingy05:40
RenatoSilvaspiv: what could make bzr not release a lock05:41
dOxxx1RenatoSilva: checkout of branch: bzr+ssh://bazaar.launchpad.net/~verterok/bzr-xmloutput/trunk/05:41
dOxxx1switching back05:42
RenatoSilvaoh sorry just /cleared the screen, what one jsut told me?05:42
spivWhat makes you ask that question?  From the information you've given here I'm not sure that's the right question to ask.05:42
RenatoSilvaspiv: why05:42
RenatoSilvaspiv: what's the right question to ask05:42
lifelessRenatoSilva: generally, not calling 'tree.unlock()' will cause a lock not to be unlocked.05:42
spivI think you want to be asking "why am I getting 'access denied' errors when bzr is attempting to release (or acquire?) that lock?"05:43
RenatoSilvalifeless: or maybe tree.unlock() failing? e.g. an external os error?05:44
lifelessbzr should be reporting any errors like that that might turn up05:44
RenatoSilvawhere's the log for this channel?05:44
lifelesssomething is messing with the reporting/output, *or* you're simply not unlocking it05:44
lifelessrace conditions and finalizers can be to blame too,05:45
lifelessand as you're testing some java lib stuff, I'd look there first05:45
RenatoSilvalifeless: the above link is just stdout, I can't recall how to mix stdout and stderr to send to a file in Windows, let me try...05:45
spivRenatoSilva: there's some at http://irclogs.ubuntu.com/2009/11/17/%23bzr.html, not sure how frequently they are updated05:45
dOxxx1RenatoSilva: command > file 2>&105:47
RenatoSilvalifeless: http://pastie.org/702167.txt05:50
RenatoSilvadOxxx1: thanks05:50
dOxxx1how long does it take for an old nick to timeout05:51
dOxxx1from the irc server?05:51
RenatoSilvadOxxx1: /msg nickserv ghost <pwd> iirc05:51
=== dOxxx1 is now known as dOxxx
dOxxxwoot... got bzr selftest --parallel=subprocess working on windows05:53
lifelessRenatoSilva: then as it says, something has the held file locked05:54
lifelessdOxxx: +105:54
dOxxxlifeless: and I think it might even still work on unix ;)05:54
lifelessRenatoSilva: figure out what process that is (sysmon all processes probably - including system)05:54
lifelessdOxxx: well, I surely hope so :)05:54
RenatoSilvalifeless: so I watch the file, not the process, ok let me try...05:55
dOxxxlifeless: it's pretty noisy. far more output than the normal selftest05:56
RenatoSilvaspiv: thanks for the log link05:56
dOxxxlifeless: lots of stuff like this: successful: bzrlib.tests.per_tree.test_path_content_summary.TestPathContentSummary.test_file_content_summary_executable(DirStateRevisionTree,WT5)05:57
lifelessdOxxx: thats subunit output, it shouldn't show up unless you supply --subunit05:58
RenatoSilvais the qt dll in the error about the qt ui?05:58
lifelessdOxxx: and you should pipe it through a subunit filter. e.g. subunit-stats05:59
lifelessbbiaw05:59
dOxxxlifeless: I'm using --parallel=subprocess because fork doesn't work on windows, at that seems to have implied --subunit05:59
dOxxxanyway, I gotta hit the sack06:00
dOxxxseeya guys later06:00
RenatoSilvadOxxx: see you06:01
poolieigc, why does only doc/ja have a sphinx configuration file?06:07
RenatoSilvalifeless: even including System, there are only two process invloved with lock/held: bzr.exe and avgchsvx.exe (AVG real time scanner)06:07
RenatoSilvalifeless: so ok, the antivirus is the problem, what I don't get is why still doesn't it work when I turn it off :(06:08
pooliewell, i see it came in inada's recent mail06:10
igcpoolie: I'll take a look06:11
poolienevermind, i'll look into it06:11
pooliei thought it was your change06:11
poolieso, really, don't worry06:11
spivigc: if you're in the mood, feel like taking a look at https://code.edge.launchpad.net/~amanica/bzr/325618_log_returns_too_much/+merge/14275 ?06:11
pooliei think they're not actually needed?06:11
igcpoolie: I think sphinx_conf.py is redundant06:14
igcspiv: I'll take a look tomorrow06:14
igcpoolie: maybe it was there for bootstrapping or it proceeded the shorter conf.py approach06:15
spivigc: cool, ta06:20
poolieOK06:23
RenatoSilvaHey folks what antivirus do you use? I'm thinking about abandoning AVG9 as it seems to be locking Bazaar06:36
* wgrant uses Ubuntu.06:37
* RenatoSilva too06:37
RenatoSilvaI want to install an antivirus that is friend of Bazaar06:38
* RenatoSilva will restart the computer and come back soon06:38
AfCUh, "av that's a friend of a dvcs"? weird06:39
poolieafc: i think he means "that doesn't hold locks on files"06:39
pooliespiv/igc: verbal +1 to remove it and fix the builds?06:39
AfCpoolie: ah!06:40
AfCpoolie: (that would be reminiscent of Tracker using inotify and blowing out the kernel's hard limit of monitorable files)06:40
spivpoolie: remove what, doc/ja/sphinx_conf.py?  Sure, if that fixes builds then +1 from me.  I guess you'd need to tweak doc/ja/conf.py to import bzrlib.doc_generate.sphinx_conf instead?07:07
poolieoh good point07:10
spivThe improved consistency makes sense.07:11
poolieyep, i just did a two-way merge against the english version07:14
RenatoSilvalifeless: removed ABG and the lock errors stopped07:14
spivRenatoSilva: that's good to know07:14
spivAlthough a shame that it interacts so poorly.07:14
RenatoSilvait who, bzr or avg? or both :P07:15
poolieboth07:15
pooliethough07:15
RenatoSilvaavg9 is weird, you deactivate the watch dog, but the process is still active07:15
pooliei think the onus is on the scanner not to interfere with applications07:16
RenatoSilvait was active in lock/held, although less than before, but it was07:16
RenatoSilvapoolie: I tired to exclude my profile dir and bzr dir from runtime scan but didn't work, and as I said above the realtime scanner doesn't really stop working it seems07:17
RenatoSilvapoolie: do you know of any "friend" antivirus?07:17
RenatoSilvapoolie: if I don't find one, I think I'll just reinstall AVG and live with these failures... at least we --know-- what's the problem now07:18
RenatoSilvabzr-java-lib tests are ok now too07:18
RenatoSilvathis is normal output for bzr selftest xmloutput right? http://pastie.org/702237.txt07:19
RenatoSilvathe xfail is the known failure?07:20
poolieyes07:21
pooliepoor name, we should change it07:21
RenatoSilvaok, waiting for the qt dll fix then07:22
lifelesspoolie: what do you thinkof the idea of turning language translations into branches07:26
lifelessdoc language translations, I mean.07:26
pooliei'm not sure what you mean07:26
lifelesswell, seems to me that each language is kindof like a branch, of the docs07:26
fullermdI've thought on that sort of thing.  The big problem is that every merge is just a giant pile of conflicts.07:27
lifeless'bzr cp' + merges from those files on an ongoing basis would model it too, if we had copies07:27
pooliemm07:27
poolieinteresting in theory07:27
pooliethe assumption under this is that folks do a diff on the english text to see what needs to be translated?07:28
poolies//newly translated07:28
lifelesswell, that they need to figure out what has gone on to update the translation, yes.07:28
lifelessa conceptual diff, for sure.07:28
pooliei guess i'd like to know more about how people actually do doc translation07:34
lifelessyeah07:34
lifelessit was a drive by thought based on the ja branch07:34
lifelesswhich had one of the conf files we had initially07:34
RenatoSilvaspiv: maybe bzr does something that makes AVG angry07:38
RenatoSilvaspiv: would you recommend to try 2.1 beta? (using 2.0 and previously 1.18)07:39
fullermdPresumably, "making the file and then trying to delete it pretty quickly before AVG gets done screwing with it"07:39
fullermdGo the other way.  Try 0.11 or something.  That may be slow enough for AVG to finish up in time.07:40
lifelessRenatoSilva: no, its not bzr07:40
lifelessRenatoSilva: avg is taking a read lock rather than opening share_delete or whatever it is. We've had this problem reported before - as I said days ago, 'probably your virus scanner'07:40
RenatoSilvalifeless: well I'm not sure. but why would AVG suspect of bzr as a potential problem?07:41
lifelessRenatoSilva: who says it thinks bzr is a problem07:41
RenatoSilvafullermd: 0.11?07:41
* fullermd was being a little facetious...07:41
lifelessRenatoSilva: fullermd was making a joke. bzr 0.11 was a lot slower, so it might not collide with avg as much07:42
RenatoSilvafullermd: so the problem is that bzr creates a file, then AVG starts to scan it, then in the meanwhile bzr wants to delete or rename the file, and so the error07:42
lifelessyes07:43
fullermd's my guess.07:43
RenatoSilvathen why does AVG8 has no problem with it?07:43
lifelessdifferent versions of software behave differently07:43
lifelesssee my comments on locking above07:43
RenatoSilvaok just was, I see07:44
RenatoSilva*saw07:44
pooliepyc files lingering after the source removed strikes again07:44
pooliespiv: you were right btw07:44
RenatoSilvalifeless: I think it's the .0 problem07:44
poolieabout fixing conf.py07:45
lifelessRenatoSilva: what do you mean?07:45
RenatoSilvalifeless: maybe it's the right thing to do, imagine the file is a virus, and another softwate deletes it after AVG detecting, maybe AVG 9 will always behave this way07:45
RenatoSilvalifeless: i.e. not the .0 problem (foo bar 2.0, 3.0 etc)07:46
lifelessRenatoSilva: I don't understand07:46
RenatoSilvalifeless: AVG locks the file to scan it right? then bzr tries to delete/rename it and can't (it could in AVG8)07:47
RenatoSilvalifeless: I think that's the right thing to do07:47
lifelessthats our working theory.07:47
lifelessRenatoSilva: I don't see why its right.07:47
RenatoSilvalifeless: the file can't be deleted while being scanned07:47
lifelessvirus scanners should not change system behaviour07:48
RenatoSilvalifeless: maybe it should just copy the file and scan the copy07:48
lifelessRenatoSilva: avg could hard link it and scan. Or it could lock it share_delete and handle client code deleting the file.07:48
lifelessRenatoSilva: that would be bad if the file is large.07:48
lifelessRenatoSilva: I think its very clearly a bug in AVG07:48
RenatoSilvahard links in windows?07:49
lifelessyes07:49
lifelessbeen supported for a while07:49
RenatoSilvaone more reason to not use .0 software :-/07:50
RenatoSilvabut thank you all you guys for helping me, I think I'll live with this error while waiting a fix07:53
lifelessRenatoSilva: you realise AVG probably don't know there is a problem, and its not a bzr problem...07:54
lifelessRenatoSilva: you really should tell them :)07:54
* poolie spams out the review queue08:08
=== maxb is now known as Guest71681
=== quicksil1er is now known as quicksilver
maxbDoes bzr ever discard dead heads? Is there a command somewhere for that?13:08
beunomaxb, dead heads?13:50
beuno(I'm pretty sure the answer is no)13:50
beunolike when you uncommit?13:51
maxbyes, heads not referenced by any branch13:51
beunomaxb, there is no way to clean them up13:53
=== r0bby is now known as r0bby|android_
=== r0bby|android_ is now known as r0bby|android__
=== r0bby|android__ is now known as r0bby
=== raimue is now known as Raim
henningeHi, I have a conflict situation that I don't know how to resolve.15:35
henningeA file was created both in my current branch and the branch that I am merging from, with different content.15:36
henningeMerge looks like this: http://paste.ubuntu.com/320877/15:36
henningeI want to keep the file as it is and discarded the merged version, so effectively renaming the .moved file to the original name.15:37
henningeI just don't know how. I tried a few things but they did not work.15:38
NfNitLoophenninge: you should be able to bzr revert <filename> to revert just that file (without blowing away your merge)15:38
NfNitLoopif you commit that merge, then, that has rejected the remote change.15:38
* henninge tries15:39
henningeNfNitLoop: Great! that worked! http://paste.ubuntu.com/320879/15:40
henningeNfNitLoop: thanks a lot15:40
NfNitLoop henninge you're welcome.15:45
NET||abusehey guys. i'm trying to push a repo of graphic work, from windows, over  to a samba share on a linux box, but i'm getting errors.15:52
NfNitLoopNET||abuse: such as...?15:55
NfNitLoop(please  use pastebin if they're large)15:55
NET||abusebzr: ERROR: [Errno 22] Invalid argument15:56
NET||abusethat's it.15:56
NET||abuseweird stuff.15:56
NfNitLoopwhat command did you use to do the push?15:56
NET||abusebzr push P:\projects\sitegraphics\15:58
NET||abuseI had a dir with 800MB of graphics work, i did bzr init in that directory15:58
NET||abusebzr add *; bzr commit ;15:58
LarstiQNET||abuse: could you try `bzr push P:/projecs/sitegraphics/` instead?16:01
NET||abuseyeh, i could.16:01
LarstiQmight be paranoid, but worht a try16:01
LarstiQif note, check the .bzr.log16:01
NET||abusejust trying to branch to a local directory right now.16:01
LarstiQ_not_16:01
NET||abuseseemed to work wen branching..16:01
NET||abuseright trying to push,, i need it up on the share so other people can get at the graphics.16:01
* LarstiQ nods16:01
NET||abusei could try branching while in the P: drive.16:02
LarstiQthat's an option16:02
LarstiQor just copying the folder should work too16:03
Takexport?16:03
NET||abusehmm, copy,, seems like cheating ;)16:03
NET||abusemaybe it's timing out.16:04
NET||abusetrying to branch now,,, it's saying "Fetching revisions:Get stream source16:04
LarstiQthat's ok16:05
LarstiQNET||abuse: which version of bzr is this btw?16:05
NET||abusei'll check.16:05
NET||abusepython25.dll version  2.5.4, bzr 2.0 seems to be what it's saying,,16:06
NET||abuseno wait,, bzr 1.18.116:06
LarstiQNET||abuse: ok16:06
phoenixzI have two projects based on the same framework in BZR. They basically share libraries and I want functionality from project one shared with project 2 and vice versa.... Is it possible to only merge the libraries directory of these two projects, and leave the other directories untouched?16:10
GaryvdMphoenixz: Have you been visioning these 2 projects in bzr allready?16:14
GaryvdMphoenixz: The idea is that you have 3 branches. 1 for the framework and 1 for each project.16:16
GaryvdMphoenixz: then you use nested trees (Which is not complete)16:16
phoenixzGaryvdM: actually, thats where I want to go to, yes16:16
phoenixzGaryvdM: nested trees? thats like a BZR tree inside a BRZ tree?16:17
GaryvdMphoenixz: untill nested trees is finished, you can use scmproj16:17
NfNitLoopHrmm, https://bugs.launchpad.net/bzr/+bug/81844 seems to be keeping me from checking out an upstream SVN repo.  >.<16:18
GaryvdMphoenixz: http://bazaar-vcs.org/NestedTreesDesign16:18
ubottuLaunchpad bug 81844 in bzr-svn "Handle backslashes in filenames more gracefully" [Low,Invalid]16:18
GaryvdMphoenixz: https://edge.launchpad.net/bzr-scmproj16:19
phoenixzGaryvdM: reading...16:20
clementeNfNitLoop: me too. It is one of the bugs with most duplicates16:22
NfNitLoopapparnetly svn is interpreting backslashes as directory separators.16:22
NfNitLoopapparently*  (Guh, this keyboard!)16:22
NfNitLoopbut bzr-svn isn't cool with that.16:23
NfNitLoopsoooo, no bzr for this codebase.  :~(16:23
jelmerNfNitLoop, that's not the problem, there are backslashes in filenames16:23
jelmerNfNitLoop, and bzr doesn't support backslashes in filenames16:23
NfNitLoopOh, hrmm.   I'm seenig backslashes as file separators in SVN.16:34
NfNitLooplet me double check that.16:34
NfNitLoopyeah, they're directory separators, I can browse the directories in the svn checkout.16:36
NfNitLoopbzr: ERROR: Unable to convert Subversion path eclipse/plugins/a.b.c\src\x\y\z because it contains characters invalid in Bazaar.16:36
NfNitLoopI can cd into eclipse/plugins/a.b.c/src/x/y/z16:36
NfNitLoopOooh.  Hrmm.16:41
NfNitLoopLooking at the log of the directory, apparently it was copied from a directory with backslashes in its name.16:41
NfNitLoopso they fixed it, but it's not fixed in history.16:41
NfNitLoop>.<16:41
NfNitLoopIs there any workaround other than blowing away the history?16:43
jelmerNfNitLoop, no, there's no way around that at the moment16:50
NfNitLoopaww, ok.  Thanks.16:55
=== Ng_ is now known as Ng
clementejelmer: the importer could convert the \ in 'file_id's and leave names with \, right? It was suggested in bug 81844 comment 6 but there's no specific bug for it17:08
ubottuLaunchpad bug 81844 in bzr-svn "Handle backslashes in filenames more gracefully" [Low,Invalid] https://launchpad.net/bugs/8184417:08
jelmerNfNitLoop, it basically needs a fix in bzr17:08
jelmerclemente: we can't leave \ in names because bzr doesn't allow it17:09
clementejelmer: the comment I mentioned also suggests allowing \ in names in bzr17:10
jelmerclemente, yes, that's the way to go17:10
jelmerclemente, there's a separate bug in bzr for that I think17:10
clementeTrue, bug 163858. I will link to it from the former bug17:13
ubottuLaunchpad bug 163858 in bzr "backslashes in filenames not allowed (dup-of: 81844)" [Medium,Triaged] https://launchpad.net/bugs/16385817:13
ubottuLaunchpad bug 81844 in bzr-svn "Handle backslashes in filenames more gracefully" [Low,Invalid] https://launchpad.net/bugs/8184417:13
=== mordred_ is now known as mtaylor
=== henninge_ is now known as henninge
=== vednis is now known as mars
Peng"Fatal Python error: deletion of interned StaticTuple failed" \o/17:45
PengI wonder if SimpleSet is thread-safe?18:05
mgedminhttp://doc.bazaar-vcs.org/migration/en/why-switch-to-bazaar.html is a very nice and convincing document19:11
=== jam1 is now known as jam
Pengjam: ping19:49
jamhey Peng19:49
PengHi. :D19:49
pickscrapeIs it possible to get back the message of a commit that failed?19:50
pickscrapei.e. I don't want to have to type it again :)19:50
Pengjam: I wanted to pester you about StaticTuple, as usual. Today, Loggerhead crashed with "deletion of interned StaticTuple failed". Any idea why that would happen? Is interning/uninterning thread-safe?19:50
jamPeng: I don't include any locking primitives19:51
jamhowever, I also don't release the GIL19:51
jamLooking at the code:19:52
jamif (SimpleSet_Discard(_interned_tuples, (PyObject*)self) != 1)19:52
jam    Py_FatalError("deletion of interned StaticTuple failed");19:52
jamIt would indicate that the interned dict claims to not have the st present19:52
jambut the tuple itself claims to be interned19:52
jamwell, the SimpleSet (vs dict)19:52
PengOr there was an exception of some sort.19:52
jamnote that right after that19:52
jamself->flags &= ~STATIC_TUPLE_INTERNED_FLAG;19:52
jamso it shouldn't be possible to try and remote it twice19:52
PengPlus... I don't think it's worth throwing a fatal error if the st wasn't present. Maybe a warning, but it's not actually *dangerous*, though it does mean something has gone wrong.19:53
jamPeng: correct, some sort of failure while removing the st from the dict19:53
jamPeng: internal state being inconsistent seems dangerous to me19:53
PengYeah, but this specific error isn't hard to recover from. Meh, I could go either way, I guess.19:54
jamPeng: and you can't raise exceptions from _dealloc19:55
jamso you have to PyErr_Clear if there is a real failure19:55
jametc.19:55
PengEquivalent to __del__ in Python code?19:55
jamPeng: basically19:55
jamexcept it doesn't cause the gc to puke19:55
PengAh, ok.19:55
Peng(The gc pukes?)19:55
jamyou can reclaim objects with _dealloc19:55
jamgc can't reclaim objects in a refcycle that have __del__19:56
jamyou *could* reclaim objects in a refcycle with _dealloc19:56
jamas it is done at a different level, I guess19:56
PengWhat did SimpleSet_Discard return, -1 (exception) or 0 (wasn't present)? Either one?19:56
jamPeng: I don't know. Something other than 1 did exist19:56
jambbiab, getting lunch19:57
Pengjam: Have fun. :)19:57
* Peng has fun causing crashes by manipulating _interned_tuples.19:58
jamPeng: manipulating?20:11
jamthat sounds seriously bad20:11
jamcertainly you shouldn't (even be able) mutate these once their created20:12
jamand definitely not after you've called .intern() on them20:12
Pengjam: _interned_tuples.discard(something_in_it) causes the dealloc crash. :)20:13
Pengjam: It's not like I'm doing that in real code; I just think it's funny (I'm easily amused).20:13
Pengpython -c "from bzrlib._static_tuple_c import _empty_tuple, _interned_tuples; _interned_tuples.discard(_empty_tuple)" -> crash20:13
jamPeng: if you are going to do something like that, I'm going to hide _interned_tuples from you20:13
Pengjam: Yes sir :(20:13
jamcertainly you can crash things easily by something like that, though20:13
jamI suppose I could expose it as20:14
jam_peng_you_really_dont_want_to_touch_these_interned_tuples20:14
jamPeng: would that be better?20:14
fullermdI'd rather have API's with specific injunctions against me than a statue   :p20:14
Pengjam: It would make the line-wrapping in _static_tuple_c.c a pain.20:15
jamPeng: :) I wouldn't change the C name, just the name exposed to python20:15
PengOoooo, clever.20:15
jamfullermd: meaning... you'd rather be able to shoot yourself in the foot than not be given a gun?20:16
PengJust out of curiousity, is it possible to mutate a StaticTuple from C code, if you're evil?20:16
fullermdWell, obviously.  But I just think of it as a fitting tribute of me to send down through the ages.20:16
fullermdCenturies from now, archaeologists will try to reconstruct my life from fragments of code berating me for my use of them.20:17
fullermdIt'll be awesome!20:17
jamPeng: raw pointers can do anything in C20:17
PengGood point.20:17
jamStaticTuple_SetItem specifically should not be called for any object that has been exposed to python20:18
jamsame as PyTuple_SetItem20:18
jambut you have to have *some* api for creating them in the first place20:18
PengAnyway... that Loggerhead crash isn't good. Sure, it's only happened once, but if there's a race condition, users who get significant traffic (Launchpad) might experience it frequently.20:19
PengBut it's also probably not easy to track down. :\20:19
jamPeng: I understand from mwhudson that loggerhead crashes regularly on LP regardless of StaticTuple20:19
jambzrlib itself isn't particularly threadsafe20:20
PengHaha.20:20
PengSince 2a, it crashes for me every day or two cuz it runs out of memory. :)20:20
PengI really need to set something up to restart it automatically... I wonder what LP uses?20:20
jamIn mooloolaba mwhudson mentioned that he had it fairly stable for a while ~6 months ago20:20
jamand just hasn't had much time since to maintain that20:20
jamPeng: cron, I believe20:20
mwhudsonjam: sysadmins20:21
jammwhudson: ah l-o-s-as what can't they do :)20:21
PengUnlike losas, I sleep sometimes, so it's often down for many hours. Fortunately, nobody uses it so it doesn't matter!20:22
jammwhudson: so how often does it crash? And how does that get reported for a restart. Is it manual?20:27
mwhudsonjam: a few times a day, nagios20:34
mwhudsonit usually doesn't crash per se, but go unresponsive20:34
jammwhudson: I also had a question that I was hoping you might have some knowledge to answer20:35
jamif you look at bug #42380420:35
ubottuLaunchpad bug 423804 in bzr "Failure to saturate bandwidth downloading lp:bzr" [High,Confirmed] https://launchpad.net/bugs/42380420:35
jamYou can see that streaming data off of launchpad has a very strange shape20:35
jam(see the last .png file: http://launchpadlibrarian.net/35795705/get_stream_lp.png)20:35
mwhudsonjam: that's a little odd20:36
jamI was wondering if it might be something with LP, but I'm not really sure how to test20:36
jamalso, what is the deal with 'staging'20:36
mwhudsonjam: how does it compare to say bzr+ssh off chinstrap?20:37
jammwhudson: I haven't tried that yet, but I'll go there next20:37
mwhudsonjam: please do20:37
jammwhudson: how does one get a new ssh key onto chinstrap?20:37
jamfile an rt request?20:37
mwhudsonjam: "what is the deal with 'staging'" <- more pls?20:37
jammwhudson: back to staging... does it have any data from lp: ?20:38
jamor is it only new stuff you upload?20:38
jam(It looks like the latter to me)20:38
mwhudsonjam: i think there's some magic email address you can email, look on wiki.c.c?20:38
mwhudsonjam: it has a few branches from production20:38
jammwhudson: as for other comparisons, http://launchpadlibrarian.net/35795404/get_stream_babune.png is from Vincent's server20:38
mwhudsonbut not many20:38
jamthough he seems to have a 100k download cap20:38
jamsorry upload cap20:38
jamwhich is 1/3rd my download cap20:38
jammwhudson: ok, does staging run a newer bzr?20:39
jam(my last test suggested that both live and staging were running 2.0.0)20:39
mwhudsonjam: only when we land a newer bzr in rf20:39
mwhudsonwhich we haven't done for a while for a variety of bad reasons20:39
mwhudsonit doesn't track bzr.dev or anything like that20:39
jamk20:41
jambabune has 2.0.2 as does chinstrap20:41
PengThink it's worth filing a bug about the crash?20:41
jambut I don't think there is anything significant there versus 2.0.020:41
jamPeng: it is worth *something*, but without being able to reproduce it, I'm not sure what a good answer is20:42
jamIf you want to create a patch that just improves debugging20:42
jamlike, perhaps writing out the actual response from the set20:42
jamchecking if there is an exception20:42
PengOh wait, my StaticTuple branch hasn't even landed in LH's trunk yet.20:42
jamif so, debugging that20:42
jamI'd be willing to land that in bzr20:42
jammwhudson: ahh local bandwith. Chinstrap is downloading a copy of bzr at about 1.8MB/s20:43
jam /glee20:43
mwhudsonjam: running bzr get lp:bzr on chinstrap?20:43
jammwhudson: yeah20:43
mwhudsonsounds a bit slow :)20:44
jamcourse, it almost seems hung at the "Inserting missing keys" stage20:44
jamwhich is a bit strange20:44
jammwhudson: well, interestingly enough "time bzr branch lp://staging/~jameinel/bzr/bzr-test" on babune was 1m49s, on chinstrap was 3m4s20:44
Pengmwhudson: Do graphs in the revgraph cache ever get mutated? If a new revision is added to the branch, is the graph regenerated from scratch?20:44
jamso it doesn't seem to be network speed that matters at that point20:44
wadesworldhi guys...looking for some advice...using the latest bzr, both myself and my colleague have expereienced bzr hangs when trying to merge from our shared repository....I went so far as to upgrade the shared repositories OS last night to see if it was perhaps a bug in OpenSSH20:45
mwhudsonPeng: yes, regenerated from scratch20:45
mwhudsonPeng: which is terrible20:45
mwhudsonjam: crowberry is fairly heavily loaded basically all of the time20:45
wadesworldthe symptom is, you type in your ssh passworld and bzr just sits there....been sitting there for 45 minutes now20:45
mwhudson(crowberry == bazaar.launchpad.net)20:46
jammwhudson: hm... this won't be exactly identical as I have to go through 'openssh' to access chinstrap, rather than paramiko20:46
Pengmwhudson: OK, thanks.20:46
jamwadesworld: do you happen to be on Windows using plink as your ssh implementation?20:46
jam(I expect not, but figured I'd start with that)20:46
PengStupid question: does each thread have its own revgraph cache?20:46
wadesworldnope...we're both on Macs, and the "server" is OpenBSD 4.620:46
wadesworldusing sftp as the access method20:47
jamwadesworld: generally sftp is slow, but I wouldn't expect indefinite hangs20:47
jamare you sure it isn't doing a cross-format conversion?20:47
jam(bzr info $REMOTE; bzr info $LOCAL should help tracking that down)20:47
wadesworldpositive, everything is 2a20:47
jammwhudson: ah wait, chinstrap *is* the forwarding host, right?20:49
jamso I don't actually require a double connect20:50
mwhudsonjam: yes20:50
jammwhudson: chinstrap is a lot 'flatter' than crowberry, I'll upload in a bit20:51
jamthough also, this source is a freshly packed repo20:52
jamrather than the organic version on lp:bzr20:52
jamI may try to use lftp and see if that makes a difference20:52
mwhudsonjam: would be interesting to quantify the differences20:52
mwhudsonjam: the main ones i would suspect are (1) twisted.conch rather than openssh (2) system load on crowberry20:53
jammwhudson: quantify the diff between crowberry and chinstrap?20:53
mwhudsonjam: perhaps not the word i really meant20:53
mwhudsonunderstand20:53
mwhudsonand yes, difference in the details of the repo being served20:54
mwhudsonjam: did you say branching from staging was faster?20:54
mwhudsonthe staging codehost is much less loaded than the prod once20:54
jammwhudson: I haven't tested download-to-local20:54
jamI was going to try download from staging as part of all this20:55
jamand just noted that staging => chinstrap was 3m+ while staging => vila's babune was 1m50s20:55
jamwhich is probably local cpu load on the target machine20:55
wadesworldhmm...actually, I just noticed something...this project was a conversion from CVS...it appears that it created a 2a branch at project, but it created another branch at project/branches/HEAD which has a format of "unnamed"20:56
jamwadesworld: if you use 'info -v' I would guess you'll find the repo is the same format, but the Branch at HEAD is different20:57
mwhudsonjam: so yes measurements of identical repos from staging chinstrap and prod would be very interesting i suspect20:57
jamthis doesn't really matter for what you're doing20:57
jammwhudson: hmm... looks like paramiko versus openssh might also play a significant role20:58
jam(locally)20:58
mwhudsonjam: oh20:59
wadesworldyeah, HEAD is branch format 6, meta directory format 121:00
wadesworldwas the "doesn't matter" comment direct at me or mwhudson?21:00
jammwhudson: well, it didn't make a big difference in the 'total time spent'21:01
jamparamiko was actually slightly faster in that regard21:01
jam236s vs 240s21:01
jammwhudson: I've uploaded 2 more graphs21:01
mwhudsonjam: i'm not sure i have any time to spend on this today21:02
mwhudsonjam: happy to look when you have some conclusions though!21:02
serviliohi! I am reading on how to track multiple svn branches of a project in one source tree from https://lists.ubuntu.com/archives/bazaar/2008q3/047779.html21:03
wadesworldjam - should I run upgrade on HEAD?21:03
serviliowouldn't it be the same to do a bzr pull for the main parent?21:04
servilioinstead of a merge, I mean21:04
jamwadesworld: I think you can without any problems21:04
jamwadesworld: doesn't matter is for you21:04
jamservilio: I don't know why he is recommending 'merge', I would have thought "pull" would have been better21:05
jamhowever, that is 2008, so it may just be old info21:05
serviliojam: I know, that's the other reason for asking here21:07
jamservilio: so *I* would say keep the branches pristine at those locations21:07
jamand only run 'bzr pull'21:07
jamand then do other things manually21:08
jamhowever, from what I can tell21:08
jamhe is talking about merging a feature into the 'trunk' branch21:08
jamand once you've done a local action21:08
jamyou can no longer 'pull'21:08
jamyou have to 'merge'21:08
serviliojam: the source tree wouldn't contain any changes, is a hosting location21:08
jamservilio: if you are just tracking 'trunk' and not doing any local changes, I'm pretty sure 'bzr pull' is what you want21:09
serviliojam: great, thanks! will give it a test21:12
jammwhudson: interestingly, things are looking pretty shoddy with the 'real-world' repo from chinstrap21:12
mwhudsonjam: aha!  your problem :)21:12
* mwhudson runs away dodging to avoid the gunfire21:12
jammwhudson: :)21:13
jammwhudson: lots of "245.277  creating new compressed block on-the-fly" lines in .bzr.log on chinstrap21:13
wadesworldas predicted, rununing upgrade on HEAD had no effect - bzr merge still hangs21:16
jamwadesworld: right, the only change I would expect is that 'bzr info' will show you 2a now21:21
wadesworldyep21:21
MTecknologylaunchpad source code was only recently released publicly21:21
MTecknology^wrong chan21:22
wadesworldstill hanging as soon as I enter my password after bzr merge though :(21:22
jamwadesworld: just to confirm 'bzr info' locally also says 2a, right?21:22
wadesworldcorrect21:22
MTecknologyI'm going to start a pretty big project. I plan to have a core branch then sub branches for each "module". For example, the core will only check if a module exists if the page is requested. If the module exists then it's loaded. I want different users working on each of these modules. I think LP is organized dlike this, but I have no idea how to setup branches liek this. The last I knew, bzr can handle these types of branches.21:30
MTecknologyAny suggestions how to setup branches like this?21:33
jamMTecknology: well, if you just do "bzr init" in the subdirectories first, things generally work ok21:38
jambut in the parent tree it will show as "unknown" and not let you add them (though you can ignore them)21:38
jamyou may want to look at the project 'scmproj'21:39
jamwhich is an initial attempt at making something like "bzr checkout" grab all of the branches needed, and build the whole collection21:39
jamthere is also "bzr-externals" though that code base is quite new21:39
MTecknologyjam: when I make a commit on the parent, will that commit all the changes in the others or just parts required to pull?21:42
MTecknologyI think bzr-externals is what I heard of21:42
jamMTecknology: I'm pretty sure scmproj uses a "project-commit" to do a recursive commit21:43
jambzr-externals was just announced ~last week21:43
* GaryvdM is away: I'm sleeping21:43
MTecknologystu mentioned something a while ago about it21:44
MTecknologyjam: is bzr-externals something I could use with launchpad?21:45
MTecknologyjam: I'm looking at this - http://bazaar-vcs.org/NestedTreesDesign21:49
jamMTecknology: I'm pretty sure both bzr-externals and scmproj can be used with Launchpad, I think they mostly define stuff as regular branches21:52
jamMTecknology: NestedTrees is not fully implemented21:52
jamIt may get specific priority in the next 6 months, depending on how it relates to some of the other stuff we are working on.21:52
MTecknologyok, thanks :)21:53
MTecknologyiteresting...    michael@panther:~$ aptitude search bzr21:56
MTecknologyBus error21:56
MTecknologythis is wierd.......21:59
jamI wouldn't have expected that from aptitud22:04
MTecknologyjam: even after reboot.... and aptitude update - trying to upgrade w/ apt-get :S22:05
wadesworldjam any suggestions on other help I might get for troubleshooting this merge hang?  I copied my local repo over to a completely different machine and still get the same hang....should I file a bug or hit a developer mailing list?22:07
MTecknology!info bzr-externals22:08
ubottuPackage bzr-externals does not exist in karmic22:08
jamwadesworld: you said you are using sftp, rigth?22:08
jamI would make sure that you can sftp data off that machine22:08
wadesworldcorrect22:08
jamMTecknology: given that bzr-externals is < 1 week old22:09
jamI'm sure it hasn't been packaged yet22:09
jambzr branch lp:bzr-externals should get you the code, though22:09
jammkdir -p ~/.bazaar/plugins22:09
jambzr branch lp:bzr-externals ~/.bazaar/plugins/externals22:09
jam*I* have not audited the code, etc. And given its age, I wouldn't trust it a whole lot yet22:09
wadesworldjam...the hang is only happening on a merge...bzr branch/pull with sft work fine22:10
wadesworlder, sftp22:10
MTecknologyjam: thanks - I'll try it soon22:10
wadesworldand push works fine too22:10
jamwadesworld: well, then a workaround is "bzr branch sftp://... temp; cd trunk, bzr merge ../temp"22:10
pickscrapeIs it possible to get back the message of a commit that failed without having to type it in all over again?22:10
jammerge not working is quite strange22:10
jampickscrape: given that you're asking, I'd probably say no22:11
wadesworldagreed - that's what we've done so far - but I'm just trying to figure out who can help me get to the bottom of it22:11
jamsome things like 'qcommit' stash the message and try to use it again22:11
jamwadesworld: you can try starting merge22:11
jamand then doing Ctrl+|22:11
jamto interrupt the process, which should drop you into a debugger22:11
jamand then you can do "bt" to get a backtrace to see what it thinks it is trying to do22:11
jamThe only problem is that ^| may interrupt the ssh connection22:12
jam(It is SIGQUIT)22:12
* pickscrape adds to the "MyTopUiComplaints" page22:12
mwhudsonpoolie: mildly curious why you nominated me as a reviewer on https://code.edge.launchpad.net/~mbp/bzr/remove-logging/+merge/1494222:16
wadesworldjam http://pastebin.org/5466822:16
pooliebecause it might break your integraiton22:16
thumperwho is working on the daily ppa builds?22:17
poolieif you don't rely on logging, no problem22:17
jamwadesworld: that would hint that we may be trying to open a directory as a file, and your sftp server is letting open it, but not return any content22:17
thumperor 2.1b3 into the beta ppa?22:17
jamwhich is a bit strange22:17
jamthumper: dailies are from james_w I though22:17
jamthought22:17
jamjohnf is doing the releases22:17
jambut IIRC has not built any of the 2.1 releases22:17
jambecause of concerns about getting a coherent set of plugins into the ~bzr-beta-ppa22:18
wadesworldhmm...that actually makes a little sense, since the sftp server is the only commonality in the problem22:18
pooliejam: it's ctrl\22:18
jampoolie: sure, though whatever it is worked for wade :)22:18
jam \ and | are on the same key at least22:18
wadesworldhmm...I was hoping for a permissions problem, but don't see anything obvious...still looking22:20
wadesworldstrange that pull works though and merge doesn't - one would think they would use the same sftp functionality22:21
jamwadesworld: I'm not positive if pull allows 'mergeables' which would be a bundle, and thus a file to read22:21
jamI thought it did, though22:21
jamthe underlying sftp implementation is identical for sure22:22
jamwadesworld: so looking at the code, both call read_mergeable22:22
jamwadesworld: one possiblity is to do "bzr merge" rather than "bzr merge location"22:23
jamas if you don't supply a location, we don't try to read mergeable22:23
jamwhich may be why "bzr pull" is working for you22:23
jamsince I assume you did "bzr branch $location" at some earlier time22:23
jamand then just plain "bzr pull" to update it22:23
jamcan you try "bzr pull $location" ?22:24
jamwadesworld: ^^22:24
wadesworldsure thing - and you're correct22:24
bpierreHi22:24
jamwadesworld: so I think we've seen this in the past...22:25
jamand we had a workaround that if the path ended in '/' we wouldn't try to read it as a file22:25
jambut that code path got updated22:25
jamand people thought that was hackish, etc.22:25
jamand apparently nobody has been using sftp as much recently22:25
bpierreI'm trying to debug one of my plugins, and even when using -Derror, not all stack traces get outputted to stderr, is this normal?22:26
jamhmm.. that said, everything works here even with sftp22:26
jambpierre: I would think that with -Derror things should get written, however I wouldn't say it always works22:27
bpierreso it's a bug?22:28
jambpierre: I don't know the details, but sounds like one22:29
bpierrejam: I modified it like this: http://pastie.org/70334922:29
jambpierre: I'm not sure that "print exception(..." is the same as displaying the traceback. I'd have to dig into the code a bit more to understand your patch22:30
wadesworldjam, you're right - it appears that bzr pull $location is suffering the same hang22:31
bpierrethis move the code from 'report_user_error' to 'report_exception'22:31
bpierreI'll make a merge request, and we'll see22:31
jambpierre: did it give you the tracebacks you expected?22:35
jamwadesworld: I'll note that I'm unable to reproduce the hang here22:36
jamare you on Mac?22:36
jam(I think I remember that)22:36
wadesworldyep22:36
jamI tried paramiko, and openssh as the local connection22:36
jamboth worked22:37
wadesworldhappens on both my Intel Mac and PowerPC Mac22:37
jammy old laptop used to be a Mac PPC22:37
jamso it may be something with mac's openssh22:37
jamwell, whatever ssh they use22:37
jamthough I would have thought the server would matter more than the client22:37
wadesworldopenssh22:37
jamwadesworld: try "export BZR_SSH=paramiko"22:37
jamand then try again22:37
wadesworldOK22:37
jambzr pull $location22:37
bpierrebpierre: yes22:38
bpierre...22:38
bpierremust be tired, obviously I meant to respond to you jam!22:39
wadesworldappears to not have any effect...one thing I can do later tonight is copy the shared repo on the server over to a different box running Ubuntu rather than OpenBSD and see if that makes a difference22:39
jamwadesworld: so the *server's* sftp implementation would make a lot of sense22:40
jammy server is a really old FC3 box running OpenSSH_4.2p122:40
jamplease report a bug about sftp trying to read a directory as a file22:40
jamand include your ssh implementation versions22:40
jamwe might just restore the old "if this really looks like a dir, don't try it" code path22:41
wadesworldOk, will do22:41
jambut I remember abentley objecting because "http://.../" could be a file22:41
jameven though, we actually try to read from ".../foo" always in the current code path22:41
jam(rather than .../foo/)22:41
wadesworldhmm...there's no call to determine if it is a dir before trying to read?  (I guess not, or you would have used it)22:42
jambpierre: ahh, I see the issue. The formatting of your patch hid the '_' from me22:43
jamprint_exception does indeed print the traceback22:43
jamdo you have apport installed?22:43
jamlooking at the code22:43
jamIOError, KeyboardInterrupt, and MemoryError are never given full tracebacks22:43
jamand report_bug which is the catchall for unknown errors22:44
jamwill try to use apport first22:44
jamand then falls back to showing a traceback, etc.22:44
jambpierre: so you may want to clarify the bug with "when a plugin raises IOError" or something like that22:44
jamdepending on what exception you are actually getting.22:45
spivwadesworld, jam: IIRC, BSDs tend to allow you to open directories as if they are files22:45
jamspiv: which is fine, as long as trying to read them would return something other than a hang22:45
spivThe results are rather nonsensical, but the open syscall doesn't actually fail.22:45
jamif it raised an error22:45
jamor returned no content22:45
jambut this seems to just hang indefinitely22:45
spivYeah, that's odd.22:45
jamspiv: I thought you could always open() a directory, since that lets you fchdir()22:45
spivWell, I've also seen read on the opened directory work.22:46
wadesworldI'll file a bug tonight with complete details - I'm also happy to give whomever works it access to my server for testing22:46
jamspiv: orig_dir_fd = open(".", O_RDONLY, 0) is what we do in _readdir_pyx.pyx22:46
jamso it better work :)22:46
spiv"work", in that it gave the on-disk representation of the directory!  But my first-hand knowledge of BSDs is rather old.22:46
jamwadesworld: mua ha ha22:46
jamspiv: well, that would be fine too, as we would realize right away that it wasn't a bundle22:47
wadesworldthanks so much for your help jam - I'll file the bug tonight22:47
wadesworldthis has really been hurting my efforts to bzr-convert my colleague :)22:48
jamwadesworld: also, if you could give the result of something like manually doing22:48
jamsftp host22:48
jamget directory22:48
mwhudsonbugs like https://bugs.edge.launchpad.net/launchpad-code/+bug/484197 make me want to cry23:04
ubottuLaunchpad bug 484197 in launchpad-code "Branches stacked on another project report errors" [Undecided,New]23:04
bpierrejam: ok, done: https://code.launchpad.net/~benoit.pierre/bzr/fix-error-debug-flag/+merge/1497123:05
bpierrethanks23:05
jammwhudson: I've shed my tears for stacking. Now I just soldier on23:06
mwhudsonjam: probably wise23:06
jambpierre: I'm pretty surprised that ValueError wasn't being reported correctly.23:07
jamalso, your patch is going to cause double-tracebacks in some cases23:07
jamso I don't think it is quite the right answer23:07
bpierrewhich cases?23:09
jambpierre: noted in a review of your patch23:09
jambpierre: I'm pretty sure that report_bug(exc_info, err_file) always displays the traceback23:09
jamdef report_bug_legacy(exc_info, err_file):23:09
jam    """Report a bug by just printing a message to the user."""23:09
jam    trace.print_exception(exc_info, err_file)23:09
jamso if you don't have apport installed23:09
jamwe always print the exception traceback23:10
jamI realize this is only with -Derror, but it is still a bit ugly to see it twice23:10
bpierrebut report_bug is not going to be called, no?23:10
bpierreI do return before the bulk of report_exception's body, where different functions get called depending on the type of exception23:12
bpierreor am I missing something obvious?23:12
poolieigc, hi, good morning?23:16
lifelesspoolie: call over?23:17
jam bpierre, then I'd have to review your code more thoroughly. I should have stopped working 15 min ago23:18
bpierre:)23:18
jambpierre: I would quickly caution that I don't think print_exception calls log_exception_quietly which dumps the data into .bzr.log23:20
jamwhich I think we want23:20
* jam runs away23:21
mwhudsonum, sanity check please? http://pastebin.ubuntu.com/321152/ <- this is insane, right?23:36
spivmwhudson: that does seem crazy, and I can reproduce using lp:subvertpy23:42
spivmwhudson: bug report please :)23:43
spivmwhudson: at a quick guess it's pushed the working tree with tip's contents, but then set the parent revids correctly.23:44
mwhudsonspiv: yes, the wts are the same23:44
spivYeah, and diff -r tag:subvert-0.7.0.. gives the same diff as found in the new tree23:45
mwhudsonspiv: push -r3 is even stranger23:46
mwhudsonspiv: https://bugs.edge.launchpad.net/bzr/+bug/48451623:52
ubottuLaunchpad bug 484516 in bzr "bzr push -r $revspec ../foo creates branch with working tree from tip, not that of $revspec" [Undecided,New]23:52
* mwhudson upgrades things23:53
mwhudsonoh good (?) it happens with everything upgraded to 2a too23:55

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