/srv/irclogs.ubuntu.com/2011/02/08/#bzr.txt

pooliekkrev, url?00:10
pooliedo you mean on the server?00:11
kkrevright on the server.  I'm asuming shared repositories don't do anything with simlinks to save space or anything like that.00:16
pooliekkrev, almost all the data will be in the repository directory00:28
pooliewith just one copy00:28
poolie the per-branch directories will be very small00:28
maxbjelmer: Concerning the removal of the bzrlib.util.configobj.configobj from the Debian package - I think we should import the system configobj to that name, as a compatibility measure. It's not unreasonable for people to consider it part of bzrlib's api01:27
pooliemaxb, that sounds reasonable02:04
GHellingsCan anyone tell of success stories with bzr-git bridge? I can only get it to work over raw git: protocols, and I'm not sure if it's me or bzr-git03:15
mwhudsonGHellings: what other protocols have you tried?03:16
GHellingsI have tried http: and git+ssh:03:17
mwhudsoni know there have been bugs accessing branches from github over http03:17
GHellingsI've been accessing gitorious over http unsuccessfully - same repo over git: is fine.03:17
GHellingsJust tried a different, private repo over git+ssh: and it failed with the same error03:17
GHellingsI'd go in to take a look, but I'd be a bull in a China shop, as I know nothing about programming bzr or its plugins03:21
pooliewhich error?03:22
GHellingsbzr: ERROR: exceptions.AttributeError: 'RemoteGitRepository' object has no attribute '_git'03:22
poolielooks like https://bugs.launchpad.net/bugs/706990 which is claimed to be fixed in trunk03:23
GHellingsAh, I see the fix is since my comment on there. It had also claimed fixed in 0.5.2 of the release on a different report.  I'll try trunk and see how it works out.03:24
pooliegreat03:25
GHellingspoolie, looks like it's working now, at least for git-import. Thanks. :)03:36
poolieGHellings, great04:23
wgrantspiv: Hi.05:52
lifelessthat thunks down to revisions.get_known_graph_ancestry05:53
wgrantYeah.05:54
lifelessfirst thing we could do is try without the pyrex.05:54
james_ware we looking at .texts .chk_bytes or what here?05:55
james_wi.e. where would we expect to find a revision?05:55
james_w.revisions I assume?05:55
wgrant.revisions, isn't it?05:55
wgrantYeah.05:55
spivwgrant: good afternoon05:56
wgrantspiv: Bug #715000 is giving Launchpad some issues.05:57
ubot5Launchpad bug 715000 in Bazaar "Stacking is not fully transitive" [Undecided,New] https://launchpad.net/bugs/71500005:57
wgrantIn particular, 3/4 of the new wheezy branches crash half way through scanning.05:57
lifelessby some, he means brick-face.05:57
wgrantBrick-face?05:57
lifeless'lots of pain'05:58
wgrantAh, yes.05:58
wgrantlifeless: still happens without pyrex, FWIW.05:59
lifelessok, thats good to know06:00
spivwgrant: hmm06:00
wgranthttp://paste.ubuntu.com/564235/06:00
lifelessgroupcompress.py line 1315 certainly looks like it should DTRT06:00
james_wlifeless, that's a comment here, which line is it?06:02
lifeless        parent_map, missing_keys = self._index.find_ancestry(keys)06:03
lifeless        for fallback in self._fallback_vfs:06:03
lifeless            if not missing_keys:06:03
james_wright, it would do the right thing06:03
james_wif self._fallback_vfs was correctly populated06:04
lifelessso thats a possibility; is it not populated properly?06:04
james_wmy current hunch is that it adds natty as a fallback for maverick, and maverick as a fallback for lucid, when it should add both to lucid06:04
lifelessvfs is 'versioned files' here.06:04
lifelessso lucid -> maverick -> natty06:05
lifeless?06:05
lifelessjames_w: that chain should work06:05
james_wright, that's the stacking chain06:05
lifelessit might not be optimal, but it should work.06:05
lifelessoh06:05
lifelessI think I see a bug06:05
james_whowever, <lucid repo>.revisions._fallback_vfs is [<maverick repo>.revisions]06:05
lifelessjames_w: print the _fallback_vfs in maverick_repo.revisions06:06
james_w[<bzrlib.groupcompress.GroupCompressVersionedFiles object at 0x8f111cc>]06:08
james_wpresumably natty_repo.revisions06:08
lifelessyes06:08
james_wand the code you pasted doesn't recurse06:09
lifelessyes06:09
james_wso does GroupCompressVersionedFiles._index.find_ancestry recurse()06:09
james_w?06:09
lifelessno06:09
james_wthen there is the bug06:09
lifelessit shouldn't recurse either06:10
lifelessthe indices are below that layer06:10
james_wI would have assumed that most of this code didn't recurse at all call-sites, and just collected all the fallbacks when opening in to _fallback_vfs06:10
lifelesswe need to be able to figure out whats *in this repo* vs *accessible via the api*06:10
lifelesseach repo is mutable06:10
lifelessso open is the wrong time06:10
lifelessflattening at execution is probably appropriate06:11
lifelessthat or recursing via the public api06:11
james_wok, I'll dump what I know in the bug and someone can take on the fix06:13
wgrantWhat should we do for now?06:13
wgrantStop the importer?06:13
james_wprobably a good idea06:16
james_wno need to add more and more branches to clean up later06:16
spivSo this is breaking the package importer?06:17
wgrantThe importer works fine.06:17
wgrantBut LP breaks when it tries to scan the branch.06:17
spivOh, ok.06:18
james_wit may break the importer at some later time though06:18
wgrantYeah.06:18
james_wso we should upgrade bzr there too when we have a fix06:18
spiv*nod*06:19
spivI'll upgrade the bug's importance06:19
wgrantLP will probably cope for now, but we may need to knock out the problematic branches if it can't keep up.06:19
wgrantSince they stay in the scan queue.06:19
wgrantjames_w: Have you turned off the importer?06:23
lifelessspiv: loom wants to user your newer api (re tag fetching)06:27
lifelessspiv: it has many tips to snarf06:27
james_wwgrant, nope06:30
spivlifeless: yeah.06:30
pooliehi all06:35
pooliespiv, are you, are you working on that? if you want to talk i'm here06:45
poolieGaryvdM, hi06:45
GaryvdMHi poolie06:45
GaryvdMpoolie: I'm going to look at mysql cases today06:46
pooliehey06:46
pooliethat's a good idea06:46
poolieGaryvdM, hi, did you see my pm?07:01
pooliespiv, hi, are you still here?07:01
spivpoolie: not yet, just got tests passing for the 'reconfigure --unstacked should copied tagged revs' though07:01
spivI'm trying to resist the temptation to start on new things while I still have other things half-done.07:03
pooliegood for you07:05
pooliethis one probably is critical so i'll look at it07:05
lifelesswallyworld_: ^ btw - you'll want to hand out an rc stamp for including the fix to this in the rollout07:06
wallyworld_lifeless: you saying that the rollout will require a new version of bzr?07:11
pooliei'm surprised we haven't seen complaints about similar things from users, or failures in lp, before07:11
poolieperhaps most people just branch and that doesn't hit it07:11
lifelesspoolie: we may have but not commonly enough to diagnose07:11
lifelessfor > 1 year the code team has been focused on applications not the core07:12
lifeless(e.g. recipes)07:12
lifelesswallyworld_: we have an Incident (I assume wgrant is writing it up)07:12
lifelesswallyworld_: the solution requires a bzr code change; this has been latent forever.07:12
spivpoolie: I think more than one level of stacking hasn't been very common in the past07:13
wallyworld_lifeless: ok. we sure are going down to the wire though with last minute changes. right atm the anticipated rollout rev is in builtbot on it's way to qastaging07:14
lifelesswallyworld_: if we bless an earlier rev, thats fine.07:15
wallyworld_is this change something we could do with a no downtime rollout post 11.02 release?07:15
* spiv logs off for the day.07:15
lifelesswallyworld_: we can, but what we release should be all the revs that are qa'd at the time - like if you bless N, and 5 more revs are qad by deploy time, we should deploy N+507:15
lifelesswallyworld_: the point of the rc stamp is to let this into pqm as soon as this patch is ready rather than after you reopen pqm.07:16
wgrantIt's not a DB change, so it doesn't really affect anything.07:17
lifelessexactly07:17
wgrantIf it's in stable by the time we need to deploy, we can deploy it.07:17
lifelessand it will get landed via ec2test :)07:17
wgrantIf not, we deploy a few minutes later :)07:17
wallyworld_lifeless: ok. it means though that pqm will need to stay in rc mode for a bit longer until this latest change is qaed07:18
lifelesswallyworld_: why?07:18
lifelesswallyworld_: it only needs to stay in rc mode until the the db rev is deployable07:18
wallyworld_i thought pqm stayed in rc mode until the rev to rollout was chosen?07:19
lifelesswallyworld_: I think the process hasn't been fully updated; the critical section is getting a db-change rev thats deployable (which may require more revs than that)07:19
wgrantOnce we are OK to release we are OK to open.07:19
wgrantIf we can add more stuff onto the release, all the better.07:20
wallyworld_since if there's a qa issue and people have landed subsequent revs, then that may be an issue?07:20
lifelessthe hysteria around what rev to deploy during the downtime was back when we did a months worth of qa at once07:20
wgrantSince if we don't, I will just request a nodowntime deploy like an hour after the release :)07:20
lifelesswallyworld_: but *once* we have the db rev ok to deploy, thats not going to be changes by more landings is it ?07:20
wallyworld_no. but the db rev is merged into devel and it's the devel rev that is qa'ed for rollout, no?07:22
lifelessyes thats correct07:22
lifelessand consistent with what I'm saying07:22
* lifeless tries again07:23
lifelessso qa is a pipeline07:23
lifelessand the db deploy is a fixed event07:23
lifelessto decrease the chance of foreign revisions interfering with fixes to the db revision07:23
=== Ursinha is now known as Ursinha-away
lifelessonce we merge db-* to devel07:23
lifelesswe enter a critical section07:23
lifelessthat critical section is relaxed once the devel deployment report shows that the db-* merge is deployable07:24
lifelesswhich might be the merge itself07:24
lifelessor require the merge plus a couple of fixup revisions07:24
lifelessat that point, if we open pqm, there is *nothing* a new landing can do to break the point we had qaed up to.07:24
lifelesswhich is why we now open pqm as soon as we have a candidate we *can* deploy.07:25
lifelessWe we *go* to deploy, the pipeline may have advanced.07:25
lifelesswe should deploy the highest deployable rev (again, what the report says is ok)07:26
lifelessthe interaction with this bzr patch is that its sufficiently important we'd be willing to let it land during that critical section07:26
lifeless[not that the patch is ready]07:26
lifelesshowever being willing to land it during that section does not imply that the section should be extended07:26
wallyworld_i guess that my point - if a new landing breaks devel and we need to do a test fix for a rev prior due to a qa issue with a prior rev, then it's messy and better that merges to devel are frozen until after the rollout rev is chosen. i guess i've always worked that way in the past - freeze all new work while the rollout rev is qa'ed and only land test fixes07:29
wallyworld_but that was then and this is now07:29
lifelessso what I'm saying is still consistent with that07:29
lifelessonce you have *a* rollout rev, you are safe.07:30
lifeless*and*07:30
lifelessyou can choose a new rollout rev at T-60.07:30
lifelessbased on the deploy report.07:30
wallyworld_that last bit (choosing at T-60) i think is where we differ07:30
lifelessok; why?07:31
wallyworld_i guess i've been more conservative in the past - lock down the rollout rev and qa  and consider all change bad and needing justification so any changes not related to test fix for defined features in the release are  verboten07:31
wallyworld_until after rollout07:32
wallyworld_what happens if we choose rev 12338 (the one going to qastaging now) and someone lands a bad change? and we find at the last minute a fix is needed for rev 12336? in my scenario, we would just land the fix to 12336 without any hassle of dealing with a later rev checked in on top07:34
lifelessso07:34
lifelessthe critical section is intended to let us *actually qa* 12336 - which has worked this month, for instance ;)07:34
lifelessbut taking your scenario07:34
lifelesswe'd just rollback 12339 at the same time as landing whatever fix (assuming 12339 also qa failed)07:35
wallyworld_but doing rollback is an extra step and any extra steps potentially introduce defects/issues07:36
lifelessthe way we reduce the risk of the db deployment is deploying all we can before it - like wgrants nodowntime yesterdayish07:36
lifelesswallyworld_: in theory yes, in practice its trivial do to a merge -r . -1..-207:36
lifelesswallyworld_: and be confident its rolling it back to a previously known ok state.07:36
wallyworld_an extra step that would not be required if landings were verboten until the release rev were fully qaed07:36
lifelessthats true07:36
wallyworld_but i see your point tooo07:36
lifelessbut blocking landings is hugely expensive07:37
lifelesswe land 6 branches a day on avg07:38
wallyworld_yes, so ones weighs up the pros and cons and perhaps your way is the better approach in terms of team velocity while still managing the risk07:38
lifeless10 per [mon-fri]07:38
lifelesswallyworld_: yes, its a risk assessment problem.07:38
lifelesswallyworld_: I generally prefer a risk recovery option rather than risk elimination07:39
wallyworld_so now that today we finally have the db-devel rev sorted (pending a final qa) we can open up pqm again once rev 12338 lands on qastaging07:39
lifelesswallyworld_: particularly with low-occurence risks07:39
lifeless*once* 12338 is qa'd07:39
lifelessbut yes.07:39
wallyworld_yes, i see your point. i think it comes down a lot to organisational culture07:39
lifelessits been a bad cycle07:39
wallyworld_yeah, i've been thrown in the snake pit as rm for sure :-)07:40
pooliegood on you for doing it though07:40
wallyworld_it's been a learning experience and i'm glad i did it actually07:41
wallyworld_part of the issue was last week where i'm told issues with pqm/ec2/buildbot delayed a db-devel landing, which pushed everything back07:42
wallyworld_so we really need to deal with those root cause issues07:42
wallyworld_if they indeed are real issues07:42
lifelessyes, they did and the pqm swallowing errors bit should be fixed now07:44
vilahi all07:44
pooliehi vila07:48
vilapoolie: see my pm ?07:48
poolievila, https://wiki.ubuntu.com/DistributedDevelopment/UnderTheHood/Importer/Operational etc08:01
poolievila, i'll need to go at some point so if you get a chance please persist on 71500008:11
vilapoolie: don't hold your breath, I'm already working on critical stuff and if I had yet another interrupted task on top of my stack...08:13
vilas/had/add/08:13
viladamn tyops08:13
poolieah fair enough08:14
poolieis https://devpad.canonical.com/~mbp/kanban/vila-kanban.html accurate?08:14
poolieat least in the middle columns?08:14
vilathe in progress yes, the needs review is... not important08:17
vilaand yes, my current branch should address both the in progress ones (and more as I discover them ;-/)08:18
nil1Hi08:30
nil1My TortoiseBzr ist Polish(?), how do I change that back again?08:30
poolienil1, not sure, perhaps setting LANG in your environment then running it?08:32
pooliehi sidnei08:32
sidneihi poolie!08:33
nil1poolie: no that didn't help08:34
nil1I opened the command line, "set LANG=C", killed explorer.exe and restartet it on the command line08:35
nil1err, LANG=de08:35
inada-nPlease use bzr-2.3-setup.exe08:35
* nil1 nods08:36
inada-nhttps://bugs.launchpad.net/tortoisebzr/+bug/66325808:37
inada-nIt is fixed but have not shipped with bzr-2.2.x08:37
nil1okay, thanks08:41
* nil1 reboots08:41
poolieyay, i might have fixed 71500008:42
* vila hugs poolie08:43
pooliein some ways this is a dangerous fix08:44
poolieso it might be better to do it in 2.3 and move lp to that08:44
poolieor 2.4 even08:45
poolienot very dangerous, but not utterly obvious not to change something else08:45
vilathere are other good reasons to deploy 2.4 on lp (controversial) but I think it's the right path for the coming months08:47
vilapoolie: you're targeting 2.2 ?1/!!08:56
poolievila, i did it based of 2.2 to keep our options open09:01
vilahaaa, pfew, you scared me09:01
vilayeah, good point09:01
vilaand good thing the bzr/2.2 branch was already opened for bugfixes09:02
poolieis it even proposed yet?09:02
poolieor did you just click through?09:02
vilahehe, I saw the bug email and fired 'bzr-review lp:~mbp....' ;)09:03
poolieok09:06
poolieif you can review it that would be nice09:07
pooliemaybe john should too09:07
poolieok, i think i should stop09:08
pooliei'm running the whole test suite to see if this affected anything else09:08
vilapoolie: yup, you (I?) should probably do that after merging up, spiv modified fetch and there may be fallouts there09:14
pooliei think it's important we check for similar problems09:22
poolieand ideally match them up to bugs09:22
pooliebut i'm running out of steam09:22
spivpoolie: quick review sent09:25
=== Ursinha-away is now known as Ursinha
vilajelmer: about review: :D and thanks12:09
jelmeryou're welcome, glad I can return the favor(s) :)12:09
vilajelmer: hmm, what needs to be done to get 2.3.0 on natty ?12:28
=== vila changed the topic of #bzr to: Bazaar version control | try https://answers.launchpad.net/bzr for more help | http://irclogs.ubuntu.com/ | Patch pilot: vila | 2.2.4 officially released, 2.3.0 frozen. Release plugins ! Build installers ! (rm vila)
jelmervila: There's already a sync request in progress12:39
* jelmer looks for the bug #12:39
vilajelmer: good enough !12:40
vilathanks !12:40
jelmerbug 71303812:40
ubot5Launchpad bug 713038 in bzr (Ubuntu) "Sync bzr 2.3.0-1 (main) from Debian unstable (main)" [Wishlist,Confirmed] https://launchpad.net/bugs/71303812:40
vilarhaaa ! I read the related mails ! I knew ! What else will I forget next ? :D12:41
jelmer(:12:41
maxbjelmer: oh, hi. I think we should put back bzrlib.util.configobj and .elementtree in the debian package, as imports of the system versions. Does that sound sensible to you, or did you explicitly choose not to?12:48
jelmermaxb: hmm, that's a good question12:55
jelmermaxb: on the one hand I think we should just have everything do the right thing and patch it to use configobj12:56
jelmeron the other hand, pragmatism is useful too12:56
maxbI am mainly working on the basis that it's something included in bzrlib.*, so it's kind-of part of the bzrlib api12:57
jelmermaxb: the configobj from the system is a different version and has slightly different semantics, etc12:57
maxbThe situation is further confused by bzrlib's in-tree configobj being slightly modified12:57
spivjelmer: just add "sys.modules['bzrlib.util.configobj'] = __import__('configobj')" to bzrlib/__init__.py ;)12:57
maxbspiv: Don't be evil :-)12:58
* spiv wanders off to bed before he can do any real damage12:58
maxbDirect users of bzrlib.util.configobj that I can find are fastimport gtk loggerhead and qbzr13:01
vilamaxb: evil plugins13:02
maxbwho says that bzrlib.util.* is off limits to plugins?13:02
maxbbzr-explorer conditionally uses bzrlib.util.elementtree on Python 2.413:03
vilanobody ;) But I'm curious about what they need there and why bzrlib.config is not enough13:03
jelmermaxb: some are already patched to support using the system configobj13:04
maxbindeed they are.13:04
maxbSo, I guess the real question that needs answering is "Is bzrlib.util.* part of the API?"13:05
vilamaxb: yes, except for configobj :-D13:05
vilamaxb: seriously: yes13:05
maxbbzr mv bzrlib/util bzrlib/__compat__ :-)13:06
vilabut we should file a bug about forbidding it or provide alternatives I think (not sure and not sure I should think about that with a flu :-/)13:06
vilaat least the gtk case I'm looking at shouldn't use configobj13:07
* vila files bug #715143 and resumes13:11
ubot5Launchpad bug 715143 in Bazaar GTK+ Frontends "annotate.config should use bzrlib.config not bzrlib.util.configobj" [Medium,Confirmed] https://launchpad.net/bugs/71514313:11
viladitto for fastimport and qbzr. Its less clear for loggerhead but probably true too13:20
GaryvdMI agree. qbzr should not be using it. I used it because at the time, I did not know better.13:21
vilayeah, I'm not throwing stones, bzrlib.config is still too hard to reuse IMHO13:23
vilaThis was a gentle "evil plugins" :D13:24
=== oubiwann is now known as oubiwann_
jelmervila: thanks for the review14:41
vilahehe, I'm PP !14:41
jelmervila: get_all() is different from items() in that it returns just the format objects, it doesn't return tuples with keys and values14:41
jelmerdid you mean values() rather than items() perhaps?14:41
vilayeah14:41
vilaerr, you're even more evil than I thougth then :)14:42
vilause items and throw the keys :)14:42
vilaanyway, you got the point right ?14:43
jelmervila: in that case there's a slight disconnect though, as the extra formats don't have keys14:43
jelmerso they would appear in values() but not in iteritems() or items()14:43
vilahaaa14:43
vilahmm, key=None won't work either I suspect14:44
jelmervila: yeah, as most callers won't care about the non-metadir formats14:44
vilaI want a value that is less than None, guido ?14:44
jelmer:)14:44
jelmervila: I think a separate method, different from values() makes sense here.. perhaps it just needs a better docstring?14:45
vilajelmer: Is it really necessary that they don't have key ?14:45
vilawhat is the key used for ? Can't that be an attribute instead ?14:45
jelmervila: even if they had a key, we would try to use them in cases where we couldn't14:45
vilajelmer: most of the refactorings you've done in this area have been somehow to transform hard-coded references to formats into feature attributes on formats14:46
vilaI think this is really nice and The Right Thing14:47
vilaCan't the same pattern apply here ?14:47
vilaSince you're introducing registries, it would be nice it this was the case and that all formats can be properly registered and only from there diverge in what features they provide14:48
jelmervila: the interface here (having a format string) is already something these formats don't really have14:48
jelmervila: so I'm reluctant to expose them in the registry everywhere when they can't really be used as such14:49
vila:-/14:49
vilaBe bold !14:49
jelmerheh14:49
vilaNobody is using this registry so far no ? Well, not the new one14:50
jelmervila: the class not, but the registry itself is used by lots of things14:50
viladev values(with_obsolete_stuff_yes_I_know=False) ? :-/ guido ?14:52
vilabah14:52
jelmervila: that works, but that's why I'd rather add a separate method (probably with a more clearer docstring than I had earlier)14:52
jelmerget_all = lambda self: self.values() + self.extra()14:53
vilajelmer: yeah, will do, and clearly identify who is using it, sounds like a good case for a leading '_' too14:53
jelmervila: there's only one user of that method at the moment - bt.per_repository14:53
vilagood14:55
jelmervila: so improve the get_all docstring and rename remove -> unregister?14:59
vilas/get_all/_get_whatever/14:59
vilaand unregister yes,15:00
jelmerah, ok15:00
vilaanother dech-debt is why Registry implements remove instead of unregister...15:00
vilajelmer: these are all mostly suggestions, I'm open to discussion ;)15:01
jelmervila: that's why I used remove() as well, since Registry is the base class15:01
vilayeah, I was *really* surprised to find it there, most of the registries uses I've seen have some sort of unregister and unregister really is more natural to my eyes15:03
* jelmer is tempted to fix some registry tech debt15:22
* vila pushes jelmer still hearing poolie saying the same this morning 15:26
vilajelmer: now I'm a bit lost... id I miss the extra-repo-formats mp earlier ? Or is it a new one ?15:37
vilameh already 55 mins old >-/15:37
jelmervila: it's a new one, on top of the one we just discussed15:37
jelmerah, argh.. it doesn't have the prerequisite bit set15:38
vilabut it still uses remove, did you postpone that ?15:38
jelmervila: no, this branch was submitted before our discussion15:38
vilahaa... pfew15:38
jelmerhttps://code.launchpad.net/~jelmer/bzr/extra-repo-formats/+merge/4893215:38
vila(waiting for lp to refresh) it uses get_all  + _get_extra, how about _get_all (not sure _get_extras is really needed unless you already know better)15:40
vilajelmer: right, so my question still stand, you keep using remove or you plan to rename it later ? (There are arguments both ways...)15:41
jelmervila: I plan to rename it later, along with remove in registry itself15:44
vilaok, good to go then15:45
jelmerthanks15:50
Daibenhello16:00
jelmerhi Daiben16:00
Daibenis there a turorial for a bazaar server16:00
Daibeni'm messing with git for 3 days and it's still not working16:01
Daibenso i'm moving to bazaar16:01
jelmerDaiben: what kind of Bazaar server ? just plain anonymous readonly access over TCP/IP ?16:01
Daibenread write16:01
Daibenyes16:02
Daibenand authentication16:02
jelmerDaiben: any sftp/ssh enabled machine should be sufficient16:02
Daibenbut how does it work16:02
vilaDaiben: pretty well :)16:03
jelmerDaiben: see http://doc.bazaar.canonical.com/bzr.dev/en/user-guide/server.html16:03
Daibenthanks16:03
vilaDaiben: as long as a user can connect with ssh and find a bzr in its path, there is nothing more to configure, the bzr client will send the right command16:03
Daibenoke:)16:04
Daibeni need to go home now i try tonight16:04
Daibenty16:04
vilaDaiben: you're welcome, come back for help if needed16:04
vilajam: if you're around and k leave you some time, poolie ask for your help/feedback on bug #715000, there is already a mp with some leads16:09
ubot5Launchpad bug 715000 in Bazaar "Stacking is not fully transitive" [Critical,In progress] https://launchpad.net/bugs/71500016:09
vilajelmer: the bzr daily builds failing are unrelated to the sync for 2.3.0 right ?16:42
jelmervila: that's a good question16:44
* jelmer looks16:44
jelmervila: btw, 2.3.0 just hit natty16:44
vilajelmer: fails with conflict in __init__ probably because the ~debian-bazaar/bzr.unstable needs to import trunk ?16:44
vila\o/16:45
vilaerr, wait, whatdyoumean just hit ? rmadison doesn't see it yet16:45
jelmervila: jriddell just uploaded it, it's probably not been published yet16:50
vilaha, ok, thanks for the timely feedback ;D16:51
jelmervila: ah, right.. I need to fix that conflict16:51
maxbvila, jelmer: the bzr dailys are failing because of a trivial conflict. We need to merge 2.3 to bzr.dev after any version bump on 2.3, to make the recipe merge cleanly16:54
maxbAnd we need to have a recipe-fixing-blitz16:55
jelmeryeah - either that, or we need to merge it into the unstable branch16:55
jelmerI've been looking at ways to make it easier to look after the recipes16:55
jelmerbut there aren't any web service API calls atm16:55
maxboh, and we need to sync-request qbzr16:56
vilamaxb, jelmer: fwiw 2.3.1dev has been merged to bzr.dev today16:57
jelmermaxb: which version of qbzr?16:58
maxbooh16:58
maxb0.2016:58
* maxb requests a recipe build16:59
jelmerthat's already in natty16:59
maxbah. people are too efficient for me to keep up :-)16:59
vilahehe, for once :D17:00
=== beuno is now known as beuno-lunch
maxboh, boo17:16
maxbnow application of patch 01_test_locale fails the recipe build17:16
mgzwhat is said patch? sounds interesting.17:22
vilamgz: already merged in trunk ;)17:32
vilamgz: you'll know if you weren't running such an old bzr ;-D17:33
vilaby the way, remind me my you're still on 2.1 ? What is missing in trunck to get you back there ?17:34
mgz...it's a little funny.17:34
mgztesttools broke a bunch of things for me, so I'm using a rev before that was merged.17:35
vilayeah, I kind of remember that, but is there still fallouts ?17:35
mgzI think I have finally fixed them, and of course to test any branches I'm actually working on I need it anyway.17:35
mgzso... now it's just inertia.17:35
=== deryck is now known as deryck[lunch]
vilahaaaaaaa17:35
vilagood, no problem with inertia :D17:36
vilamgz: MOVE ! NOW !17:36
vila:D17:36
mgzI'm just going to do a quick review of the ~eurokang branch, I note you beat me to it.17:36
vilamgz: I was wondering if there was some low hanging fruits around it...17:37
mgzI'm not certain on the core change, it seems like bug 255687 isn't much of a step further.17:40
ubot5Launchpad bug 255687 in Bazaar "log and annotate should work on removed files" [Medium,Confirmed] https://launchpad.net/bugs/25568717:40
mgzAlso various edge cases etc...17:40
vilayup, probably a good idea for a followup17:40
mgzbut what it's actually doing looks correct, and it's a first contribution,17:41
mgzso it's right to not move the goalposts.17:41
vilamgz: you're reading above my shoulder right into my brain again ?17:41
mgzI do try. :)17:41
vila. o O (Being transparent or keep secrets... That is the question )17:43
mgzI'll branch it and fiddle in a minute, the test assertion strikes me as wrong.17:45
mgzah, no, it's build_tree_contents so the file really is empty17:45
vilawhich is fine for a bb test17:47
mgzyep, but I don't think the test would actually fail without the fix17:48
vilahehe, it did, I tried :-D17:48
mgzah, at the run_bzr state17:49
mgz*stage17:49
mgzforgot taht checks the return code.17:49
=== beuno-lunch is now known as beuno
=== zyga is now known as zyga-afk
=== Meths_ is now known as Meths
=== deryck[lunch] is now known as deryck
kkrevI'm evaluating bazaar.  Our current tool (synergy) spits out individual file history graphically so you can see all the branch revisions and who made them: http://i.imgur.com/0uFoJ.png20:28
kkrevcan bzr do this?20:28
kkrevit's not make or break, but it's something people are very used to.  the graph-ancestry tool seems to be just about how branches relate to each other?20:28
vilakkrev: try qannotate from the bzr plugin, it displays the annotated lines in the main window but a the file graph in a smaller embedded one while maintaining the link between a line and the revision that modified it20:56
vilakkrev: from the file graph view you can also request to annotate the file at this revisions or consult the diff for the file itself or the diff of the wole revisions (which helps understanding why the file was modified)20:57
vilakkrev: qlog is also a real gui when it comes to navigate the revision ancestry20:59
kkrevthanks.  investigating.21:08
kkrevis qbzr prefered to the "Bazaar Explorer" shown in the "visual tour" linked to from the front page?21:10
lukskkrev: Bazaar Explorer is built on qbzr21:15
vilakkrev: both are bundled together in most of the distributions, which OS/version are you using ?21:20
kkrevPeople would be running this stuff on windows.21:25
vilakkrev: then try https://launchpad.net/bzr/+download there are all-in-one installers there21:30
vilakkrev: 2.3.0 is expected to be released in two days21:31
kkrevis there a good template or writeup about how to structure a repository with several past release branches and different patch series?  Do people put all the release branches under a parent repo?  I'm guessing I'd do branch per patch series and just tag the patch releases.21:51
kkrevsorry if i'm spamming.21:51
pooliejam22:22
pooliehello jam22:22
spivGood morning23:00
pooliehi spiv23:01
pooliewhat's up for you today?23:03
spivpoolie: first looking over the test changes in lp:~spiv/bzr/reconfigure-unstacked-copies-tagged-revisions-401646 before I submit that fix for review, then see if I can figure out how to reproduce https://bugs.launchpad.net/udd/+bug/65330723:06
poolienice23:07
pooliedo you need anything from me?23:07
jelmerg'morning spiv, poolie23:08
pooliehi jelmer, how are you?23:08
jelmerI'm well, thanks :)23:09
jelmerHow is your day?23:09
spivpoolie: I don't think so23:10
pooliegood23:10
pooliei'm planning to look for more similar stacking bugs and then updated the LEP23:10
poolieabout build from branch into main23:11
spivpoolie: oh, and I'm happy to see https://code.launchpad.net/~eurokang/bzr/537442-annotate-removed/+merge/48906 — they mailed me off-list during my patch pilot week and I provided some guidance, and they got far enough to submit a reasonable patch :)23:11
poolienice23:11
pooliethere are many easy but annoying bugs23:15
poolieit'd be good to get more communty people into them23:15
pooliejelmer, what's next for you?23:15
jelmerI'm trying to get my current WIP landed - lazy hooks, non-metadir repository/branch/workingtree tests (useful for the weave plugin and foreign formats) and fixing 80% of the bzr-hg imports23:16
pooliecool23:17
jelmerafter that, I was hoping to have a look at the bzr whoami warning that the losas were asking about, if nobody else beats me to it :)23:17
pooliei was wondering if you felt bikeshedded-upon about lazy hooks?23:17
pooliewe should do that23:17
pooliei was hoping to myself but it keeps getting interrupted23:17
poolieso if i haven't got code up, please take it23:17
jelmerI still have some other code to finish first too so perhaps we should see who gets to it first :)23:18
jelmerI'll make sure to communicate about it if it's me.23:18
jelmerpoolie: I didn't really mind the lazy hooks discussion, there was other WIP I could work on, though I do agree it was bikeshedding23:19
pooliei don't really understand from john's comment why this is important23:19
poolieit seems like we'll register ~50 hooks; 100 bytes each is not really important23:19
spivpoolie: I don't follow why it matters either23:21
jelmerI don't see the performance problem either, but I also don't feel strongly either way about using tuples or strings.23:22
jelmerI also noticed somebody was taking on the "bzr cp" bug..23:24
pooliei saw that too23:25
pooliei don't think we should block the lazy hooks thing on this23:25
jelmerShould we be proactive about contacting them to discuss their implementation? I don't want to be discouraging, but I also worry about the merge discussion being disappointing further down the road otherwise.23:25
poolielet's encourage them to discuss it23:25
poolieperhaps we can either do it in a plugin, or in a way where it won't paint us into a corner23:26
jelmerthat makes sense23:27
wallyworld_poolie: do you expect there will be a bzr update for the 11.02 rollout as mooted in yesterday's irc chat?23:30
pooliere lazy hooks, there are other things i'd like to see before worrying about tuples vs strings23:31
poolielike getting rid of per-hook-group classes23:31
poolie(which will save memory and load time)23:31
pooliewallyworld_, yes, there's a patch in review now23:31
pooliewallyworld_, would it be easy to just run from a revision off the 2.3 branch?23:32
jelmerpoolie: as a prerequisite for lazy hooks landing you mean? or as an independent fix?23:33
wallyworld_poolie: i guess that's up to you? afaik, we just check in the egg and update the versions.cfg so lp uses the new version23:33
pooliejelmer, independently, in the same vein23:35
pooliei mean, let's unblock this and do more on hooks23:35
jelmerpoolie: wfm :)23:36
poolieand there are other things we can do that will probably do more to help memory usage and load time23:37

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