/srv/irclogs.ubuntu.com/2010/04/02/#bzr.txt

idnarbzr: ERROR: No module named configobj01:12
idnaris there some way to make that more verbose?01:12
idnarah, .bzr.log has a traceback01:13
lifeless-Derror01:13
tct_hi, bzr started crashing on me today when i tried to commit01:13
idnarI guess bzr-fastimport is out of date wrt bzrlib, or something01:14
tct_any ideas?  trackback is here: http://pastebin.com/aiUXNkWm01:14
lifelessidnar: I think we stopped bundling configobj01:14
lifelessidnar: fastimport should be importing the system configobj, if it wants to play with configobj directly.01:15
idnarlifeless: yeah, this code tries to do "import bzrlib.util.configobj.configobj as configobj"01:15
lifelessyeah, naughty.01:15
lifelesstct_: most folk are on leave with easter01:15
lifelesstct_: you might file a bug01:15
tct_thanks, will do01:18
idnarwhat... the heck is fast-import doing01:19
idnarI suppose I should just create the destination myself01:19
=== ctrlsoft_ is now known as ctrlsoft
=== ctrlsoft is now known as Guest44441
=== Guest44441 is now known as ctrlsoft
lifelesspoolie: I <3 google - lmirrors pypi page is the first hit for 'lmirror' :>02:04
pooliethat's pretty quick02:05
=== BasicPRO is now known as iMacBasic
vilahi all !07:21
GaryvdMHi all09:16
reymanhello guys09:25
GaryvdMHello reyman09:30
reymani have question about bzr, and i see anything about that in help  ...09:35
reymani'm working with launchpad, and i want to work in a decentralized workflow09:35
bialixhi all09:36
reymani checkout a trunk branch, but when i try to duplicate in a local branch with branch command, bzr says me " trunk is not a branch" :/09:37
reymanhi bialix09:37
bialixreyman: I don't understand your problem09:40
bialixmaybe it helps if you pastebin shell session09:40
bialixor example of commands09:41
reymani make first a "bzr checkout /myproject/trunk trunk" , a mirror if i understand correctly the help.09:42
reymanthen i want to work in decentralized workflow, users commit on local branch before mergin with human gate keeper on launchpad09:43
bialixcheckout is the checkout or bound branch. It's not exactly mirror09:43
GaryvdMhi bialix09:43
bialixyou can convert your checkout to the simple branch with command `bzr unbind`09:44
bialixhi GaryvdM !09:44
reymanok09:44
reymanabout mirror branch the help says : "To create a mirror branch, set-up a shared repository (if you haven’t already) and then use the branch (or checkout) command to create the mirror"09:45
reymanbut why create a checkout branch, if i need to unbind after to duplicate the checkout with branch command09:46
reymanit's impossible to make a "bzr branch trunk newTrunk" when trunk is a "checkout mirror"09:47
bialixreyman: why it's impossible? it's not true AFAIK09:47
fullermdNo it's not...09:47
bialixhi fullermd !09:48
AndrewLueckeello09:53
bialixolle09:53
fullermdlole?09:53
bialixleol?09:54
AndrewLueckeI hate to admit, I've been against Bazaar for a while, but now thinking of setting up a new revision control system.. Been comparing bzr and git.. Bazaar looks nice, but I'm just wondering if there are any updated benchmarks?09:54
* AndrewLuecke has a 1-2GB repo09:54
* bialix does not think bzr can beat git on such repo09:55
AndrewLueckeEveryone seems to be saying Git is much faster, (and they both seem to have good features, with bzr more polished).. But the other benefits I see for bazaar seem to put it in the running09:55
AndrewLueckeYeah.. but I don't need it to beat all cases, but just not be much slower than SVN..09:56
fullermdI doubt it's arguable that git will be faster.  But will git be pleasant, and bzr unpleasant?09:56
fullermdDoubt you could say without trying.09:56
reymanbialix: so ok it's possible, but i try and i don't understand why i fail with this command :s09:57
AndrewLueckewell, been going through the features, addons, etc.09:57
bialixreyman: pastebin please09:57
reymanoki thx bialix09:57
bialixreyman: also I'm not native english speaker it's hard to understand you what's wrong09:57
GaryvdMbla - I don have my gpg key here.  going to pop in to work to get it. See you all later.09:58
reymani'm not native english too :] with bad bad bad english09:58
AndrewLueckefrom your opinions though, does Bazaar feel like it gets really slow?09:59
bialix!pastebin09:59
ubottuFor posting multi-line texts into the channel, please use http://paste.ubuntu.com | To post !screenshots use http://tinyurl.com/imagebin | !pastebinit to paste directly from command line | Make sure you give us the URL for your paste - see also the channel topic.09:59
bialixreyman: ^10:00
fullermdWell, I've never used it with a 2 gig repo.  There are a lot of variables other than size that have huge effects on speed too.  It depends on shape of history, size and shape of tree, yada yada.10:00
bialixAndrewLuecke: if you want to know what is slow, you can try to run benchmarks on Windows10:01
AndrewLueckeyeah.. only prob is, I'm in Australia, so quota'ed internet.. Must save downloads.. Not sure I could run a good comparison (maybe a local one I guess, but not sure how useful that would be)10:02
AndrewLueckebut anyway, if it was woefully slow, I guess there wouldn't be as many people here, as there are now..10:02
* AndrewLuecke put up with SVN for this long anyway10:03
bialixone of my past coworkers said one day: the result of meterings is highly dependent on the methods of measuring.10:04
bialixso mostly all benchmarks lies10:04
bialixonly your PC and the operations you're interested is make sense10:04
AndrewLueckeyeah.. Normally I would stick the tree into both.. But hard to say10:04
AndrewLueckefact is, we don't know yet fully what is needed, because we are forking an open source project10:05
artagnonWhat's the bzr equivalent of git reset --hard <sha1>?10:07
AndrewLueckemeh.. fedge it.. maybe I will give them a proper test (technically, the code can be broken into 3 trees anyway, so each would only be 600MB anyway I guess. Most of its mozillas code I guess10:07
fullermdartagnon: I believe that would be bzr pull --overwrite -r<abc>10:08
reymanpff i delete all my branch, checkout and restart cmd, and it's ok ... duplicate checkout in another local branch is ok.. sorry for inconvenience.10:09
bialixmost likely bzr pull . --overwrite -r<abc>10:09
fullermdWell, yeah.  My brain typed the period; not its fault if my fingers didn't comply   :p10:10
bialixreyman: there were gremlins10:10
artagnonfullermd && bialix: Got it, thanks :)10:11
bialixartagnon: always happy to help10:11
artagnonHuh? I just got a huge bunch of conflicts!10:11
fullermdDid you have local changes?10:13
artagnonYeah :|10:13
fullermdMmm.  pull may try to merge them.  I can never remember if --overwrite affects that or not.10:13
fullermdWell, git reset --hard blows them away too AFAIK, so you can just revert to get back to a pristine rev <abc> WT.10:13
* artagnon nods10:14
artagnonso bzr pull . --overwrite -r<r> isn't the equivalent10:14
fullermdNot quite.  pull ; revert (or revert ; pull) would be I guess.10:14
fullermdgit reset blurs the lines.  In bzr, pull affects the branch, and revert the WT.10:15
artagnonok, got it10:16
artagnonwhat do I do now though? I just want to hard reset to HEAD and try all this10:17
fullermdrevert with no args will blat a pristine state of the current rev onto your working tree.  After the pull, that 'current rev' will be what you set for there, so just 'revert' should do it.10:18
artagnonOk, nice. Now bzr status indicates a lot of unknown files though- how do I get rid of them?10:20
fullermdMmm.  Probably a construction of bzr ls --someargs | xargs rm10:21
jszakmeisterartagnon: I haven't tried it before, but 'bzr clean-tree' is probably what you're looking for.10:21
fullermdProbably  --unknown -R ?10:22
lifelessrm `bzr unknowns`10:22
fullermdOh look, another ls bogusness I find in checking that...   how surprising.10:22
bialix`bzr clean-tree` FTW10:22
reymanin help there are a chapter "advanced layout", and the speak about the launchpad model, but when you use launchpad to host the code, you doesn't have choice with your layout for repository, no ?10:23
jszakmeisterIs it sound to pass a URL to bzrlib.config.LocationConfig()?10:25
artagnonjszakmeister: works perfectly, Thanks :)10:26
jszakmeisterartagnon: you're welcome!10:26
defnHi all -- I have a branch, of a branch, of a "master" repository -- This branch is on a server.  How can I create a branch of my remote branch so I can work locally, and then push my commits into my the remote branch11:17
defnso right now I have branch-foo -> branch-bar -> master, and i want to have branch-local --|--> branch-foo -> branch-bar -> master11:18
defndoes that make sense?11:18
=== Kamping_Kaiser is now known as Bambi_BOFH
GaryvdMdefn bzr branch server/master11:20
GaryvdMdefn: you will then have a master branch on your computer11:20
GaryvdMdefn: I think that it is easier than you are expecting it to be :-)11:21
defnGaryvdM: :) thanks11:52
spirov92hi people, I'm having problems commiting to a launchpad branch, is launchpad down or something?11:57
spirov92ah, yes, it seems so11:58
defnGaryvdM: so would it look like:  bzr branch user@remotehost:dir/of/my/branch12:18
GaryvdMdefn: maybe bzr branch sftp://user@remotehost/dir/of/my/branch12:19
GaryvdMdefn: how is the branch shared?12:20
defnGaryvdM: im not sure im new to bzr12:20
defni have a branch in another user's branch, which is pulled into the master12:20
GaryvdMdefn: The branch can be shared over ftp, ssh(sftp), http, or anything that you can mount.12:22
defni have a dir with a .bzr/ dir in it, and then i created a branch named v1.0 in the same directory which has its own .bzr directory inside12:22
defnthat branch was created from the other user's branch12:23
defndoes any of what im saying make sense?12:23
defn:)12:23
GaryvdMdefn: no, rather don't move the .bzr dirs arround yourself.12:24
defni havent touched the .bzr dirs12:24
defnim getting "Not a branch"12:24
GaryvdMdefn: What are we trying to do again. I thought you were trying to get a branch from a server12:25
defnbzr branch bzr+ssh://user@server/dev/repo/v1.012:25
defnGaryvdM: im trying to do local development of that remote branch, like so i can commit locally when im not on the LAN12:25
defnand then when i get to work i can commit those changes12:25
GaryvdMAnd what happens when you do bzr branch bzr+ssh://user@server/dev/repo/v1.0 ?12:26
defnserver does not understand bazaar network protocol 3, ... error: not a branch12:26
GaryvdMWho created the branch? maybe they did not?12:27
lifelessis bzr installed on the server?12:27
defnlifeless: yes but it's an older version i think12:27
defn1.3.112:27
* GaryvdM -> lunch12:28
defnokay so here is the layout...12:31
defnanother user on the same remote server created a branch for me in his home directory. on that server i created a branch in my home directory by doing: bzr branch /home/otheruser/dev/repo/branch branch-name12:32
=== reyman is now known as reyman_aw
defnokay i think i got it12:35
defni guess my next question is, now that i've got a local copy of my branch, how do i commit locally only, so i dont need to have access to the remote server at all times?12:36
luksif you downloaded the brach using 'bzr branch', just use 'bzr commit'12:37
defnand then how, when im on the lan, do i push those commits to the remote branch?12:38
defnpush?12:38
luksbzr push12:39
luksyes12:39
defnokay cool12:39
defnthanks everyone12:39
=== Bambi_BOFH is now known as Kamping_Kaiser
reyman_awi don't understand why i have "sproject.dev/trunk" and not "/trunk" when i make bzr checkout "bzr checkout http://bazaar.launchpad.net/~reyman64/sproject/sproject.dev"13:20
bialixactually you should have only sproject.dev13:22
bialixthe last part of URL used by default as the directory name13:22
reyman_awyes i have only a branch sproject.dev in serie trunk13:23
nomatter001hi13:24
reyman_awi want to make a human gate keeper flow, with a trunk only available for merge by me13:24
nomatter001i have problems with qlog because of that error: https://bugs.launchpad.net/ubuntu/lucid/+source/qbzr/+bug/54492813:24
ubottuUbuntu bug 544928 in qbzr "qlog fails with a special combination of PyQt4 and Qt" [Critical,Confirmed]13:24
nomatter001ubottu: exactly that problem, any whay to solve that?13:25
ubottuError: I am only a bot, please don't think I'm intelligent :)13:25
reyman_aw^^13:25
nomatter001lol13:25
bialixreyman_aw: you may want to push your branch as lp:~reyman64/sproject/trunk13:25
nomatter001is there any way known to solve that problem13:25
bialixnomatter001: downgrade the PyQt13:25
nomatter001bialix: no other way?13:25
nomatter001manual patch in pyqt/qbzr?13:26
bialixGaryvdM working on this, he's away for lunch now13:26
reyman_awbialix: yes, with no confirmation for me, and restriction review for other push'er13:26
bialixreyman_aw: lp:~reyman64/xxx is only writable by you13:27
bialixreyman_aw: check this page and read https://code.launchpad.net/~reyman64/sproject/sproject.dev13:27
reyman_awok thx bialix13:27
nomatter001bialix: does it work with pyqt-4.7.0-2?13:27
bialixreyman_aw: when I'm looking at your branch I see the following message: "You cannot upload to this branch. Only sebastien.rey  can upload to this branch. "13:27
bialixGaryvdM: are you here?13:28
GaryvdMnomatter001: Yes13:28
bialixGary the Wizard came to the room13:28
nomatter001GaryvdM: ok thx13:28
reyman_awand, so i have sprojet.dev in my repository after checkout, but why there are trunk folder into, don't understand ..if i want to create a fix , i need to branch the sprojet.dev/trunk or sprojet.dev only ?13:29
bialixreyman_aw: just advice: use english for the project description13:29
bialixor at least english + french13:29
reyman_awok bialix thx for advice, i translate later ;)13:29
bialixreyman_aw: are you using Bazaar Explorer?13:30
reyman_awno13:31
reyman_awcommand line for understand :)13:31
reyman_aw(try to understand ...)13:32
bialixwait a sec, I'll try to reproduce13:32
bialixbzr 2.1?13:33
reyman_awyes bialix13:40
reyman_awlatest bzr on windows13:40
bialixokay13:46
bialixthe same here13:46
bialixreyman_aw: you have trunk directory in your branch13:46
reyman_awhum :/13:47
bialixthe sproject.dev is the checkout root13:47
bialixdo following:13:47
bialixcd trunk; bzr mv * ../13:47
bialixcd ..13:47
bialixbzr rm trunk13:47
bialixbzr commit13:47
reyman_awok so i make noob mistake in my manipulation when i create a trunk folder , arg13:48
reyman_awthx a lot bialix, it's clear now :]13:48
reyman_awsorry for this noob inconvenience13:48
bialixno problem13:49
bialixreyman_aw: remember: bzr info is your friend when you lost in the bzr forest13:49
reyman_awok thx for advice :)13:49
bialix`bzr info` tells you what bzr object you have and where its root13:49
reyman_awi see yes13:50
bialixreyman_aw: you can try Bazaar Explorer13:51
bialixit provides some hints13:51
reyman_awok13:52
bialixback to your question about workflow13:52
bialixyou'd better create shared repo for local work13:52
bialixbzr init-repo sproject13:53
bialixcd sproject13:53
reyman_awi create a shared repo yes13:53
bialixbzr checkout lp:sproject trunk13:53
bialixthe last command will create local checkout of your lp branch13:53
bialixthen if you need to create new feature branch you do: bzr branch trunk xxx13:54
reyman_awok13:54
bialixto merge your branch back to trunk do: cd trunk; bzr merge ../xxx13:55
reyman_awok13:55
bialixafter merge you need to check the result, resolve conflict if needed, and commit13:55
reyman_awand if i want to propose merge on initial checkout trunk13:55
reyman_awi make this with launchpad interface?13:56
bialixwhat it means?13:56
bialixif you want to create merge proposal?13:56
bialixor somebody else?13:56
reyman_awonly ~reyman64 have the access of initial trunk, but if other want to create feature and want to merge,13:57
reyman_awyes bialix exactly13:57
bialixusually to create merge proposal one have to push his branch to lp13:57
bialixthen do: bzr lp-open13:57
bialixthe latter command will open the branch page, like https://code.launchpad.net/~reyman64/sproject/sproject.dev13:58
bialixthere will be a button to create merge proposal13:58
bialixand ~reyman64 will receive the mail about merge proposal13:59
reyman_awok :]13:59
reyman_awperfect !13:59
bialixthen to merge the branch from lp you need to cd to shared repo sproject13:59
bialixthen: bzr branch lp:other-branch13:59
bialixcd trunk14:00
bialixbzr merge ../other-branch14:00
bialixand commit as usual14:00
reyman_awbialix: thx a lot for this tutorial, there are no real tutorial for decentralized workflow :/14:00
reyman_awon launchpad14:00
bialixreaaly?14:00
bialixthere is tutorials on Bazaar site14:00
bialixreyman_aw: http://doc.bazaar.canonical.com/bzr.2.1/en/tutorials/index.html14:01
reyman_awyes but, not really for launchpad, so i don't understand the layout branch for launchpad14:01
bialixhttp://doc.bazaar.canonical.com/bzr.2.1/en/tutorials/using_bazaar_with_launchpad.html14:01
bialixask your questions, give us feedback14:01
bialixsend proposals to ML how the docs should be improved14:02
bialixthere was nice tutorial on arstechnica14:02
bialixanybody has the link to that article?14:03
reyman_awok ! i search on arstechnica14:03
reyman_awi have this review http://arstechnica.com/business/news/2010/02/an-introduction-to-collaborative-development-with-launchpad.ars14:03
bialixyes, that's it14:04
bialixreyman_aw: what do you mean by "the layout branch for launchpad"?14:08
reyman_awbialix: in help there are a chapter " advanced layout"14:14
bialixlink please14:14
reyman_awah the end :14:15
reyman_awhttp://doc.bazaar.canonical.com/latest/en/user-guide/shared_repository_layouts.html14:15
reyman_aw-h+t14:15
reyman_awlayout " Simple developer naming (project/joe/foo, project/barry/bar) "14:15
reyman_awthis is not very clear for newbies14:15
reyman_awlike me :)14:15
AndrewLueckeBtw, has anyone tested both HTTPS and ssh, which was faster?14:16
AndrewLueckeActually, nevermind, I'll just use SSH14:16
bialixbzr+ssh14:16
bialixreyman_aw: yep, there is the picture of tree of folders14:17
bialixreyman_aw: I think you don't need advanced things while you're newbie14:17
bialixreyman_aw: in short about lp: it uses the simple naming scheme: lp:~USER/PROJECT/BRANCH14:18
reyman_awnow i understand that the folder tree is a snapshoot of the launchpad ,no ?14:18
bialixI'd say that doc should be improved14:18
* vila is stunned by bialix explanations, who needs doc after that ?14:19
reyman_awbazaar have a great doc, and bialix help a lot ! Perhaps a tutorial on "how participate" on real launchpad project for dub :p14:20
reyman_awmake things more clear14:20
vilareyman_aw: patches welcome ! :)14:21
reyman_aweheh14:21
AndrewLueckeI'm correct in believing bzr_access only allows r/rw/nothing right? Not anything special thats per directory (unless I create many users).. That is correct right?14:21
vilareyman_aw: I'm only half-joking here, at this instant, *you* have the clearer idea about what is missing...14:22
AndrewLueckenevermind.. doesn't matter anyway :P14:23
vilaAndrewLuecke: roughly yes, there was some discussion about going further but I can't remember it if was 1) with bzr-access, 2) with another script, 3) only discussed14:23
reyman_awyes, i'm pionner in my entreprise, so i probably make a tutorial for the other later :]14:23
vilareyman_aw: keep notes !14:23
reyman_awand why not for communities14:23
AndrewLueckeI think I heard somewhere vila, there is was ACL's, is that what you are refering to?14:23
vilaAndrewLuecke: not ACL as the OS ones, but yes, something about allowing more fine-grained control at branch level14:24
AndrewLueckeok14:24
vilaAndrewLuecke: but nothing *below* the branch level in case that's what you're after14:25
bialixvila: the bug for 1st april: https://bugs.launchpad.net/bzr/+bug/553955 (unfortunately today is 2nd)14:25
ubottuUbuntu bug 553955 in bzr "bzr 2.1: commit incorrectly reports missing files as modified" [Undecided,New]14:25
AndrewLueckenah.. It was more of a theoretical.. But I guess it doesn't matter, as I'll only probably have 1 primary repository anyway I guess14:26
reyman_awi have a problem bialix, i delete the false trunk in my sproject.dev, make commit, but i have BZR ERROR: cannot lock dir : transport operation no possible : http does not support mkdir() ( ?? )14:26
vilaAndrewLuecke: I'm 80% sure someone has a working solution, I just can't remember the details (Alzheimer, etc)14:27
bialixreyman_aw: because you did checkout from http branch, which is read-only14:27
reyman_awhmm14:27
AndrewLueckeok vila.. It will probably pop up anyway14:27
bialixreyman_aw: do the following: bzr switch lp:xxx (where xxx is your lp branch)14:28
reyman_awok14:28
* AndrewLuecke is still wrestling with debian anyway14:28
vilabialix: naah, you can't delete foo.txt, that's not allowed14:28
bialixAndrewLuecke, vila: there is ClueBzrServer project which I'm still planning to try out14:29
reyman_awthx bialix it's ok :)14:29
bialixvila: seriously? %-)14:29
AndrewLueckecool14:29
vilabialix: no :) 'bzr remove foo.txt' is so engrained in mind that I cannot encounter such a bug, checking14:30
bialixphew14:30
* bialix used Windows Explorer, but don't say anybody14:30
* AndrewLuecke debates switching his server to ubuntu again14:33
vilabialix: feel free to mark such bugs as confirmed and set an importance (I just did)14:33
* vila needs to reboot bbiab14:34
bialixvila, come back14:48
GaryvdMBug 544928 Fixed.14:50
ubottuLaunchpad bug 544928 in qbzr "qlog fails with a special combination of PyQt4 and Qt" [Critical,Confirmed] https://launchpad.net/bugs/54492814:50
GaryvdMbialix: Because it affects so many people, I'm going to release 0.18.5 now. That ok?14:51
bialixGaryvdM: sure, please also put in the release my fix for backslashes14:52
GaryvdMYes14:52
bialixGaryvdM: congratulations on the bug fix!14:52
bialixI've planned to do 0.18.5 anyway tomorrow14:53
bialixGaryvdM: you can leave it for me14:53
* GaryvdM grumbles about qt....14:53
* bialix grumbles about all new versions of all software14:53
=== Kamping_Kaiser is now known as Bambi_BOFH
GaryvdMI'm developing a love hate relationship with qt.14:54
bialix(excluding qbzr of course)14:54
bialixor PyQT?14:54
=== Bambi_BOFH is now known as Kamping_Kaiser
vilajam ?14:59
GaryvdMvila: I'm loving BZR_PLUGINS_AT15:26
vilaGaryvdM: I'm glad you like it, but I wonder how you avoided bug #552922 though....15:27
ubottuLaunchpad bug 552922 in bzr "BZR_PLUGINS_AT can be fooled by os.listdir order" [Critical,In progress] https://launchpad.net/bugs/55292215:27
vilaGaryvdM: fix available at https://code.edge.launchpad.net/~vila/bzr/552922-plugins-at/+merge/2269715:28
bialixwow, nice feature15:28
GaryvdMvila: I don't know15:28
AndrewLueckewoot.. I am such a fool.. Nobody cares, but its hard to explain the satisfaction you get when ssh actually authenticates properly15:44
vilaAndrewLuecke: You're not alone :-)15:44
vilaAndrewLuecke: about the satisfaction that is...15:45
vilaAndrewLuecke: nah kidding, I'm so a fool too :-P15:45
AndrewLueckeserves me right for using 2 different texts to set up ssh (one told me that my home dir should be my repo, and I forgot I did that so clearly, authenticated keys wouldn't work)15:45
AndrewLueckeooh.. Import time.. Time to see how fast I can import from songbird's svn to prgmr15:46
vilaAndrewLuecke: 'ssh -v' is your friend too15:46
AndrewLueckeit was a server side issue.. I thought I did the authorised keys thing wrong.. So dumb as I was.. I figured if I redid the same thing 5 times it would work..15:47
vilaAndrewLuecke: good policy, served me right for the last 20 years, I use 2 instead of 5 though :-D15:48
* vila kills more chicken15:48
AndrewLueckeSpeaking of chicken.. If I'm not here tomorrow, its because the chicken in the fridge I purchased 2 or 3 days ago wasn't safe anymore15:49
vilatsk tsk, always sacrifice *live* chicken so you're sure they are fresh when you eat them...15:50
* AndrewLuecke needs to find out how big the SVN tree is his importing, he suspects it wont fit on his VPS15:50
AndrewLueckeNah.. no need15:51
AndrewLueckeDanger is my middle name...15:51
AndrewLueckebtw.. there is a broken link on: http://doc.bazaar.canonical.com/bzr.2.1/en/admin-guide/migration.html#subversion-conversion15:52
AndrewLueckeit points to http://doc.bazaar-vcs.org/en/migration/foreign/bzr-on-svn-projects.html15:52
AndrewLueckewhich isn't found..15:52
vilaAndrewLuecke: please file a bug on lp15:52
AndrewLueckeI assume we don't have access to edit that15:52
AndrewLueckeHow do I file a bug?15:53
* AndrewLuecke is joking...15:53
vilaAndrewLuecke: the admin-guide is part of the sources, so you can even provide a fix if you know the right url :)15:53
viladoc/en/admin-guide/migration.txt15:54
AndrewLueckenot sure yet.. Anyway.. priority #1 is to start tearing the SVN to pieces (because that might take a day or so)15:54
vilasure, I'm just trying to help you find something to do while waiting for the import :-D15:55
AndrewLueckeHaven't started the import yet.. I'm concerned about waking up tomorrow and finding my VPS full.. Trying to find out how big it is first..15:55
NfNitLoopHrmm, I remember there being some caveats in the difference between lightweight/heavyweight checkouts that don't seem to be mentioned on http://wiki.bazaar-vcs.org/CheckoutTutorial16:06
* AndrewLuecke wonders when google wave got proper extensions16:07
NfNitLoopand I vaguely remember things like "rebase" sortof ... break in a heavyweight checkout.16:07
NfNitLoopAndrewLuecke: "proper" extensions?   It's had extensions from the start.16:07
AndrewLueckeyeah.. but now, it actually has some in the list.. not only 2 or 3 (lots of em)16:07
bialixvila: can you help? It seems I found rather serious bug in bzrlib16:12
vilaApril 2th, really 2th !16:12
vilabialix: don't ask to ask :-)16:13
bialixoh, it seems I understand16:13
bialixbug about relative path to the master of light checkout16:14
bialixrats16:14
bialixit kills mew16:16
bialixme16:16
vilaI think someone reported a bug about that recently or at least mentioned it on the ML or here16:16
bialixI can work with light checkout at all if it uses absolute path to another windows drive!!!16:18
GaryvdMbialix: Have you noticed a difference in qbzr startup time?16:24
GaryvdMbialix: Have you noticed a difference in qbzr startup time?16:24
bialixno, I havent16:25
bialixo I havent16:25
vilaGaryvdM: it's twice as slow ?16:25
vilaGaryvdM: it's twice as slow ?16:25
bialixno, I havent16:25
GaryvdM:-( Sorry about the dup, I push up+enter, the wrong window had focus :-)16:26
bialixwe're joking16:26
bialixrelax16:26
GaryvdM:-)16:26
bialix:-)16:26
vila:-)16:26
GaryvdMno difference though?16:26
* bialix just hits the wall with relative paths16:27
bialixGaryvdM: in which branch/revno?16:27
vilabialix: I thought poolie may have landed a related patch recently but I can't find it....16:27
bialixvila: I'm not sure16:28
vilabialix: anyway if things have changed and broke your workflow, raise a bug16:28
GaryvdMbialix: in trunk since rev 1229 (2010/03/25)16:28
bialixvila: things are not changed I belivev, I've just found another use case when absolute paths are show stopper for me16:28
bialixGaryvdM: oh, I'm often working/dogfooding with 0.1816:29
vilabialix: haaa, then I may be I've got everything backwards and the discussion was about using relpaths instead16:29
bialixGaryvdM: but no, I don't think I've noticed any highly visible improvements16:30
bialixGaryvdM: do you have benchmarks?16:30
bialixvila: relative paths will helps16:30
bialixGaryvdM: when you'll finish with 0.18.5 can you look at my question in qbzr ML about qlog+colo?16:32
bialixplease16:32
GaryvdMSure, I have a half finished draft16:33
GaryvdMSuch a change will need quite a bit of plumbing work in qlog...16:33
ctrlsoftbialix: did you see my reply?16:33
bialixjelmer, is it you?16:34
bialixctrlsoft: no, I don't16:34
bialixreply for what?16:35
ctrlsoftbialix: your email about colo support in qlog16:35
ctrlsofts/qlog/qbzr16:35
bialixctrlsoft: no, is it recent?16:36
ctrlsoftbialix: a couple of days ago I think16:36
bialixI've sent my question just yesterday16:36
bialixI don't see any your mails, ctrlsoft16:37
GaryvdMctrlsoft: can't see it either. Maybe got filtered by google groups spam filter.16:37
ctrlsofthmm :-(16:37
ctrlsoftbialix: to summarize it; bzr 2.2 has support for colocated branches in its API16:38
bialixI have to admit that google groups became worse in last weeks16:39
ctrlsoftbialix: it would be nice if qbzr and bzr-colo supported that, that would also give you support for colocated branches in git repositories16:39
bialixctrlsoft: that sounds great16:39
bialixcan you CC your mail to bzr ML, please?16:40
bialixctrlsoft: you have joined to qbzr ML with your samba mail16:41
bialixyour mail have to arrive, I believe16:41
=== salgado is now known as salgado-lunch
GaryvdMbialix: For inno setup, should I us the unicode, or non unicode version? Does it make a difference to the output?16:42
GaryvdM*use16:42
bialixGaryvdM: currently I'm using 5.3.3 which is pre-unicode IIRC16:43
* bialix is just lazy to upgrade16:43
bialixin short: I dunno16:44
GaryvdMOK16:44
bialixvila: is it new thing that push to another drive letter don't create working tree?16:44
vilameh, I don't think so, are you sure you're not pushing into a --no-trees repo ?16:45
* bialix checks16:46
bialixvila: info -v says: Create working tree for new branches inside the repository.16:46
vilabialix: no idea then, but I don't recall any change in this area either16:47
bialixokay, time for bug report16:47
bialixhmmm, can't reproduce16:49
bialixwith simple branch I can't reproduce16:50
vilabialix: kill more chicken16:50
bialixwhat's that?16:50
vilabialix: black magic against the gremlins16:51
bialixoh, cool16:51
* bialix notes16:51
bialixlevel-up!16:52
vila:-)16:52
bialixOIC, I'm pushing from colo workspace, which uses treeless branches and light co16:53
* GaryvdM checks if he is in the right channel....16:53
GaryvdMbialix: oh - thats how bzr qlog sees the colo branches...16:54
bialixGaryvdM: bzr qlog colo: ?16:55
GaryvdMyeah16:56
=== IslandUsurper is now known as IslandUsurperAFK
bialixvila: yes, I can reproduce16:56
GaryvdMbialix: fyi: I get an error with the unicode version of inno. It went away when I installed the non unicode version...16:57
bialixGaryvdM: ok, thanks for the info16:58
bialixperhaps wine issue?16:58
GaryvdMmaybe wine related...16:58
GaryvdMyes16:58
GaryvdMhttp://pastebin.org/13134516:58
GaryvdMbtw - it rocks that I can now build the windows installer on ubuntu.17:00
bialixstrange17:00
bialixindeed, rocks17:00
bialixwine is cool17:00
vilaGaryvdM: you should 1) backup your HD, 2) wipe it clean 3) insall Ubuntu, 4) install a windows VM :)17:01
vilabialix: you too :-P17:02
bialixvila: :-P17:02
bialixand who will report about windows bugs then?17:03
vilabialix: you can still use windows in the VM :-)17:03
GaryvdMvila: The problem is that I have allsorts of windows apps that I'm not sure If I have instalers for.17:03
vilabialix: Some addictions just can't be cured17:04
* bialix prouds to be addicted17:04
vila:)17:04
GaryvdMvila: It would be cool if I could boot my existing windows installation in a vm...17:04
vilaGaryvdM: That will be a good occasion to cleanup :)17:05
bialixI'm using windows also because there is a lot of PC games for my daughter17:05
bialix(and sometimes for me)17:05
vilaGaryvdM: I've never done it, but I think it can be done17:05
GaryvdMvila: I pritty much weened of it now. The last real thing that I need is to be able to run classic asp on linux.17:06
reyman_awbye all, and thx for the advice !17:06
GaryvdMFor maintenance.17:06
* bialix waves17:07
reyman_awexit17:07
vilaGaryvdM: just checked, VirtualBox can use raw host hard disk from a guest, either an entire physical hard disks or selected partitions17:08
GaryvdMOh cool - I'll try that...17:09
vilaGaryvdM: but if I had to try that, I'd make sure to have backups, just in case something weird happen like windows suddenly thinking that it's running on a new hardware because the video card is not the same anymore or something like that17:10
vilaGaryvdM: this is from chater 9.5 Advanced storage configuration in the vbox doc by the way17:10
GaryvdMqbzr 0.18.5 code name Silver terminalia17:16
bialixnice!17:16
vilabialix, GaryvdM : Can you run python -c 'import paramiko; print paramiko.__version__' and tell me which version is shipped with bzr ?17:26
=== deryck is now known as deryck[lunch]
bialixvila: no17:27
vilahehe17:27
bialixit's not easy with py2exe17:27
bialixwait a minute17:27
bialixvila: it seems 1.7.6 (Fanny)17:30
vilabialix: cool, thanks17:30
* bialix was lazy to install depends plugin17:31
=== IslandUsurperAFK is now known as IslandUsurper
GaryvdMvila: 1.7.6 (Fanny) (on lucid)17:33
* bialix eods17:34
bialixbye all17:34
GaryvdMbialix:17:34
vilaGaryvdM: yeah, I know, babune reports a test failing on lucid and so far I've got 1.7.4 passing on karmic and 1.7.6 failing on lucid, but maybe it's pycrypto instead17:34
vilabignose: enjoy your week-end !!17:34
vilatoo late :-/17:34
vilaand wrong nick :-(17:34
vilasorry bignose that was for bialix17:35
vilajam: ping, I seem to remember you mentioned something about paramiko/pycrypto on windows but I can't remember the details17:36
jamhi17:37
vilajam: something about either patching one package or the other or going with a workaround17:37
vilayeah ! jam is here ! Good morning !17:37
jamso paramiko uses a RandomPool from pycrypto IIRC17:37
jamand17:37
vilayeah, along these lines17:37
jam1) With older pycrypto and MS < Windows17:37
jamit loops around time.clock() 100 times, with 15ms granularity (taking 1.5s to start)17:37
jam2) With MS Vista at least (sorry time.time()) granularity goes to 1ms17:38
jamso it is only 100ms to start17:38
jam3) We can patch pycrypto to use time.clock()17:38
jam4) Newer pycrypto doesn't have the bug, but has completely deprecated RandomPool17:38
vilaright, but during the discussion I think it was mentioned another point about some, yeah that17:38
jamso raises a warning that paramiko is using it17:38
jam5) So we have to patch paramiko to work around *that*17:39
jamSo at the moment, we stick with older pycrypto and patch it17:39
jamWe could upgrade to newer pycrypto and patch paramiko somehow17:39
vilaright, so across all our platforms, freebsd, gentoo and now lucid are failing because paramiko use RandomPool17:40
vila(not 100% sure for lucid, but gentoo and freebsd now says: PID check failed. RNG must be re-initialized after fork(). Hint: Try Random.atfork()17:41
vilawith a traceback from crypto to paramiko17:42
vilajam: ok, so patching paramiko seems to be the only viable alternative there, I'm EODing, but I'll file a bug first thing when I came back17:43
vilabye all, have a nice week-end !17:44
vilajam: just one last thing, when/where do we *require* paramiko ?17:46
jamwe have to have it for sftp support17:47
AndrewLueckenight17:47
AndrewLueckeand thanks17:47
jamwe *can* use it as an ssh agent instead of openssh17:47
jamso bzr+ssh shouldn't require paramiko if you have openssh17:47
vilajam: right, thanks for confirming17:48
=== salgado-lunch is now known as salgado
=== deryck[lunch] is now known as deryck
=== radoe_ is now known as radoe
psynaptichey guys20:50
psynapticis there a way to display just *my* commits20:52
psynapticI'm expected to provide a log of my work each day and it would be ideal if I could run something like bzr log -u email@example.com20:52
lifelessbzr log -m email@example\\.com20:54
psynapticlifeless: doesn't seem to work on this server. is there a special requirement?20:58
* psynaptic pasted http://pastie.textmate.org/private/gepmld86ygjflga6qro3a20:59
psynapticthis is what I tried20:59
lifelessuhm, it might not search author/committer; file a wishlist bug21:00
psynapticok, thank you21:00
lifelessvila: ping21:21
baclifeless: can you tell me how to get a diff of the changes since a given revision MINUS the changes merged in from trunk?21:31
lifelessuhm21:32
lifelessmake a temp branch21:32
lifelessof that rev21:32
bacyep21:32
lifelessmerge trunk to it21:32
lifelessmake a temp branch of tip21:32
lifelessmerge trunk to that21:32
lifelessdiff --old first-temp --new second-temp21:32
baci'd tried *most* of that.  let me try.  thanks21:33
lifeless(this feeds into why looms and pipelines have things merged together)21:33
magciusI'm having problems when pulling from a repo.21:34
magciusbzr: ERROR: KnitPackRepository('local-repo') is not compatible with CHKInventoryRepository('lp-repo')21:35
magciusdifferent rich-root support21:35
ctrlsoftmagcius: the remote repository has more information than the local one, so the revisions can't be losslessly stored locally21:41
ctrlsoftmagcius: you might want to upgrade to a newer repository format21:41
ctrlsoft("bzr upgrade")21:41
magciusctrlsoft: um21:41
magciusctrlsoft: you should have a better error message, or do that automatically21:41
magciusctrlsoft: because it was an older version before, so when I try to pull it should try to upgrade21:41
ctrlsoftmagcius: I agree a better error message would indeed be a good idea, I think there's an open bug about that.21:41
ctrlsoftmagcius: we don't want to upgrade automatically because it will make the repository unreadable by older versions of bazaar21:42
vilalifeless: pong21:58
lifelesshai21:59
lifelessbzrlib's HTTP transport21:59
lifelessis it threadsafe?21:59
lifelessand if I were to do a 'get' on it, does it buffer the full response still ?22:00
lifelessvila: ^22:00
vilahmm, I can't think of any part that shouldn't.22:00
lifelessvila: persistent connection cache ?22:00
vilapycurl buffers, urllib doesn't22:00
vilathe connection  is shared between the transports that use it, there is no global cache22:01
vilalifeless: the only weak point is when the server and the client are in the same process but I don't think you care about that22:01
vilaand even there it's more a python bug than unsafe thread code22:02
vilalifeless: when you do a get, the urllib transport try to make all reads goes to the socket without buffering (at least for the data, headers are a different story but again you should not care about that)22:04
magciuscan someone explain this though? "We identify revisions using sequential numbers per branch, not per repository."22:05
magciusI thought branch was synonymous with repository?22:05
mkanatmagcius: bzr help init-repo22:06
lukshttp://wiki.bazaar.canonical.com/MatthewFuller/SpotDocs/PiecesInBrief22:07
magciuscan bzr revision numbers theoretically get to 1.6.12.46.76.1.6.78/123 and so on?22:08
magciuss:/:.:22:08
luksseriously, read http://wiki.bazaar.canonical.com/MatthewFuller/SpotDocs22:08
luksshort answer, no, they can't22:08
vilamagcius: no, they are either 123 or 123.456.789 i.e. one or three numbers22:09
magciuswait, what?22:09
magciussorry, I'm a bzr noobie22:09
vilamagcius: yeah, luks gave you a very good url for that22:09
lifelessvila: right, I don't care about that22:09
lifelessvila: is there control over cache-control yet ?22:09
RumblePuregot an older revision, since that revision I have removed and created new files. How to restore the older revision?22:10
vilalifeless: no, we explicitly disable the caching unconditionaly22:10
luksRumblePure: bzr revert -r X path/to/file22:11
luksif I understand correctly that you want to undelete a file22:11
lifelessvila: yeah, I thought so22:11
lifelessvila: is it at least in a function I could override ?22:12
vilalifeless: see -urlib2_wrappers.AbstractHTTPHandler._default_headers22:12
magciusHow are the pieces stored on the disk? Is it pickle or something?22:12
lukswhich pieces?22:12
parthmhello all. i was looking at bug #51860922:12
ubottuLaunchpad bug 518609 in bzr "Unicode exception occurs by "version-info"" [Medium,Confirmed] https://launchpad.net/bugs/51860922:12
lifelessvila: bug 12069722:12
magciusluks: the files, the commit metadata22:12
ubottuLaunchpad bug 120697 in bzr "want a way to mark transport operations as cacheable" [Medium,Confirmed] https://launchpad.net/bugs/12069722:13
vilalifeless: overriding AbstractHTTPHandler.http_request should be a good starting point22:13
parthmit seems that the exception occurs due to log.add('message', message) in format_rio.py but message is already unicode22:13
parthmhttp://pastebin.com/XP5VfTJt22:13
lifelesshth debbian things its fixed, I dunno22:13
parthmany ideas what the problem might be?22:13
luksmagcius: there are various repository and branch formats in bzr22:14
lifelessparthm: it shouldn't be unicode22:14
RumblePureluks: simple enough. thx for your help. :)22:14
vilalifeless: yes I remember this bug22:14
magciusluks: is there any documentation on them, if I wanted to, say, implement a bzr web viewer in PHP or Perl?22:14
luksmagcius: only the source code, I'm afraid22:14
vilalifeless: especially comment #9 :)22:14
luksbut reading them directly is not going to be easy22:15
parthmlifeless: oh. so does bzr store message as regular 8-bit strings?22:15
parthmbyte strings22:15
magciusluks: ouch22:15
lifelessmagcius: bzr, like all VCS's, is a database.22:16
luksmagcius: bzr is more a vcs framework than a simple application :)22:16
lifelessmagcius: would you write a viewer for Postgresql or MySQL databases in PHP/Perl ?22:16
magciuslifeless: it's been done22:16
luksthe interface (both user and API) was always more important than the file formats22:16
lifelessmagcius: well, its that order of complexity.22:16
lifelessyou need to implement the B+Tree index logic, groupcompress compression engine, pack file format, to have any hope22:17
lifelessand then on top of that you can start implementing user visible things.22:17
lifelessthose three things are well documetned, in pydoc.22:17
luksand hope bzr will not change it's default format in the next version :)22:18
magciuslifeless: do you have a library written in something like C that I can get bindings to?22:18
lifelessluks: that doesn't really matter, a given website can stay on any format it wants indefinitely.22:18
lifelessmagcius: you can call python from C; so our existing Python code is accessible from C.22:18
magciuslifeless: um22:19
lifelessand bzr is structured very cleanly as front-end and library.22:19
lukslifeless: I assume if somebody invests time in writing a reader for the 2a format, they want to actively use it22:19
lifelessthere is also bzr-xmloutput, xml bindings for most commands.22:19
luksand bzr doesn't tend to support old formats indefinitely22:19
parthmmagcius: loggerhead is a bzr web viewer written in python https://launchpad.net/loggerhead22:20
lifelessluks: we still support the very earliest alpha formats22:20
magciusparthm: yes, I've used loggerhead and seen it break thousands of time22:20
lukslifeless: usually only for conversion22:20
lifelessluks: its only the absolutely oldest ones (that couldn't even do networking or merge) that are readonly22:20
luksyou wouldn't want to use them22:20
lifelessluks: !citation time, you're making FUD22:20
vilamagcius: bug reports and patches welcome :)22:20
lukslifeless: :)22:21
luksa little too serious? :)22:21
magciusvila: I made a feature request a while ago: indentation lines or a left margin, it's awful reading Python code in Loggerhead because I can't tell where global scope is22:21
vilaluks: he's right, the test suite guarantees that and fully pass for every commit on mainline...22:22
magciusvila: second, fix your URLs, I don't want to see %2F or whatever : is in my URLs. Third, I don't like how you have different URLs for reading files or trees. I should be able to change the URL to delete the filename and make it work.22:22
luksvila: yes, I know they are fully working22:22
luksvila: but they are inneficient22:22
vilamagcius: I didn't write loggerhead22:22
lifelessluks: magcius have you filed a bug for that ?22:22
lifelesssorry22:23
lifelessmagcius: have you filed a bug for that?22:23
luksvila: and they get more inneficient as new formats get developed22:23
magciuslifeless: I was told that both bugs already existed earlier22:23
vilaluks: well I surely the newer formats are more efficient22:23
lifelessluks: they shouldn't be more inefficient than their intrinsic capabilities22:23
parthmlifeless: you are right `log.add('message', message.encode('ascii', 'ignore'))` fixes the issue. but is this the right place to convert the message to ascii? or do i need to find out why the message is becoming unicode in the first place?22:23
lifelessluks: we have removed unsafe optimisations that we used as a stopgap while preparing better formats22:23
vilamagcius: I don't clearly see how reading the low-level bzr data will help you there ?22:23
luksvila: knits were getting alower along with packs development, the original packs were getting slower along with ...22:23
lifelessparthm: I have no idea what you're doing, so I can't really answer that.22:24
lifelessparthm: perhaps mail the list ?22:24
luksvila: anyway, I never wanted to argue about this :)22:24
lifelessparthm: unless vila has time to dig into this - I don't right now,s orry.22:24
luksI only said that this would be a reason for me to not implement bzr's internal file formats22:25
vilaluks: I won't deny that but I won't say that the degradation were more important than the optimizations either22:25
parthmlifeless: i will do that. thanks for the pointer on message being ascii.22:25
vilaluks: that's for sure :-)22:25
parthmlifeless: mailing list is probably good :)22:25
lifelessvila: so - http://launchpadlibrarian.net/10490569/120697.patch22:26
vilalifeless: yup, still valid (still not usable as is but in essence that's what controls the caching)22:27
* vila giggles at the # Begin bundle, long time not seen :)22:27
lifelessvila: I've suggested an API22:28
vilalifeless: I'll happily review any patch you can come with :-P22:29
vilalifeless: but roughly, caching packs/* and indices/* should cover at least 90% of the possible gains no ?22:37
lifelessvila: yes22:53
lifelessI don't plan to do that22:53
lifelessI want caching in another project, dealing with large data sets22:53

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