Pengmwhudson: Doesn't help for redirects.00:02
mwhudsonPeng: but proxypassreverse does00:03
awilkinsShould it really take over 6 minutes to branch the Launchpad repository from one local disk to another?00:05
awilkinsIt's throwing a lot of CPU at it when I think it would be relatively quick to just... copy the folder.00:06
awilkinsNow, that's just lazy. But still.00:06
lifelessbranch validates data00:07
lifelesswe don't know if its e.g. removable or network or trusted or not00:07
lifelessif you just want to copy the folder, I suggest you copy the folder.00:07
awilkinsIt just seems a lot of CPU time for a repo of ~ 300MB00:07
lifelessdo you have the C extensions?00:08
awilkinsShould do, it's from the PPA00:08
thropemwhudson: links from the landing page with the list of repos all have https, but links from within a served repo dont any more00:09
mwhudsonthrope: links in directory listings are *really* relative00:09
mwhudson<a href="$foo">foo</a>00:09
Peng...But they still invoke HTTP redirects cuz they leave off the trailing/. :D00:09
mwhudsonPeng: you can fix that if you like00:10
PengOh. It's totally trivial to fix. Doing so now. :D00:13
mwhudsonthrope: try bzr+ssh://bazaar.launchpad.net/~mwhudson/loggerhead/relative-links00:17
thropemwhudson: great - it works! thanks a lot!00:21
mwhudsonthrope: awesome00:21
mwhudsonthrope: you'll need to use proxypassrequest to handle the redirects00:21
thropeyou mean proxypassreverse? or something else (dont know what proxypassrequest is)00:24
PengDarn, it's a little bit trickier to add trailing slashes to breadcrumbs, cuz you have to avoid making the root link to //.00:25
mwhudsonthrope: i mean that yes, sorry00:26
* mwhudson needs lunch00:26
thropethere are a few problems poking around00:26
mwhudsonah ok00:26
thropeview branch changes goes to nn_review/changes/14start_revid=1400:26
* mwhudson can believe it00:27
thropegives internal server error00:27
thropebut https stuff is ok00:27
mwhudsonthrope: where is that?00:27
thropeand "view changes to this file" button leads to nn_review/changesfilter_file_id=nnreview.py-20091126142852-yobx026pq984w1a0-1 which gives not found00:27
mwhudsonthrope: ah stupid mistake00:28
thropesorry nn_review is my branch, from nn_review/files/13 i click the view branch changes button00:28
thropeit works with the ? in by hand00:28
mwhudsonthrope: pull again?  you want r39700:28
mwhudsoni forgot to put the ? in00:28
thropeah breadcrumbs (I think thats what their) called at the top are still non https (root)/nn_review at top of changes page00:31
thropefunny thing mouse over is https but actual link is http00:32
thropeanyway thanks a lot - I have to head off now00:33
thropehappy thanksgiving to any us folks (normal day here!)00:33
mwhudsonPeng: can you review/test https://code.edge.launchpad.net/~mwhudson/loggerhead/relative-links/+merge/15298 ?00:37
* mwhudson lunches00:37
Pengmwhudson: I'll test it, at least.00:42
Pengmwhudson: I have been fortunate enough to avoid learning anything about URL handling. :)00:42
Penglifeless: Check finished. 945 inconsistent parents, but nothing worse.01:41
PengOnly took 26.5 hours. Nice.01:41
lifelessPeng: cool. check with vila - he has history there - but I suspect 'reconcile' is in order.01:41
fullermdbzr's pretty impressive; *I* was never able to reconcile my parents' inconsistencies...01:42
Penglifeless: How do you reconcile something on LP, though?01:42
lifelessPeng: pull, reconcile, sftp/hitchiker and nuke the repo; push01:43
lifelessPeng: this is for the candidate converted maria, right?01:44
lifelessor 'spmdo reconcile url'01:44
lifelessspm: ^ :)01:44
Penglifeless: Yeah, it's for Maria.01:44
Penglifeless: How do you reconcile a stacked branch?01:45
lifelessPeng: same same01:45
PengIt'll automatically reconcile the stacked-on repos just fine?01:45
lifelessit reconciles the stacking branch and repo only01:46
PengWell, that's still OK.01:46
PengI don't know which repo the inconsistent parents are in, though. :\01:46
lifelessyou did 'bzr check' locally though,right ?01:47
lifelessso they are local01:47
lifeless :)01:47
PengBut I have copies of everything locally.01:48
lifelesscheck checks only the local repo/branch01:48
lifelessgotta eat01:49
PengAnd, actually, I don't think I've added any revisions to my MySQL repo since I last checked it, and there weren't any inconsistent parents then...01:50
Penglifeless: If it only checked the...1400 revisions in the stacked branch, why the heck did it take 26 hours?01:52
PengI'm reconciling LP over ssh, just to see how awful it is.01:57
lifelessPeng: not branch, repo02:05
Pengs/stacked branch/stacked branch's repo/, then.02:06
Peng...One reconcile died with a KeyError.02:06
lifelessPeng: check has issues ;P02:07
PengWhen reconcile says it's repacking, does that mean it's done reconciling?02:10
PengOr is that part of reconcilnig?02:10
PengNow another reconcile has crashed with the same KeyError.02:12
PengAnd there goes the last one.02:15
PengYeah, _that_ makes me confident about the integrity of my repo. :P02:15
spm'spmdo reconcile url' rofl02:18
PengOh hi. :D02:18
spmhey Peng, so what's up - am trying to put 2+2 together from the backscroll?02:20
Pengspm: I'm just reconciling a branch or two (lp:~mnordhoff/maria/5.1-2a and lp:~mnordhoff/maria/5.2-2a), including the copies on LP.02:21
PengBut reconcile crashes now. :\02:23
PengAh. It's bug #441125.02:24
ubottuLaunchpad bug 441125 in bzr "bzr: ERROR: exceptions.KeyError: ('makefile.am-20080508221105-rbs9wugi1qq76gcs-2', 'scott@netsplit.com-20090702173125-4nayj8jp8h4f8jnq')" [High,In progress] https://launchpad.net/bugs/44112502:24
pooliewhere does this "20 characters message" come from?02:27
PengMaybe I'll stop using stacking, locally and maybe even on LP.02:28
lifelesspoolie: ?02:28
Penglifeless: It's in one of the recent mailing list messages about emacs.02:28
spmhrm. oki, digested that bug report. So I'm guessing this is going to need me to fiddle with backups or some such?02:28
lifelessPeng: if you're pushing up a fresh mainline thats been converted, you won't want it stacked.02:28
Penglifeless: I pushed up lp:~mnordhoff/mysql-server/mysql-5.1-2a non-stacked, and then have all of my other branches (including Maria) stacked on it.02:29
Pengspm: Well, originally the "spmdo" was just to run "reconcile" on the two branches on LP. Then it turns out reconciling them fails, so it's moot.02:30
spmPeng: ahhh. bummer. ok.02:30
PengI hate stacking. :(02:31
=== arjenAU2 is now known as arjenAU
* igc lunch04:15
pooliespiv, around?04:56
pooliei have some python weirdness for you:04:56
* spiv looks04:57
pooliei think in 2.5 and up 'exitfunc' is not a real method anymore, and04:57
poolieprobably logging is causing the compatability method aluded to in http://bugs.python.org/issue235604:57
poolieto activate04:57
poolieand if i remove that, it breaks04:58
spivpoolie: hmm, the stdlib docs do say it might not be set04:59
spivpoolie: file:///usr/share/doc/python2.6/html/library/sys.html#sys.exitfunc04:59
spiv(And that it's been deprecated since 2.4, but we knew that already I think)05:00
poolieok, this is it05:00
spivpoolie: so I suppose the correct thing to do is actually "exitfunc = getattr(sys, 'exitfunc', None); if exitfunc is not None: exitfunc()"05:00
poolieor to run atexit._run_exitfuncs()05:00
poolieor we can just say that there is nothing like that05:01
pooliebut the getattr is probably a safer change05:01
spivYeah, we're stuck with either a deprecated interface (sys.exitfunc), or an undocumented one (atexit._run_exitfuncs).05:02
pooliewhen in doubt, prefer the smaller diff05:03
pooliethe good thing about this is that this patch is avoiding loading at least one file (atexit)05:03
spivAlthough the *implementation* of atexit is actually to install _run_exitfuncs as sys.exitfunc.05:03
spivSo in practice it's the same thing.05:03
poolieprobably not enough to matter, buta  small chance you'd have to wait until the disk head got to it05:03
spivBut getattr avoids an import ;)05:03
igcpoolie: didn't you put the explorer website into the list of automatically refreshed ones?05:17
pooliei thought i did05:17
igcpoolie: I pushed a change there an hour ago05:17
igcand it's not appearing yet05:17
* poolie checks05:17
poolieat the moment it only runs once per day05:18
poolieit can be more05:18
pooliebut now that it does the sphinx generation it actually takes a fair amount of work to do all of them05:18
poolieso i turned it down05:19
igcpoolie: once a day ought to be fine for the core docs. Maybe bzr-migration-docs and bzr-explorer-website could be hourly. They ought to be far more lightweight05:25
igcpoolie: I maybe I just need a way to do it on demand05:25
pooliei'll just make it hourly for now05:30
poolieit'll kick off soon05:30
pooliewe should probably move it all into a role account that you can get at but i don't really want to do that right now05:31
Rotaerk_can bazaar handle having a branch of one repository nested inside a branch of another repo05:38
Rotaerk_I'm thinking that I'd like my dependencies handled that way05:38
Rotaerk_i.e. one repo per solution.  if the main project in solution A depends on the main project in solution B, I create a branch of solution B's repo inside a folder in the branche of solution A's repo05:39
Rotaerk_that way the version of B that A depends on can be updated whenever, and easily05:40
spivRotaerk_: I don't know precisely what you mean by "solution", and I suspect what you mean by "repository" isn't quite what bzr means, but I think the answer may still be yes.05:41
spivRotaerk_: if you have branch of one project at foo/, and a branch of another project at e.g. foo/libs/bar, then that's fine by bzr.05:43
Rotaerk_hmm okay sounds good, thanks05:43
Rotaerk_"solution" and "project" are part of the visual studio code organization model05:43
spivRotaerk_: bzr won't keep track of which version of libs/bar you happen to have in foo/, but it won't get confused or anything like that.05:43
spivRotaerk_: so you can do "bzr pull" or "bzr commit" etc inside foo/libs/bar, and the fact that it's inside foo/ will be irrelevant05:44
spivAnd similarly you can pull, commit etc in foo/ without disturbing the branch in libs/bar05:45
Rotaerk_okay time to try it05:46
spivYeah, that's the best way to figure this out I think :)05:46
Rotaerk_just didn't want to screw up my current repo if bazaar would be confused by it05:46
poolieigc: how now?05:48
igcpoolie: excellent. thanks!05:48
igcpoolie: http://doc.bazaar-vcs.org/explorer/en/tutorials/open-source-dev-gnome.html05:48
poolievery nice!05:54
poolieigc, i wonder if not specifically mentioning emacs would be sound better?05:55
poolieafter all we'd be willing to provide site policy for any hosting site05:55
poolieit would make it look more like you're using emacs & savannah just as an example05:55
igcpoolie: I'm not sure I understand what you're saying05:56
Rotaerk_if i created a branch and want to get rid of it, can I just delete the folder it's in, or is there a command I need to use05:56
igcthe doc is explicitly aimed at the Emacs developers05:57
igcbut generalised to be useful to others05:57
pooliei'm saying the document seems to have some tension about whether it's specifically for emacs, or just using emacs as an example05:57
Rotaerk_hmm nm, I guess I can just delete it... since bzr has to scan to find branches, it must not actually track them05:58
poolieit's just an observation, not a big problem05:58
igcpoolie: it's meant to be general with Emacs as an example ...06:00
igcbut good enough to show Emacs developers the "right" way to get started06:00
igcpoolie: should I take out the note re savannah push policy perhaps?06:01
pooliegiven what you just said i'd probably write it as something like this06:01
poolie"explorer knows about the right way to publish to different hosting sites, but at the moment not how to publish to Savannah where emacs branches are hosted.   (Patches or information on how it should work gratefully accepted.)  Therefore we have to manually tell it where to push this branch...."06:02
igcpoolie: ok06:04
Rotaerk_hmm darn06:04
Rotaerk_given branch of repo A at aaa, and branch of repo B at bbb, if I create a branch of bbb at aaa/bbb, I can't do "bzr add bbb" from aaa06:06
=== timchen1` is now known as nasloc__
Rotaerk_it remains unknown06:07
Rotaerk_was hoping that revisions of A could contain snapshots of branches of B06:08
spivRotaerk_: no, unfortunately.  We'd like to support something like that, but it hasn't gotten past the experimental stage yet.06:18
Rotaerk_hmm I wonder if git or mercurial can do that06:19
spivRotaerk_: that's what I was trying to say when I said "bzr won't keep track of which version of libs/bar you happen to have in foo/"06:19
Rotaerk_ah I see06:19
Rotaerk_is there any other way to go about what I'm wanting to do?06:19
Rotaerk_i.e. have particular revisions of A dependent on particular revisions of B06:20
Rotaerk_i think SVN can handle this using "externals"06:21
Rotaerk_though I've only heard about it06:21
spivRotaerk_: there are some plugins and add ons that might help06:22
Rotaerk_ah this is actually listed as a limitation on the bazaar site06:22
spivRotaerk_: http://bazaar-vcs.org/ScmProj is one, there was also a mailing list thread touching on this recently06:22
spivRotaerk_: it starts at https://lists.ubuntu.com/archives/bazaar/2009q4/064637.html06:23
Rotaerk_hmm thanks06:25
igcpoolie: how does one get permission to upload to our +downloads page. Is it joining ~bzr?06:35
pooliei think so06:36
poolieshowing the current transfer rate is geeky provicialism (according to sjt)?06:37
igcpoolie: can we add the guys making mac packages into there then?06:37
poolieof course06:37
poolieif you just add them to that team they'll get a lot of mail06:38
poolieit may be better to work out what lp role controls access, and then make that a different group06:38
poolieit may not be possibly06:38
poolieit's probably better also to add them to bzr-core06:38
=== Rotaerk_ is now known as Rotaerk
igcpoolie: the PPA packaging guys are in bzr, not bzr-core. hmm06:40
igcdownloads sounds similar to PPAs conceptually wrt permissions?06:41
pooliethe ppa is an example of one thing that sends a fair amount of mail to its owners06:45
pooliei trust the guys doing packaging of course06:45
pooliei don't mind adding them to any group06:46
poolieperhaps the easiest thing is to just add them to ~bzr and then if that's not working, try something else06:46
Rotaerkmeh, I only wanted to nest revisions of B within a revision of A so that I could setup a reference from project A to project B, but instead I'll just build B and copy B.dll into A06:57
vilahi all07:38
PengHi. :)07:39
spmhey vila!07:42
bignose‘bzr branch lp:foo’ is agonizingly slow. what protocol is being used when I specify the scheme ‘lp:’?08:16
Pengbignose: If you've run "bzr launchpad-login", bzr+ssh. Otherwise, http.08:16
bignoseI don't have a Launchpad account. can I easily make ‘lp:foo’ use ‘bzr+http’?08:17
PengLP doesn't support bzr+http.08:17
bignosewhy on earth not?08:18
PengProbably cuz all of the LP developers use bzr+ssh, so it's not important to them. :P08:18
lifelessbignose: time08:18
lifelessPeng: no08:18
lifelessPeng: we want to. Needs TUITS08:19
bignoseit's not simply a matter of upgrading the Bazaar instance on Launchpad?08:19
Penglifeless: TUITS?08:19
Pengbignose: It's a matter of...setting it up.08:19
bignosePeng: specifically, round tuits.08:19
lifelessPeng: ^08:19
bignoseas in, “We haven't got a round tuit”.08:20
lifelessbignose: its a deployment/testing issue08:20
bignosehmm, perhaps there is something in Stephen J Turnbull's somplaints about the degree of difficulty in setting up a Bazaar server.08:21
lifelessPeng: a better one - http://www.stosyth.gov.uk/default.asp?calltype=sep03roundtuti08:21
lifelessbignose: its about 5 lines of apache config08:22
lifelessbignose: but we have loggerhead, which is fragile at scale, and we really don't want to destabilise that08:22
lifelessand they have to coexist on the same space.08:22
bignoseokay. well, I can only agree with Stephen that it's a black eye for Bazaar when one's first likely interaction — branching an existing project— is dreadfully slow by default.08:23
* igc dinner08:24
lifelessbignose: setting up is in fact documented - 'running an http smart server'08:24
AfCI can't agree. Setting up a bzr:// server was easy.s08:25
bignoseright, but that doesn't affect that Launchpad doesn't have it enabled, which immediately raises the question of why it's difficult for the experts to do. (and most people asking that question are likely to come to the “because it's too difficult” conclusion)08:26
lifelessbzr+http is a little more fiddly, but not much.08:26
bignoseum. what protocol does ‘bzr://’ run over? is it different from ‘bzr+http://’, ‘bzr+ssh://’?08:26
bignoseit seems to me the read-only one is the important one for PR.08:27
AfCbignose: it runs over the bzr protocol08:27
lifelessomg the doc search is slow08:27
Pengbignose: bzr:// servers listen directly on TCP port 4155; they aren't tunnelled over SSH or HTTP or anything.08:28
bignoseoh okay. well, that raises the question: if *that*'s the easy one to set up, why doesn't read-only ‘lp:foo’ use that protocol by default instead of slow ‘http://’?08:28
lifelessbignose: because lp isn't a typical deployment.08:28
lifelesstheres a db with virtual filesystem and 'stuff'08:29
lifelessas well as private branches to consider08:29
AfClifeless: (which is a shame, because otherwise it would promote bzr:// quite well)08:29
bignosebut it's the most public one. “let's see how Bazaar performs over the network” is highly likely to lead to branching a project from Launchpad without an account there.08:29
lifelesshttp://doc.bazaar-vcs.org/bzr.2.0/en/user-guide/http_smart_server.html documents how to run a bzr+http setup08:29
lifelessrunning bzr:// from inetd is ridiculously simple for straight forward environments (and savannah is AFAIK - its no where near as complicated a setup as LP's production environment)08:30
bignoseand hence branching from ‘lp:foo’, which leads to HTTP without specifically asking for it, which leads one to think that Launchpad and/or Bazaar are very slow over the network.08:30
* fullermd still vaguely wishes he could setup bzr+http on a non-trivial setup...08:31
lifelessbignose: as I said, we want to do it. the team that is responsible also has a bunch of other things to do.08:32
bignoseso I think this ties directly into Stephen's observations about PR and what Bazaar (and Launchpad, and Canonical, etc.) can do to improve image: get the most obvious Bazaar site working very fast by default.08:32
lifelessis it hard? not any harder than the other bugs they are working on. But they haven't gotten to it.08:32
bignosenaturally. so perhaps, since Ian has published a guide, in response to Emacs developers needing to learn more about Bazaar, and specifically using Launchpad as a demonstration ... now is a good time to raise the priority of setting up a fast protocol by default for ‘lp:foo’ branch URLs.08:34
bignoseto forestall a whole lot of Emacs developers, who might have otherwise been on the fence, having an abysmal first experience with Launchpad.08:34
lifelessI think that you should make this observation on the list.08:35
bignoseokay, shall do.08:35
lifelessTHe folk that need to see it are out drinking beer at the moment. ;)08:35
=== jamesh_ is now known as jamesh
=== weigon_ is now known as weigon
bignoselifeless: done, thanks.08:53
* fullermd waves at bialix.09:02
* bialix waves back09:02
bialixhi fullermd :-)09:02
stanman246hi, not a bzr question, but i guessed i'll drop it anyway... Anyone using Krusader for filetransfers?09:17
Tortyi have a question: it is possible to include the current Rev.number into my source files?09:20
Tortyi.e. in sourcefile "###bzr-rev###" and bzr replace this with the current Rev. number?09:21
Tortyi know in CVS/SVN it its possible09:21
Tortyi think this replacement should be done by commit command09:22
Tortybecause only the currently commited files should be became the new rev.number09:23
Tortyany idea?09:23
PengTorty: Generally you make your build system do "bzr revision-info >version.txt" or somesuch.09:24
PengTorty: But there is the bzr-keyword plugin if you want it.09:24
PengOr is it "bzr-keywords"? I don't remember.09:24
Tortyi think i dont know what you mean (advice: write simple english *g*)09:28
PengTorty: The usual practice is to make your build system do it, using a command such as "bzr revision-info".09:28
PengTorty: But there is a plugin that does what you want. See http://bazaar-vcs.org/KeywordExpansion09:29
Tortyok i read09:29
Tortyok it seems to be what i searching :-D thx09:30
PengTorty: That page looks a little out-of-date. It might be better to start at https://launchpad.net/bzr-keywords09:30
fullermdThe plugin functions more like PoC than usable code, for various reasons.  Some of the changes needed to really use it are only in 2.1, and I'm pretty sure some aren't anywhere yet.09:36
* vila cries, testtools doesn't support python2.4 (it requires functools) :-( <- lifeless09:42
lifelessvila: https://code.edge.launchpad.net/~lifeless/testtools/2.409:43
jmlhas bzr's auto-resolve behaviour changed recently?09:43
lifelessjml: I don't think so09:43
jmlvila, lifeless: actually: lp:testtools09:43
lifelessvila: but you probably want that branch + my 0.9.1 branch.09:43
jmlUsing '=' to underline things confuses the auto-resolver.09:44
lifelessjml: oh yeah, sorry.09:45
lifelessuse ---- perhaos09:45
jmlproblem for another day, I think.09:45
lifelessor ++++ actually, that shouldn't be used there and should be unique09:45
* vila sends love to lifeless, jml and checks09:45
fullermdvila: By the by, 8.0 final release was finally cut.09:48
vilafullermd: Great, thanks for telling me, I'll upgrade asap09:48
vilajml, lifeless: lp:testtools still has the problem, trying 2.4 + 0.9.1 branches now09:50
jmlvila, oops. pushed to wrong location09:51
* vila jumps on the brake pedal09:51
jmlvila, lp:testtools should have 2.4 now09:52
* vila laughs at the commit message and wishes all commit messages were like that :)09:52
* vila confirms --parallel=fork works again with 2.4 \o/09:53
vila11 mins between tears and joy, who said bzr was slow ?09:54
vilayes, I know, that's a totally unfair reasoning :-D09:55
fullermdMan, that's pathetic.  CVS can go from joy to tears in SECONDS.09:55
lifelessjml: push 0.9. to trunk ? :)09:57
jmlno, not now09:57
jmllifeless, I was writing the release announcement and uploading the tarball. Now I can do the branch bit :)09:58
lifelessjml: I would just push 0.9 to trunk again, is aall I meant09:59
jmllifeless, rather than merge?09:59
lifelesswe haven't landed anything on trunk that we haven't also landed in 0.910:01
lifelessif we had it would be different. Just a thought.10:02
lifelessI don't intrinsically care.10:02
jmlthat's a release, I think.10:04
jmlcrap. PyPI10:05
jmland setup.py10:06
jmldammit, I can't believe I need a release checklist for such a small project.10:06
lifelessyou always need a checklist.10:07
lifelesswrite a tool.10:07
fullermdSometimes I hate the day I internalized 'write a tool'...10:08
lifeless-> fud10:08
bialixlifeless: what;s tool?10:10
vilabialix: ?10:10
bialixvila: hello10:11
bialixwhat I should write in authentication.conf if I want to specify details for bzr+ssh10:11
vilabialix: hello :)10:11
bialixscheme = bzr+shh10:11
bialixor just ssh?10:11
vilano, scheme = ssh, that's valid for both bzr+ssh and sftp since that's really the same scheme10:11
bialixvila: thanks very much10:12
* vila thinks the problem has been raised already and a warning is emitted ?10:12
TortyPeng: i've installed new bzr and the plugin but i have problems to understand what i have now to do10:12
vilaOr am I just dreaming that I wrote the fix ?10:12
Tortyi mean the keywords-plugin10:12
Tortyon Launchpad the documentation is missing10:13
bialixvila: works perfectly!10:13
PengTorty: Did you see above what fullermd said about the bzr-keywords plugin?10:14
Tortyon launchpad?10:14
jmllifeless, I'll write a tool after I have a checklist, probably.10:14
jmllifeless, anyway, release done.10:15
Tortyah - fullermd here on irc - no - i have to reboot my system10:16
Tortyno chat-log active10:16
Tortycan you paste me what he said10:16
PengTorty: 09:36:46 < fullermd> The plugin functions more like PoC than usable code, for various reasons.  Some of the changes needed to really use it are only in 2.1, and I'm pretty sure some aren't anywhere yet.10:16
Tortythx - mom i try to translate ...10:17
PengTorty: Short version: it's still experimental and doesn't work completely.10:18
Tortythis means the plugin ist useable up from 2.1 version of bzr?10:18
Tortyaha - but in future this replace-feature (bzr-keywords) will be working10:19
fullermdWith versions before pretty recent dev head, the keywords won't update all the time when you perform bzr operations.10:19
fullermdAnd with any version I know of actually existing, filtering in general can only be configured globally, so you can't turn them on in a single branch.10:19
Tortybut the feature will be finialize in newer versions10:19
Tortygood to know10:19
Tortywhat means also: if i want rev.# in my sources i have to do it by hand10:21
Tortyor (bedder) dont include it in source files10:21
Tortyok thx - i wish you a nice weekend10:22
vilafullermd: And people still don't believe that computers have feelings.... The freeBSD8 VM just crashed...And it runs from a different host than the one I use to do IRC....10:56
fullermdvila: 's what you get for running emacs on it   :p11:07
vilafullermd: pfff, not even, it was running unattended :)11:12
vilafullermd: more seriously, since it crashed, I may as well upgrade now, http://wiki.freebsd.org/8.0TODO is out of date ?11:14
fullermdDunno.  The last edit date is, what, a week and a half back, or something?11:15
fullermdNot sure how actively it was maintained during the RC cycle.11:15
vilafullermd: it's ok, just found http://www.freebsd.org/releases/8.0R/announce.html11:16
* fullermd glances at how recently the version control page was updated as long as he's bouncing around the wiki...11:16
vilahey ! vbox guest support !11:16
vilaof course, just when I wanted to start migrating to kvm...11:17
* fullermd . o O ( Last real update: 2008-01-19 )11:17
fullermdWell.  That's almost certainly not much changed since the last few RC's   :p11:17
vila.. may be, but it may also mean I need some tweaks I'm not aware of...11:18
fullermdI guess the topic fizzled out of major notice after src moved CVS -> SVN.  Owell.11:19
drmabuse_Hello! Anyone an idea how stacked branches differ from others (regular ones)?11:40
Pengdrmabuse_: Stacked branches don't store all of the revisions locally.11:43
Pengdrmabuse_: They should function exactly the same as a normal branch, more or less.11:43
GaryvdMdrmabuse_: A stacked branch does not have all the revsions in it's repository. It has a url to the branch that it is stacked on, and if bzr needs any revisions that are not in it's repository, it gets them from the stacked on branch.11:43
PengYou put it very well. :)11:44
drmabuse_Ah, thank you!11:44
GaryvdMPeng: thanks11:44
* fullermd blinks.11:44
fullermdThe heck...   how did I get a modified file in my bzr.dev tree...11:45
fullermdOK, what the hell?  log $FILE is showing 1 rev touching the file, log -n0 $FILE is showing 2, and there's no overlap between them.11:47
fullermdAnd none are actually direct edits, they're all merges.11:48
fullermd...  OK, that's even weirder.  I revert it, and it STILL shows modified.11:49
PengKill dirstate?11:50
Peng(well, mv)11:50
vilawhat file is that ?11:50
fullermdOh, I found it.11:50
fullermdJust snows to go you the sad state of content filtering.11:50
fullermdI still had a ~/.bazaar/rules file turning on keywords on *.txt, and doc/ja/user-reference/index.txt had something that ate.11:50
fullermdOf course, on the plus side, that does show that revert Does The [Hypothetically] Right Thing with filters now   :p11:51
fullermdInsofar as deleting 372 lines of the file is Right, anyway...11:51
fullermdMmph.  And it compresses things that aren't valid keywords either.11:53
fullermdStill freaky what log is doing there, though.11:54
GaryvdMfullermd: What file is it?12:03
GaryvdMOh nvm - doc/ja/user-reference/index.txt12:04
GaryvdMfullermd: bzr log doc/ja/user-reference/index.txt , and bzr log doc/ja/user-reference/index.txt -n0 work as expected for me.   ?12:10
fullermdWell, now that I've updated bzr.dev, both show only 1 rev.  Just different 1 revs.12:12
fullermdAnd still both just merges.12:12
GaryvdMfullermd: bzr log doc/ja/user-reference/index.txt -n0 shows me 4 revisions - http://pastebin.com/d100bf59812:14
GaryvdMfullermd: bzr qlog doc/ja/user-reference/index.txt also the same12:15
fullermdHow odd.  I get that too, without -v.  But with -v, kaplooie.12:17
fullermdThat's pretty marfed up.  Why the hell should -v affect ANYTHING like that?12:17
GaryvdMfullermd: yhea - thats def a bug IMHO12:19
GaryvdMHi vila12:21
GaryvdMvila: Is there a way do detect if some code is being run from a test?12:22
vilameh, where should I put the comma ?12:22
GaryvdMI don't know?12:23
vilaGaryvdM: :-) Is it: 'some code is, being run from a test' or 'some code is being run, from a test'12:24
GaryvdMvila: I got a test where a exception is being caught by qbzr error reported, which shows a nice gui error report, and the error does not get to the test.12:24
GaryvdMvila: so I want to disable qbzr's error handler if it is being run from a test.12:25
vilahaaa, you want the code to realize it's run by the test ?12:25
vilaDon't ever do that or the code police will come to arrest you12:26
vilaInstead, the test should alter the environment12:26
fullermdNah, as long as they check with log -v, they'll never find it being introduced  :p12:26
vilaThe former is known as 'test code in production code' and very frowned upon :)12:27
GaryvdMvila: ok12:27
vilathe reason being that it's cheating really :)12:27
vilalog -v can find more revisions touching a file :-/ I don;t remember the details but I think it has to do mainly with file deletions12:28
fullermdNo, it finds less.  Much less.12:28
fullermdOr rather, it finds more, but gives up really quick.12:28
* vila bangs head to wall12:28
vilathat's pretty unclear my dear friend :)12:29
GaryvdMfullermd: vlia is right, normal log file won't find a revisions that deletes a file12:29
GaryvdM-v will12:29
GaryvdMvila: compaire bzr log doc/ja/user-reference/index.txt -n0  to bzr log doc/ja/user-reference/index.txt -n0 -v12:29
vilafullermd: but log and log -v are on amanica plate again IIUC12:30
vilaso filing bugs now may be a good idea12:30
vilaGaryvdM: aaargh, vade retro satanas, I want to go have lunch, don't make me vomit :-(12:32
vilathat's pretty ugly :(12:32
vilaerr, can I really use pretty and ugly like that ?12:33
vilabbl, will have lunch anyway12:35
GaryvdMvila/fullermd: I've loged bug 48917912:51
ubottuLaunchpad bug 489179 in bzr "log file -v misses some revisions" [Undecided,New] https://launchpad.net/bugs/48917912:51
GaryvdMvila: when you are back from lunch, would this be an acpetable way to "alter the environment" : http://pastebin.com/d75e9a627 ?12:56
vilaGaryvdM: with the tweaks http://pastebin.com/m285da0a9 , yes13:22
lifelessvila: would like your feedback on assertThat (in testtools 0.9.1)13:22
GaryvdMvila: thanks13:23
vilaand regarding that bug, log -v shows *only* the revisions touching the file, while log, once it found a revision, also displays the ones that merge it (I forgot that case earlier),13:23
vilaso the bug is presumably about the "right" revision being lost while the merging ones are shown, because 4792.5.5 really add the file and I presume nobody ever touch it since13:24
vilalifeless: is that about the matchers I saw mentioned in the commit messages ?13:24
lifelesssee NEWS and the MANUAL13:24
thropeis it possible to share subversion.conf between machines - to the checksums int here come from the svn repository or are they randomly generated (ie does it make any sense) - I guess I was hoping if I accessed the same repo on another machine the checksum would be the same13:26
vilalifeless: after reading NEWS and MANUAL, I'm still hungry :-) Now reading matchers.py13:32
vilathat was quick :)13:33
vilaI recognize that DocTestMatches as very closely resembling my needs in shell-like tests :)13:33
lifelessif you want to see it in use, look at test_testresult.py13:34
vilayeah, I see that... making doctest.ELLIPSIS the default sounds sensible... (I did that in the shell-like tests)13:35
lifelessvila: I haven't read the shell like stuff yet13:36
lifelessvila: did you use the doctest module?13:36
vilagreat minds etc13:36
vilayes I did use it13:36
vilaso, the problem I have with assertThat is that the actual value comes first13:37
lifelessread it as an english sentence13:37
vilayeah, I know, that's the good part13:37
lifelessassert that foo doctestmatches thing13:37
lifelessits a bit cutey13:37
lifelessbut otoh fairly memorable13:38
vilabut then when I look at the tests, I stop "reading" and go into some matching mode13:38
lifelessI think you would adapt quite quickly - bzr already has inconsistency here13:38
lifelessthe needle, haystack thin13:38
vilahehe, you used the right words, I can adapt but inconsistencies make adaptation hard in the end13:39
lifelessI think its better to make this really nice13:40
vilaanyway, as long as switching the args is invalid, it can hardly become a problem right ?13:40
lifelessso we can effectively argue for13:40
lifelessassertThat(thing, equals(other))13:40
lifelessyeah, it will blow up, unless thing is a matcher too :)13:40
vilahehe, when you start writing tests about matchers, I suspect the parameter order is already wired ;)13:41
vilaassertThat(thing, equals(other)).... really nice13:42
lifelessdoing not may require some care13:42
lifelessassertThat(thing, is(not(other))) would be nice to be able to write.13:42
lifelessbut 'is(not(' really would be 'not(is(' in this language. which isn't english (though it is other languages))13:43
vilaon the feedback front, reading MANUAL was... refreshing, there nothing I want to delete there13:44
vilaIsn't there an english construct for assertThatNot ?13:44
vilafailIf >13:45
vilafailIf ?13:45
lifelessin english, 'the horse *is* *not* red'13:45
lifelessin this language, 'the horse *not* *is* red'13:45
lifelessvila: think bigger, more complex composed matchers13:45
lifelessplay. Use. Enjoy.13:46
lifelesswas addDetails in the MANUAL?13:46
lifelessI forget if I added it there13:46
lifelessif so - bzr log files. failed test work areas from disk. Possibilities abound.13:46
lifelessok, I should add that. Please file a medium priority bug on testtools if you would13:47
lifelessits referenced from NEWS, I'm sure.13:47
=== mtrudel_ is now known as cyphermox
=== Meths_ is now known as Meths
=== Sam__ is now known as SamB_XP
jlduponthi - I keep getting "Unexpected error while decorating: xxx.yyy" when using Bazaar Plugin for Eclipse... any clue?15:03
beunojldupont, verterok is the developer for that plugin, maybe he will know15:03
jldupontverterok: I keep getting "Unexpected error while decorating: xxx.yyy" when using Bazaar Plugin for Eclipse... any clue?15:04
verterokjldupont: could you check the stacktrace in <workspace>/.metadata/.log ?15:05
verterokjldupont: also, what options do you have enabled in the decorator settings?15:06
jldupontverterok: http://jldupont.pastebin.com/d5663d1bf15:06
jldupontverterok:  I don't believe I have ever touched this... the only option checked at the moment is "Enable Status Overlay Decorator"15:07
verterokjldupont: ok, what version of bzr-xmloutput do you have installed?15:07
verterokjldupont: bzr plugins should show that15:08
jldupontverterok: how do I check that?  Windows->preferences->Bazaar??15:09
verterokjldupont: in a terminal: bzr plugins15:09
verterokjldupont: hmm, it's quite old, are you in windows or *nix?15:10
jldupontis there a PPA for auto-update of that stuff?15:10
verterokjldupont: is the bzr-xmloutput  from the repository?15:10
jlduponthmmm... don't remember where I got that...15:11
verterokjldupont: "bzr plugins -v" should show the path15:11
jldupontwhat's the best way to install & keep up-to-date on this plugin?15:11
verterokjldupont: ok, it's the package15:12
jldupontxmloutput 0.8.315:12
jldupont    This plugin provides xml output for status, log, annotate, missing, info,15:12
jldupont    /usr/lib/python2.6/dist-packages/bzrlib/plugins/xmloutput15:12
verterokjldupont: try this: 1) uninstall bzr-xmloutput 2) mkdir -p ~/.bazaar/plugins; bzr branch lp:bzr-xmloutput ~/.bazaar/plugins/xmloutput15:13
maxbSemi-related, I have heard there are two Eclipse plugins for Bazaar, which one should I use?15:14
verterokmaxb: qbzr-eclipse use qbzr for the dialogs, bzr-eclipse is a native plugin (pure java+SWT, except the interface with bzr)15:16
jldupont" bzr: ERROR: Target directory "/home/jldupont/.bazaar/plugins/xmloutput" already exists.  "15:16
verterokjldupont: so you already have it: cd ~/.bazaar/plugins/xmloutput && bzr pull15:17
jldupontit blew in my face:  http://jldupont.pastebin.com/d2f611ae915:18
verterokjldupont: oh, you have bzr 1.13.1 and bzr-xmloutput is using a newer repository format :(15:20
jldupontwhere is the PPA for Bazaar again?15:21
jldupontis this it: https://launchpad.net/bazaar15:22
verterokjldupont: https://edge.launchpad.net/~bzr/+archive/ppa15:22
jldupontverterok: ok, thanks!15:23
jlduponthmmm... I've added the PPA to my sources but Synaptic doesn't show an upgrade to bzr...15:26
jldupontwhat's wrong?15:26
jldupontit concludes that 1.13.1 is latest.15:26
jldupontmaybe it is taking the "ubuntu" default?15:27
vilajldupont: most probably you missed some step while adding the PPA ? You did add the key for it ?15:28
jldupontYes I did add the key.15:29
jldupontsudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8c6ce1efd15:29
vilahmm, you refreshed the package list ?15:29
jldupont"reload" in Synaptic.15:29
vilalet me start my hardy vm15:30
jldupontI went for apt-get update15:31
jldupontand back to Synaptic:  1.13.115:31
vila1.13.1-1 (hardy) or 1.13.1-1ubuntu0.1 (hardy-updates) ?15:32
jldupontvila: I must be Synaptic having the problem:  I do sudo apt-get install bzr  and I got upgraded....15:34
jldupontjldupont: vila: I must be Synaptic having the problem:  I do sudo apt-get install bzr  and I got upgraded....15:34
jldupont... and now it shows up in Synaptic !\\15:35
jldupontnot the first time I've had problems with Synaptic !15:35
jldupontnote to self:  go with apt-get  if problem with Synpatic *before* bugging people.15:36
jldupontTHANKS GUYS!15:36
jldupont... and now Bazaar Eclipse plugin complains that bzr-xmloutput isn't found!!!15:38
vilajldupont: you're welcome15:38
jldupontwhat is the approved process for installing bzr-xmloutput ??15:38
jldupontit shows in Synaptic!15:39
jldupont... and now "mark for reinstallation" in Synaptic takes care of the problem...15:40
jldupontlet's just say I do not love Synaptic that much ...15:40
jldupontI still get a ton of "decorator" errors: http://jldupont.pastebin.com/m4b23cbe215:42
* vila leaves it to verterok :)15:42
verterokjldupont: did you restarted bzr-eclipse?15:43
jldupont... just did ( you can of course flame me good ! ) ... but now a new problem: http://jldupont.pastebin.com/d2d1e7b8115:45
verterokjldupont: could paste the whole traceback? or is just that?15:48
jldupontit was only that when I posted it... now, I tried doing a commit:  http://jldupont.pastebin.com/d4d5fb3c915:48
verterokjldupont: looks like bzr-gtk is killing bzr15:49
jldupontwhat's the solution?15:50
verterokjldupont: removing bzr-gtk...maybe?15:50
jldupontget rid of it?  I just need eclipse pluing and cli15:50
verterokvila: do you know what's the status of bzr-gtk?15:50
verterokjldupont: yes, I think that removing/uninstalling bzr-gtk is enough15:51
verterokjldupont: or updating it15:51
vilaverterok: what status ?15:52
jldupontgot right of it... still blows up in my face!15:53
vilaoh, hum, bzr-rebase seems to be a problem15:53
vilabzr-gtk should be upgraded from the PPA I think15:53
jldupontbzr-rebase: got rid of it too.15:53
verterokjldupont: you still have an old xmloutput installed15:55
jldupontmaybe my repo of the old version is causing the trouble?15:55
jldupontxmloutput: 0.8.315:57
vila\what PPA did you add exactly ?15:57
jldupontedgewall one15:57
vilajaunty ??? 1.13.1 is the latest proposed in jaunty by default ???15:59
MvGAgain I'm asking for someone to review changes to trac-bzr. This time https://code.launchpad.net/~gagern/trac-bzr/bug194277/+merge/15323 in particular, as it removes quite a large portion of (supposedly unused) code. I'd love a second opinion here!15:59
vilaMvG: I know nothing about trac-bzr, but given the work your putting into it, you clearly seem to be the de-facto maintainer...16:00
jldupontvila: yes it seems.16:00
MvGAnd become so in little more than a week, or so it seems.16:00
MvGI feel like every time I fix a bug, I find a new one.16:00
vilaas such, you'd better just take over the trunk and wait for people to complain or, more likely, thank you :)16:00
MvGI'll have done unreviewed commits in the past, and will likely do more in the future, especially if I get no reviews here.16:01
MvGOn the other hand, I've gotten some very useful input from reviews, so I'd at least give people a chance to look things over.16:02
vilaha ok, I thought you didn't get any16:02
vilajldupont: ok, I misunderstood, I thought you were on hardy :-/16:03
jldupontvila: no probs.16:04
jldupontvila: I installed the latest xmloutput (from what verterok wrote earlier): still blows up in my face.16:05
verterokjldupont: did you removed the system wide installed xmloutput?16:06
jldupontverterok: yes.... got Synaptic to do it.16:06
jldupontis this ok?16:06
jldupontI have zapped my .bzr from my project...16:06
jldupontrebuilding everything now...16:06
verterokjldupont: and did you updated the xmloutput in .bazaar/plugins ?16:07
vilajldupont, verterok: that shouldn't matter if the .bazaar/plugins one is loaded, which 'bzr plugins -v' should confirm16:07
jldupontxmloutput 0.8.6.dev16:07
jldupont    This plugin adds an option (--xml) to log and provides an xml version of some16:07
jldupont    /home/jldupont/.bazaar/plugins/xmloutput16:07
verterokjldupont: ok, good16:07
verterokjldupont: are you getting the same error?16:08
jldupontException in Decorator. The 'Bazaar' decorator will be disabled.16:08
=== oubiwann_ is now known as oubiwann
bialixMvG: you may want to set some limit for waiting of review: say 1 day. I fnobody answers, then simply go on and commit your improvements16:11
jldupontverterok:  any clue?16:12
bialixMvG: thank you for working on trac-bzr btw16:12
verterokjldupont: you removed the .bzr dir?16:12
MvGbialix: I'm committing when I tire of waiting for reviews...16:12
bialixMvG: I'm still have to find a time to test your changes, busy at work too much16:12
jldupontverterok: Yes I did.16:12
MvGThe more central a change, the more I want it in trunk before working on, and the more impatient I am with reviews.16:12
verterokjldupont: please add it again, or remove the project from bzr-eclipse control in eclipse16:13
bialixMvG: when I know that review in qbzr or bzr-explorer may wait weeks, I clearly say that I will wait no more than week and if nobody subject will land it16:13
verterokjldupont: it will fail as eclipse have it mapped to bzr but there is no .bzr16:13
jldupontverterok: oh, wait a sec16:13
bialixMvG: there is too little people who can and most important want to review your changes16:14
bialixMvG: that said you can develop as you wish16:14
bialixMvG: i.e. don't wait for review at all16:14
MvGAlready doing so for minor changes.16:15
MorbusIffg'day. i've got bzr log bzr:// working just fine. but a bzr log bzr+ssh:// complains that it's Not a Branch. No error about ssh auth or connecting. Just Not a Branch.16:15
jldupontverterok: ()@!_)( Eclipse is all confused now!16:15
bialixMorbusIff: what if you try sftp:// instead?16:16
=== beuno is now known as beuno-lunch
vilaMorbusIff: what path are you specifying ? '~' support has changed recently between sftp and bzr+ssh16:16
MorbusIffbialix: same erorr.16:17
MorbusIffvila: i'm specifying the path to a branch in both cases. example.com/branchname.16:17
jldupont    Error while executing push16:17
jldupont    RemoteRepository(bzr+ssh://bazaar.launchpad.net/~jldupont/tinycouch/trunk/.bzr/)16:17
jldupontis not compatible with16:17
jldupontdifferent rich-root support16:17
bialixso there is really not a branch16:17
vilaa full path then ?16:17
jldupontwhat do I do now??16:17
jldupontdelete from LP ?16:17
MorbusIffbialix: but when i run bzr://, it works fine, with the same path.16:17
MorbusIffbzr://example.com/whee works, bzr+ssh://example.com/whee does not (complaining that it's not a branch)16:18
bialixMorbusIff: look into .bzr.log, you'll find there some debug info, maybe it helps to identify problem16:18
MorbusIffvila: using a full path causes both bzr:// and bzr+ssh:// to report Not a Branch.16:18
MorbusIffbialix: getting a traceback.16:19
MorbusIffdoesn't personally tell me much though. i don't code python/bzr.16:19
bialixedit private urls and pastebin16:20
bialixthen we can look and suggest something16:20
bialixright now you can test via any ssh client if you can read sftp://example.com/whee/.bzr/format16:21
bialixperhaps you've got permission denied problem16:22
bialixare you sure your local login name and your login name on the server is the same?16:22
MorbusIffthey are not, but i'm forcing the remote name in .bazaar/authentication.conf.16:22
bialixmaybe you need to explicitly specify them in URL?16:22
bialixjust for testing16:22
MorbusIfftried that before here, and same error.16:22
bialixMorbusIff: can you test via your ssh client if you can read sftp://example.com/whee/.bzr/format16:23
MorbusIffyeah, i'm getting there.16:24
bialixwhat it means?16:24
MorbusIffi'm still in the process of testing that. tlaking to someone else at the moment.16:24
MorbusIffyeah, that was it, actually.16:26
MorbusIffthe full path iw as giving was wrong.16:26
MorbusIffso the test failed.16:26
jldupontverterok: vila:  just to close the loop:  I deleted the branch on LP, delete my .bzr on my side, closed eclipse, re-init everything by hand through CLI, restarted eclipse... and now it works!16:26
MorbusIffwhen i gave the right full path, bzr log works now under bzr+ssh16:26
jldupontthanks for your precious time guys!16:26
verterokjldupont: cool :)16:30
Imperionum, is anyone willing to lend their Bazaar expertise and help me out with this?16:31
bialixit depends16:31
Imperionwhat on?16:31
bialixon your question, of course16:31
bialixjust ask first16:32
Imperiondesigning and organizing the repository/branches16:32
bialixso what is your question16:32
Imperionjust a sec16:33
GaryvdMHi bialix and vila16:34
bialixHi Gary!16:34
Imperionmy project consists of a core executable and several modules16:34
Imperionthe modules depend on files in the core for the interfaces, etc.16:34
Imperionwhat's the recommended way to set this up?16:35
GaryvdMbialix, vila: I'm very eger to here what you guys think about lp:~garyvdm/qbzr/just_show_tests16:35
bialixGaryvdM: I'm about to look at your branch right *now*16:35
bialixgosh, I don't run bzr log for ages, forgot leading q...16:37
bialixGaryvdM: ok, I've ran it16:38
bialixlooks terrible as you expected :-)16:38
bialixbut I can live with that16:38
bialixbut maybe if we can made those tests optional or control them somehow -- it will be nice16:39
bialixvila: ping16:39
GaryvdMbialix: The other option is to just init and run initial_load, but not show the widow.16:39
vilabialix: pong ?16:39
GaryvdMbialix: this would mean that the paint methods don't get tested.16:40
bialixvila: have a couple of minutes for qbzr>?16:40
vilabialix: I'm upgrading it to 2a and looking at gary's branch16:40
bialixGaryvdM: no, if we can I'd better test all we can16:40
bialixGaryvdM: this flashing windows is a bit annoying, but I understand the price.16:41
chxif i run bzr serve --directory=/reall/long/path is there a way to replace bzr co bzr+ssh://example.com/real/long/path/branch with simply bzr co bzr+ssh://example.com/branch16:41
vilaGaryvdM: meh, that's 46 revisions on top of trunk ???16:41
bialixvila: in the past there were interactive tests for bzr itself16:41
GaryvdMvila: no - just 216:42
bialixvila: is it possible to make part of test suite switchable?16:42
dOxxxImperion: Whatever makes sense for the language you are using. If the core executables and modules all make a single logical project unit, then they can all go into a single bzr branch16:42
bialixchx: yes16:42
chxbialix: And how...?16:42
vilabialix: interactive tests make no sense for automation in my mind, what are you talking about ?16:42
ImperiondOxxx: okay16:43
chxbialix: I read the help for both co and serve and saw no way :/16:43
chxbialix: some conf file?16:43
bialixchx: you mix bzr serve and bzr+ssh16:43
chxoh i do not even need bzr serve when urnning bzr+ssh?16:43
chxthat ... makes sense, i suppose?16:44
bialixchx: no16:44
bialixbzr+ssh launch bzr serve via ssh automatically16:44
vilaGaryvdM: if I run 'bzr qlog trunk just_show_tests' it shows 46 additional revisions, what's up ?16:44
chxbialix: aaaaaaah16:44
bialixvila: do you have old trunk? new trunk is trunk2a16:44
vilabialix: aaaaaaaaaaaaaaargh16:45
vilaI updated old trunk :-(16:45
vilaI *upgraded* old trunk16:45
bialixthat's fine, run pull --remember lp:qbzr now :-)16:46
vilaonly 2 revisions now16:46
bialixImperion: every branch is separate entity16:46
vilaaaargh again, I ran 'pull --overwrite' and forgot --remember, you guys drive me nuts ;)16:46
* bialix said --remember, not overwrite16:46
bialixvila: we don't want, honestly16:47
* vila did it before bialix gave the right invocation :)16:47
bialixrats, I've late16:47
chxbialix: ok then is there a config value like the user=joe in authentication.conf to supply a sort of base bath?16:48
vilaGaryvdM: so, a couple of remarks16:48
* GaryvdM listens16:48
Imperionbialix: meaning16:49
vilainstead of doing try/finally, use addCleanup, that avoids errors and indentations16:49
bialixchx: mmm, no. But I think you can try to use settings in authorized_keys on the server16:49
bialixImperion: do you want all your modules to live in separate branches?16:49
chxbialix: like....?16:49
vilaGaryvdM: i.e. self.addCleanup(win.close) just after the win is created16:49
chxbialix: or set the home directory of the bzr user.16:50
bialixchx: look in contrib/bzr_access to get some ideas16:50
chxi will16:50
GaryvdMvila: we have code that runs when the windows close (like saveing the window sizes.) What would happen if there was and error in that code?16:51
vilaGaryvdM: don't override trace.report_exception unconditionally, you will regret it one day or another, do that in a setUp() and again use addCleanup to restore the original16:51
bialixImperion: you can put your entire project into one big branch, or use separate branches for every module16:51
Imperionbialix: all of the parts depend on the core16:51
vilaGaryvdM: don't worry, errors are allowed during cleanup methods, but they generally indicate deeper problems16:51
bialixImperion: yes, but do your modules have thevalue by itself? to reuse them in other similar project?16:51
Imperionthey're useless without the core16:52
bialixImperion: then put all modules into one big branch with core16:52
bialixImperion: just think why you call them modules and separate from core?16:52
GaryvdMvila: Re overriding report_exception: What would be a good way to make that common among lots of test? (can you think of an example in bzrlib?)16:53
bialixImperion: in bzr world branch is main thing, it's often synonym to repo in other systems16:53
GaryvdMvila: The big question is, is it ok to show and hide the gui from the test suit like that?16:54
vilaGaryvdM: define a base class or a mixing that all test classes that requires the feature will use16:54
Imperionbialix: they're modules because they're interchangeable with other modules with the same interface16:54
bialixGaryvdM: I wonder if we actually can use QtTest16:54
Imperionbialix: e.g. multiple video driver modules16:54
vilaGaryvdM: yes it is, bzr-gtk does that16:54
vilaor did16:54
bialixImperion: so they have value by itself? with other core?16:54
vilahmm, let me try a trick or two16:55
bialixImperion: there are several reasons to not put modules into the same branch as core16:55
bialixImperion: because once you put them there you'll have problems to split this branch later16:56
vilahehe, it works :)16:56
Imperionbialix: modules depend on the core to compile16:56
bialixImperion: but there is one big reasons to do so: much simpler to clone entire project16:56
GaryvdMbialix: Yes - QTest will help when we want to test things like clicking on a button.16:56
vilaGaryvdM: http://paste.ubuntu.com/329520/16:56
bialixGaryvdM: In my undertsanding QtTest can help to avoid actually show the GUI?16:57
bialixImperion: what you need called nested trees16:57
vilabialix: look at my pastebin, no more windows showing up :-D16:57
Imperionbialix: explain?16:57
bialixImperion: but they are not implemented yet16:57
GaryvdMvila: I'm not sure if that will cause paint events to run - I run with --coverage to check16:58
bialixImperion: you can organise several separate branches into complex project16:58
vilaGaryvdM: could be, let me know16:58
bialixand work with such construct as with one big branch16:58
bialixvila: hehe, nice16:58
GaryvdMbialix: As far as I can see from the docs, no16:58
bialixImperion: there is 3rd party tools to manage this problem though16:59
bialixImperion: config-manager utility; scmproj, externals plugins16:59
bialixImperion: I'm the author of scmproj17:00
bialixscmproj is somewhat emulation of nested trees17:00
bialixImperion: do you familiar with svn?17:00
bialixor CVS?17:00
bialixImperion: no other VCS experience?17:01
Imperionmy project is hosted on Launchpad17:01
Imperionwill this be possible? :S17:01
bialixis and will in last 2 sentences are conflict17:01
bialixyes, it's possible17:02
vilaImperion: why do you want to separate the modules if they require trunk ? (I.e. they make no sense without trunk)17:02
bialixwhat is your project? it's open source as I understand17:02
Imperionvila: I don't want anything, I'm asking for advice17:02
Imperionbialix: 2D isometric RTS engine, https://launchpad.net/catom17:02
Imperionthe code currently available is old17:02
ImperionI've refactored everything17:02
bialixvila: Imerion said the modules can be changed by similar with the same interface, sounds like pluggable architecture for me17:03
Imperionbialix: it is17:03
Imperionand I'm wondering about improving the organization of it17:03
bialixvila, Imperion: therefore I'd suggest to not put plugins into the same branch as core17:03
vilaImperion: sry, my advice will then be: don't separate modules from trunk if there is a strong dependency, just keep them in the same branch17:03
PengAfter 80 hours, "bzr check" on 1.14 MySQL is *still* at "[####\               ] checking commit contents:inventories 0/2". I might give up soon.17:04
Imperiondun dun dun17:04
vilabialix: that's just asking for trouble if they should always be kept synchronized17:04
bialixthe truth is: you can merge all your separate modules into core branch easily but not vice versa17:04
bialixImperion: so you need some experiments17:05
ImperionI wonder how I'll fix the CMake script to work with this17:05
MorbusIffif i checkout a bzr branch, is my commit access to it allowed or unallowed, barring any other configuration?17:05
vilahaaa, GaryvdM is back !17:05
bialixback from Ubuntu17:06
vilaGaryvdM: why don't you use a VM instead of a double boot ?17:06
GaryvdMin ubuntu17:06
GaryvdMvila: Yes I should17:06
* bialix does not know cmake specific, can't say much useful17:07
bialixImperion: single branch with all modules + core would be much simpler to you right now, given in mind lack of good nested trees support17:08
bialixI'm working on new design of scmproj, I'm hope I'll have better support of critical features soon17:09
GaryvdMvila: The window still flashes for me :-(17:12
GaryvdMvila: and the paint methods don't get run.17:12
GaryvdMvila: I'm going to make your other changes though.17:13
vilaGaryvdM: forget about the cheap trick then, we may want to try harder when I add the plugins to babune17:13
vilaGaryvdM: but even there you may add some feature check to ensure there is a usable display17:14
GaryvdMvila: yes - I hope to still find a solution.17:14
vilaGaryvdM: don't spend too much time on it now, it's better to have tests that requires some feature than no tests :)17:15
GaryvdMvila: but for now, it's a start in the right direction I believe.17:15
GaryvdMvila: yes17:15
vilaGaryvdM: definitely !!17:15
vilaGaryvdM, bialix : gtg, have a nice week-end !17:16
GaryvdMBye vila - Thanks for the help.17:17
GaryvdMgot to go17:17
vilagotta go17:17
bialixbye vila, thanks!17:17
=== beuno-lunch is now known as beuno
bialixGaryvdM: I'm ok with your new flashing tests17:51
bialixGaryvdM: btw, one observation about exception dialog reporter17:52
bialixif I click X button on this dialog or press Esc then it treats this as Ignore. In most cases the problem too serious and we need to actually close the window17:53
* bialix going home17:54
bialixbye GaryvdM, bye all17:54
Pengbeuno: ping18:03
beunoPeng, hi dude18:03
Pengbeuno: You approve lp:~deuns-martinez/loggerhead/flup? I'd be happy to tweak and land it.18:04
beunoPeng, I do, I think that with the tweaks it's good enough18:04
beunoand he's gone to the trouble of signing the contributor agreement, submitting the branch, etc18:05
Pengbeuno: So...want me to go ahead and do that?18:06
beunoPeng, yes!  thank you18:06
PengOK. :)18:06
beunothanks Peng!18:09
serviliohi! do the karmic versions of bzr & bzr-svn work OK under Ubuntu Hardy?18:34
beunoservilio, probably not18:34
beunothere are some depenency issues with python-central, if IIRC18:34
PengThere aren't Hardy versions you can use?18:35
serviliobeuno, Peng: just enabled the backports in hardy but didn't see it, now trying to debbuild using karmic source repos, but wanted to quick ask first18:36
servilioI'd prefer to build from source packages18:36
PengThere's probably a PPA.18:37
Pengservilio: Try https://edge.launchpad.net/~bzr/+archive/ppa18:38
servilioPeng: looking at https://launchpad.net/~bzr/+archive/ppa?field.series_filter=hardy18:41
servilioPeng: thanks for the suggestion118:41
Pengservilio: Don't thank me until you confirm that the PPA versions of bzr + bzr-svn + subvertpy are all compatible...18:42
servilioPeng: shouldn't the source package specify when it could not be built by using minimum versions for its requirements?18:45
roychriI created a new test project and I pushed to my server using sftp.  No errors.  When I try to branch off using http, I get : "bzr: ERROR: Unknown working tree format: ''"20:14
roychriI searched for that error in google but found nothing :(20:14
maxbWhat a weird error20:18
maxbPerhaps you should publish a test repo on your server that people can use to reproduce the bug20:18
roychrimaxb: I published a test repo on my "dreamhost" account using sftp and I can branch off from there.20:22
roychrimaxb: I cannot do it from this internal apache web server that the infra team setup.20:22
roychrimaxb: They did not set it up for me to publish bzr branches so they are not willing to help me out20:22
roychriI can do it but I am on my own :(20:23
maxbSo, to clarify, you are using "dumb" http20:23
roychrisftp to publish and dumb http to branch from.20:24
abbeci have a problem with bazaar on nfs4 share20:25
abbecanyone that can help?20:25
maxbroychri: Perhaps you could see if using -Derror or -Dhttp shows any useful information20:28
roychripassing that to bzr cli?20:28
roychrimaxb: http://pastebin.com/d5852206f20:30
abbeci have a problem with running bzr stat on an nfs4 share... anyone that can help?20:31
maxbroychri: bzr 1.3.1? That's like, ancient history! :-)20:31
roychrimaxb: oh... I simply did "apt-get install bzr".20:32
roychrimaxb: I did not realized it was archaic20:32
maxbUbuntu or Debian?20:32
roychriubuntu 8.0420:32
maxbThere is an official PPA carrying the latest release20:32
Pengroychri: What does http://server5591.lan/code/testyyy/.bzr/checkout/format look like?20:33
roychriPeng: no checkout in .bzr20:34
roychrithere is a http://server5591.lan/code/testyyy/.bzr/branch/format file however.20:34
roychrimaxb: Thanks for the PPA, I will give it a try20:35
Pengroychri: What happens if you try to visit http://server5591.lan/code/testyyy/.bzr/checkout/format in a browser, though?20:35
Pengroychri: Also, is ther eany sort of proxy involved?20:35
Pengthere any*20:35
abbeci have a problem with running bzr stat on an nfs4 share... anyone that can help?20:36
abbecif i run bzr stat on the nfs4 share everthing hangs up20:36
roychriPeng: hmmm. you might be on to somethnig. I am not getting 404.20:37
roychriPeng: nice.  You got it!20:37
roychriPeng: There was an .htaccess in the parent folder.20:37
roychriWith some rewriterules that was screwing things yup20:38
PengDoes it work now?20:38
roychriBranched 1 revision(s).20:38
PengPerfect. :)20:39
roychriThank you Peng and maxb for your help today.20:40
abbeci have a problem with running bzr stat on an nfs4 share... anyone that can help?20:47
abbecif i run bzr stat on the nfs4 share everthing hangs up20:47
Peng"Hangs up"? Are you sure it's not just slow?20:48
abbeci am sure20:50
abbecevery other command works though20:50
ubottuLaunchpad bug 403697 in bzr "bzr hangs trying to lstat dirstate file" [Medium,Invalid]20:50
abbecthis bug describes the same behaviour20:50
abbecPeng: it works with nfs3 and bzr stat works with nfs4 if there has not been any changes20:51
abbecPeng: but if there is changes it hangs on bzr stat20:52
PengSorry, I don't know much about this.20:52
abbecanyone else?20:52
abbecbzr diff and other commands work20:54
dOxxxabbec: you could try emailing the mailing list, you may reach a broader audience and increase your chances of finding somebody who knows something about it20:55
abbecdOxxx: ok... how do i do that?20:55
dOxxxabbec: https://lists.ubuntu.com/mailman/listinfo/bazaar20:56
dOxxxyou'll need to subscribe to post20:56
abbecdOxxx: thx20:56
maxbAnyone knowing lots about bzr-svn layouts here?21:04
maxbIf I have a repository containing many projects *not all at the same depth from the repo root* what should I do?21:05
rittyanHi all. Can't connect to answers.launchpad.net (some network problem). I am using git for 1,5y and now I am in a company where bzr is popular. I considered switching and I have a question about a feature I use 100% of time in git: interactive add. Is there something like that? I found shelve feature, but it looks like stash in git (i.e. isn't the one I am after)21:05
GaryvdMrittyan - Not in the core, but I think there is a plugin.21:06
GaryvdMlet me search21:06
maxbhttps://edge.launchpad.net/bzr-interactive ?21:07
dOxxxrittyan: are you referring to something like the git staging area?21:08
GaryvdMmaxb: yes that's it21:09
maxbjelmer: Hi, is there any bzr-svn layout configuration that will enable it to deal with a svn repository with multiple projects (trunk tags branches in each) *not all at the same depth from the repo root*?21:10
jelmermaxb: custom/wildcard branch layout21:10
rittyan1(sorry for repeating, I got disconnected) Hi all. I am using git for 1,5y and now I am in a company where bzr is popular. I considered switching and I have a question about a feature I use 100% of time in git: interactive add. Is there something like that? I found shelve feature, but it looks like stash in git (i.e. isn't the one I am after)21:11
rittyan1i.e., can I commit hunks or lines I pick from a file, instead of whole file21:11
maxbSo I'd have to enumerate each project separately in the bzr-svn config?21:11
dOxxxrittyan: Somebody suggested trying bzr-interactive21:11
GaryvdMrittyan1: https://launchpad.net/bzr-interactive21:12
jelmermaxb: You can use multiple asterisks in the wildcard layout21:12
maxbbranches = */branches/*;*/trunk  ?21:13
dOxxxrittyan: also, you can use shelve to accomplish something like git's staging area. you shelve the changes you don't want, commit the rest and then unshelve.21:14
rittyan1dOxxx: troublesome21:14
rittyan1and that plugin looks... "new", according to bugs21:14
jelmermaxb: for example21:14
rittyan1also, as I understand, plugin => no support in gui21:15
jelmermaxb: asterisks will only cover one directory level21:15
GaryvdMrittyan1: I'm one of the devlopers of qbzr. I hope to add support for that soon.21:15
jelmermaxb, you might need "*/trunk; */*/trunk; */*/*/trunk", etc21:15
rittyan1dOxxx: I do series of commits at once, making them small and per-feature from big changes. Shelving/Unshelving is definitely troublesome with such workflow :<21:15
dOxxxrittyan: yeah. although to be honest, shelve -> commit is pretty much the same amount of effort as stage -> commit, if you ask me. :)21:16
dOxxxrittyan: if you're using this to separate feature commits, perhaps you should be trying feature branches.21:16
rittyan1feature branch is something like creating a branch per feature? Like, `git branch ticket-1234`21:17
dOxxxrittyan: yes. usually used in conjunction with a shared repository so as to save disk space and make the branching quick.21:17
rittyan1I use that workflow already :) it's just isn't wise to use it to add a function (one commit), then put this function to use (another commit), for example21:18
rittyan1damn, I am addicted, it seems :/ without hope to switching21:19
dOxxxrittyan: for sure, it's best used in a somewhat coarse manner, like a bug per branch, etc.21:19
dOxxxrittyan: comment #10 and #16 on http://tomayko.com/writings/the-thing-about-git are interesting21:23
dOxxxrittyan: something that may also be useful to you is bzr-pipeline or bzr-loom21:24
rittyan1dOxxx: I don't get what it says. I never had any problems with testing or whatsoever, hm :<21:34
dOxxxrittyan1: it's more of a general principle thing. The changes committed using git's staging area have not been tested on their own as you're committing them.21:35
dOxxxrittyan1: anyway, I'm just saying it's an interesting perspective. I personally found the staging area quite useful in some cases when I was using git a while back.21:35
rittyan1care to share what do you do when you write a function, put it to use, make cosmetic changes (you are on a coding spree) and then you need to make 3 commits of it?21:35
dOxxxrittyan1: my usual working environment uses cvs, so in that case I cry. ;)21:36
rittyan1what about your after-work life :)21:36
dOxxxrittyan1: but using bzr, I would use shelve to separate the changes21:37
dOxxxrittyan1: or if the cosmetic changes are closely related to the function I added, I would probably just include it in the one commit21:37
dOxxxrittyan1: commit history doesn't have to be an exact replica of the process you went through to make the changes.21:38
rittyan1of course, that's why I spent an hour today moving back and forth commits for 3 prev. weeks, squashing or "fixing" then a bit21:38
rittyan1before pushing to public21:38
dOxxxrittyan1: using git or bzr?21:39
rittyan1I am using git21:39
rittyan1I never tried bzr yet, but a lot of people at work do21:40
rittyan1I am preparing myself :)21:40
dOxxxrittyan1: as I understand it, when you merge stuff from one git repo to another, the target repo gets the individual commit messages. so if you commit with messages "1", "2", "3" and then merge to another repo, that repo will have revisions with messages "1", "2", "3", right?21:41
dOxxxalthough I think I'm mixing up my terminology. merge is not push. :)21:41
rittyan1hmm I am not sure I got it, but what you say looks correct to me. Also, I used merge only once maybe, in 1.5y of using git21:42
rittyan1I am rebase kind of user21:42
rittyan1(i.e. try to stack commits from one branch on top of another and fix conflicts if there any)21:43
rittyan1moin lifeless21:43
dOxxxanyway, the point I was trying to make is that using feature branches and merging them into a trunk means that the "messy" nature of the commits on the feature branch are hidden.21:43
dOxxxbecause the merge appears as a single revision with your merge commit message on the trunk21:44
rittyan1dOxxx: yes that's why I don't like merging :))21:45
dOxxxrittyan1: however, bzr does expose the individual commits of the merge if you want21:45
dOxxxrittyan1: check out this example: http://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev/revision/483221:46
rittyan1what at I should take a closer look there?21:46
rittyan1ah! got it21:46
dOxxxif you follow the link "4831.1.1 integration" on that page, that takes you to the branch vila merged into trunk21:47
rittyan1except that I don't see any individual commits there21:47
dOxxxon the page for vila's branch you can see 4815.3.8 quiet-serve21:47
dOxxxthat's *my* feature branch21:47
dOxxxif you then click the view history link you'll see the individual commits21:48
dOxxxbut note that all this info is coming from the bzr.dev trunk repo21:48
dOxxxthe bzr GUI log tool, qlog, shows it quite a nice way21:48
rittyan1I think that I should give it a try21:49
rittyan1and see if I like it21:49
rittyan1because anyway, sooner or later I will probably have to face bzr21:49
rittyan1like it or not :/21:49
dOxxxit's not that bad ;)21:49
rittyan1and one more question: there must be rebase, I bet. Interactive one? :)21:50
GaryvdMrittyan1: Here is a screen shot of those revisions in qlog: http://imagebin.ca/view/IjcR0oL.html21:51
rittyan1GaryvdM: looks like typical git log in gui21:51
rittyan1except that green node has trailing pink changes that have no parent21:51
GaryvdMthe parent is off the screen21:52
rittyan1this is that? commits existed during merge?21:52
rittyan1ah, right21:52
dOxxxrittyan1: yes21:52
GaryvdMrittyan: note that you can also colapse and expand those merges, like a tree21:52
dOxxxrittyan1: there is a plugin for rebase/rewrite21:53
GaryvdMrittyan1: Yes - there is rebase, via plugin. See http://bazaar-vcs.org/Rebase21:53
rittyan1does it mean that on public repos people will know about my private <s>life</s> commits?21:53
dOxxxif it's merged, yes21:54
dOxxxyou could always email patches ;)21:54
GaryvdMHopefully you don't commit you private life to a public repo ;-)21:55
dOxxxbrb, disconnecting vpn21:57
rittyan1hmm, thanks for help21:59
rittyan1honestly it all sounds very limited, no offence... I am just used to something bizzare it seems21:59
rittyan1you are great bunch of guys, thank you o/21:59
GaryvdMrittyan1: Any time.22:00
dOxxxrittyan1: you're welcome22:00
dOxxxwhat's the diomatic way in python to represent an abstract method in an abstract class?22:07
dOxxxi.e. as a hint that subclasses must implement this method22:07
GaryvdMraise NotImplemented22:07
PengNo, NotImplementedError.22:08
GaryvdMYes, sorry thats what I ment.22:08
PengNotImplemented is for use in comparison methods. You return it if you don't know how to compare with the other object.22:09
lifelessraise NotImplementedError(self.methodname)22:09
dOxxxwhere 'methodname' is the actual name of the method?22:10
PengdOxxx: Where "self.methodname" is an expression that evaluates to the method object itself.22:11
Pengdef foo(self): raise NotImplementedError(self.foo)22:11
dOxxxPeng: gotcha22:11
gutworthwhen do we get branch specific eol patterns?23:20

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