cxoHow do you clone just the last revision of the repository?00:50
mkanatcxo: I think you might want bzr checkout --lightweight00:55
spivlifeless: I suppose you saw the mail about setUpClass on python-dev?01:11
mwhudsonspiv: that dull thumping sound is robert's head meeting the wall, i think01:11
spivmwhudson: good good01:11
lifelessspiv: fuzzyman mailed  me directly01:18
lifelessspiv: I'm getting out of sprint backlog at the moment though01:18
mwhudsonlifeless: the fix for https://bugs.edge.launchpad.net/bzr/+bug/513432 should be deployed now, do you have a simple recipe to verify?01:31
ubottuUbuntu bug 513432 in launchpad-code "AttributeError: 'Inter1and2Helper' object has no attribute 'source_repo'" [Critical,Confirmed]01:31
james_wmwhudson: create a local 2a repo, branch an older format in to it01:34
mwhudsonjames_w: ok, happens for every such attempt?01:34
james_wI think so01:35
james_wtrying with the project I saw someone hit the problem with01:35
mwhudsonit seems to be fixed then01:35
lifelessmwhudson: that should verify it, yes.01:36
mwhudsonlifeless: ta01:36
lifelessmwhudson: and just to be sure, you did preserve the other hotfix we had ?01:36
mwhudsonlifeless: the thread safety one?01:37
mwhudsonlifeless: yes01:37
mwhudson(though the server in question _hasn't_ been rolled out to yet, so it still has a cowboy afaik)01:37
pooliemwhudson, thanks for that01:42
mwhudsonpoolie: np, it still seemed to take about a week longer than it should01:43
RenatoSilvalifeless: I have no idea of what "Show hits as a diff " means01:43
pooliei wasn't going t omention that :)01:43
RenatoSilvalifeless: and I can't get the problem with "Show revisions whose diff contains the search string"01:43
RenatoSilvalifeless: and mainly, how they relate to each other01:44
lifelesswell, if you stay on irc for more than 60 seconds we can talk about it :)]01:47
lifeless /rant01:47
pooliemwhudson, i added a bzrlib.initialize which you asked for02:33
poolieso you should give me a review :)02:33
RAOFIs there any way that bzr could preserve the rich-root status of a branch when branching from a non-rich-root branch into a rich-root repository?03:03
RAOFNow that 2a is the default repository, I tend to accidentally trap my changes into a rich-root situation and then pushing back to lp fails.03:04
RAOFAlternatively, how can I easily rescue a series of changes from a rich-root repository?03:25
lifelessRAOF: ideally get the other end to upgrade03:27
lifelessfailing that for x in revno: bzr diff03:27
lifelessin principle rebase can do it03:28
lifelessthere is a certain amount of '03:28
lifelessexercise for the reader03:28
RAOFWould it be possible to somehow keep the non-rich-root status of a branch pulled into a rich-root repository?  This is a significant cause of friction I've run into.03:28
lifelessRAOF: not in the current repositories, not03:28
RAOFBut in future?03:29
lifelessits code, anything is possible.03:29
lifelessI don't expect anyone to do the heavy (and its fairly heavy I think) lifting involved03:29
lifelesswe could make branch error unless given a flag03:29
RAOFRight.  That's what I wanted; an evaluation of whether it's worth filing a bug.03:29
lifelessthough I'm not sure that that is a good idea03:29
lifelessRAOF: file a bug, we can gather 'affected by' counts ;P03:30
RAOFLooks like it's bug #50655603:33
ubottuLaunchpad bug 506556 in bzr "Branching does not maintain compatibility with parent" [Low,Confirmed] https://launchpad.net/bugs/50655603:33
lifelessme too it then :)03:34
RAOFHave done.03:35
* vila waves@gerard_08:23
vilagerard_: I'm reviewing your patch08:27
* emmajane waves.08:27
vilagerard_: out of curiosity, what editor are you using ?08:27
emmajaneI've just had someone ask me about syncing upstream source with downstream plugins. Maybe like svn vendor branches? I know I've seen this asked about on the mailing list loads but I can't figure out where in the docs the answer is... it's not just tagging releases, is it?08:28
vilaemmajane: weird, you were here during my late evening and you still here in my early morning, don't you ever sleep ??? :D08:28
emmajanevila, I'm in NZ. :)08:28
emmajanevila, It's 2130 here.08:28
vilaemmajane: right, so we are both working far too late in the evening ;D08:28
vilaupstream source and downstream plugins, the first is singular the second plural, are you talking about branches in both cases ?08:30
emmajanethey're writing a plugin that needs to be synced with the upstream source.08:30
mkanatemmajane: That's a pretty standard DVCS case, it sounds like to me.08:31
vilathe upstream source is a plugin too or more than just the plugin ?08:31
mkanatemmajane: You just want to merge from upstream into downstream, right?08:31
emmajanemkanat, and know which version of the plugin applies to what upstream version of the full code base.08:31
mkanatemmajane: cd /local/checkout; bzr merge bzr://path/toupstream08:31
mkanatemmajane: Well, that's more a code decision than a VCS decision.08:32
vilaemmajane: you don't strictly need to track the upstream version as long as you can merge08:32
mkanatemmajane: But if you do merge --remember, it remembers where you last merged from.08:32
vilait remembers at the first merge08:32
emmajanemkanat, so it would know that bug fix #3 applies to upstream release 4.0alpha?08:32
mkanatemmajane: What would know?08:33
vila--remember can be used to change afterwards08:33
emmajaneit == the plugin that's being written.08:33
mkanatemmajane: If you check it in to that branch....08:33
mkanatemmajane: I assume you'd have different branches for the different upstream versions.08:33
emmajaneahh, right. so just a new branch for each version of upstream?08:34
mkanatemmajane: Yeah.08:34
* emmajane nods08:34
emmajanehttp://wiki.bazaar.canonical.com/TrackingUpstream is that page what i'm looking for?08:34
emmajaneI think I'm trying to make it harder than it is? :)08:34
mkanatemmajane: That's certainly possible. :-) It's very simple. :-)08:34
mkanatAnyhow, I'm off to bed. :-) Night all!08:35
gerard_vila: good :)08:35
gerard_vila: geany08:35
gerard_did it do weird stuff?08:35
vilagerard_: can you configure it to avoid leaving spaces at end of lines ?08:36
gerard_vila: yeah, no problem08:36
vilagerard_: not a big deal, but we try to get rid of these damn spaces :D08:36
gerard_invisible characters are annoying anyway08:37
gerard_a few days ago I had some trouble with a non breaking space char that was messing up search and replace :p08:38
vilagerard_: my gut feeling is that jam mentioned more cases than your tests covers, should I dig deeper or can you quickly confirm ?09:13
* bialix waves heloo all09:18
vilahi bialix09:18
bialixbonjour vila!09:18
bialixhello davidstrauss, how's drupal dvcs contest going?09:20
bialixhi jelmer09:21
gerard_vila: yeah, he mentions one more09:21
davidstraussbialix: Well enough. The debate for Drupal is turning out quite different from the one for most projects.09:21
jelmerHI bialix09:22
gerard_to be honest, I didn't check that one09:22
gerard_but I have a good feeling about it ;)09:22
bialixdavidstrauss: that's good09:22
vilagerard_: good, I'm cleaning up some details and I let you know where to get an updated branch so you can build on it if that's fine with you09:23
davidstraussbialix: I'm glad to see that it hasn't devolved into another silly performance contest. Just because performance gives easy objective numbers doesn't mean it's a good way to decide.09:23
gerard_vila: what do you mean with "build on it"?09:24
vilagerard_: more concretely, I'm looking into rewriting test_update_checkout_prevent_double_merge such as it's less verbose, you could then reuse the same tricks for further tests09:24
gerard_vila: ah ok, so you are cleaning it up and then showing me how it should have been in the first place? ;)09:25
vilagerard_: err, I meant test_update_remove_commit09:25
bialixit was funny (for me) to read comments about drupal contest in hg mailing list: there seems enough people who hate bzr for some reason so they're happy to see git in winners only because it's not bzr. crazy09:25
vilagerard_: hehe, not exactly, I prefer to view that as a gentle nudge in *improving* your tests :D09:26
gerard_vila: yeah, the test_update_remove_commit is really verbose :)09:26
vilagerard_: the way we write the tests is constantly evolving which means there are many bad examples in the existing ones and the good examples are hard to find09:26
gerard_I noticed09:27
vilatest_update_remove_commit, especially because there is no conflicts, is a perfect candidate for using branchbuilder and can even become a whitebox test (which are far easier to debug than blackbox ones)09:28
vilaand also faster09:28
vilahmm, good and bad are a bit rude, I meant old and new of course :D09:30
vilaor rather new and old or bad and good whatever...09:30
gerard_blackbox tests are really easy to write though ;)09:32
vilagerard_: yup, you got what you paid for :D09:34
gerard_what I find interesting is that there are a lot of tests and still there are enough corner cases that are not tested09:34
vilagerard_: yeah, that just means there aren't enough tests yet, welcome to the debate, it's still open :D09:57
vilagerard_: one key argument is whether indirect tests (like blackbox ones) are enough to cover lower layers implementations (like your tests for wt._update_tree), that's precisely what I like to enhance with your submission :D09:59
vilagerard_: that's not strictly required to land your patch though, but if we can make the tests easier to write for that method...10:00
gerard_vila: easier sounds good :)10:03
mvohm, what is the right command if bzr says my format is not compatible but bzr upgrade claims my branch format is the most recent one? http://paste.ubuntu.com/373111/ has the details10:47
vilamvo: actually, *you* use the most recent 2a format but the remote branch don't10:49
mvovila: can I downgrade then? I do not want to upgrade the remote branch as I don't know who else is using it and with what bzr version(s)?10:52
vilamvo: you can't downgrade your branch, you had to re-create it from remote, they use different models :-/10:56
vilamvo: do you have a lot of commits there /10:56
vilamvo: do you have a lot of commits there ?10:56
vilamvo: and how did you end up there ?10:57
mvovila: I ended up there via bzr co I think, let me check my shell history to be certain10:57
vilamvo: 'bzr info -v' will tell us about a shared repository too10:58
mvo    6  bzr co  lp:aptdaemon/0.2.x10:58
vilamvo: doing that locally gives me a 'Packs containing knits without subtree support' repo, not a 2a one11:00
mvohttp://paste.ubuntu.com/373125/ <- that is the info -v output11:00
mvobzr --version11:00
mvoBazaar (bzr) 2.0.311:00
vilamvo: did you 'bzr upgrade' when you wanted 'bzr update' ?11:01
vilamvo: try doing 'bzr co lp:aptdaemon/0.2.x' again and you should get a different 'bzr info -v' output11:02
vilamvo: 'bzr co' in a different place !11:02
mvovila: right, sorry. the bzr co lp:aptdaemon/0.2.x one is the wrong line in my history, i was working with both branches and mixed them up. I don't have the trunk co in my shell history, so I guess the best workaround is to bzr co lp:aptdaemon/trunk again and just commit that. thanks for your help!11:04
vilamvo: you're welcome, feell free to come back or file a bug if you end up with such a setup11:05
mvothanks, with the fresh checkout it works fine now11:05
vilamvo: that's not supposed to occur if you do't explicitly ask for it11:05
vilamvo: good11:05
mvoI guess I must have used bzr upgrade at some point that I just don't remember :(11:05
mvomaybe it could warn for co branches if the local and remote one become incompatible when bzr upgrade is issued?11:06
vilamvo: sounds like a good idea, care to file a bug ?11:09
mvovila: thanks, I will do that (after lunch :)11:10
=== jamesh_ is now known as jamesh
=== mrevell is now known as mrevell-lunch
gerard_vila: did you get around to beautifying the test yet?13:13
vilagerard_: almost :D Got distracted and also ran into unsuspected complications, but the final result should be something like: http://paste.ubuntu.com/373202/13:14
gerard_vila: hmm, it sure is more compact, but hard to read when you're not used to it13:18
vilagerard_: which part ?13:18
vilagerard_: i.e. where should I add comments to make it clearer ?13:22
gerard_vila: if you haven't seen build_snapshot being used before, you have a hard time making sense of it13:23
vilagerard_: ha, yes, you need to look at branchbuilder a bit, but that far easier to build graphs than with run_bzr13:24
vilagerard_: but now we have the workingtree object and we can make far more assertions with it and more precise ones too13:25
=== mrevell-lunch is now known as mrevell
vilagerard_: http://paste.ubuntu.com/373215/13:37
vilagerard_: http://paste.ubuntu.com/373216/ without the typo :D13:38
vilagerard_: does it make sense ? Do you think you can write other tests from that ?13:40
gerard_not quickly unless you provide some documentation for build_snapshot13:41
gerard_and I was not really planning to write more tests...13:42
gerard_that is, until I'm fixing a new bug or building a new feature13:43
vilaha, I thought you were rejoicing  about TDD yesterday, I misinterpreted that a will to write more tests :D13:43
vilagerard_: no problem, I'll write them13:43
gerard_hehe, I like it when working on something, I don't like testing in itself13:44
=== gerard_ is now known as zo_bijvoorbeeld
=== zo_bijvoorbeeld is now known as gerard_
vilahehe, yeah, the usual "I love existing tests but... why should I add more ?" :-P13:45
gerard_vila: well, I like adding tests for existing bugs13:48
gerard_just writing tests out of the blue seems like a waste of time13:49
gerard_I feel that's the responsibility of the guy that wrote the feature in the first place13:49
vilagerard_: yeah, I agree with that, but what do you do when tests are missing then ?13:49
gerard_vila: so how do you know they are missing?13:50
vilagerard_: because I can't find them :D But I don't have any problem if you don't add them, they were missing before your patch, don't get me wrong !13:50
gerard_vila: no, seriously, how do you know what test you can't find?13:51
vilagerard_: there is no general rule, but here, I couldn't find tests for wt._update_tree() nor wt.update() only blackbox ones...13:52
jelmervila: what's the name of the 2.1 branch? I tried to submit that cherrypick during lunch but lp kept timing out :-/13:53
gerard_vila: that's the reason they were so broken then13:53
vilagerard_: which ones ?13:53
gerard__update_tree() mostly13:53
vilajelmer: lp:bzr/2.1 ?13:53
gerard_that -r feature was seriously not working correctly, can tell that from the code13:54
vilaoh, you mean the code, I thought you were referring to the tests13:54
jelmervila: argh, way too obvious - thanks13:54
gerard_vila: no, the tests were fine13:54
vilagerard_: you mean you identified other bugs ?13:54
jelmervila: (I tried ~bzr/bzr/2.1 and that failed)13:54
vilajelmer: that's why you couldn't find it ;D13:54
gerard_vila: yeah, using -r to go to somewhere before you branched cannot have worked correctly13:54
vilajelmer: pfft, so last century....13:54
jelmervila: Well, being able to look at http://code.launchpad.net/bzr would help too :-)13:55
vilajelmer: lp ooopsing again ? I can read that page without problems13:55
jelmervila: I reproducibly get a timeout13:56
vilagerard_: you scare me there, and reinforce my feeling that your patch do more than its tests :-/13:56
vilajelmer: I can't reproduce that13:56
gerard_vila: it was using graph.find_unique_lca(revision, old_tip) to find the branch point13:57
gerard_but if revision is before the branch, that will just return revision13:57
gerard_the whole update was horribly broken (I repeat myself here)13:58
gerard_but I agree it probably needs more tests13:59
vilawhat do you mean 'revision is before the branch' ?13:59
gerard_if you branched at revision 2, and do update -r 114:00
vilagerard_: oh, and by more tests I don't mean you introduced more bugs, but adding tests when you diagnose a bug guarantees that we won't regress14:00
gerard_vila: we should probably add a test that update -r will properly remove revisions14:01
gerard_just like the test that checks if it removes the commit from the branch14:01
jelmervila: does http://code.lp.net/launchpad work for you ?14:04
vilaredirected to http://www.ndparking.com/lp.net14:06
=== radoe_ is now known as radoe
vilahttps://code.edge.launchpad.net/launchpad works fine14:07
vilajelmer: and http redirects to https14:08
vilajam: can I land https://code.edge.launchpad.net/~jelmer/bzr/2.1-fix-foreignrev/+merge/19008 into 2.1 ?15:50
jelmervila: please do15:51
gerard_vila: :)15:51
vilagerard_: congratulations, your patch is landing :D15:52
vilajelmer: hello acting RM :D15:52
jamvila: sure15:55
bialixdoes configuration of ML has changed recently/15:57
* bialix feels blacklisyted15:57
gerard_vila: thx15:58
vilabialix: not that I know of. Why the feeling ?15:59
vilajelmer: pqm'ed15:59
bialixI can't post via gmane, 3 mails sent today, none appears15:59
bialix(maybe I've reached my limit of ... something)16:00
vilabialix: weird16:01
bialixposting to other ML via gmane was success16:02
jelmervila, thanks!16:02
bialixindeed, weird16:02
bialixabentley: unshelve with editor works very nice, thanks!16:04
abentleybialix, you're welcome.16:04
bialixabentley: one minor UI thing: if I've invoked editor to work with several changes in one file then it invoked only once, that's ok; but final confirmation slightly misleading: "Shelve 2 changes?" -- and I think: "strange, I've edited the file only once".16:07
abentleybialix, I believe that means "two lines changed".16:07
bialixit's not very obvious16:08
bialixusually it the count of hunks16:08
bialixabentley: maybe "Shelve selected changes" would be more neutral16:08
abentleybialix, that could make sense.16:09
bialixabentley: also, if I've invoked "shelve --destroy" it will be nice to see more strong confirmation question: "Destroy selected changes?". but all this UI things, maybe I'm wrong16:10
abentleybialix, yes, there's always tension between providing a consistent UI and a specific UI.16:11
bialixperhaps I need dump this questions as bug report?16:11
abentleybialix, sure.  They're good questions, and I'm not sure what the right answers are.16:11
maxbabentley: Hello. For bzrtools, do you like people to use the "Resubmit" button on MPs accepting that it disturbs the comment train, or to just comment and ping you to request re-review?   (https://code.edge.launchpad.net/~maxb/bzrtools/skip-import-.bzr in my case)16:12
abentleymaxb, the latter.16:12
maxbdo you consider yourself pung, or would you like an email? :-)16:12
abentleymaxb, let's say I'm pung.16:16
bialixabentley: done: https://bugs.launchpad.net/bzr/+bug/51991916:17
ubottuUbuntu bug 519919 in bzr "shelve UI messages: is it possible to improve them?" [Undecided,New]16:17
gerard_vila: I guess the fix will not get into 2.1?16:21
gerard_or will it?16:21
vilagerard_: I don't think so, 2.1.0final is around the corner16:22
Noldorinhow can i ignore all files under a certain folder in .bzrignore?16:50
jelmerNoldorin: Add 'foldername/*' to .bzrignore16:54
Noldorinjelmer, yeah, that doesn't work for some reason16:55
jelmerNoldorin: is the directory itself versioned?16:56
Noldorinif i have just '*.xap' it works16:56
Noldorinbut if i have 'ClientBin/*.xap', no luck16:56
Noldorinjelmer, ?>17:02
gerard_Noldorin: how about just "ClientBin"?17:05
Noldoringerard_, i need to actually include the folder in the repo, strangely enough, but none of the contents17:06
* gerard_ wonders what the use of having an empty directory underversion control is17:07
Noldoringerard_, it's a quirk of Visual Studio. it needs the folder to be there17:07
gerard_Noldorin: create it in a pre-build action?17:08
Noldoringerard_, yeah, that just crossed my mind heh.17:08
jelmerNoldorin: no idea, sorry17:08
Noldorinno prob17:08
Noldoringot it sorted now. thanks guys17:09
Noldorinjelmer, oh btw. do you remember some time ago when we were looking into hacking the bzr-git/dulwich source to investigate the problem with pushing to git-hub?17:09
Noldorini was getting somewhere actually17:10
Noldorinwondered if you had a few mins to continue with that17:10
jelmerNoldorin, sure17:10
Noldorinjelmer, i can't remember exactly where we were, but i remember confirming the path was correct17:10
* bialix waves at GaryvdM17:14
bialixvila, jam: is it possible that posts from gmane blacklisted?17:14
jambialix: I suppose it is possible, but I wouldn't think so17:15
Noldorinjelmer, is it worth upgrading from 0.4.2 to 0.4.3 for a start?17:16
bialixit seems my usual mail marked as spammer or something similar (given the answer about waiting approval I've got recently)17:16
bialixjam: http://pastebin.com/d7df6fa4b17:17
bialixjam: who can help me in such situation?17:17
bialixit seems some software on mailman server was upgraded today?17:18
GaryvdMHi bialix17:19
GaryvdMHi all17:19
bialixHi Gary17:20
vilahey GaryvdM !17:20
* bialix feels really blacklisted and with tag "spammer" on the back goes away in sadness: goodbye cruel world!17:20
vilabialix: could it be that your From header has changed ?17:24
bialixvila: I'm even don't understand what you're say right now.17:24
bialixI think I have not changed anything17:25
bialixmy "From:" seems the same as yesterday, just my name and surname17:26
vilamails have headers and a body, the headers are (roughly) lines of the form '<header_name>: value'17:26
bialixyes, yes, vila it was silly joke17:26
vilaha :D17:27
bialixbut I really have no idea how to screw this in Thunderbird17:27
chxhi. in the "which VCS to pick" http://groups.drupal.org/node/48818?page=1#comment-131203 we have a user who tried bzr on mac with not much success. can someone people help me with a nice reply?17:27
bialixchx: install bzr from installer is good answer?17:27
bialixthere is only small issue with Qt17:28
chxbialix: i do not have OS X.17:28
bialixanother silly joke17:28
bialixheh, I really need head to home17:28
vilachx: there is an OSX package for bzr, I don't know who is maintaining the macports one17:28
* bialix waves bye all17:28
chxvila: Next try was installing the binaries for OS/X 10.6 from Canonical's website after cleaning out the Macports install.17:28
chxvila: it seems he tried.17:28
vilawhat's doxxx nick here ?17:30
vilaBasicOSX: do you use the mac installer ?17:31
GaryvdMchx: Difficult to tell what went wrong with the installer.17:32
vilaverterok: do you use the mac installer ?17:32
GaryvdMchx: Critical point: "Trying "bzr explore" from the command line in a bzr-repository failed miserably with ever more error messages piling up on my screen."17:32
GaryvdMI installed bzr on a client17:33
GaryvdMI installed bzr on a client's mac the other day with no major issues.17:33
GaryvdMusing the installer17:34
vilaGaryvdM: and using bzr-explorer ?17:34
RenatoSilvaverterok: hi17:34
verterokvila: hi, it's been a while since I booted into OS X :/17:34
verterokRenatoSilva: hi17:34
verterokvila: so, the answer is: not recently :)17:35
RenatoSilvaverterok: did you remember if you have already added an encoding param in bzr-xmloutput?17:35
jambigjools: I just sent it through17:35
chxGaryvdM: i do not have more info than this17:35
RenatoSilvaverterok: because I remember something like this...17:35
verterokRenatoSilva: I didn't17:35
jamsorry, meant to say 'bialix'17:35
bigjoolseasy mistake :)17:35
chxGaryvdM: but someone chiming in from the bzr community would be nice to counter this bad experience (which obviously should not affect the choice but it will)17:35
jelmerNoldorin, yeah, upgrading is definitely useful17:35
RenatoSilvaverterok: there's already branch for that?17:35
jelmerNoldorin, actually, I was assuming you were using trunk...17:36
GaryvdMvila: Yes, Bzr explorer, There is no shortcut created, but I could run it fine from the command line17:36
verterokRenatoSilva: No, there is a branch with a --encoding option for the xmlrpc-service, but that's not what we talked yesterday ;)17:36
RenatoSilvaverterok: oh so it's the xml rpc, ok17:37
GaryvdMchx: He maybe did not install the qt binaries, which has to be done manualy17:37
chxGaryvdM: maybe the installer should warn ?17:37
GaryvdMchx: yes.17:38
GaryvdMI'll reply.17:38
vilahmm, the coyote is efficient...17:39
chxGaryvdM: thanks!17:40
Noldorinjelmer, heh, ok. will do so now17:43
Noldorinjelmer, getting a horrible error now :S17:44
=== radoe_ is now known as radoe
Noldorinjelmer, never mind, that disappeared17:45
Noldorinjelmer, anyway, all upgraded now. how to proceed?17:45
jelmerNoldorin: are you running bzr-git trunk?17:48
Noldorinjelmer, 0.43 now17:51
SamB_XPwhat, he does releases of tht?17:52
Noldorinjelmer, upgrade to trunk?17:54
jelmerNoldorin, please do17:55
Noldorinjelmer, ok, done now :)17:55
Noldorinjelmer, same error, of course17:56
Noldorinbut anyway...17:56
Noldorinwhich file should we start off messing with?17:57
jelmerNoldorin, I'm adding some debug code17:58
Noldorinjelmer, ah, great17:58
jelmerNoldorin, done18:01
jelmerplease pull again18:01
jelmerplease try again and use -Dtransport18:01
jelmerthis'll write extra info to ~/.bzr.log18:01
jelmerI'll be back in ~30 minutes18:03
=== deryck is now known as deryck[lunch]
Noldorinjelmer, ok18:05
BasicOSXvila:  no, I run bzr.dev18:07
BasicOSX(sorry for the late response)18:07
=== davidstrauss_ is now known as davidstrauss
vilaBasicOSX: better late than never :D And you use bzr-explorer or not ?18:07
BasicOSXnot ... my roots are unix and most of my work is done on linux18:08
BasicOSXCLI server stuff18:08
BasicOSXJust taking poll? or looking for more feedback?18:09
vilaBasicOSX: trying to update my mental Who's Who :D18:09
BasicOSXThen you'll need some mental floss after talking to me :-P18:10
vilajam: wt.list_files() raising OSError when trying to lstat  a non-normalized Unicode filename... rings a bell ?18:11
vilaBasicOSX: Ok, I stop right now then :D18:12
GaryvdMBla, me too18:14
GaryvdMgroups.drupal.org says "Your submission has triggered the spam filter and will not be accepted."18:15
fullermdWho's who?  Me's me.18:15
Noldorinjelmer, doesn't print anything in dtransport now :S18:16
jelmerNoldorin, re18:28
jelmerNoldorin, did you try adding -Dtransport on the commandline ?18:28
jelmerNoldorin, and nothing shows up in .bzr.log ?18:28
vilajam: for WorkingTreeFormat2 that is18:28
GaryvdMHmm. For bzr 2.1, I thought that python-testtools was only a requirement if you are going to run the test suit.18:33
GaryvdMSome commands (like update) fail if you don't have it.18:34
GaryvdMWas this intended?18:34
GaryvdMvila ^18:36
vilaGaryvdM: If sftp is involved you're running into bug #51618318:39
ubottuLaunchpad bug 516183 in bzr "sftp transport module requires testtools" [Critical,Fix released] https://launchpad.net/bugs/51618318:39
vilaGaryvdM: the fix should be included in 2.1.0final but is still present in 2.1.0rc218:39
fullermdHeh.  It's funny how two wrongs make a right.18:41
jelmerNoldorin, ?18:41
fullermdI never had a chance to run into that bug, since I yanked paramiko off my systems after the pycrypto upgrade left it bleating all the time   :p18:41
GaryvdMvila: Ok I was using sftp. So I'm not going to add testtools as a dependency to the debs in the ppa.18:42
vilajam: I'm banging my head on the failing tests for https://code.edge.launchpad.net/~vila/bzr/322767-dont-add-conflict-related-files/+merge/18858, if you could have a look during my night, I'm sure I will sleep better ;) I can't figure why using wt.list_files() *during* smart_add fails while using it after succeeds (or something like that)18:43
vilaGaryvdM: testtools should be a Build Dep for bzr18:44
jamvila: ... WT.list_files() often fails because we get the offending file back in plain str form, and stuff like 'list.sort()' raises a UnicodeDecodeError trying to compare that string to others.18:44
jambut sure, I'll look at your work18:44
vilaGaryvdM: i.e. something you need to build (ok, test) but not when *using* it18:44
GaryvdMvila: Ah yes.18:44
vilajam: here we fail in a call to file_kind() which calls os.lstat AFAICT with the normalized form when the not normalized form has been used on disk18:46
jamvila: well, I'm not going to try to solve Mac issues :)18:46
jamat least, not yet18:46
vilanot on mac ! It's on karmix/etx318:46
vilayeah karmic even18:46
jamhmm.... maybe we failed to remove some of the normalization code18:47
vilaanyway, the mp gives a subset that includes the failing tests (they succeed without my patch ...)18:48
* vila is off18:48
GaryvdMIs there something similar to a bzr checkout (aka bound branch) in git?18:53
jamGaryvdM: past experience seems to indicate no, but I haven't checked again recently18:56
GaryvdMjam: Ok, I'm going to state that in a forum.18:57
jamI believe they have 'stacking', but only for local (I don't believe you can stack across a network boundary)18:58
jamthere are also some strange things you can do with env vars18:58
jamvila: in case you are still here, what is failing is that calling 'conflicts' to list what files are conflicted has to walk the whole filesystem because it has to search for .BASE, etc files.18:59
jamYou change causes us to invoke '.conflicts' in a case where we didn't before18:59
jamSo I think it was already broken, we just didn't know it, because we weren't calling it in those circumstances19:00
jamI would consider adding a KnownFailure for WTF2 in that case19:00
jamnot worth the effort to fix, IMO19:00
jamwell, I should say, fixing list_files() is worthwhile at some point, but not worth blocking your patch for19:02
=== deryck[lunch] is now known as deryck
Noldorinjelmer, sorry, thought you had left.19:33
Noldorinjelmer, well, let me paste you the output19:33
Noldorinjelmer, that's all i get19:36
jelmerNoldorin, did you pull from trunk after I added that debug output?"19:38
Noldorinjelmer, yep19:42
Noldorinjelmer, just double check - it is up to date. what were you expecting?19:44
vilajam: passing rapidly post-lunch, ha, that makes sense and kind-of imply that Unicode is badly supported for WorkingTreeFormat2. So accepting my patch means we won't support adding files for that format, but given the big red flashing warning to upgrade from that format, I think that's acceptable.19:50
jelmerNoldorin, what revno of bzr-git do you have?19:51
vilajam: can I consider adding the expected failures  as a BB:tweak ?19:51
Noldorinjelmer, r70819:51
jelmerNoldorin, are you sure that's the version actually being loaded? using -Dtransport I get more debug output in ~/.bzr.log..19:52
Noldorinjudging by the log, it is19:53
Noldorinone sec19:53
jamvila: yes19:53
vilajam: thanks, I'll sleep better :D19:54
dahostehey #bzr.19:54
Noldorinjelmer, how can i check?19:55
jelmerNoldorin, "bzr plugins -v"19:55
GaryvdMjelmer: I want to update bzr-svn, and bzr-rebase and add bzr-git to the beta ppa. I'm not sure which is the best way to go about this.19:57
GaryvdMjelmer: E.g. One of the questions I have is for bzr-svn, should I start with lp:~bzr/bzr-svn/<ubuntu- ver>-ppa or lp:~debian-bzr-svn/bzr-svn/unstable19:57
dahosteQuestion: I'm trying to get some shared-repo branches exposed via wsgi+apache.  Works fine for a non-shared repo branch, but fails for a shared repo.  I get: " An attempt to access a url outside the server jail was made".   Something to do with how the transport is created.. but not sure how to tweak it to make it work.19:58
dahosteMy little wsgi handler is using the make_app() function from bzrlib.transport.http.wsgi.19:59
Noldorinjelmer, erm, how do i rebuild?19:59
Noldorini think i need to do that now19:59
Pengdahoste: Upgrade to bzr 2.1.0rc1.20:00
jelmerGaryvdM: the debian packages are on http://bzr.debian.org/pkg-bazaar/bzr-X/unstable20:00
Noldorinoh, never mind20:00
Noldorinneed to add back in the hack20:00
Noldorinone sec20:00
jelmerNoldorin: there's nothing to rebuild, it's just python files20:01
jelmerGaryvdM: the packages on launchpad are outdated (mirrors/imports don't work for packaging branches yet)20:01
GaryvdMjelmer: Should I base the ppa packages on http://bzr.debian.org/pkg-bazaar/bzr-X/unstable?20:01
dahostePeng, .... ok.  Was this a known issue, then, that is definitely fixed?  I'm not averse to implementing a more substantial wsgi handler, if that's all it takes.20:02
jelmerGaryvdM: Yeah20:02
Noldorinok, seems i've got to update dulwich too...20:02
GaryvdMjelmer: cool20:02
jelmerNoldorin: you shouldn't have to, bzr-git trunk and bzr-git 0.4.3 require the same dulwich20:02
Noldorinjelmer, i haven't updated since 0.4.220:03
Noldorinso yes i think i need to20:03
jelmerNoldorin, but then cloning wouldn't have worked earlier either20:03
Noldorinok, working now20:03
Pengdahoste: Yes, it's been fixed. Bug #348308.20:03
ubottuLaunchpad bug 348308 in bzr "Smart server jail breaks bzr+http with shared repos" [High,Fix released] https://launchpad.net/bugs/34830820:03
Pengdahoste: If you don't want to upgrade bzr, you can put a simple monkeypatch in your WSGI script, but upgrading would be better...20:04
Noldorinjelmer, http://pastebin.com/m5950138d20:04
Noldorinseems to be including your debug info now :)20:05
Pengdahoste: My favorite version of the monkeypatch is http://paste.pocoo.org/show/176320/, FYI.20:07
dahostePeng, hmm... I apologize for not seeing that.  I did search the bugs.   Weird - searching on either 'wsgi' or 'jail' doesn't bring up 348308.20:07
Noldorinjelmer, i guess the problem is where the ssh key is transported over the git connection?20:07
Pengdahoste: Don't sweat it, I never find anything searching Launchpad either. I think it excludes fixed bugs by default?20:08
dahostePeng, cool, that should be enough to get me going.  I'm not averse to upgrading, but I'm using gentoo and avoid stepping outside of portage unless it's a security issue or something.  They've still got 2.1.0-beta4 masked.  I'll monkeypatch in the interim.20:09
Pengdahoste: OK. :)20:11
dahostePeng, thanks for the quick info.   irc ftw, as usual.20:12
Pengdahoste: I used to have that bug number memorized, though I've started to forget it since it was fixed, since I run bzr.dev. :P20:12
Noldorinjelmer, any ideas?20:13
dahostePeng, I'll admit I was surprised that this didn't 'just work'... figured everyone was running their repos through wsgi, and it would be well-paved for all the common scenarios.20:14
jelmerNoldorin: as far as I can tell the ssh bit works ok20:14
GaryvdMInteresting: http://upsilon.cc/~zack/stuff/img/vcstype-year.png (Graph of Debian VCS usage)20:14
Pengdahoste: For some reason, very few people use the WSGI server.20:15
Pengdahoste: If they want good performance, they just use bzr+ssh.20:15
dahostePeng, I almost went that route.. but wanted to avoid dealing with full shell accounts.  Though I think there's a way to use a single account, not sure.  Anyway, with wsgi, I can just defer to apache to auth through ldap for write access.   I'm prepping to migrate a ton of svn repos over to bzr, and wanted to maintain as much of the auth environment as possible.20:18
Pengdahoste: Ooh, you're going to do HTTP writing too? That's probably even less common.20:19
dahostePeng, yup.   fingers crossed.  :)20:19
Noldorinjelmer, hmm ok. so what now then?20:21
GaryvdMjelmer: When I'm done, should I push --overwrite to lp:~bzr/bzr-svn/<ubuntu-ver>-ppa?20:22
jelmercan you try adding self._path = self._path.strip("/") after the call to trace ?20:22
jelmerGaryvdM, please do20:23
Noldorinjelmer, strangest thing is that ssh auth works perfectly for bzr/launchpad....20:24
GaryvdMah lp:~bzr/bzr-svn/<ubuntu-ver>-ppa has allready been merged with  http://bzr.debian.org/pkg-bazaar/bzr-svn/unstable/ -- Cool20:25
jelmerNoldorin, any luck?20:32
Noldorinjelmer, see my previous message20:33
jelmerNoldorin, <jelmer> can you try adding self._path = self._path.strip("/") after the call to trace ?20:33
=== salgado is now known as salgado-afk
jelmerNoldorin: any luck?20:46
jelmerNoldorin, still there?21:03
Noldorinjelmer, seems we keep missing each other.21:41
Noldorinjelmer, oh, i thought that comment was to someone else, sorry.21:41
jelmerNoldorin: can you pull from current trunk21:41
Noldorinjelmer, what file/position?21:41
jelmerNoldorin, and try again21:41
Noldorinthat's running dpush -Dtransport on the latest revision21:44
Noldorinjelmer, doesn't look any different21:46
* Noldorin pings jelmer 21:57
jelmerNoldorin, sorry, I'm out of ideas21:58
Noldorinjelmer, what did you expect to see in that trace?22:00
pooliegood morning22:10
GaryvdMHi poolie22:10
Noldorinjelmer, (if you were looking for anything at all)22:10
pooliehello gary22:11
Pengmwhudson: BTW, looks like my mirrored branches are happy again...22:12
mwhudsonPeng: oh good22:12
PengI guess the gremlins have been placated?22:13
GaryvdMThere were lots of critical bugs in 2.1.0rc2 (that have been fixed). I think we should maybe do a rc222:18
GaryvdM*I think we should maybe do a rc322:19
GaryvdMBug #515597 makes rc2 unusable22:19
ubottuLaunchpad bug 515597 in bzr "TypeError: merge_text() takes exactly 2 arguments (3 given)" [Critical,Fix released] https://launchpad.net/bugs/51559722:19
* mtaylor made bzr crash...22:21
mtaylorbzr revision-info lp:~mordred/+junk/testme22:22
mtaylorbzr: ERROR: bzrlib.errors.ReadOnlyError: A write attempt was made in a read only transaction on LockableFiles(lock, file:///home/mordred/src/testme/.bzr/branch/)22:22
mwhudsonrevision-info is pretty weird about its arguments22:24
mwhudsonmtaylor: i think what that command tries to do is number the tip of lp:~mordred/+junk/testme in the branch in your cwd22:25
mtaylormwhudson: lovely22:25
mwhudsonor something like that22:25
mtaylormwhudson: is there a command I'm missing then that would give me the revision-id of the tip of the branch specified?22:25
mwhudsonmtaylor: bzr revision-info -d lp:~mordred/+junk/testme22:26
mwhudson(i added the -d option in an extreme rage a while ago)22:26
mtaylormwhudson: what does -d do?22:26
mtaylorawesome. rage is a good source of commands22:26
mwhudson  -d ARG, --directory=ARG22:26
mwhudson                        Branch to examine, rather than the one containing the22:26
mwhudson                        working directory.22:26
mtaylorah. heh22:26
GaryvdMjelmer: I've gotten (and upgraded) lp:~bzr/bzr-svn/karmic-ppa/ and run merge http://bzr.debian.org/pkg-bazaar/bzr-svn/unstable/22:27
GaryvdMjelmer: I'm not sure how to handel the merging of changelog22:28
GaryvdMThere are some entries from debian/unstable that have been added22:28
GaryvdMjelmer: Do I keep these?22:29
GaryvdMjelmer: I think that I'm going to revert merges changes to debian/changelog, and create my entry (with version number for the ppa)22:33
spivGood morning.22:59
=== webchick is now known as webchick|afk
GaryvdMHow do I get bzr builddeb to not download the .orig.tar.gz with uscan, but to rather use the code from the branch?23:44
james_wGaryvdM: you need to use "merge-upstream" to merge the code from the branch, and pass the tarball if there is one corresponding to the release you are using23:45
* GaryvdM is confused23:46
GaryvdMah merge-upstream is a builddeb command23:47
AfCGiven an arbitrary Debian package in Ubuntu, what's the bzr command to get a Bazaar branch of its sources? [is there one?]23:51
james_wbzr branch lp:ubuntu/<package>23:53
GaryvdMjames_w: I cant get merge-upstream to work, but I think I have don what it does manually, so I'm not to worried.23:55
igchi poolie, jam, garyvdm, james_w23:57
GaryvdMjames_w: My org question is theoretical, because the .orig.tar.gz should be the same as the contents of the branch, but what if I have modified the code in the branch so that it differs from the .orig.tar.gz?23:58
GaryvdMHi igc!23:58
james_whi igc23:59
james_wGaryvdM: the way that .deb repositories work mean that you have to have a byte-for-byte identical .orig.tar.gz for versions that share the same upstream version23:59

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