/srv/irclogs.ubuntu.com/2009/05/10/#bzr.txt

lifelessjfroy: pack doesn't alter what data is visible or how its indexed00:02
lifelessjfroy: all it does is shuffle it around on disk so that fewer I/O operations are needed to get at related data00:03
jfroywell it definitely fixed my problem00:06
jfroyI was able to pull the remote svn branch after packing my local repository00:06
jfroywhereas before the pack it would die on a missing revision exception.00:06
lifelesshow confident are you that no other operations were done in between the failure and the pack00:11
lifelessinclude updates to svn/bzr-svn/bzr00:12
lifelessif pack does fixit there is a critical bug in bzr's repository code00:17
SamBlifeless: and not bzr-svn's ?00:22
lifelessSamB: bzr-svn implementation a repository proxy around libsvn00:22
lifelessSamB: it doesn't, as far as I know, rummage around through bzr's repository implementation internals00:23
SamBtrue00:23
SamBit doesn't mess with access to a native repository ...00:23
lifelessso if packaging a repository you're pulling into stops a bzr-svn bug happening, packing has changed the behaviour of [some] public interface || bzr-svn is poking under the hood badly00:24
lifelessI think the latter is unlikely and that leaves the former, assuming that jfroy has gathered the evidence accurately00:25
lifelessjfroy: next time this happens, can you take a backup of your bzr repo and your ~/.bazaar/bzr-svn cache die00:25
lifeless*dir*00:25
lifelessjfroy: then, try the pull again, if it fails again, pack and pull00:25
lifelessif that works, backup your backups and then put them back in place00:26
lifelessjfroy: and try the pull again, if it fails once more, we'll have a reproducable dataset to work with00:26
lifelessif the repo is private we'll write code for you to test00:26
lifelessif its not private you can schlep it to us00:27
SamBis schlepnet fast?00:27
lifelessit can be00:28
jfroylifeless: will do00:29
lifelessthanks00:32
=== dereine is now known as dereine[OFF]
Peng_Is there an equivalent to "bzr revno" that shows the revid?01:41
jelmer_jfroy: hi01:41
Peng_Well, bzr lookup-revision $(bzr revno)01:41
jelmer_yeah, bzr only uses public interfaces01:43
jelmer_jfroy: which bug was it exactly that seemed to be fixed by a 'bzr pack' ?01:47
jfroyjelmer_: hey01:54
jfroySorry just checked IRC01:54
jfroyjelmer_: https://bugs.launchpad.net/bzr-svn/+bug/36441601:54
ubottuUbuntu bug 364416 in bzr-svn "bzr branch fails with "ERROR: The branch <url> has no revision. None" with bzr foreign + bzr-svn 0.6d" [Low,Triaged]01:54
lifelessPeng_: bzr revision-info01:58
Peng_lifeless: Oh, nice.01:59
jelmer_jfroy: any chance you can comment on what seems to fix it in the bug report?02:01
jfroysure02:03
jfroybut I don't know much02:03
jfroyI simply packed to "try see if it does anything", and it unexpectedly did.02:03
jfroyI didn't make a backup of the repository before packing, unfortunately.02:04
jfroyalthough...02:04
jfroywe may be in luck, actually.02:04
jfroyI backup my documents automatically02:04
jfroyI most likely can revert the repository to its state prior to packing02:05
jfroyand try the sequence all over again02:05
jelmer_jfroy: which repository format are you using?02:05
jfroy1.1402:06
jfroy(-rich-root of course)02:06
lifelessjfroy: really? bzr info and paste the format details please02:12
jfroylifeless: 1.14-rich-root or 1.9-rich-root02:12
lifelessah actually nvm02:12
lifelessits 1.9 repo02:12
jfroyanyways, restoring from backup and trying again02:12
lifelessa new tree format is in 1.14 is all, it supports filters [yay]02:12
jfroysee if I can reproduce02:12
jfroyahhh, backups :)02:14
jfroyIs there any flags I can use to spit out more info in the bzr.log?02:16
jfroythe repo is confidential, I won't be able to share it02:16
lifelessjfroy: for this operation, nothing offhand02:16
jfroyAlthough I can certainly paste logs and what not02:16
lifelesswe may write some custom patches to debug02:16
jfroyjelmer_: I'll be using your bzr foreign branch and bzr-svn for this02:17
jfroyit's what I usually use02:17
jfroyeh this time it's still dying after the pack02:22
jfroythis is very odd02:22
jfroymmmm02:23
jfroyinteresting02:23
jfroyso after the pack, I still got the missing revision exception02:23
jfroyI then pulled the trunk branch (which was already in the repository)02:24
jfroyrepacked02:24
jelmer_jfroy: at this point my bzr-foreign branch is basically bzr.dev with bzr+http removed02:24
jfroyand the the branch command worked02:24
jfroyso it may be the trunk pull that fixed it, not the pack02:24
jfroylet me try this again starting at the beginning...02:25
jelmer_k02:25
jfroyjelmer_: I think it does a few more things, no?02:26
jelmer_jfroy: no, the other things have been merged now02:26
jfroypush working to create new branches and printing the svn revno when pulling02:26
jfroyI see02:26
jfroygotcha02:26
jfroygood to know02:26
jelmer_jfroy: it used to be more02:26
jfroyyeah02:26
jfroywas the fallback credential store stuff merged in too?02:26
jfroyI adopted the protocol in my keychain store and it's working great02:26
lifelessjfroy: the trunk pull is likely it02:27
jfroyIt makes a lot more sense, yes02:27
lifelessyes, yes it does :)02:27
jfroypack should not fundamentally change the content of the history02:28
lifelessright02:28
jfroyit just makes it tidier02:28
jfroyconfirmed02:29
jfroythe trunk pull fixes the branch command02:30
jfroyI also confirmed I cannot pull the branch in a new repository without having trunk in it02:31
jfroyif trunk is not there, it always dies with a no such revision exception02:31
jfroyso it's unlikely that the svn cache is involved here either02:31
lifelessjfroy: are you pulling from svn02:34
lifelessor from bzr02:34
lifelessthere is a bugfix in bzr (server side) for 'NoSuchRevision' pulling from a stacked branch02:34
jfroypulling from svn02:35
jfroyin all cases02:35
jfroyjelmer_: confirmed, I just made a brand new repository02:35
jfroytried to pull the svn branch in it, died with the usual error02:36
jfroyI then pulled the svn trunk in that repository and then pulled the svn branch again02:36
jfroyand that worked02:36
jfroyso it seems bzr-svn is failing to pull certain revisions it needs02:36
jfroyI've updated the bug with that finding.02:36
jelmer_thanks02:39
jfroyif you need revprop / file props to debug this when you get around to it, let me know02:40
jelmer_will do, thanks02:56
jelmer_lifeless: btw, did I mention dpush to remote git branches works now?03:55
jelmer_the only thing remaining now is 'proper' push03:56
lifelessye03:58
jelmer_it would be nice if somebody could fix up hg support at some point03:59
jelmer_I think the API changed or something but it can't do much else than view revision history atm04:01
=== dereine[OFF] is now known as dereine
pzicohola, I have a stupid question that I couldn't figure out from "Bazaar in 5 minutes".. If I want to force checkout the latest revision of file abc.py in current folder, what is the command?08:58
bob2if you want the one corresponding to the currently checkout'd revision, bzr revert abc.py08:59
bob2(ie it will undo all uncommited local changes)09:00
LarstiQpzico: Bazaar considers the entire tree 1 object. If you are using a checkout `bzr update` will make it up to date with the master location. If you're using a branch, `bzr pull` will pull in all the new revisions from your parent location.09:00
LarstiQpzico: or possibly what bob2 said, from your wording it isn't clear to me what effect you're looking for09:00
pzicoWell, I haven't yet learned to think "bazaar" way. So I just made simple project and used bzr init, add and commits.. now I just want to revert back to previous committed version..09:03
pzicoand only for one of the files I have edited09:03
LarstiQpzico: ah ok, if the most recent commit is the one you want to go back to `bzr revert abc.py`09:04
pzicoIt seems that the revert command did the job. Thanks.09:04
LarstiQpzico: or if you would like to bring it to an arbitrary revision, `bzr revert -r 123 abc.py`09:04
LarstiQcool09:04
awilcoxDoes anybody know of an Xcode plugin for Bazaar?09:54
=== dereine is now known as dereine[OFF]
=== dereine[OFF] is now known as dereine
ronnyhmm13:51
ronnyanyone aware of an api that kind of combiness Workingtrees iter_changes and list_files ?13:52
ronnyi need renames and unknown files at once if possible13:53
luksronny: TreeDelta?14:25
luksof working tree against the basis tree14:25
ronnycurrently im using wt.iter_changes(wt.basis_tree())14:25
james_wronny: can't you ask for unknown in iter_changes?14:26
james_wwant_unversioned=True14:27
ronnyah,14:27
ronnyhmm14:28
ronnyi have that, yet its still somehow missing something14:28
* ronny rechecks his test helpers14:29
ronnyhmm, i have include_unchanged and want_unversioned14:30
ronnydo i have to invalidate a workingtree after a commit?14:33
lifelessronny: how do you mean14:35
ronnyhmm, i think im confusing something about the api here14:36
ronnyok, i think i found my error14:39
ronnylifeless: i didnt notice i had a broken test14:39
vxnickhi guys - a question: is there much difference between push/pull and commit/checkout when working on a remote repo with others?14:40
ronnyoh darn14:44
LeoNerdvxnick: Not really.. they're basically the same... A "bound" branch is just one that pushes after it commits. etc...15:43
vxnickLeoNerd: thanks, I thought it might've been something like that15:43
vxnickguys - I think I'm going crazy here. I've created a shared repo and a trunk on a remote server, but can't checkout locally - I get the "bzr error not a branch" error17:31
jelmer_vxnick: are you checking out the branch location?17:35
jelmer_I mean, the location of trunk17:35
vxnickjelmer: I am indeed17:36
vxnickjelmer: I 'bzr init-repo project_name' and then 'bzr init trunk" within  that dir17:36
jelmer_vxnick: so the url ends in /trunk?17:36
vxnickjelmer: that's right17:36
jelmer_does bzr info work on the URL?17:37
vxnicknope17:37
vxnicknot a branch17:37
vxnickoh dear17:38
vxnickthe path was wrong17:38
vxnick*embarrassed*17:38
vxnickthanks for your help17:38
jelmer_np17:38
vxnickbzr-upload stores the remote location by default, but is there a way that I can switch between locations, perhaps by using some form of alias? I think I might have read about this somewhere but can't find anyhting18:53
jkakarSometimes I wonder if 'bzr update' should automatically fall back to 'bzr pull' when the branch isn't bound.18:53
=== zirpu2 is now known as zirpu
cdecarlohi, I'm new to bzr and distributed vcs all together, I've created my first bzr repo with a friend an we are using the decentralized workflow, we wanted to use PQM as our gate keeper but I'm having trouble even getting started, is there a good how to available, I can't find one18:57
james_wvxnick: have a look at bzr-bookmarks, it allows you to refer to different locations by short names18:59
vxnickjames_w: thanks19:00
james_wcdecarlo: I don't know of one I'm afraid19:00
Laneyis --fixes lp:xxx just supposed to link the branch?19:19
james_wthat's all it does currently19:20
james_wthere are plans to be a bit more useful I believe19:20
Laneyok, I thought it would set fix committed too19:20
* Laney does so19:20
ronnyjelmer: ping?19:58
=== vxnick is now known as vxnick_away
dirkDis it possible to manage permissions/access rights with a bazaar smart server?20:34
LarstiQdirkD: yes20:35
dirkDLarstiQ: :O20:35
dirkDhow?20:35
dirkDjust with unix permissions?20:35
dirkD(i can't find it in the user guide)20:35
luksLarstiQ: I'd say "yes" is a kind of cheating, until the smart server still has VFS calls20:37
dirkDluks: i'm using bzr 1.1420:40
dirkDso... RPC calls?20:40
luksdirkD: you can ignore me, that was purely technical :)20:41
lukswhat kind of access rights do you want to setup?20:41
dirkDi want to give some users access to a branch, and some users not20:42
dirkDor groups...20:42
luksthe easiest way is probably to use contrib/bzr_access20:43
luksassuming you want to use bzr+ssh20:43
dirkDindeed20:43
dirkDis there any documentation on bzr_access?20:44
dirkD(it's a plugin i assume? or a patch?)20:44
luksthere are some examples in the file itself20:44
luksyou basically give users ssh access and restrict the commands they can execute20:45
dirkDah20:45
luksit's in the source code tarball20:45
dirkDluks: looks fine :)20:49
dirkDbut they're talking about .ssh/authorized_key20:49
dirkDis that about ~/.ssh20:49
dirkD+ ?20:50
dirkDso i do have to edit authorized_keys for every user?20:50
dirkD(or create a symlink to a system-wide one of course20:50
dirkD+ )20:50
lukssorry, I don't know more about that20:52
luksmaybe there is a global way, I don't know20:52
dirkDok, thanks for your help20:52
bluszczhello, how can i create plugin on the bzr server?20:52
bluszczi've got bzr+ssh server - on the client side pre_commit works as expected, but i cannot make it run on server on (bzr co, bzr up, bzr ci -m "" flow)20:53
=== vxnick_away is now known as vxnick
bluszczis this possible?20:58
CardinalFangbluszcz: Plugins don't do that.  Consider the SFTP transport -- it *couldn't*.20:59
luksI think there is a post push hook21:01
lukshm, no, that's not the one21:02
CardinalFangOn the client, maybe.21:02
LarstiQluks: I see what you mean, and what I was thinking of is also not directly helpful (Launchpad/ClueBzr style smartserver)21:02
bluszczhmmmm...21:03
LarstiQluks: post_branch_tip_change or something like that21:03
luksyeah, that one21:03
bluszczCardinalFang: plugin's don't do what? sorry, but i didn't understand21:03
LarstiQbluszcz: `bzr help hooks` should mention which ones get run on the server21:03
bluszczok21:03
luksstrange, I can see post_tip_change mentioned in tests, but not the code21:04
bluszczi was reading BranchHook.__init__ ;)21:04
LarstiQlet me fish up how I run bzr-email on the server21:05
bluszczok, i read help hooks but still have no idea how to install server side hook21:07
LarstiQbluszcz: in all ~user/.bazaar/locations.conf I have: [chroot-*:///srv/bzr/]\npost_commit_push_pull = True\npost_commit_url = bzr+ssh://server/srv/bzr\npost_commit_url:policy = appendpath\npost_commit_to = commits@21:07
LarstiQetc21:07
LarstiQbluszcz: the plugin you execute must be loaded by the bzr your users execute21:08
LarstiQ(on the server)21:08
LarstiQbluszcz: other than that, that should be it21:08
bluszczreading21:08
bluszczhm, bit complicated21:09
LarstiQtrue.21:09
LarstiQsome of that is due to how bzr-email works21:09
LarstiQbluszcz: if you write your own plugin, the key thing is to make sure your plugin code gets loaded, and that you configure for the right branch21:10
LarstiQif you do it for all branches, that last bit doesn't matter.21:10
bluszczhm21:15
bluszczmy configuration is:21:15
bluszczi've got ssh acount on my server21:15
bluszczmy user21:15
bluszcz;)21:15
bluszczthere are branches21:16
bluszczwhich are checkout locally and using it as i write above (locally make commit for remote branches)21:16
bluszczgenerally at this time, i am not interested in any wide system/multi user solution, only "wide" in my needs is that i want to run some plugins on the server during commiting to that branches, all branches.21:17
bluszcz(reading http://bazaar-vcs.org/ConfiguringBz)21:19
bluszczi found also this:21:24
bluszczhttps://lists.canonical.com/archives/bazaar/2008q3/044390.html21:24
bluszczpre_change_branch_tip (Branch)21:27
LarstiQbluszcz: does that get run on the smartserver?21:29
mwhudsonjelmer: so what's new and sexy about bzr-git 0.3.0 ?21:31
bluszczyeah21:33
lifelessmoin21:34
bluszczbzr: ERROR: Received bad protocol version marker: 'sage 3 (bzr 1.6)\n\x00\x00\x00\x1dd16:Sof'21:35
bluszczlol21:35
bluszczserver: Bazaar (bzr) 1.14.121:35
bluszczlocal: $ bzr version21:35
bluszczBazaar (bzr) 1.14.121:35
bluszczso, wtf?21:35
lifelessbluszcz: its been mangled21:35
lifelessbluszcz: you have something outputting to stdout while you login to your machine, if you're using bzr+ssh21:36
lifelessthat will also break sftp21:36
bluszczstdout from my local?21:38
lifelessthe server21:38
lifelesswhat protocol are you using?21:39
bluszczyes, pluging is talking to me21:39
bluszczbzr+ssh, ssh221:39
lifelessok, if you do "ssh host: echo"21:39
lifelessdo you get anything shown ?21:39
lifelesssorry, get rid of the : there21:39
bluszczbluszcz@atomic [(nie maj 10) 22:39]:~/projekty/blogi21:39
bluszcz$ ssh bzr-bluszcz echo21:39
bluszczbluszcz@atomic [(nie maj 10) 22:39]:~/projekty/blogi21:39
bluszcz$21:39
bluszczonly \n21:40
lifelessok that looks fnie21:40
lifeless*fine*21:40
lifelessmust be something else21:40
bluszczyes, i now21:40
bluszczhow can i pass -vvv for ssh in bzr+shs?21:40
bluszczssh21:40
lifelessif you have a plugin, which execs something and that writes to stdout, it can also interrupt a bzr session21:40
lifelessbecause the bzr protocol is writing to stdout21:41
bluszczhm21:41
bluszczso, i should use stderr?21:41
lifelessoh yes21:41
bluszczto write information about "your commit message is empty?"21:41
lifelessin a plugin on the server?21:41
bluszczbtw, lifeless  - nice nick ;)21:41
bluszczlifeless: yes, on the server21:42
lifelessone sec I'm looking up a bug for you21:44
bluszczok21:44
bluszczit looks like working now21:44
bluszcz:)21:45
lifelesshttps://bugs.edge.launchpad.net/bzr/+bug/36490821:45
ubottuUbuntu bug 364908 in bzr "server side 'progress'" [High,New]21:45
lifelessthats a closely related issue21:45
lifelesshowever, if your plugin is actually stopping the commit/push, you should probably just raise an exception -  except that won't get formatted well. hm time for another bug21:46
bluszczyea21:46
bluszczraise "You should check first you *py files, or die"21:47
lifelessif this is a pre-tip-change hook21:49
lifelessthere is a specific exception for that you can raise21:49
lifelesswhich I think gets formatted nicely21:49
=== beuno_ is now known as beuno
lifelesserrors.TipChangeRejected21:49
lifelesshttps://bugs.edge.launchpad.net/bzr/+bug/37460521:51
lifelessjust filed that for you21:51
ubottuUbuntu bug 374605 in bzr "way for plugins to present non InternalError from hpss" [High,Confirmed]21:51
bluszcz:)21:53
bluszczRobert Collins 2 minutes ago Changed in bzr:21:54
bluszczimportance: Undecided → High21:54
bluszczstatus: New → Confirmed21:54
bluszczthings really goes fast21:54
bluszczok, now i have to read how to read file liste22:03
bluszczech, it has only:         # (params) where params is a ChangeBranchTipParams with the members # (branch, old_revno, new_revno, old_revid, new_revid)22:46
bluszczno way i suppose to check the commited files22:46
mwhudsonis it possible that getting a dev6 branch over http would use very large amounts of RAM?22:47
bluszczdev6?22:48
bluszczuser ram on which element? client or server?22:48
mwhudsonbluszcz: the development6 format22:49
bluszcz"uses"22:49
lifelessmwhudson: if it is file a bug22:49
lifelessmwhudson: it might if transcoding22:49
mwhudsonlifeless: ok, finding out now22:49
mwhudsonlifeless: it really really shouldn't be doing that22:49
mwhudsonbut i guess i can find out22:49
[tpd]Hey folks, does anyone here use bazaar for website deployment?22:51
mwhudson[tpd]: some people do, and they find the bzr-upload plugin useful22:51
[tpd]Ah, is that a standard way of doing it? I'm new to vcs.22:52
mwhudson[tpd]: it's what the plugin is for22:55
[tpd]I understand that, but is this how it "should be done"?22:56
mwhudsoni don't know of any better way22:56
bluszczhow is the best way to gest list of modified files using bzrlib.?23:31
lifelessin a commit?23:31
bluszczsi23:31
lifelessbzr st -c rev23:31
lifelessoh, bzrlib23:31
bluszczsi23:31
lifelesstree1, tree2 = bzrlib.repository.revision_trees([rev1, rev2])23:32
lifelesschanges = tree2.iter_changes(tree1)23:32
bluszczchecking, thanx23:32
bluszczno such revision_trees hm23:33
lifelesssorry23:34
lifelessI meant 'repository.revision_trees'23:34
lifelesswhere repository is a bzrlib.repository.Repository object23:34
lifelessif you have a branch its branch.repository23:34
lifelessif y ou have a working tree its wt.branch.repository23:34
bluszczworking tree is easiest i think23:34

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