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

spivigc: want to take a second look at https://code.edge.launchpad.net/~patrick-regan/bzr/lp-quicktutorial/+merge/15073?  I think it looks good now.00:09
igcspiv: done00:12
spivigc: thanks!00:16
lifelessspiv: I have a suggestion for pqm-submit00:33
lifelessspiv: let it take a lp merge request url.00:33
spivlifeless: +100:35
poolielifeless: any comments on bug 48854401:37
ubottuLaunchpad bug 488544 in launchpad-code "unclear meaning of resubmit action" [Undecided,New] https://launchpad.net/bugs/48854401:37
lifelesspoolie: yes, commented.01:49
poolieheh01:49
poolieexpected you to say "yes, that bug has comments" :-)01:50
lifelessI'm not quite that harsh:)01:50
=== jelmer_ is now known as jelmer
* igc lunch03:21
PengHeh, I made push default to --no-strict, and it just bit me. :D03:45
mwhudsonbzr alias oops='merge --uncommitted ../trunk'03:57
mwhudsongetting bzr revert ../trunk in there would also be good03:58
lifelessmwhudson: this is another reason to use a single checkout :)04:03
mwhudsonyes, i guess that's true04:04
mwhudsonlifeless: do you prefer merge proposals to already have NEWS in them, or is best to add that at the last minute, given the potential for conflicts?04:04
lifelessthe former04:06
* mwhudson proposes a merge04:11
lifelesspoolie: I have a suggestion for your lp scripts04:15
pooliemwhudson: you can always resolve it later04:15
poolieok04:15
lifelesspoolie: 'add an approve for folk in the bzr team'04:15
lifelessso that e.g. your proposals show up with 1 approval by default, once the script runs.04:15
poolienon-canonical people in ~bzr?04:15
pooliehm, i might be confused04:16
pooliewhich script?04:16
lifelesswell you're writing lpapi scripts to help bzr get more out of lp, right?04:16
poolieok, this is a new but similar script?04:16
lifelessyes04:16
poolieinteresting04:16
lifelessthats the policy we still have that LP doesn't know about.04:16
pooliealternatively the robot could just complain about things that have had N reviews but not changed status04:17
lifelessthats also interesting to do, and different.04:17
lifelessso I wouldn't say its an alternative.04:17
pooliewould just adding those votes really add value?04:18
lifelesspoolie: I think so. At the moment I have to read two columns: author and votes.04:19
lifelessif I knew that proposals from committers would have the committers vote present in the votes column,I could scan faster.04:20
pooliehm04:21
pooliei'll think about it04:21
poolieyou can prototype this by manually voting +1 on your own things04:21
lifelessits only a suggestion ;)04:21
lifelesshmm, the script would have to run as 'root-alike' I guess.04:21
lifelessbecause it would want to impersonate the committer.04:21
lifelessthumper: ^ would be nice to be able to do the above experiment.04:22
mwhudsonlifeless: thanks for the review04:23
poolielifeless: quick call?04:32
lifelesssure04:32
bialixhello all04:49
PengHi. :)04:57
lifelesspoolie: btw https://code.edge.launchpad.net/~lifeless/testtools/0.9.1/+merge/1525605:26
lifelesspoolie: thanks for the review.05:42
pooliethanks for doing it05:42
lifelesspoolie: I think I was more saying 'this is the outcome'05:42
lifelessdo you think its more tasteful like this?05:43
pooliei do05:43
lifelesscool05:43
pooliei think it's less likely to lead to that kind of failure05:43
pooliei guess we can see if jml agrees05:43
lifelessI discussed doing a point release with him before doing the change.05:44
lifelessI'm confident he won't object to the content of the change.05:44
poolielifeless: do you have any ideas about https://bugs.edge.launchpad.net/ubuntu/+source/devscripts/+bug/43498706:35
ubottuLaunchpad bug 434987 in devscripts "chdist fails with "E: Internal Error, Could not perform immediate configuration (2) on libattr1"" [Undecided,New]06:35
poolieideally, a way to work around it06:35
vilahi all !07:28
fullermdWhoop, that must mean it's time for me to go   :p07:30
vilahehe, enjoy your night fullermd :)07:32
fullermdOh, it's hardly night, not for many many hours yet...07:33
fullermdI just got through my post-breakfast stuff.07:33
vilaoooh, you meant go *to* work, sorry for the misunderstanding07:33
pooliehi vila07:44
vilahey :)07:46
poolievila, so how about if you add the comments for shelve-no-tty and merge it?07:54
vilapoolie: fair enough, I'll do that (<- spiv)07:55
=== loxs_wrk is now known as loxs
igcping jml, spiv08:31
igcjml, spiv: can we get the emacs mirror on LP updated?08:31
igcsee https://code.edge.launchpad.net/~vcs-imports/emacs/trunk08:32
igcthe new url is http://bzr.savannah.gnu.org/r/emacs/trunk/08:32
jmligc, what should it be updated to?08:32
igcjml: how would I change that?08:32
igcjml: do I need to join some team?08:32
igcto get permission?08:33
jmligc, you need to be in ~vcs-imports. I've changed it.08:33
* jml is not here08:33
igcjml who is not there, can you re-enable that import too? It says Next mirror: Disabled08:37
jmligc, I have re-enabled it.08:38
jmlbut then it gets disabled again very quickly08:39
jmlsomething is fishfy08:39
jmlfishy08:39
mwhudsonwtf08:45
mwhudsonwhy08:45
mwhudsonis that owned by ~vcs-imports?08:45
MvGHi! While it's still some time off, I'm starting to think about trac-bzr 0.3.x releases. Have just registered a series in lp.08:45
mwhudson(it doesn't seem like it is an import branch though)08:46
MvGNow I wonder: should there be beta milestones before the official releases? Would there be enough of a user base to get actual beta-testing done?08:46
MvGOr would simply asking people around here to give latest checkouts a try be enough of a test so I could simply start with 0.3.0?08:46
bialixMvG: hi, are you about trac-bzr?08:47
MvGbialix: Yes.08:47
bialixgiven in mind there was no release at all in the past, I'd say you can just cut tarball and move forward.08:48
bialixi.e. do release, or don't08:48
bialixbeta is overkill right now08:48
MvGGlad you think so. Will certainly serve me a lot of worries.08:49
bialixthose who used trac-bzr already used to use trunk08:51
bialix(how's bad I said :-/)08:51
jmlmwhudson, I might have changed the owner way back when08:52
jmlmwhudson, a more interesting question to me is, "why does it apparently retry and then still fail with an error message referring to the old branch location"08:52
mwhudsonjml: yeah, that's a bit odd08:53
* jml drinks something awesome that rhymes with "banoffee"08:56
jmlmwhudson, I'm torn between investigating it, and not.08:58
pooliehi jml09:09
mwhudsonjml: https://code.edge.launchpad.net/~vcs-imports/emacs/trunk seems happier now09:09
mwhudsonnot happy09:10
mwhudsonjust happier09:10
jmlmwhudson, looks happyish09:10
mwhudsonlet's leave it for 6 hours and see what happens :-)09:10
mwhudsonor kill it and start again09:11
jmlmwhudson, the dates on the 'recent revision' thing seem a little off :)09:11
mwhudsonyeah09:11
jml(weird, years used to begin with a 1 and no one cared)09:12
jmlpoolie, hi09:12
mwhudsonjml: loggerhead seems to have a more plausible idea of the revisions09:14
mwhudsoni wonder if it's choking the scanner09:14
jmlpoolie, fwiw, I think that food prepared from _Lobscouse and Spotted Dog_ makes more sense over here.09:15
jmlmwhudson, I'll bet its choking the scanner.09:16
jmlit's09:16
pooliejml, i bet09:18
lifelesspoolie: re: devscripts, not offhand, let me have a look09:47
poolienm09:47
pooliei'm sending a mail summarizing where i got up to09:47
lifelessanyhow, I'd be using schroot fwiw09:51
jmllp devscripts?09:55
* bialix hates to get random errors in the tests with sftp testing server like this: PermissionDenied: Permission denied: "lock/held": [Errno 13] Permission denied10:38
=== kostja_o1ipov is now known as kostja_osipov
kostja_osipovHello10:43
kostja_osipovcould somebody help me with bzr gannotate?10:44
kostja_osipovwhat I actually need is to find out the revision id of a changeset that deletes lines10:44
kostja_osipovsince the lines are not in annotate output, I can't find the revision10:45
kostja_osipovwhat is the procedure for that in bzr?10:45
bialixI'm doubt there is simple way to find deleted lines10:45
bialixthey are deleted10:45
bialixmaybe hgrep plugin will help?10:45
bialixor log -p?10:45
kostja_osipovoh well... there of course is. you scroll back in the revision history, till you find the changeset that still has the lines10:46
kostja_osipovthe next changeset removes them10:46
kostja_osipovbut it can be quite tedious10:46
bialixI won't call this way "simple"10:46
kostja_osipovwould be nice if I could see all revisions in a file  on a time line so that I could do binary search on it10:46
bialixyou're need weave representation it seems10:47
bialixyou may want to ask jam when he'll be here10:47
=== lionel__ is now known as lionel
vilakostja_osipov: bzr qannotate provides the per-file graph, i.e. displays all the revisions that modify a file one way or another11:17
lifelessgnight11:21
bialixvila: it's not quite true: this graph is sorted and represents only revisions which modified lines in currently annotated version. but if you go back in history and annotate older versions you'll get more graph11:26
bialixbonjour vila, btw :-)11:27
vilabialix: hi !11:27
vilabialix: you're right, I keep forgetting the difference :-(11:27
vilabialix: I should really talk to garry about *not* using that graph but presenting the real per-file graph instead, I'm pretty sure the performance penalty will be lost in the noise11:28
bialixvila: sometimes I have the same needs as kostja_osipov, I'm still not found easy way to bisect this11:28
bialixvila: you can, but actually this feature done not from performance point of view11:29
bialixI guess it's intended11:29
bialixbut as we see, sometimes this approach has flaws11:30
bialixfile a bug!11:30
bialixplease11:30
jmlhello12:03
stanman246lol12:03
stanman246sometimes i work on a project with someone else. Now i'd like to do some kind of version control, he's been looking into bzr already.12:04
stanman246It's a webbased project (cakephp) and we're working on the same files every now and then, can this be controlled with bzr?12:05
jmlyes12:06
jmlin a variety of ways12:06
stanman246ok, will need to go into some tuts i guess12:06
jmlprobably.12:07
jmlstanman246, have you used a version control tool before?12:07
stanman246no12:07
jmlstanman246, the big difference from just editing files is that rather than just hitting "save", you can group changes together in a single "commit", which generally also has a short description of the change12:09
stanman246come across Git, hows that?12:09
jmlstanman246, roughly speaking it has feature parity with Bazaar. I find it's UI more complex and less helpful.12:09
stanman246jml: yes, so i saw12:10
stanman246ah12:10
stanman246but... bzr is working with .bzr folders locally right?12:10
jmlstanman246, yes, kind of, but that seems an odd question to ask.12:10
stanman246really need to tut first, before asking, sry12:11
jmlstanman246, are you and your colleague editing PHP files on the web server itself?12:11
stanman246not at first12:11
jmlstanman246, ok.12:12
jmlthat's good :)12:12
stanman246we used to use winscp to get the files, edit them and then up them12:12
stanman246but with bzr we could edit the files on the server right?12:13
stanman246I don't feel really comfy with that thos12:13
jmlit's not a good way of doing things.12:14
jmlVCS makes it slightly easier to separate changing the code from doing a release, IMO.12:14
jmland changing files onto the webserver in the web area is basically doing a release12:14
jmlanyway, here's what I'd do to start with:12:16
jmlmake a copy of your code.12:17
stanman246local12:17
stanman246right12:17
stanman246?12:17
jmlfor now, anywhere.12:17
jmljust make sure you have a copy in case everything goes horribly wrong12:18
jmlbut also have a copy that you can change into and run 'bzr init' then 'bzr add' and then 'bzr commit'12:18
jmlthis makes a branch that you can play with12:19
jmlif you put that branch onto the server (either by copying it or running 'bzr push' or something) then you can either check it out ('bzr checkout') or branch it ('bzr branch')12:20
kostja_osipovvila: thanks, I actually used bzr log -p and was able to dig up the changeset i need12:49
vilakostja_osipov: cool, did you succeed with your cherry-picks yesterday ?12:49
kostja_osipovvila: i'm still in progress.12:50
kostja_osipovI am reapplying the first patch in a series, and it touches 40 files and each file has conflicts.12:50
kostja_osipovour problem yesterday was a bit of a bit larger puzzle :)12:50
vilahmm, so you're back to doing the *first* merge without using patch -p0 ?12:51
yuvalhey all, I'm seeing the error "not installing http[s]+webdav:// support (only supported for bzr 1.12 and above)" on every command i run. any ideas why this is happening and how to fix? running bzr 2.0.013:13
marek_hi i have a question13:17
marek_i have two repos one or locally connected server13:17
marek_and other on my local host13:17
bialixmaxb: ping13:18
maxbpong13:19
bialixmaxb: do you remember your patch for qlog to preserve leading spaces?13:20
maxbyes13:20
marek_and the problem is:13:20
bialixdoes it still work for you with latest qbzr trunk?13:20
marek_i first branched from server to my localhost13:20
marek_than edited few files13:20
marek_then comited locally13:20
bialixmaxb: when I've merged your patch I've added the test. Now this test started to fail13:21
maxbbialix: oh. no, it doesn't13:21
marek_and i can see status "unknown" in olive ide... do you know what does that mean?13:21
bialixmaxb: you've asked me why I want test for such small thing. that is.13:21
maxbbialix: Your point is proven! :-)13:21
bialixcan we pair to fix it?13:21
maxbI need to grab lunch now. I will look at it in a few hours13:22
bialixok, ping me when you'll have a time13:22
bialixmarek_: any reason to not use bzr-explorer?13:23
marek_no reasons13:24
marek_:)13:24
bialixmarek_: I don't see a log of your questions but I can help with explorer, not with olive13:25
bialixmaxb: when you'll back: here is my branch with updated test: lp:~bialix/qbzr/htmlize-nbsp13:28
MvGTo anyone interested in trac-bzr: I've got 7 propesed merges waiting for review at https://code.launchpad.net/~trac-bzr-team/trac-bzr/trunk/+merges . I'd be glad if at least some of them would have a second pair of eyes looking at them before I commit them to trunk. Thanks!13:46
=== verterok_ is now known as verterok
MvGabentley, mzz: of course past contributors are particularly likely candidates for such reviews, so if you can spare the time...13:48
abentleyMvG: sorry, but I have no interest in trac-bzr anymore.13:49
MvGabentley: all right, noted. Won't bother you with this in the future.13:50
bialixmaxb: I found the root of problem, but the fix is not so trivial...13:54
bialixmaxb: fixed and pushed to trunk2a. testing are welcome14:05
stanman246hi, i've got ubuntu 9.04 running and installed bzr14:06
stanman246but the version is 1.13.1 and my colleague has the repository set up on v 2.0, can i upgrade my bzr version?14:07
vilastanman246: you can use the bzr PPA14:11
maxbstanman246: There is a bzr PPA that carries the latest released version of bzr, bzrtools and a few other things14:11
vilastanman246: https://launchpad.net/~bzr/+archive14:12
vilastanman246: or you can upgrade to 9.10 :)14:12
stanman246haha14:16
stanman246thinking of that...14:16
chxhey, 9.10 is awesome14:16
vilathe later is a couple of clicks away while the former requires a bit more work :)14:16
chxit drives my T400s just fine14:16
chxI think the only feature of the laptop that does not work is the "silence the mic" button14:17
chxbut i bet i could make that work too if i would care :)14:17
stanman246hmm... on my hp 6720s 9.10 didn't work with compiz..14:23
stanman246just did the ppa upgrade to 2.0.2!14:23
stanman246ok, now i'm gonna read some! Thanks for the info!14:27
MvGbialix: Are you still working on https://bugs.launchpad.net/trac-bzr/+bug/327508 as that report is assigned to you?14:57
ubottuLaunchpad bug 327508 in trac-bzr "[wishlist] add Bazaar Location link to the contextual navigation under Browse Source" [Undecided,New]14:57
bialixMvG: oh, no sorry, I'm not14:58
MvGbialix: I guess I'll then reasissign to nobody.14:58
beunovila, email2blog: http://beuno.com.ar/archives/16814:58
bialixyes, please14:58
bialixMvG: too bad for me, I was too busy since 2009/03 until now14:59
vilabeuno: hehe14:59
bialixpush --no-strict :-P15:01
bialixbzr upload-files FILES --no-strict :-P :-P15:01
beunobzr upload-files --jfdi?15:01
bialix--jdi? perhaps15:03
bialixoh, got it15:03
beuno:)15:05
beunoit's the ruder version15:05
vilaAnd the subliminal message is: vila,  http://beuno.com.ar/archives/168, now, jdfi15:08
vila:-D15:08
beunovila, I'm glad that got through  ;)15:09
vilaha ha ha15:09
MvGbzr clone lp:~rocky-burt/trac-bzr/bug-263300 fails for me. Seems that the launchpad bzr server for some reason isn't happy:15:58
MvGbzr: ERROR: bzrlib.errors.ErrorFromSmartServer: Error received from smart server: ('error', "Absent factory for ('TREE_ROOT', 'bialix@ukr.net-20090118015300-t997i4a3wn3jjpr2')")15:58
MvGAny ideas? Is this a launchpad issue or a bzr issue?15:58
bialixvila: Bug #48882416:03
ubottuLaunchpad bug 488824 in qbzr "qannotate: don't filter log of revisions" [Medium,Confirmed] https://launchpad.net/bugs/48882416:03
vilabialix: lp:~bialix/bzr/shelve-no-tty make the test suite fail :-/16:04
bialixdetails?16:04
bialixshelve --all / shelve --list ?16:04
vilablackbox.test_shelve.TestShelveRelpath.test_shelve_in_subdir blackbox.test_shelve.TestShelveList.test_shelve_destroy16:05
* bialix looks16:05
vilait took me a while to notice because pqm send me a truncated mail for the first failure and I didn't notice the mail at first either16:05
bialixshelve --all16:06
bialixso....16:06
bialixvila, I think plan B then16:06
vilahmm, weird, pqm fails for the second one only while both fail here..16:07
vilawhat is plan B /16:07
vilawhat is plan B ?16:07
vilaoh and thanks for filing that bug, I went to lunch and forgot :-/16:07
bialixyou reject my patch and I provide new patch which will check tty presence in osutils around lines     def getchar(): return msvcrt.getch()16:08
=== beuno is now known as beuno-lunch
bialixvila: shame on you16:08
bialixbut lunch is the most important, so ok16:09
bialixvila: but I'll need your help for testing linux-specific getchar()16:09
vilahmm, I don't think that will work, there are cases where we want to read from stdin being a file and that's a valid use case16:09
bialixmsvcrt.getchar() never read from stdin16:09
bialixthis is direct access to keyboard buffer16:10
vilabut it's windows specific16:10
bialixso what?16:10
bialixthis is the root of my problem and why this patch is created16:10
vilaso that doesn't match the cover letter of your patch that wasn't windows specific16:10
bialixvila: because I have no way to test shelve in qrun on non-windows16:11
bialixcan you?16:11
bialixanybody?16:11
* bialix screams: HEEELP16:11
bialixvila: osutils.py around line 190016:12
* bialix has no idea how linux part works, tty and termios not his area of expert16:13
* bialix trying to prepare non-qt test16:14
vilabialix: how about transfering your patch to shelf_ui.Shelver.prompt instead ?16:15
vilaso you don't have to check at two different places... or in getchar() but making the os specific versions pushed down to _getchar() ?16:16
bialixthis is possible16:16
bialixI'm clearly get lost in shelf_ui16:17
bialixusage of sys.stdout makes me nervous16:17
vilagetchar() is used only prompt() but it seems to require a real terminal anyway16:17
vilahi GaryvdM16:17
bialixprivet Gary16:18
bialixthat means hi16:18
GaryvdMHi bialix, vila16:18
bialixhi GaryvdM16:18
bialixvila: your chance to say about log in annotate!16:18
vilahehe16:18
bialixjoke16:19
bialixI've just stumbled with it myself16:19
vilaGaryvdM: bialix just filed bug #488824 about qblame not using a true per-file graph16:19
ubottuLaunchpad bug 488824 in qbzr "qannotate: don't filter log of revisions" [Medium,Confirmed] https://launchpad.net/bugs/48882416:19
vilaGaryvdM: can you remind me why ?16:19
bialixvila: so ok, I'm agree moving my tty check to prompt16:20
vilaerr, I mean16:20
GaryvdMvila: Performance16:20
bialixvila: so I need resubmit or you reject or how?16:20
GaryvdMvila: maybe have a right click - "Show all revisions that change this file" option16:20
bialixGaryvdM: I'm agree to have knob16:20
vilabialix: just pushing the change to your branch should be enough16:20
GaryvdMbialix: knob?16:21
GaryvdMI want a plugin that has a  pre_change_branch_tip hook, that I configure to run a test suit before I push to a specified location16:21
GaryvdMThat will be like a mini pqm that I can use for qbzr16:21
vilaGaryvdM: that shouldn't be a perf problem, we do that for bzr log FILE by finding the relevant keys in the index16:21
bialixGaryvdM: checkbox16:21
GaryvdMvila: Yes - but it is still slower than just taking the list of revisions from the annotate16:22
GaryvdMbialix: ok - I see16:22
bialixGaryvdM: or context menu -- does not matter16:22
bialixGaryvdM: hook? I can do it16:22
vilaGaryvdM: hmm, faster but incorrect :-) It will be nice if you could do it in the background after displaying the first page :-D16:23
GaryvdMDoes such a plugin exist, or should I write one from scratch?16:23
bialixGaryvdM: it would be pretty trivial16:24
bialixvila: can I ask about tree.is_ignored?16:24
GaryvdMvila: Yes - I can do it after the annotate has been shown.16:24
vilaBut I'm still a bit surprised that querying the index only makes such a difference compared to the annotation time... anyway, you know better, but we had a use case this morning that your current implementation doesn't help (I thought it was):16:25
bialixit was afternoon16:25
vilasearching for deleted lines can be done only if all revisions are displayed in the graph16:25
GaryvdMvila: yes16:25
vilabialix: before my lunch is morning :-)16:25
vilabialix: even if I take it at seven PM :D16:26
bialixyep, I'm a bit distracted16:26
bialix:-D16:26
bialixLOL16:26
vilabialix: what about trees.is_ignored ?16:26
bialixI think the name is awfully misleading16:28
bialixso I think is it worth to starting patch or just forget16:28
bialixthis method does not check is file actually ignored16:28
bialixit returns matching ignore pattern only16:29
vilathat's what the docstring says16:29
bialixso if file versioned but matches ignore pattern -- this function name is wrong16:30
vila>-/16:30
bialixdocstring said: Check whether the filename is ignored by this tree.16:30
vilaWhat will be a better name ?16:30
bialixthis is not true16:30
vilabialix: look at the workingtree one16:30
bialixbetter name: something about ignore pattern16:30
vilaCheck whether the filename matches an ignore pattern.16:31
bialixECONFLICT16:31
bialixbut anyway, my point still valid16:31
bialixfunction name is not correct16:32
bialixit's counterintuitive for API users (QBzr)16:32
bialixI've just yesterday fixed serious bug because of this16:32
vilaI don't follow. What are you searching for ?16:32
vilaThere is no such thing as an ignored file. If you want to be pedantic you should say: will that file be ignored if I try to add it *now*.16:33
vilaThat's what wt.is_ignored() answers16:34
GaryvdMvila: we understood it to be "is this file ignored"16:35
vilaHmm, not even16:35
vilaBut what does that mean ?16:35
gioelewt.would_be_ignored() vs wt.is_being_ignored() maybe?16:36
GaryvdMvila: The bug fix that bialix was taking about = "is_ignored = not versioned and tree.is_ingored()"16:36
GaryvdMgioele: yes16:37
bialixvila: WorkingTree subclass MutabkeTree which in turn subclass tree.Tree16:38
bialixtree.Tree is therefore defined interface IIUC16:38
bialixand interface in tree.Tree said that is_ignored checks is file actually ignored16:38
bialixI suppose somewhere along the road original meaning has lost16:39
bialixand now is_ignored means is_matches_ignore_pattern16:39
vilaSounds right16:39
bialixso to remove confusion in weak minds like mine and I have proposal to change method name16:39
vilabialix: good, you understand that means taking care about deprecating the old name right ?16:40
bialixyes,16:40
bialixthat's why I'm trying to talk with some of core devs first16:41
bialixIIUC such change is too big for 2.1.0rc16:41
bialixso better to make it after 2.1.0 gone glod16:41
bialixright?16:42
vilaThat's for the 2.1 RM to decide, don't worry too much about it, that's why we have deprecations for16:42
bialixthis function is very heavily used16:43
bialixand not only inside bzrlib16:43
bialixbut and by 3rd party tools, I guess16:43
bialixat least in QBzr definitely16:43
bialixI will worry too much16:44
vilaThen maybe only the doc should be fixed ?16:44
bialixmmmm, no. all or nothing16:44
bialixthe name is misleading in my humble opinion16:45
vilalol, is that how you negotiate ?16:45
bialixno :-)16:45
vilaha, good :)16:45
bialixbut writing such patch only to change docstring in tree16:45
bialixis too trivial16:45
bialixand this was real WTF for me16:46
bialixI guess name is wrong today16:46
vilahmmm, I'm not a native english speaker, so when in doubt, I either write a test or read the code :)16:46
bialixas you see there is 2 places to read16:47
vilaI have no idea about other implementations....16:47
vilatree.is_ignored() returning False sounds.... arbitrary, wt.is_ignored() implementation is obviously tied to .bzrignore (both the user one and the global one),16:48
* bialix inspecting qannotate for tree.py16:49
vilathe misleading bit is that the temporal indication is nowhere to be seen16:49
vilaalso, revisiontree inherits from tree so is_ignored() returning False is understandable there16:50
bialixwhat's the sense of is_ignored in revisiontree?16:52
bialixaccording to annotation Tree.is_ignored has added by lifeless in 2255.7.97 revid:robertc@robertcollins.net-20070305031021-ypbakvagbivyw5mu16:54
bialixbut this revision does not use this api, and don't test it16:54
bialixno, sorry, I'm wrong16:55
* bialix looks on Gary with prayer to search in qdiff/qannotate16:58
bialixGaryvdM: idea: what you think about adding grep to qbrowse?16:59
* bialix gave up17:00
GaryvdMbialix: Search in diff/annotate - Soon17:02
GaryvdMbialix: for browse: I was planning to use bzr-search.17:03
bialixbzr-search?17:03
GaryvdMbialix: like qlog17:03
bialixno, I mean search in files of specific revision17:03
bialixbzr-search will going through all history?17:04
bialixvila: back to shelve-notty: do you have good comment for me so I can use it when I'll rework my patch?17:04
GaryvdMbialix: but you can filter it for a specific revision easily17:05
bialixI don't understand yet17:05
GaryvdMbialix: maybe grep would be better17:05
GaryvdMbialix: anyway - I'm not plaining to work on that any time soon - sorry17:06
vilabialix: yup, see lp:~vila/bzr/shelve-no-tty17:07
GaryvdMbialix: but search in diff/annotate soon17:07
vilabialix: the tests are passing here, please test that is still works for you17:07
bialixGaryvdM: I don't asking you to work, I'm asking your opinion17:07
bialixideas bouncing as you said other day17:08
GaryvdMbialix: I see - To be honest, I'm not too familiar with grep17:08
bialixvila: branching17:08
bialixGaryvdM: heh, I'm even manage to write something like ack in python for fun17:09
vilaack or awk ?17:09
bialixgrep just searching in files for pattern17:09
bialixvila: ack17:09
vilaoh, yes, ack, I keep forgetting about it, the perl thing ?17:09
bialixyep17:09
=== beuno-lunch is now known as beuno
GaryvdMbialix: What I'm unsure of is how you could get grep to read the text of a revision tree.17:10
bialixbecause I have no desire to install Perl on Windows only for one utility it was fun to rewrite it (partially)17:10
bialixGaryvdM: I will do it via python17:11
bialixI said grep-like not grep itself17:11
bialixthere is hgrep plugin17:11
vilaI don't think hgrep works17:11
bialixI'm just bad to remember too much things17:12
vilabialix: that's why grep is good for you :-D17:12
bialix?17:12
bialixperhaps I'm said not precisely what I want to say17:13
bialixI have very long memory about things no more relevant17:13
GaryvdMvila: There is a grep plugin on http://bazaar-vcs.org/BzrPlugins, which you are the author of. Is is able to grep a revision tree?17:13
vilaTo say the truth, I'm the maintainer only because I upgraded it long ago to the current bzr version at that time,17:14
bialixvila: http://pastebin.com/d33dd960e17:14
vilaI think I remember that it worked only for the working tree and the plans were to enhance it to work with revision trees, but the internals weren't good enough to do that trivially, there may be some FIXME there...17:15
bialixvila: running full test suite takes 3 hours for me17:15
vilabialix: no worries,17:15
vilaI wasn't clear: can you test that with qrun where it was previously failing (as in before your patch)17:16
* bialix -> now17:16
vilaif that works, then push that to your branch and add a comment in the mp when done so I can merge from there17:17
vilaerr, I mean merge and submit from there17:17
vilapfff, forget that, that's silly, tell me if it works and I'll submit from here :)17:18
bialixvila: http://imagebin.ca/view/9ptrtg_B.html17:19
bialixit works17:19
vilahehe, I love Add-Art (the FireFox plugin), even if the art is not always that good, it's always a pleasure to realize that I avoided yet another ad :)17:20
* bialix using NoScript17:20
vilaYeah, I really should do that too, but I'm lazy and they say there is no virus on Linux :-D17:21
GaryvdMI use adblock plus. I'm all ways surprised how many ads there are when I work with out it :-O17:22
vilaGaryvdM: Add-Art is on top of adblock :)17:22
GaryvdMvila: Oh - I see17:23
bialixso vila you don't see my wonderful screenshot? :'-(17:23
* bialix crying17:23
vilaI see you screenshot, not the ad at the top of the page ;)17:23
bialixI don't see AD either17:24
vilameh, soory for the confusion,  the ad was on the pastebin17:24
bialixI understood17:26
=== oubiwann_ is now known as oubiwann
vilagnight all17:37
bialixbye17:38
* bialix will go home too17:38
bialixbye all17:39
GaryvdMbye17:39
jonohi all18:34
GaryvdMHi jono18:34
jonohey GaryvdM18:49
jonowhen merging I see an M next to files but one has a * - what does that mean?18:49
jelmerjono: IIRC some of its metadata changed (perhaps it become executable or is no longer executable?)19:14
jelmer*became19:14
jelmeryep, looks like it - see "bzr help status-flags"19:14
jonothats the one19:14
jono:)19:14
jonoit was a perms change :)19:14
GaryvdMjono: Sorry - My connection went down. The * most likely the execution permission bit changed.19:44
jononp :)19:44
jonofigured it out19:44
jonothanks!19:44
GaryvdMcool19:44
ronnyjelmer: dulwich seems to have a set of methods that look duplicate on the fist look19:44
ronnyom, mom, pulling the most recent to be sure19:45
ronnyjelmer: ah, right, at least the from_file/from_string classmethods are unnecessary at each class19:47
lifelessmoin19:47
GaryvdMHi lifeless19:48
lifelesshi GaryvdM19:49
ronnyjelmer: and i really dislike the exception hierachy now that i take a look at it, i'll try to make a patch19:51
jelmerronny: That's for historical reasons19:53
jelmerronny: patches are welcome, but I'm not very keen on breaking backwards compatibility..19:54
jelmerronny: btw, there is a #dulwich now19:56
ronnyjelmer: i dont intend to break the backward compatibility20:18
brmassaGuys, on C/C++ projects, do you normally track the entire project directory or just the source files?21:40
AfCbrmassa: "entire"?21:41
=== r0bby_ is now known as r0bby
brmassaAfC: including the "/bin", "/includes" and other possible directories.21:41
AfCbrmassa: well, if bin/ is _build product_ then no21:43
AfCbrmassa: ie, no need to version control things that your build creates.21:43
brmassaAfC: its useful coz it will track the directories changes (where the project is going to be build), but it also polute the bzr status with tons of files that doesnt need to be versoned21:43
AfCbrmassa: (I suspect you know that, which is why I'm trying to figure out the nuance of what you're asking)21:43
brmassaAfC: yep,.21:43
lifelessbrmassa: you could 'bzr add --no-recurse bin; bzr ignore bin'21:43
AfCbrmassa: bzr understands how to ignore things21:43
AfCbrmassa: but you want to do:21:44
AfC$ bzr help ignore21:44
brmassaAfC: the makefile/projectfile generally include information that is a little beyond the /src dir, like where to build the project. so it would be nice to track the entire project dir, excluding the content of certain dirs.21:45
AfCbrmassa: that said, I'm not sure why you'd need to version the directory bin/ if it is a temporary (or final) output of the build. Surely your Makefile (or whatever) knows how to mkdir bin21:45
brmassaAfC: my question was more like the common practice than a howto. what people normally do.21:45
AfCbrmassa: right. So version control Makefile.21:46
AfCbrmassa: ah. Well, I can't speak for anyone else, but in the GNOME world we don't version control build artifacts.21:46
brmassaAfC: hmmm not even the directory structure needed to build a given app?21:47
AfCbrmassa: there is a *horrible* tendency in the Windows centric side of the Java world to whack .jar files the project depends on into version control21:47
AfC(partly because they don't have a proper package management system they can query & reply on, and partly because they're just doing the wrong thing out of sheer bloody mindedness :)21:48
AfCbrmassa: sure, you can do that, but why not have your Makefile (or whatever) mkdir your temporary & output structure for you?21:48
lifelessbrmassa: if you need a directory structure, and your toolchain doesn't create it automatically, versioning the structure would be a good idea.21:48
lifelessbrmassa: what toolchain are you using ?21:48
AfC[thereby making it just the sort of thing that can be a) `bzr ignore`d and b) `make {dist,}clean`ed21:48
AfCbrmassa: other than that, listen to lifeless :)21:49
PengIf you have to version e.g. bin, you could still "bzr ignore bin/*".21:49
AfCbrmassa: [as indeed this isn't the place to talk about comparative merits of different toolchain strategies; bzr can do what you're asking if that's the way you wish to do it]21:49
brmassalifeless: im programming using Qt's qmake. well.... it does create directories if i tell so, but i was wondering to just track the myproject/src dir...21:50
=== mwhudson_ is now known as mwhudson
AfCOh, there's a gem: on #cairo, "git has erased all history of that merge"21:50
lifelessbrmassa: you should track the things that are both: things other people will need to build the software AND things they can't get elsewhere21:51
brmassalifeless: hmmm nicely put21:51
lifelessdirectories that the toolchain can make for you aren't in that set, IMO :)21:52
AfClifeless: that _was_ nicely put21:52
* AfC takes a quote of that, and then wonders how to properly cite an IRC discussion in a footnote :)21:53
brmassaits because i use a specific dir structure on all my projects, like myproject/src, myproject/includes, myproject/bin, myproject/tests, myproject/media, so i was wondering to just version the part of it instead the whole structure...21:53
brmassabut for new developers, who wil download the bzr tree, it might help to just see the BIN dir...21:54
AfCbrmassa: {shrug} they will after they type `make` :)21:55
brmassaAfC: yep. maybe u r right.21:55
AfCbrmassa: in most projects I'm maintainer of, things are structured so that with the exception of a Makefile fragment called .config created by our [custom] top level ./configure,21:55
AfCbrmassa: *all* the build output runs out into directories under a top level tmp/ that the build creates for itself21:56
brmassaAfC: nice. it seems to be the right thing to do. well thank all you guys.21:57
AfCbrmassa: [with one further exception that there's an entire source tree created during the first step of the build, and so the build mkdir's a tree called generated/ for that]21:57
AfCbrmassa: [but in this case generated/ is a peer twin of src/ so it rather made sense]21:57
AfC[it could have been tmp/generated/ too]21:58
lifelessAfC: thanks21:59
thumperlifeless: any idea on bug 485318 ?22:53
ubottuLaunchpad bug 485318 in launchpad-foundations "POSTToNonCanonicalURL error using bazaar client" [Undecided,Incomplete] https://launchpad.net/bugs/48531822:53
lifelesslooks like a bug to me22:53
thumperlifeless: should I add a bzr task?22:55
thumperlifeless: or reassign?22:55
lifelesslet me have a look22:58
lifelesswhat is %20 - ' ' ?22:59
lifelessyeah22:59
thropehello - I was following loggerhead and noticed there have been no changes since may... my branch is following %7Eloggerhead-team/loggerhead/trunk/ but I had a look on launchpad and I think they moved to trunk-rich23:07
thropecan I do bzr switch in my tree? or will it mess everything up23:07
thropeor can I pull from the trunk-rich23:08
lifelessthumper: bzr pull lp:loggerhead23:08
lifelessthrope: ^23:08
lifelessthrope: and if that errors, run 'bzr upgrade' before pulling ;)23:08
thropeERROR: KnitPackRepository('file:///home/robince/src/loggerhead/.bzr/repository/')23:09
thropeis not compatible with23:09
thropeCHKInventoryRepository('http://bazaar.launchpad.net/%7Eloggerhead-team/loggerhead/trunk-rich/.bzr/repository/'23:09
thropemaybe my bzr on this machine is too old23:10
lifelessthrope: do you have 2.0?23:12
thropeno 1.16 on here I think... just upgrading23:12
PengIf it knows about CHKInfoRepository, it has to be at least 1.18, no?23:16
pooliehello lifeless, peng23:16
Pengpoolie: Good $timeofday. :)23:16
thropeits ok now23:17
lifelessPeng: 1.16.1, but see my mail about emacs for why thats not enough23:20
lifelesshi poolie23:20
Peng1.16.1, eh?23:23
lifelesspoolie: you might like to add #launchpad-dev to your channel list23:28
poolieoh as opposed to lp-code?23:28
pooliemy config is out of date23:29
lifelessand, not xor23:29
Peng#launchpad-code?23:32
lifelessPeng: lp-code is on irc.canonical.com23:33
lifelessPeng: its where dev discussion happened before the open sourcing23:34
PengOh.23:34
PengIs irc.canonical.com open to the public (i.e. me)?23:34
lifelessno23:35
lifelessunless you get a job with us :)23:35
Peng:D23:35
thropeso I finally got loggerhead running through my apache proxy with serve-branches since the start/stop scripts are deprecated23:46
thropeI can see host.net/nn_review/files  fine with css etc23:46
thropebut basically every link is broken23:46
mwhudsonthat seems surprising23:46
thropechanges, annotate/head%3A/nnreview.py23:47
thropeall give Not Found23:47
mwhudsonif the css/js links are right, i'd expect the other links to be right too23:47
thropeI am using RewriteEngine instead of ProxyPass23:47
thropecould that be it?23:47
thropeI couldn't get ProxyPass to pass the front page properly23:48
thrope(I dont want a prefix, just bzr.host.net/23:48
mwhudsonthrope: do the links look wrong, or are urls you would expect to work not working?23:48
thropenot sure about the colon above23:48
thropeah wait23:48
thropethey are to http instead of https23:48
mwhudsonoh right23:49
mwhudsonthrope: you might be able to use proxypassreverse to fix this23:49
thropehow can I tell loggerhead that?23:49
mwhudsonbut i don't know how that works23:49
thropeah ill try proxypass again23:49
mwhudsonthrope: i don't think you can, i could add a --https flag to serve-branches23:50
mwhudsonbut i don't think i did, just thought about it23:50
thropeyeah the proxy pass didnt make any difference23:51
mwhudsonah23:52
mwhudsoni misunderstood how that works23:52
thropedo you know if theres somewhere in the code I can add the 's' in... actually now I think about it I think I did that before with the older version23:55
thropebut it looks like its got more complicated since then ;)23:55
mwhudsoni should just give up and generate relative links23:56

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