/srv/irclogs.ubuntu.com/2008/05/21/#bzr.txt

igcmorning00:00
beunogoooooooood morning igc00:01
Pilkyigc: you in australia or something?00:01
igcPilky: yes, Brisbane00:03
igcmorning beuno!00:04
thumperjelmer: ping00:04
jelmerthumper, pong00:08
thumperjelmer: lp:~jelmer/python/trunk is this still wanted?00:09
thumperjelmer: it is having problems scanning00:09
LaserJockjelmer: around?00:26
jelmerthumper: no, should be ok to remove00:28
jelmerLaserJock, hi00:28
LaserJockjelmer: it's me again :-)00:28
LaserJockjelmer: I'm trying to get bzr-svn going on Fedora 900:28
thumperjelmer: do you want to delete it or shall I?00:28
LaserJockjelmer: when I try to use bzr-svn it gives me "Installed Subversion version does not have updated Python bindings."00:30
jelmerthumper: I don't think I can, can I?00:30
thumperjelmer: you should be able to00:30
LaserJockI looked in the bzr-svn README about the issue, but I'd like to avoid having to build my own Subversion 1.5 if I can00:31
LaserJockjelmer: I wondered if you'd had other people wondering about bzr-svn on Fedora. Surely somebody must use it00:32
jelmerLaserJock: you do really need to have subversion 1.5 or 1.4 with the patch, there's no way around that00:33
jelmerafaik everybody who has used bzr-svn on fedora has done the patching00:33
LaserJockjelmer: ok, do you know where the patch is?00:34
jelmerLaserJock, yes, it's linked from the bzr-svn wiki page00:34
LaserJockdoh00:34
jelmerthumper: hmm, it's mirrorred so it'll just be recreated next time I run my register branches command :-/00:36
jelmerthumper: I'll see if I can create a new branch from python svn and upload that00:37
thumperjelmer: ok00:37
thumperjelmer: lp:~jelmer/bzr-gtk/AUTHORS??00:39
jelmerthumper: yeah, error in my script that did the registration :-/00:39
thumperjelmer: are you going to clean up those branches?00:39
thumperjelmer: https://code.edge.launchpad.net/~jelmer/ shows lots of mirror failures00:40
jelmerthumper: are the failures a problem? The web ui doesn't make deleting them very easy00:50
thumperjelmer: no not really a problem, it just looks messy :)00:51
Verterokmoin01:23
mrbrocolihow do i remove a stale bzr lock?01:27
spiv"bzr break-lock URL"01:28
mrbrocoliawesome, thanks!01:28
beunospiv, maybe we should add that to the message that says the repo is locked?01:28
spivbeuno: yeah.  I think there's even a bug about that :/01:29
* beuno goes look01:29
beunofound it, bug #13920201:36
ubottuLaunchpad bug 139202 in bzr ""Could not acquire lock" error doesn't tell you how to fix it" [Medium,Triaged] https://launchpad.net/bugs/13920201:36
* beuno diggs into the code01:39
mwhudsonheh, i thought from the summary that that was probably an mpt bug01:40
Pilkydoes it take a while for launchpad to recognise a push to it on the site?01:41
mwhudsonPilky: it can take a minute or two01:41
Pilkyah there we go01:41
LaserJockjelmer: woot! I finally built new Fedora 9 subversion rpms and bzr-svn now loads01:50
jelmerLaserJock, nice01:51
jelmerwould you perhaps be interested in putting them up somewhere and linking to them from the wiki?01:51
LaserJockI was just thinking of that01:51
LaserJockit'd be a shame for me to horde them all to myself ;-)01:51
LaserJockjelmer: alright, all done, have a look at http://bazaar-vcs.org/BzrForeignBranches/Subversion#fedora-9-i386 and see if it looks ok02:14
pooliejam, did you work out what was wrong with your ssh keys?02:17
LaserJockunfortunately right now I can only make i386 rpms02:17
tolstoyHi Folks. I have a repo (via init-repo) with no files in it, and I'd like to create a new repo style branch (NOT in init-repo) that also has no files in it.02:56
tolstoySort of like I had "branched" from the original, then "pushed" elsewhere. Possible?02:56
tolstoyI don't see a --no-tree option on a lot of these things.02:57
mwhudsonyeah, i think that must be possible but not necessarily from the command line02:58
tolstoyAh.02:58
tolstoyHm.02:58
mwhudsonprobably easy-ish to do it in a plugin02:58
mwhudsonhow badly do you want it? :)02:58
tolstoyI just have a bash script. Running it against the output of a cvsps conversion to arrange the repo how I want it.02:59
tolstoySo it's not really worth it.02:59
tolstoyI can just "branch" to a staging area, then from there, "push" it to the "source-of-truth" area.02:59
tolstoyHm. Can I do a push from a repo with just a .bzr in it and end up in the same place?03:00
tolstoyI think that works, actually.03:01
tolstoyYep!03:01
mwhudsonyes03:03
tolstoyFaster, too.03:03
mwhudsonyou can also do a regular branch, then 'bzr remove-tree' i think it is03:03
mwhudsonthough this is obviously a bit of a waste of effort :)03:04
tolstoyYes. I'm glad I didn't see that earlier.03:04
tolstoyMy experiment here is to see if we can organize project repos by releases.03:05
tolstoySort of ruins the shared-branch repo thing, but ah well.03:05
bob2another way: mkdir foo ; bzr init foo ; bzr reconfigure --branch foo ; bzr push ~/repo/blah foo03:16
tolstoyCool.03:18
tolstoyThe push method (just have bash cd in and push) worked, but, alas, the branches are not consistently named.  Still, it mostly worked and was slow only on the project with 8000 revisions.03:19
* igc lunch03:55
pooliespiv, i'm reading your patch04:23
beunopoolie, lifeless, are you guys coming to DebConf after all?05:00
pooliebeuno: i am not, i think robert may be05:09
beunopoolie, ah, ok. Because I just saw you guys didn't send a talk for bzr05:11
mwhudsonman, using bzr on launchpad on an old-ish os x/ppc laptop hurts a bit05:11
* igc pick up kids05:42
lifelessbeuno: poolie: I'm not as far as I know; we had discussed my going to talk but that was all06:48
beunolifeless, well, you can still organize one or two BoFs06:49
beunoare you registered?06:50
lifelessno06:51
beunoau, I suppose you don't need to get sponsored anyway06:53
beunowell, if you do decide to come, let me know and I'll do as much as I can to help out06:54
lifelessunless canonical actively wants me to go, I doubt I will at this point06:55
beunowell, poolie, ball's in your court now  :)06:57
keithyany loggerhead users?07:00
mwhudson_i am a loggerhead developer, for my sins07:00
keithycan I serve non-public branches?07:01
mwhudson_i think i need more context07:01
mwhudson_before i can answer that question07:01
keithymy first problem is noone can see whats in my repo07:02
keithysecondly I have two private clients07:03
mwhudson_i don't understand the first problem at all07:03
mwhudson_'see'?07:03
mwhudson_for the second, i'd run loggerhead behind apache and do authorization type stuff in apache07:04
keithyso they need to see what in my repo, but not what is in eachothers reps07:04
keithyiam thinking tubogers is too much hassle07:05
mwhudson_i love my isp!07:05
mwhudson_keithy: it's getting late here, so if you mail the bazaar list i can try to help there07:06
mwhudson_or you can try to get life out of someone else here :)07:06
beunokeithy, I'll give it a try07:06
beunoyou want to setup loggerhead, which gives access to different branches depending on the user?07:07
=== jml` is now known as jml
keithybeuno: yes thats about it07:09
keithylast time I tried I gave up at turbogears07:09
beunokeithy, I can't think of a straight forward way of doing that, unless you run multiple loggerhead instances in different ports, and do some magic from apache07:10
keithyman07:10
keithywhy are bzr branches so invisible07:11
beunokeithy, invisible in what sense?07:11
keithywell on mac os x all you see is an empty directory07:11
beunokeithy, that's because it's a hidden directory07:12
beuno.bzr07:12
keithyright...07:12
beunols -a should show it to you07:12
keithyso how is anyone able to know what branches you have to push to?07:12
beunokeithy, either where you branched from, or you specify it once, and bzr remembers it07:12
keithyarg I dont want to have to install XCode on my server07:18
lifelesskeithy: I would run three loggerhead instances:07:18
keithyso how do I install turbogears?07:18
lifelesskeithy: 1) with your branches that are public, 2) with client A's branches, 3) with client B's branches07:19
keithywhy cant I install turbogears without having to put 2Gb worth of XCode on my server07:21
TheSheepis there a simple way to find all revisions that change a particular file from python, or do I have to look through all revisions and filter them?07:23
beunothat's it for me07:33
beunog'night all07:33
keithyarg even fink wants xcode07:38
poolieigc, thanks for the reviews!07:40
igcpoolie: np07:45
gourigc: see https://bugs.launchpad.net/bzr-fastimport/+bug/23217708:03
ubottuLaunchpad bug 232177 in bzr-fastimport "Better darcs support needed" [Undecided,New]08:03
liwlifeless, so... the bzr process is still running on add universe, RSS is 6.7 GiB, and strace tells me it does brk occasionally, but nothing much else08:03
poolieliw, hi08:03
liwpoolie, greetings and salutations!08:04
igcgour: thanks for putting that issue in and collecting your progress08:05
* igc dinner08:05
poolieliw, if you're wanting to see where it's spending its time try pressing C-\ but be aware there is some chance this may make it crash08:05
liwpoolie, I'm going to wait for lifeless to come and do that :)08:05
poolie:)08:05
liwalthough I may have to find \ for him on this keyboard08:06
vilamneptok: ping, can you have a look at bug #229076 and enlighten us ?08:24
ubottuLaunchpad bug 229076 in bzr "'Connection reset by peer' error when branching repository" [Undecided,Fix released] https://launchpad.net/bugs/22907608:24
mneptokvila: enlighten you in what regard?08:38
vilawhat is the setup of www.gnome.org, what is the server that close the connection when the header is 'User-agent' instead of 'User-Agent' ?08:39
mneptokAFAIK, "User-agent" is non-RFC for HTTP1.108:42
mneptokhttp://www.faqs.org/rfcs/rfc1945.html08:42
mneptokhttp://www.faqs.org/rfcs/rfc2068.html08:42
mneptoki agree it's a bit strict, but is is understandable, IMO08:43
vilahttps://bugs.edge.launchpad.net/bzr/+bug/229076/comments/1308:43
ubottuLaunchpad bug 229076 in bzr "'Connection reset by peer' error when branching repository" [Undecided,Fix released]08:43
vilait's a bit clear that header names are case-insensitive :)08:43
vilataken straight from rfc261608:44
vilaanyway, the bug has been fixed, what I'd like to know is what is the server that triggered it since that the first time we encounter such strictness08:44
vilawell "strictness"08:44
liwthe reply from www.gnome.org, port 80, includes: Server: Apache/2.2.3 (Red Hat)08:46
liwlifeless, update: bzr is now continuing past the place it was stuck, I didn't do anything except kill the interactive python process I had open (the one on which you counted files/tips/whatever it was)08:47
vilaliw: yes, but apache2 itself has always been perfectly happy with that08:47
liwvila, indeed08:47
liwvila, could be a (transparent) proxy somewhere, perhaps08:48
vilaliw: hence the question :) My 8-ball doesn't reveal that transparent one :) Which by the way could at least politely answer  with 400 or any 5xx :)08:50
vilathat's why I'd like to contact it to report the problem even if we fixed it on our side08:50
liwyeah08:51
mneptokvila: it looks like the case sensitivity is a deliberate change to the GNOME infrastructure08:52
mneptokvila: it was put in place after DDoS attacks08:52
mneptokit's not an optimal fix, but it works.08:52
lifelessmneptok: rfc2616 - any captilisation is valid for field names08:53
lifelessliw: interesting08:54
mneptoklifeless: OK I'LL READ THAT AFTER I HAVE SOME COFFEE. THANKS FOR POINTING ME AT IT.08:54
mneptok>:)08:54
liwlifeless, now doing pool/universe/p/portsentry08:54
lifelessOk i SeE iF i CaN hElP yOu08:54
mneptok:)08:54
liwlifeless, I guess bzr was stuck into swapping mode for a while, but eventually got past that08:54
liwlifeless, typical bzr processes are right now in the 20-30 megabyte range (for RSS)08:55
* vila find the coffee idea too tempting to resist08:55
lifelessliw: how long is it taking for each package?08:55
lifelessliw: and what is the repo size up to ?08:55
liwlifeless, a couple of seconds for most small packaes08:55
lifelesspoolie: got a few?08:55
lifelessliw: (just du -sH .bzr/repository/packs)08:56
liwlifeless, 17 GiB total in the directory, with 16 GiB in one big pack file08:56
lifelessliw: I think it was paused doing a full pack :P08:57
jmlthat's absolutely no history, right?08:57
lifelessyeah08:57
lifelesscan you time doing a branch from one of those packages to a standalone branch ?08:57
lifelessliw: ^08:57
liwlifeless, sure08:59
liwaalib: real    0m2.370s08:59
liwuser    0m1.332s08:59
liwsys     0m0.128s08:59
liw(now I'm busy for a while)09:00
lifelessliw: awesome09:02
vilalifeless: the liw experiment is for all universe packages in hardy ? Sources ?09:02
lifelessvila: unpacked sources, yes09:02
vilaawesome, 17GiB is cheap for that IMHO, is that an hint that one of my dream will come true ? Having all sources available in sync with my install ?09:04
liwvila, it's still running09:04
vilaliw: ok, you will report here isn't it ?09:05
liwvila, yup09:05
vilagreat09:05
vilalifeless: bzr-email is failing tests, I have a patch, should I send it to you or push to lp ?09:07
lifelesssend to the list  with Merge/bzr-email09:10
james_wbzr-email/MERGE isn't it?09:12
lifelesssounds plausible09:20
vilajames_w, lifeless: grr, so not only did I forget the /bzr-email and re-send it, but now I read that ;-/09:24
lifeless:09:25
jmlwhat's the difference between Branch.pull & Branch.clone? I'm guessing that the latter preserves format and the former doesn't?09:26
jmlalso, clone needs a bzrdir it seems -- is this right?09:26
lifelesspull mirrores between existing branches09:27
lifelessclone makes a new branch09:27
lifelessvila: what is should_send returning ?!109:27
jmllifeless: I guess I meant in the case where a branch has just been created.09:28
vilathe email itself09:28
jmleg.g bzr init; bzr pull <url>09:28
lifelessvila: then i don't think the fix is appropriate; for starts the method is wrongly named09:28
vilalifeless: hey man, I fix the tests as they are because I'm tired of adding --no-plugins to selftest :)09:29
lifelessvila: well, this is what review is for no? To identify slippery-slope events  :)09:30
vilaLOL09:30
vilalifeless: ok, you won. My daughters also found my weak point when I'm angry about them: make me laugh.09:31
lifeless:)09:31
lifelessseriously though, it sounds like something has creeped here, and that the method has come to have a different purpose - thats fine, but it should be trivial to give it a better name and then the test and code won't be confusing09:32
vila    def should_send(self):09:33
vila        return self.to() and self.from_address()09:33
lifelessso it can return None or to()09:35
vila+        return bool(self.to() and self.from_address())09:35
lifeless'return self.to() is not None and self.from_address() is not None' would be wrong, because '' is wrong for an email address09:35
lifelessyes, thats good09:35
lifelessthat would avoid changing the tests09:35
vilaand about the name ? should_send seems to capture "check that we have enough info before sending"09:36
lifelessI think the name is ok given the details we've just looke at09:36
lifelessif it had been returning the email body as I thought you meant it would have been an issue09:36
jmllifeless: Is there a way to pull stacked branches such that I only pull the stacked bit, and not the whole thing.09:37
lifelessjml: I think you want init --stacked=url && pull in command line terms09:37
lifelessjml: in library terms, doing branch.bzrdir.clone(target) should DTRT I think09:37
jmllifeless: and pull as well? or just clone the bzrdir?09:38
lifelessjust clone09:38
lifelesssubsequent pulls will preserve the stacking bit and add data not accessible as one would expect09:39
gourif one uses 'restricted' subscription policy on launchpad, what is restricted to other lp members?10:02
gour/to/for10:03
pooliegour: is this a restricted team?10:07
lifelesspoolie: ping10:08
pooliepong10:08
gourpoolie: i'm reading lp feature high. document, team managament section --> subscription policies10:08
lifelessgour: restricted means that you hasve to invite people10:09
gourpoolie: and i'm interested if i create a project, how it can be managed...in the beginning we want a smaller number of devs to discuss and commit10:09
gourlifeless: that's clear. but what will be seen by non-invited people? code, bugs, blueprints?...10:10
lifelessgour: it des not affect visibility of the team, just how to get into it10:10
gourlifeless: hmm, so everything is visible except commit rights?10:11
lifelessgour: everything is visible, full stop.10:12
gourlifeless: everyone can commit his stuff in main trunk? strange...10:13
lifelessgour: no10:13
lifelessgour: *membership* and *visibility* are differewnt10:14
lifelessgour: membership grants commit rights10:14
lifelessgour: everything is visible10:14
gourlifeless: ahh, ok. that makes sense10:14
keithyI am trying to setup loggerhead10:17
keithyits complainging about no module sqllite10:17
keithyno mention of anything in the eadme's etc10:17
keithyreadmes*10:17
keithyIt hought squeak was bad at dependencies10:17
keithyI am beginning to feel there is some python initiation ritual I havent been through10:18
keithyor are you guys just used to things not working?10:18
lifelessturbogears is rather painful; I believe the loggerhead devs such as mwhudson would like to use a different toolchain to ease the pain10:21
keithyseaside?10:21
lifelessin this case I can help; there are sql alchemy optional modules or something under the hood there10:21
keithyso I need sql lite?10:22
keithyno mention of this in the docs10:22
keithyso not what do I do?10:24
keithyso now what do I do?10:24
bob2install pysqlite210:25
keithyhow?10:25
bob2how do you normally install libraries on your OS?10:26
keithydownload dmg and double click on an installer!10:26
keithyhow else10:26
keithyso far I have needed c compilers10:26
keithyand all sorts10:26
bob2fink, darwinports?  I don't use os x, sorru.10:27
keithyand they require xcode and xcode is 1G install10:27
lifelesskeithy: by a different toolchain I mean cleaner and more self containined python libraries10:30
lifelesskeithy: I suggest that you file a bug on loggerhead; I too have had trouble installing it10:31
bob2is python2.5's included 'sqlite3' module the same as 'sqlite'?10:31
keithylike seaside! ;p;10:31
keithylol10:31
bob2it looks pretty dbapi2-y10:31
TheSheepbob2: it's sqlite10:31
keithyah so it is loaded!10:31
keithyI winder where it si10:32
keithyI wonder where it is10:32
siretartwould someone please to upload bzr-svn 0.4.10 to the bzr ppa?10:37
liwlifeless, 39619 seconds total run time (real time), 21 G total pack directory size, 16 G for the biggest pack file, then 1.7, 1.6, 1.2, 0.39, and then pretty smal ones10:38
keithyso do I need to install sqllite3 separately?10:38
keithyso fink doesnt work10:41
lifelesskeithy: I'm sorry I can't be more help right now, I'm in a week long sprint of meetings10:43
keithynp10:43
lifelesskeithy: if you can put a bug/question against loggerhead in launchpad I think its likely you can attract mwhudon's attention in his workday which is GMT+12 or so10:43
keithythe dependency on sqllite is already in the bugs list10:44
lifelesswell I am talking about docs on how to get it going largely10:47
lifeless-> going for a while10:47
keithyk cya10:47
jmllifeless: is there a way to use the test machinery to create a branch with a specific branch format?10:47
lifelessformat=10:50
jmllifeless: it's unclear whether that's a bzrdir format, a repo format or a branch format.10:50
jmllifeless: I'm guessing there's something about the interrelation between formats that I don't get.10:51
keithysqlite3 is included in pythin, why does loggerhead want sqlite10:53
lifelessjml: format='dirstate'10:55
lifelessbah, I have been sucked back into IRC. let me outta here!10:55
jmllifeless: feel free to talk to me IRL.10:58
liwlifeless, http://files.liw.fi/temp/output.log -- I forgot to capture theoutput of the universe run, but that's the one for the main run11:03
keithyafter all that! loggerhead renders my hierarchical branches structure as flat!11:13
keithyI am dissappointed11:19
awilkinsDo you just add stuff to the top of NEWS when pathcing?11:21
awilkinsAnd does a small extra option for a command count as a feature or an improvement :-)11:22
visik7hi11:41
visik7"This transport does not update the working tree"  means that there is another transport that support it ?11:41
bob2only file://11:42
bob2or ssh if you have the update-after-push plugin installed (which just does 'ssh remotehost bzr co /path'11:42
jmllifeless: ping11:46
matkorvila:I have noticed yours recent commit to bzr-gtk. Could you please merge https://code.launchpad.net/~matkor/bzr-gtk/trunk-matkor ?12:00
matkorOne-line chages but close two bugs (I think). TIA, regards12:01
vilamatkor: better ping bzr-gtk@lists.canonical.com, it looks like I didn't really respect the process by pushing that way12:04
gourif someone wants to migrate repos from darcs, no matter whether darcs-1 or darcs-2 format, and no matter how old are they, tailor is the only player which does the job atm - pull latest tailor and latest darcs. both darcs-to-git and darcs2git fails with either darcs-2 repo format or older date-format in darcs12:05
vilamatkor: wow, looks like your patch doesn't even appear on http://bundlebuggy.vernstok.nl/bzr-gtk/12:05
vilamatkor: what you should do is send it to bzr-gtk@lists.canonical.com with [MERGE] in the subject or nobody will be informed of its existence, I'm not a core bzr-gtk dev, just an occasional contributor12:06
gour...or new tailor-0.9.3312:07
matkorvila: should I subscribe or can I just send e-mail out of ist ?12:07
vilamatkor: I don't know for sure, look at https://lists.canonical.com/mailman/listinfo/bzr-gtk12:09
matkorok tnx12:11
gourigc: i updated 'darcs support' bug with latest info...12:19
matkorIs it OK to send bundle intendent to merge having  target_branch: file:///home/users/matkor/src/bzr-gtk/trunk/ ? Which is checkout of http://bazaar.launchpad.net/%7Ebzr-gtk/bzr-gtk/trunk/ ?12:29
vilamatkor: taget_branch yes, that's how bzr calculated it, bonus points if public_branch is set though, look at bzr help send12:35
matkorvila: I got confused with:  bzr send ./ http://bazaar.launchpad.net/%7Ebzr-gtk/bzr-gtk/trunk/ -r -3..    giving me: bzr: ERROR: No mail-to address specified.12:42
vilamatkor: add --mail-to bzr-gtk@lists.canonical.com12:43
vilamatkor: or use -o my.patch12:44
vilamatkor: but your public_branch is wrong, you should use *your* branch here, it's where the bundle can be merged from12:45
vilaerrr, wait12:46
visik7bob2: any possiblity to get it on bzr:// transport  ?12:47
vilabzr send <where you want your patch to be applied> <where your patch have actually been applied>12:48
vilamatkor: ^12:48
bob2visik7: not supported as yet, as far as I know12:49
vilavisik7: the idea is that you have working tree where you can.. work. So you need at least a shell access there, and then you can just do bzr co or bzr update12:50
visik7yes I'm in the process of misusing bzr as a deploy tool :)12:52
visik7'couse I work with some pigs&dogs that puts their hands on the server so I need to track them12:53
bob2ghetto workarounds include push-after-update and bzr co from cron12:53
TheSheepok, I have finished writing a storage plugin for my wiki that uses bzr repository to keep the pages and history. Would anyone want to take a look at it and maybe suggest doing some things differently?12:55
visik7TheSheep: based on some web framework ?12:55
TheSheepvisik7: no, just wsgi12:56
TheSheepthe code for the plugin is here (sorry that it's Mercurial) http://sheep.art.pl/devel/dandelion/file/tip/dandelion/plugin/bzrstore.py12:56
visik7:)12:56
visik7ahahah12:56
visik7funny12:56
TheSheepI had trouble for example with getting the list of all files that were changed in a revision12:58
visik7TheSheep: from the bzrlib or from the command line tool ?12:58
TheSheepvisik7: from bzrlib12:59
visik7maybe whatching in the command line tool you got how it does12:59
visik7no ?12:59
TheSheepin the end I did [entry.name for path, entry in entries if12:59
TheSheepentry.revision == rev_id]13:00
TheSheep:)13:00
luksrepository.get_revision_delta or something like that13:00
matkorbzr: ERROR: Please specify smtp_server.  No server at default localhost - how can I do it ?13:00
matkorbzr send does not mention any option for that ...13:00
luksTheSheep: working_tree.commit(message="imported existing pages", author="wiki")13:00
lukser, maybe you meant committer there?13:00
luksand unicode(revision.message, "utf-8")13:00
luksthe decoding there is wrong, it's already unicode13:01
TheSheepluks: ah, I thought it stores bytes, cool13:01
luksno, most things in bzrlib are unicode13:01
bob2matkor: -o foo.patch, then send it using your mail client13:01
TheSheepluks: isn't delta just another tree?13:01
luksTheSheep: delta is the list of files that changed in a revision13:02
TheSheepgreat13:02
TheSheepI'm sure some parts of this code can cause nightmares for anyone familiar with bzrlib :)13:03
luksnot bzrlib relased, but you have some locking problems in try/finally there13:03
luksit should be lock(); try: ... finally: unlock()13:04
luksyou have try: lock(); ... finally: unlock(), which might call unlock even if lock failed13:04
TheSheepah, right, so that it doesn't try to unlock when the lock fails13:04
TheSheepthanks13:04
matkorbob2: Thats last option, seems  $HOME/.bazaar is place where I should specify smtp server ...13:04
bob2matkor: yes, ~/.bazaar/bazaar.conf - it presumably defaults to localhost13:05
matkorok .. it went ... I doubt it gets through to bzr-gtk@lists.canonical.com with strange from adress ...13:07
luksusually you want 'bzr send' to just launch an external mail client13:08
matkorHow often http://bundlebuggy.vernstok.nl/bzr-gtk/  is updated ?13:08
vilamatkor: you need to set mail_client in bazaar.conf for that, smtp_server is adifferent beast13:09
vilamatkor: presumably http://bundlebuggy.vernstok.nl/bzr-gtk/ get the mails from bzr-gtk list so if you don't see your mail here neither does it13:10
matkorvila: I do not see even my subscribe confirmation mail .. but I am postgreyed so might have delays ..13:11
vilamatkor: just be patient then, may be an admin need to validate your subscription,13:12
gouri'm new with bzr, but somehow feel strange that bzr status reports nothing when there is no change. what do you think about something like darcs' "No changes!" ?13:27
Odd_Blokegour: I dunno, I think you'll find you just adjust to the lack of output.13:30
gourOdd_Bloke: i consider that providing some output is nice HIG13:31
Odd_BlokeIt does provide output, a newline followed by a prompt.13:31
gourwell, i'm serious13:32
Odd_BlokeMe too, I don't want our UI cluttered up for no reason.13:32
pickscrapeJust create a file and never add it. Then you'll always have output :)13:33
Odd_BlokeRegardless, if you think something about bzr should be different, submitting a patch to the ML is a much better way of getting it discussed than IRC (especially as most of the core devs are probably in bed ATM). :)13:34
gourpickscrape: i'm not interested for *any* output, but info that nothing changed13:34
gourwill do13:35
nekohayohmm. let's say I cherry pick r3..6 from some branch, and later I just "bzr merge" from it, what would happen?13:42
nekohayoand if that branch has a change I don't want to incorporate ever, that means I need to always cherry-pick?13:43
luksor you can merge it and revert the particular change13:44
nekohayooh, you can do that? how can you revert a past committed change?13:44
luksif that change in a single commit?13:44
luksis13:44
nekohayoyeah, but for example 10 revisions earlier13:45
luksyeah, so merge, commit the merge, and then `bzr merge -r X..before:X .` and commit the reverted change13:45
nekohayobzr merge -r150..22 ?13:46
nekohayooh -r 150..14913:47
nekohayothat uncommits revision 150?13:47
luks-r 150..14913:47
luksor -r 150..before:15013:47
luksthat will revert the change from revision 15013:48
nekohayook, thanks :)13:48
=== spiv_ is now known as spiv
lelithi all14:04
lelitI'm playing with bzr and tailor lately: it was able to migrate the whole darcs history to bzr without a glitch! :-)14:05
jelmerhi lelit14:05
lelitnow I'm trying the other way around, and notice that bzr is *very* slow in collecting the "missing" changesets14:05
lelithi jelmer14:05
lelithow's going?14:05
jelmerpretty well, thanks :-)14:06
jelmerlelit: Collecting missing changesets in what regard, "bzr missing" ?14:06
lelitI have a local bzr.dev clone, and when I do (tailor backend does, that is) "cd /tmp/p; bzr init; bzr missing SomeSourceRepo"14:07
lelitsee http://progetti.arstecnica.it/tailor/browser/vcpx/repository/bzr.py#L16814:09
lelitthat missing_revisions() takes something more than 1h here, with 100% cpu14:10
jelmerthere was talk about reimplementing it using a somewhat smarter algorithm earlier14:11
jelmerjam, ping14:11
lelitafter than, in another couple of hours the migration completes14:11
lelitjelmer: ah, ok, it's a known problem then, not something wrong with that code14:11
jelmerlelit: I think bzr itself only uses that particular function for the "bzr missing" command, not for anything else14:12
lelitdo you think there's a better way of knowing the list of csets that a "bzr pull" would fetch?14:14
lifelessbzr.dev makes missing much faster14:14
lelitlifeless: ?14:15
lifelessjohn landed a patch to improve missing yesterday14:17
* lelit goes to update14:18
* lelit restarts the test14:22
lelitthank you14:22
gourlelit: good luck ;)14:26
cjean_Hi, I'm looking for a complete tutorial explaining how to manage a decentralized workflow with gatekeeper14:43
jamjelmer: pong14:43
cjean_there is no much details on the current documentation14:43
jamjelmer, lelit: I did land a patch yesterday that made missing better, and another that made the function missing used even better14:44
jelmerjam: sorry, was wondering about your missing improvements but lifeless already replied14:44
lelitjam: thankyou, I'll write here the result. It's still using 100% cpu, since 25 mins ago now...14:46
jamlelit: using the latest bzr.dev?14:47
jamI would really like to understand your circumstance14:47
jamhere, things run on bzr.dev in <10s14:47
lelittailor is doing (look at the trac URL for the function) a missing() from an empty new repo, pulling from a local bzr.dev clone14:48
lelitI just want the *list* of patches, "darcs pull --dry-run" in darcs parlance14:49
lelitI *must* be doing it wrongly...14:50
lelitjam, and yes, updated and reinstalled current bzr.dev14:50
lifelesslelit: is it possible that the repository is not locked ?14:50
jamlelit: are you writing your own plugin for it?14:51
jamlifeless: 'find_unmerged' would be locking the branches14:51
jamI'm not sure what function he is using14:51
lelitjam, see http://progetti.arstecnica.it/tailor/browser/vcpx/repository/bzr.py#L16814:51
lelitit's just my tailor business :)14:51
jama Branch.missing_revisions14:52
jamI don't know if that is ever used14:52
jamit certainly doesn't scale well14:52
jamandprobably doesn't take a lock14:52
lelitwhat you'd suggest?14:52
jamlelit: ATM, bzrlib.missing.find_unmerged(this_branch, other_branch, 'local'/'remote'/'all')14:53
lelitok, thanks alot, I'll try that way14:53
jamThe only place that uses Branch.missing_revisions() is one function in the test suite14:54
jamlifeless: what do you think, should I just nuke the function, or should I move the 'find_unmerged' functionality over into it?14:55
jamI think it *used* to be used as part of pull/push/etc to figure out if branches had diverged14:55
jamNow, I think we use get_graph.().heads()14:55
lelitlater, ciao14:56
jelmerjam: bzr-svn uses it14:56
lelitso, that's *three* places :)14:56
jamjelmer: well, it's a Bad(tm) function14:56
fullermdOur *three* users are...   wait, I'll come in again.14:57
jamwe could improve it14:57
jamjust not sure if it is worthwhile14:57
jamjelmer: what do you use it for?14:57
jelmerjam: actually, never mind me14:58
jelmerjam: I added a custom implementation for bzr-svn later on14:58
Lo-lan-doHi all14:58
jelmerjam: it's being used from Branch.pull()14:59
jamjelmer: you mean SVNBranch.pull(), right?14:59
jelmerjam: yep14:59
Lo-lan-dojelmer: I am under the impression that bzr-svn is slower and slower as time passes, and possibly that it's doind more and more connections to the SVN repo15:00
jelmerLo-lan-do, what version are you using?15:00
Lo-lan-doIs that known and/or addressed?15:00
jamjelmer: well, there is example code in Branch.update_revisions() which shows you how to do it with a Graph instead of missing_revisions15:00
jamthough we could arguably do something similar in missing_revisions15:00
=== yacc__ is now known as yacc
Lo-lan-do0.4.10 + bzr 1.5, I guess15:01
jelmerLo-lan-do: in that case, it's not a known issue15:01
jelmerjam: thanks, I'll see if I can steal that15:01
Lo-lan-doI just did a bzr commit on a svn-bound branch for gforge, and it took 4 minutes and 40 seconds, and 276 sockets opened to the repo15:01
gumpaHowdy, I've hosed my gui bazaar stuff.  Started after creating ~/.bazaar/plugins, and branching lp:bzr-gtk  and qbzr there15:02
jamjelmer: any chance you could be around for a skype call tomorrow around 1900 UTC time ?15:02
jamwe are thinking about talking about bzr-svn in my next "This Week in Bazaar" post15:02
jamand it would be nice to have your input15:02
jelmerjam: yep, sounds good15:03
jamjelmer: great15:03
jelmerLo-lan-do, ouch, that's wrong - please file a bug15:03
gumpanow olive crashes15:03
jamgumpa: did you branch "lp:bzr-gtk ~/.bazaar/plugins/gtk" ?15:04
jamjust to make sure it was named correctly15:04
gumpaI've removed and installed bzr-gtk, removed the plugins dir, still ng15:04
jamlifeless: how is UDS going, btw15:06
gumpaI had changed bzr-gtk to bzr_gtk, just changed bzr_gtk to ~/.bazaar/plugins/gtk still crashes15:08
jelmergumpa: what's the error you're getting?15:09
jelmerjam/lifeless: Somewhat related to Branch.missing_revisions(), any chance you can reply to https://lists.ubuntu.com/archives/bazaar/2008q2/041834.html ?15:09
gumpajust did apt-get remove bzr-gtk --purge, now 'bzr qdiff' says 'Not running bzrlib.plugins.gtk, things may break'15:10
gumpaand lots of 'Two plugins defined the same command:'15:11
jelmergumpa, qdiff is not part of bzr-gtk15:12
jelmerbzr gdiff is15:12
gumpatypo s/gdiff/qdiff15:12
gumpasame messages with gstatus15:13
gumpaPreviously this command was registered from <module 'bzrlib.plugins.bzr_gtk' from '/home/ktenney/.bazaar/plugins/bzr_gtk/__init__.pyc'>15:15
gumpaafter Two plugins defined the same command: ...15:15
jelmergumpa: remove the bzr_gtk directory in ~/.bazaar/plugins15:16
gumpaFixed. You make it look so easy.  thanks15:17
lifelessjam: good15:18
gumpacan I apt-get install bzr-gtk to get Olive now?15:18
jelmergumpa, Olive is part of bzr-gtk15:23
gumpahow do I start it?15:24
jelmergumpa, So you should already have it if you installed bzr-gtk into ~/.bazaar/plugins/gtk15:24
jelmerstart the olive-gtk binary from that directory15:24
xifHi. I have a file that I need to use in two code tree (two separate projects). How would I share that file among the two projects, if they're both managed with bzr?15:24
gumpajelmer great, thanks, see you15:25
matkorxif: Those separate project are not self-branches  ?15:31
xifmatkor: nope, they're completely separate projects.15:32
xifto further explain: these projects are web applications.15:33
xifthe file they're sharing is a Javascript library.15:33
LeoNerdHrm... Any reason why bzr doesn't ignore directories called "CVS" by default?15:34
NfNitLoopLeoNerd: Heh, I've wondered that myself.15:36
fullermdLeoNerd: Because the speed of add varies inversely (and significantly) with the number of ignore rules.15:36
LeoNerdfullermd: Ahh... OK.15:36
NfNitLoopbzr init; bzr add . ; bzr commit;   What!?  CVS/?15:36
fullermdSo the default set is pared down as much as possible.15:36
LeoNerdBesides... bzr ignore CVS    isn't exactly difficult15:36
LeoNerdIt's just something I hadn't thought about and just presumed would work15:36
jamLeoNerd: at one point we ignored lots of things by default15:37
jambut it turned out to slow things down15:37
jamwhen you had to check every file against 100+ possible ignores15:37
LeoNerdRight15:37
jamso we turned it down a bit15:37
NfNitLoopWouldn't the better solution be to fix the performance of ignore?  ;)15:37
jamNfNitLoop: It isn't ignore15:38
jamit is stuff like 'add' having to compare against a large list15:38
jamwe already use tricks to make it faster15:38
jambut if you are adding 20,000 files15:38
jamthe overhead of each one makes a difference15:38
NfNitLoopaaah.  Yeah.15:38
xifOK, nobody has an answer?15:38
xifdoesn't BZR have something like svn:externals?15:39
NfNitLoopNot that I know of, but I'm not a bzr developer. :)15:40
NfNitLoopIIRC, you can check out a project within the directory of another.15:40
xifOK, that might be a solution...15:40
NfNitLoopbut there's nothing to tie revision X of baseProject to revision Y of innerProject.15:40
xifhm, this kind of sucks :/15:45
lifelessjam: do you remember if we fixed the problem where commit did not notify the dirstate of the sha1 of files read in during commit ?15:49
lifelessjam: sabdfl is still seeing status on large trees as 70-80% slower than hg's.15:49
jamlifeless: afaik we never fixed that15:53
xifOK, looks like this has been thought of before: http://bazaar-vcs.org/NestedTreeSupport15:54
beunoxif, LarstiQ is working on that, but it might take a while to land15:55
xifa Nested Tree "by reference" is basically svn:externals.15:55
vilajam: what's that "This Week in Bazaar" post thing ? 8-)15:55
jamvila: jam-bazaar.blogspot.com15:55
xifbeuno: good to know, that's a useful feature :)15:55
jamhttp://jam-bazaar.blogspot.com15:55
jamvila: I'm just doing a weekly blog post with statik15:55
jamif you have ideas of something to talk about let me know15:56
jamit is a "spend 45 minutes every week to get some publicity"15:56
vilaok, reading it.15:56
jamso, quick topics, nothing terribly fancy15:56
jamjust that we do a lot of work that doesn't get noticed because we forget to communicate ti15:56
jamit15:56
vilaooh, the 'my' plugin I wanted to code for ages exists and is called 'bookmarks' :)15:57
vilaooooh 'removable' !15:58
htdhi, i am totally new to bzr - if i merge my changes, can i control if the full history of my changes gets merged or just the most recent revision?16:00
Pilkyjam: might have something for you next week16:02
matkorhtd: you can control what changes are marged16:02
jamPilky: what is that?16:03
Pilkyfirst release of a OS X GUI client for Bazaar16:03
htdmatkor: sounds great, thanks for the info16:04
jamsounds interesting16:04
Pilkygonna be pretty basic to begin with (add, init, init-repo, commit, status) but should still be pretty helpful16:05
pickscrapebeuno: what happened to your plugin_management plugin? I just did a pull and upstream has vanished.16:05
=== awilkins is now known as dr_barnowl
=== dr_barnowl is now known as awilkins
gumpaI am getting a traceback and hang on "Please wait, loading ancestral graph" when I click  the 'Log' button in Olive, current lp:bzr-gtk16:13
jamPilky: have you tried QBzr on Mac?16:13
jamjust wondering if your time might be better spent expanding something that already works there16:13
gumpapastebin?16:14
Pilkyjam, possibly, I just don't think that there's going to be a huge adoption of a GUI client on the Mac if it's not native16:14
jamPilky: perhaps, though there won't be huge adoption if it is underdeveloped, either :)16:15
pickscrapeOne of my colleagues spotted BazaarX the other day16:15
pickscrapeWhich is apparently a bzr client for cocoa.16:15
jamjelmer: I responded16:15
Pilkyheh, but an application is only underdeveloped for a certain amount of time ;)16:16
Pilkypickscrape: that would be the app I'm working on16:16
pickscrapeAh16:16
jelmerjam: earlier you mean, or just now?16:16
jamjelmer: just now16:16
jelmerjam: Thanks :-)16:16
PilkyWe only started coding it yesterday but we've got pretty far16:16
pickscrapeYes, it caused a small flurry of excitement amongst the Crayon Monkeys who aren't too keen on the idea of using the command line :)16:16
pickscrapeUnfortunately I have no idea how to compile it, so I can't advise them :(16:17
Pilkycompile BazaarX?16:17
Pilkyat the moment there's not much to compile, just some unit tests for the bit that talks to bzr, but we'll be providing disk images with the app on for each release16:19
pickscrapeCool. Yeah, I realise it's young. I just get frustrated by the whole apple thing. At least with windows I can easily run it under vistualbox.16:19
pickscrapevirtualbox.16:20
awilkinsI'd rather people diverted all their attention to Olive, frankly, and shamelessly stole as many ideas from TortoiseSVN as possible.16:20
awilkinsIs vistualbox a euphemism for "The OS before Windows 7" ?16:21
awilkins;-)16:21
pickscrapeThat would be Windows ME II ;)16:22
jamjelmer: do you use the 'stop_revision' parameter of missing_revisions?16:22
jamI'm just trying to understand it16:22
jamI *think* it is a revno16:22
jamI was going to clean up the function16:22
jelmerjam: in my implementation it is a revid16:23
pickscrapePilky: either way, my colleagues are very much looking forward to your work on that, and it is appreciated.16:23
jambut now I'm thinking about just deprecating it because it is crufty16:23
jamjelmer: well I see:16:23
jamif stop_revision > other_len:16:23
jamjelmer: so I'm pretty sure it *has* to be a revno16:23
jelmerjam: It may've changed since I created my implementation though16:23
jamat least for the base implementation16:23
Pilkypickscrape: nice to know that others are interested as well :)16:23
jelmerjam: Mine is called lhs_missing_revisions() these days16:23
jamjelmer: update_revisions() takes a revision id16:23
jamI think missing_revisions is just badly broken16:23
jamand nobody noticed16:24
jelmerjam: looks like it16:25
jamjelmer: ok, deprecation and future nuking it is16:27
steelpotatocan somebody help me an error message?16:34
steelpotatoI'm trying to use bzr switch, and it says:16:34
steelpotatobzr: ERROR: Cannot switch a branch, only a checkout.16:34
Pilkysteelpotato: did you use bzr checkout to get the files?16:35
steelpotatoI guess not :) No, I think I used branch.. so that makes sense, but I still want to switch it16:35
steelpotatothe url I'm switching to is a branch of the url I originally branched from16:35
Pilkyso you're wanting to change the default URL to merge/push/pull?16:36
Lo-lan-doThen first bind to your initial URL, and switch after that16:36
steelpotatoPilky: well, yes, but mostly I want to change to the new files, since they contain some changes16:37
radixsteelpotato: then maybe you just want to pull or merge16:37
jamsteelpotato: bzr pull http://new_url ?16:37
jamor maybe16:37
Pilkysteelpotato: try bzr pull URL16:37
jambzr pull --remember --overwrite http://new_url16:37
steelpotatothat would change the files16:37
Pilkyand add --remember to that if you want to set that as the default16:37
steelpotatobut what if I wanted to switch back?16:37
Pilkyto the previous files?16:37
steelpotatoyeah16:38
radixsteelpotato: or... maybe you just want to branch again? :)16:38
steelpotatothis is an experimental change i'd like to review16:38
Pilkyjust bzr revert -116:38
beunopickscrape, I moved it: https://code.edge.launchpad.net/~beuno/bzr/automatic_plugins16:38
beunoit has almost-working-install now  :)16:38
jamsteelpotato: alternatively "bzr merge http://new_url"16:38
radixsteelpotato: ok, so someone made a branch and you want to review the changes it has?16:38
jamif you just want to review it16:38
steelpotatoLet me explain my background a little bit...  :) I'm used to using git, where I could branch all over the place16:38
steelpotatoand switch between them at wil16:38
steelpotatoI'm trying to duplicate that without needing to create new checkouts16:38
steelpotatobecause the folders are flex projects and the IDE doesn't like duplicate projects16:39
radixYeah, I suggest merging it and then viewing the diff.16:39
radixAnd you can branch as much as you want. branch branch branch.16:39
bob2steelpotato: create a repository, branch things into it, checkout from it and then switch that checkout amongst the branches16:39
steelpotatobob2: right, that's what I am trying to do, but since I used bzr branch instead of bzr checkkout originally, switch isn't working16:39
steelpotatoI could just check it out again16:40
Pilkysteelpotato: just wondering why you don't just branch from the repository with the new files?16:40
steelpotatoPilky: I'm not sure I understand16:40
bob2steelpotato: right, so 'bzr init-repo ~/somewhere', 'bzr branch . ~/somewhere/trunk', 'bzr bind ~/somewhere/trunk', 'bzr reconfigure --checkout'16:41
steelpotatoPilky: you mean get a new folder with the branch?16:41
Pilkyyeah16:41
PilkyI'm assuming the files you want are in some central location16:41
steelpotatoPilky: they are, but I can't create multiple copies locally16:41
Pilkywhy not?16:41
steelpotatoPilky: because the IDE gets mad at me for having two projects claiming to be the same one16:42
Pilkyodd, which IDE?16:42
steelpotatoFlex Builder16:42
steelpotatoEclipse16:42
Pilkyah16:42
steelpotatoI just use it for compiling and linking :)16:42
PilkyI can see how that would be an issue16:42
radixsteelpotato: IMO merge is the easiest thing you could do right now.16:43
steelpotatobob2: I totally don't understand those commands, but I could give them a shot... Why would I need to use the bind command to get that to work?16:43
radixsteelpotato: If you merge it, it'll change your working copy but not the branch; you can view the differences and then revert them.16:43
steelpotatoradix: would my local commit history be any different than the branch's?16:43
steelpotatoradix: would it show a new commit or something, or would that match the branch I'm merging from ont he server?16:44
radixsteelpotato: No. merging doesn't affect your branch (i.e., it doesn't add any revisions). You have to commit the merge if you want to save it.16:44
pickscrapebeuno: thanks. And bzr pull --remember Just Worked too :)16:44
steelpotatobob2: or is it the reconfigure --checkout thing16:44
radixsteelpotato: and if you don't want to save it, you can "bzr revert" and the merge goes away.16:44
beunopickscrape, sorry about moving it  :)16:44
bob2steelpotato: well, the idea is that a checkout doesn't actually include a branch, it just points at one. those commands put the branch elsewhere, then attach the existing branch dir to that other place.  you're right, the reconfigure is redundant.16:44
pickscrapeNot a problem16:44
steelpotatobob2: alright... i'm going to try to switch my working copy to be a "checkout" instead of a "branch"16:45
bob2steelpotato: or, like someone else said, you can just bind to the remote branches directly16:46
steelpotatobob2: ? Is that what they said? :D16:47
steelpotatowell, I don't like the merging idea (it would work, but I want something more flexible)16:48
steelpotatoyou mean bzr bind the_new_branch?16:49
steelpotatothat makes it send all commits to the server, right?16:49
bob2bzr bind sftp://whatever16:49
bob2yes16:49
steelpotatowould the bind command get me those new files?16:49
steelpotatothen I could unbind, or somethign?16:49
steelpotatoBecause I don't want my commits sent to the server automatically16:50
radixsteelpotato: fyi, a "checkout" is a bound branch, and means that commits automatically get sent to whatever branch you "checked out"16:50
steelpotatoohhh16:50
radixsteelpotato: then you don't want to reconfigure to a checkout.16:50
steelpotatoradix: but I DO want to do the switch16:50
steelpotatoso I could bind, switch, then unbind, right?16:50
steelpotatoI think I'm totally missing the point here16:50
lifelessindeed16:51
lifelessswitch assumes you have your work stored elsewhere16:51
radixoh, or you could bind to a branch on your own machine? I guess that's what beuno's suggesting16:51
steelpotatoMaybe I should read more about the design decisions of bzr16:51
lifelessif you just want a new basis, just pull --oveerwrite16:51
radixmerging sounds like a much simpler way to review changes than all of this stuff :)16:51
steelpotatolifeless: yeah, that would work like I'm expecting switch do, right?  Would it changed my "stored location"16:51
steelpotatoradix: yeah, but I might want to work on it, then switch back to something else, etc16:52
Pilkysteelpotato: have you read through the user guide? might be worth identifying what workflow best fits your situation and reading the relevant section16:52
steelpotatoradix: I'm looking for something that willl support the workflow I'm used to16:52
steelpotatoPilky: thanks16:52
bob2steelpotato: what I would do: create repository, branch everyone else's stuff there, make your 'trunk' or 'reviewed' or whatever branch, co it, then use switch to move between all the others16:53
Pilkybzr is incredibly flexible to various workflows. I'm using it for solo stuff, distributed stuff that's centralised on launchpad and the friend that is working on the launchpad project is hoping to switch over from subversion while using it similar to subversion16:53
steelpotatobob2: so, basically what I'm doing now, except I'm bound to the branch I'm working on?16:54
steelpotatobob2: we have a repo on the server, it has some branches there16:54
steelpotatobob2: somebody branched locally, then pushed their changes up to a new folder up there16:55
steelpotatobob2: we're planning on distributing lots of experimental changes there until it is reveiwed, when it will be merged into the trunk16:55
steelpotatoI'm thinking this will work ..16:55
steelpotatoPilky: yeah, I like it so far...16:56
steelpotatothanks everybody16:56
steelpotatoI'll fool around with it more16:56
sabdflsteelpotato: the user guide is still very cool to gain an understanding of all the different workflows that are easy with bzr, because you can then compose a customer wokflow that right for you16:56
Psy|ecimTechHi there, someone can guide me a bit on a problem trying to install bzr-eclipse?16:59
beunoPsy|ecimTech, I can try, and, if not, I'll try and drag the developer in here17:00
Psy|ecimTechThanks17:00
Psy|ecimTechI'm on XP SP3, I have the bazaar executable intalled and the xml plugin on the plugin directory17:00
Psy|ecimTechI'm now configuring bazaar's plugin on eclipse, but the preference dialog keep telling me that there is no bzr-xmloutput plugin17:01
Psy|ecimTechon bazaar plugins path I have17:01
Psy|ecimTechbazaar\plugins & bazaar\plugins\bzr-smloutput17:02
beunoPsy|ecimTech, could you fire up a console in windows, and run:  bzr plugins17:02
Psy|ecimTechoh I see17:02
Psy|ecimTechseems that there is a problem with the folder name17:03
Psy|ecimTechbazaar recomends rename it to bzr_xmluoutput17:03
Psy|ecimTechlets see..17:03
Psy|ecimTechSolved!17:04
Psy|ecimTechthanks very much17:05
beunoPsy|ecimTech,  :)17:05
Jc2kjelmer: i'm looking at bug #232196 and wondered if you could spare 5 to see if i'm hot or cold..17:16
ubottuLaunchpad bug 232196 in bzr-svn ""The file id FOO is not present in the tree" on svn-import or branch" [Undecided,New] https://launchpad.net/bugs/23219617:16
Jc2kjelmer: i actually just realised i'm coooold :-(.. *goes back to digging*17:22
matkorIs it posible to mark bug as duplicate of another ?17:27
matkorhttps://bugs.launchpad.net/bzr-gtk/+bug/23255117:27
ubottuLaunchpad bug 232551 in bzr-gtk "Olive hangs when 'Log' is clicked" [Undecided,New]17:27
beunomatkor, sure, on the left hand side, you have "Mark as duplicate"17:30
matkorahh17:30
matkorthanks bueno17:31
beunomatkor, np17:32
jelmerJc2k, hi17:49
Jc2kjelmer: lo17:59
Jc2ki thought the branch commit history was weird, but it looks similar to branches that do work18:00
Jc2kso im no closer to finding out whay these branches are screwy/different to normal18:01
jelmerit's probably just a corner case bug18:01
* jelmer tries to branch the eog url18:01
grahalis there something similar to git-send-email in bzr?18:14
grahalbzr send doesn't seem to be the answer18:14
fullermdIt's the usual one.  What's it lack?18:15
Jc2kjelmer: changing trains. be back in a bit..18:15
grahalI was expecting the ability to break commits into several emails18:17
grahalnot a single email with all the merge18:17
grahal1/3, 2/3, 3/3 kind of thing18:17
fullermdgrahal: You may want to see the thread at <https://lists.ubuntu.com/archives/bazaar/2008q2/thread.html#41611>18:23
fullermdThe topic seems to come up every few months; that's the last time through it (it generally quickly goes a bit meta)18:24
lifelessgrahal: you could also do send -r -4..-3; send -r -3..-2; send -r -2..-118:24
grahalI see, thanks for the info18:25
grahalwill have a look18:25
jelmerJc2k, it's svn revnum 3335 that is the culprit18:32
lifelesstchau19:05
jelmerJc2k, ping19:28
Jc2kjelmer: pong19:31
jelmerJc2k, I think I have a fix19:46
Jc2kjelmer: awesome :D19:49
keithyI am attempting to setup loggerhead still19:50
keithythe directions for ProxPass in apache dont setup the static files19:50
lelitjelmer, lifeless: for whatever reason, bzr.dev took even longer in that .missing()19:53
Jc2kjelmer: got a diff so i can take it for a spin?20:06
keithyI am struggling to get the static content served by appache20:31
keithyfor loggerhead20:31
keithyhas anyone got some conf I could look at20:31
sabdflkeithy: expert is mwhudson_20:32
keithy 20:33
jelmerJc2k: yeah, I'll commit to bzr-svn's 0.4 branch in a few minutes20:35
jelmerI was trying to add a test case to reproduce this20:35
jelmerbut I haven't been able to do so yet20:35
Jc2kcool20:37
Lo-lan-dojelmer: Sorry about the duplicate bugs, by the way20:39
keithymwhudson_ hello: :20:39
jelmerJc2k, pushed20:40
Jc2kawesome20:40
Jc2k*patches and kicks off some imports*20:49
Jc2kjelmer: happily your patch is what i was thinking, but i just couldn't figure out a test case to go with it20:52
jelmerJc2k: Yeah, me neither :-(20:52
Jc2kSVN seems to stop you creating that kind of a state these days?20:52
jelmerwell, I must admit I haven't reproduced the full state, just the bits I thought mattered20:53
Jc2kwell, same here20:53
Jc2k*shrugs*20:54
NemesisDhi all, ive found the documentation on using the ssh+bzr:// protocol a little spotty, is there a way you can specify the username and password so that several dirs can be pushed with a shell script21:09
Lo-lan-doNemesisD: You can do the username with ~/.ssh/config, and use keys to avoid the password problem21:10
NemesisDhmm21:13
NemesisDLo-lan-do, ok im following the guide on bazaar's site but its a bit confusing, i did an ssh keygen21:22
NemesisDand its telling me to copy the contents to my local authorized_keys file, do i just copy the big huge key or am i copying the DEK-Info part and th Proc-Type part?21:22
Lo-lan-doActually, you need to copy it to the remote authorized_keys file.21:25
Lo-lan-doThe ssh-copy-id command does it for you.21:25
NemesisDhmm,  i just did cp id_bzr.pub authorized_keys on the remote system then i scp'ed the authorized_keys to my local .ssh directory21:27
beunoNemesisD, and make sure the permissions for that file are set to 60021:27
NemesisDi entered a passphrase when it asked when i did the keygen, should i not have done that?21:28
beunoNemesisD, then, you will be asked for a passphrase every time21:29
beunoif you don't want to use a passphrase, re-generate it without one21:29
Lo-lan-doOr use ssh-agent, which will cache it in memory.21:30
NemesisDhmm, im a bit confused, i think i would like to be prompted for a password when i ssh in manually to do stuff but i want my script that uses bzr+ssh:// to not be prompted, but i suppose that doesn't make much sense21:31
NemesisDi tried resetting the password to blank and its still prompting21:37
NemesisDcrap, ive somehow done the process in reverse, now the remote can ssh into me with no pass but not vice versa21:45
beunoBB is down, The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.21:46
beunoabentley, ^21:46
NemesisDfix'd21:48
abentleybeuno: Should be up in a minute.21:49
beunoabentley, cool, thanks. Didn't know if you where aware  :)21:50
abentleyNo, I wasn't.  Thanks.21:50
abentleyEvery now and then it hangs badly enough a kill -9 is needed, and the auto-restart doesn't do that.21:51
beunoabentley, always sqlite's fault?21:52
beuno(loggerhead seems to do the same, so it makes me wonder)21:52
abentleyNo, an interaction between sqlite's and turbogears.21:53
NemesisDugh, ok so rather than doing a bzr push with ssh, would it be equivalent to, on the local machine, do bzr checkout foo/ temp/, scp temp/ to the remote machine then delete the local copy of temp?21:54
beunoabentley, I haven't looked into it, but, would adding a postgre backend be too complicated?  I think you already use alchemy, right?21:54
abentleyNo, adding the backend isn't complicated.  I just don't see an easy way of migrating the data.21:55
beunoabentley, well, I want to use BB for a few projects, so, if you're willing to point me in the right direction now and then, I can try and add postgre/mysql support, and a migration script21:57
beuno(and, of course, to improve BB's uptime for bzr :p)21:57
abentleyI'd love it if you did that.21:57
beunocool, I've just finished work, so I'll plunge into the code now and start snooping21:58
beunois there anyway I can get my hands on the current bzr sqlite DB to run tests?  I don't know if there's any sensitive data on it like passwords and such21:58
keithyhave we a loggerhead expert in the house?21:59
keithyI have a heirarchical arrangement of brances21:59
abentleyThere are passwords.  I can get you a copy, but I'll have to scrub the passwords first.21:59
keithyand some duplicate names21:59
keithyloggerhead flattens them22:00
beunoabentley, no hurry, but if you could, it would probably speed things up for me  :)22:00
keithyand the duplicates are pointint to the same repo22:00
beunokeithy, mwhudson_ seems to be still away. He's in New Zeland, so don't expect him to be up for a couple more hours22:01
abentleybeuno: Actually, he's awake and active on the private irc server.22:02
beunoah, well, he must be busy then (I assumed because he has the _ in the nick)22:03
keithymwhudson_: hello22:07
keithydo any of the other web frontends support a heirarchy of repos?22:07
keithyI cant see the "download tarball" option22:09
beunokeithy, loggerhead currently doesn't have that option22:09
beunosome work might be done on loggerhead in the following months, so expect improvements  :)22:10
keithysigh22:10
keithyso nothing works22:10
beunothat may be a bit over the top, but feel free/encouraged to file bugs toward loggerhead as feature requests22:11
keithyhttp://bzr.warwick.st/22:11
keithythe published urls for the repositories are wrong22:12
keithythats on the front page!22:12
beunokeithy, please file bugs with as much detail as you can so it can get fixed22:13
mwhudson_keithy: what's wrong with the urls?22:17
keithyI access my repo via22:18
keithybzr push ssh://bzr.warwick.st/squeak/3.10/LPF/pr_tools22:18
keithythe url listed for pr_tools is22:19
keithybzr push ssh://bzr.warwick.st/squeak/pr_tools22:19
keithythere are two LPF branches22:19
keithybzr push ssh://bzr.warwick.st/squeak/3.10/LPF22:19
keithybzr push ssh://bzr.warwick.st/squeak/3.9.1/LPF22:19
keithythey show up as the same repo22:19
keithyagain with the wrong url22:20
keithyI spent 6 hours or more trying to get the apache config to work22:21
keithyI set up a virtual host instead22:22
keithyso that working now22:22
mwhudson_loggerhead displays the public_location url for each branch i think22:22
keithysorry I dont know what that means22:22
keithya branch should not know where it is in the hierarchy22:23
mwhudson_keithy: well, i don't really understand your description of your problem22:23
mwhudson_keithy: so i guess we're about even22:23
keithyI have a heirarchical repo22:23
keithybzr push ssh://bzr.warwick.st/squeak/3.722:23
keithybzr push ssh://bzr.warwick.st/squeak/3.822:24
keithybzr push ssh://bzr.warwick.st/squeak/3.822:24
keithybzr push ssh://bzr.warwick.st/squeak/3.922:24
keithybzr push ssh://bzr.warwick.st/squeak/3.1022:24
keithyetc22:24
mwhudson_ok22:24
keithybzr push ssh://bzr.warwick.st/squeak/3.10/LPF22:24
keithybzr push ssh://bzr.warwick.st/squeak/3.9/LPF22:24
mwhudson_oh, i think i see22:24
keithybzr push ssh://bzr.warwick.st/squeak/3.9/LPF/pr_tools22:24
keithyeach level is a specialization of the one above22:24
keithyhttp://bzr.warwick.st  ignores the hierarchy22:25
mwhudson_so i guess one thing to say is that the urls loggerhead is using in the web browser and the paths you push to using ssh don't inherently have anything to do with each other22:25
mwhudson_keithy: can you pastebin your loggerhead.conf file?22:26
keithyurl?22:26
=== samurai_ is now known as samurai
mwhudson_http://pastebin.ubuntu.com/22:27
=== mwhudson_ is now known as mwhudson
keithyhttp://pastebin.ubuntu.com/13727/22:27
keithythe repo heirarchy is fairly invisible since .bzr is a hidden directory, so my public users have no idea what is in the repo22:28
keithyso something should tell them what bzr command to use to access the repo22:28
beunoabentley, meeting all dependencies for BB in hardy is turning out to be quite a challenge22:30
mwhudsonah dammit i don22:30
mwhudson't have the loggerhead source on this machine yet22:30
mwhudson(my hd in my other laptop died yesterday)22:31
keithyouch22:31
abentleybeuno: What's the problem?22:32
beunoabentley, BB asks for a newer (or older) version of almost all the dependencies22:33
beunopkg_resources.VersionConflict: (PasteScript 1.6.2 (/usr/lib/python2.5/site-packages/PasteScript-1.6.2-py2.5.egg), Requirement.parse('PasteScript>=0.9.7,<1.6'))22:33
beunofinding newer egg's for the other ones was fairly easy, finding *older* versions is turning out to be much harder22:33
abentleyI find you have to hand-hack the URLs for PyPI.22:34
beunoRuleDispatch above revision 3201 was a tough one too22:34
abentleyBut I honestly was unaware of any issue.  That PasteScript is not a dependency I deliberately put there.22:34
abentleyNeither the RuleDispatch.22:34
beunopkg_resources.VersionConflict: (RuleDispatch 0.5a0.dev-r2115 (/usr/lib/python2.5/site-packages/RuleDispatch-0.5a0.dev_r2115-py2.5-linux-i686.egg), Requirement.parse('RuleDispatch>=0.5a0.dev-r2303'))22:35
abentleyThis is all sounding suspiciously like *TurboGears* requirements, not BB's.22:35
beunohrm22:35
abentleyHave you installed Hardy's TG?22:36
beunothey are...22:36
beunoyes22:36
mwhudsonkeithy: so basically the problem is that loggerhead only really seems to expect branches to be directly in the repo22:37
mwhudsonrepo/22:37
mwhudsonrepo/branch122:37
keithysomething like that22:37
mwhudsonrepo/branch222:37
mwhudsonkeithy: you can sort of fudge around this by not using auto_publish_folder i expect22:37
keithyand it finds branches at a deeper level, but "moves" them to the top level22:38
mwhudsonor by using it for each part of your repo or something22:38
keithyk22:39
beunoabentley, I've got /usr/lib/python2.5/site-packages/TurboGears-1.0.4.3-py2.5.egg/turbogears/22:39
mwhudsoni think you could say that the auto_publish_folders feature wasn't amazingly well thought out22:39
abentleySo what are you doing that's triggering the demand for PasteScript.22:39
beunoabentley, starting BB. Although, traceback *is* from TurboGears22:40
abentleyYou don't have an old TG install do you?22:40
abentleyin addition to the Hardy one?22:40
beunoabentley, let me check, but the traceback is coming from the path above22:41
abentleybeuno: Please pastebin the traceback.22:41
beunoabentley, http://paste.ubuntu.com/13732/22:42
abentleybeuno: It doesn't look like you're starting BB.22:42
beunoabentley, I was running setup for BB there, but it's the same error22:43
beunoin fact, I get the same error while importing turbogears in ipython22:43
beunoso it's definetly not a BB problem...  :/22:44
mwhudsoni think i'd look for out of date crap on $PYTHONPATH22:45
abentleybeuno: Yeah, I've just double-checked and BB only specifies versions of TG, Elixir, SQLAlchemy and bzr.22:45
beunomwhudson, I'm starting to suspect it has something to do with when I installed loggerhead  :)22:46
beuno:p22:46
mwhudsoneh, i wouldn't recommend actually _installing_ loggerhead22:46
beunocleaning things up, installing them all over again22:46
kwahhi everyone22:47
beunomwhudson, setup.py outdated?22:47
kwahare there features in bzr helping out in tracking refactoring ?22:47
mwhudsonbeuno: i haven't looked at setup.py once since i started maintaining loggerhead22:48
beunomwhudson, aaah, good to know22:48
beuno(makes a lot of sense now)22:49
mwhudsonbeuno: perhaps i should have made it more obviously broken22:49
mwhudsonoh actually i have looked at it22:49
mwhudsonbut only to get sdist to work22:49
beunook, yes, it was the loggerhead which b0rked everything22:50
mwhudsonwhich reminds me, i should see if bzr 1.5 breaks loggerhead like i expected it to22:50
beunooddly enough, for python2.5, if I run BB with python2.4, it works fine22:50
beunomwhudson, I22:51
beunoI'd recommend breaking setup.py in a very obvious way  :)22:52
beunoif things go well, I might end up packaging, so I guess I'll have to fix it eventually, but, for now...22:52
mwhudsonand wa-hey, no python 2.4 on this machine yet eithr22:55
mwhudsonoh er, or tg22:55
johanis there a command similar to git log -p in bzr. which shows me a log but includes the diffs?22:57
beunoabentley, ok, cleaning up everything and doing clean installs worked.  Thanks, and sorry for the noise23:04
pickscrapejohan: that's a request already in launchpad23:10
johanpickscrape: okay, that's good enough for me23:10
abentleybeuno: No problem.23:15
beunoabentley, is there a specific problem you see in going from sqlite to postgre?   I'm running a few quick tests now against MySQL, and I don't see many problems in the horizon23:34
abentleyNo, I don't know of any specific problems.23:35
abentleyI just have all this data and no simple way to convert it.23:35
beunoabentley, that's good news, I thought I was missing something23:35
beunoI'll try and hack together a script that does it, and, when you send me the data, I'll run tests against it23:36
abentleyI guess you should try exercising all the hardcoded queries, since that's most likely to differ.23:36
beunoonce I get all the data over, I'll look into testing those23:37
abentleybeuno: The other thing to try would be getting the test suite running under PG.23:46
beunoabentley, sure, sounds sane. I'm going to start with mysql, because it's what I know best, and will spend the less amount of time with trivial problems, but jumping to pg after that should be very easy23:48

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