| dvheumen | lifeless, about the locking behaviour we talked about yesterday. That special case 'LockResult(file:///tmp/testbzr-J2pcy2.tmp/.bzr/branch-lockc4au55ppz8wdym11z1aq)', you can never get this if you install your own hook, right? (i.e. you will only find it if you use _lock_actions directly) | 00:05 |
|---|---|---|
| lifeless | dvheumen: you can get it, but only if you install your hook before creating a bzrdir | 00:06 |
| dvheumen | aha okay, so that's the idea. Okay in that case I'll add that case to the documentation too. | 00:07 |
| dvheumen | bzrdir is the '.bzr' directory right? | 00:08 |
| dvheumen | so in essence a newly created checkout/branch/repository | 00:08 |
| poolie | jelmer: so feed-pqm worked for you, it seems? | 00:08 |
| spiv | dvheumen: bzrdir is the .bzr directory, yes | 00:09 |
| jelmer | poolie: no, unfortunately the email it generated in the end was rejected because of the gpg signature | 00:09 |
| poolie | huh | 00:09 |
| poolie | the signature was invalid? | 00:09 |
| lifeless | dvheumen: yes | 00:10 |
| lifeless | is feedpqm in the bzr-pqm plugin | 00:10 |
| lifeless | ? | 00:10 |
| jelmer | poolie: I'm not sure - it's very cryptic in its error messages: "PQMException: 'Failed to verify signature: gpgv exited with error code 1' | 00:11 |
| jelmer | " | 00:11 |
| jelmer | lifeless: it's in hydrazine | 00:11 |
| poolie | jelmer: :/ | 00:13 |
| poolie | what if you pipe it through gpgv yourself? | 00:13 |
| poolie | could it be that you have multiple secret keys and it's using the wrong one? | 00:13 |
| jelmer | No, I'm sure this is the right key | 00:14 |
| jelmer | it seems like it might be related to the from address - does pqm rely on that ? | 00:14 |
| poolie | i don't know | 00:14 |
| jelmer | (feed-pqm uses the email address to do a proper CC but it doesn't override the actual from address) | 00:14 |
| lifeless | jelmer: the key's primary UID *I think* | 00:14 |
| poolie | that could well be the problem though | 00:14 |
| lifeless | jelmer: check the code. | 00:14 |
| lifeless | lp:pqm | 00:15 |
| poolie | so you could try forwarding the message from the right from address and see what happens | 00:15 |
| poolie | lifeless: feed-pqm is i presume what you were just asking me about | 00:15 |
| jelmer | lifeless: Thanks, but I've wasted too much hours of my life in pqm source code already :-) | 00:15 |
| lifeless | poolie: nope | 00:15 |
| lifeless | poolie: the queue API stuff you found | 00:15 |
| poolie | it uses the queue api | 00:16 |
| lifeless | good | 00:25 |
| jelmer | poolie: Things seem to work quite a bit better if I use bzrlib's email API | 01:00 |
| jelmer | poolie: Are you opposed to having hydrazine depend on bzrlib for sending email ? | 01:00 |
| poolie | nup | 01:00 |
| poolie | it's probably much better to do that | 01:00 |
| jelmer | awesome; one mp coming up :-) | 01:00 |
| poolie | i'd like to teach it to ignore mps from people who can merge their own | 01:01 |
| poolie | thanks | 01:01 |
| lifeless | poolie: I think its great to have it submit other ppls mps ;) | 01:01 |
| jelmer | poolie: yeah, I agree that'd be nice (except for the current user, of course) | 01:01 |
| poolie | or we could do that | 01:02 |
| poolie | but it gets more into 'almost ready' vs 'actually read' | 01:02 |
| poolie | ready* | 01:02 |
| mwhudson | jelmer: are you using hydrazine to triage bugs? | 01:21 |
| mwhudson | because all you comments are coming wrapped in "s | 01:21 |
| jelmer | mwhudson: yes | 01:21 |
| jelmer | mwhudson: oops, I was assuming I had to quote arguments to the comment command :-) | 01:21 |
| jelmer | mwhudson: thanks, I'll avoid that from now on | 01:21 |
| * jelmer thinks he also added a comment '--help' somewhere | 01:22 | |
| poolie | heh | 01:22 |
| poolie | is that working again? | 01:22 |
| poolie | for a while most bug operations were broken because of an etag bug | 01:22 |
| poolie | but it was marked critical so maybe it's fixed | 01:22 |
| poolie | i guess adding a comment would still work | 01:22 |
| jelmer | I did get "precondition" exceptions on some changes | 01:22 |
| jelmer | other than that it worked quite well | 01:23 |
| james_w | I think the CP may have gone through today | 01:24 |
| james_w | but I'm not sure if that was production/edge | 01:24 |
| poolie | heh, i see your "--help i'm trapped in a bug" message :) | 01:44 |
| poolie | also for some reason it no longer exits cleanly on ^D | 01:44 |
| poolie | um | 01:44 |
| poolie | i'd like to have a way to go into $editor to add a comment | 01:44 |
| poolie | probably most easily done by calling bzrlib | 01:45 |
| poolie | igc is https://bugs.edge.launchpad.net/bzr/+bug/524162 still open in bzr itself? | 02:00 |
| ubottu | Launchpad bug 524162 in bzr "bzr-explorer don't work if installing by bzr-2.1.0 standalone installer." [Critical,Confirmed] | 02:01 |
| igc | poolie: yes. It's waiting on https://code.edge.launchpad.net/~ian-clatworthy/bzr/plugin-packaging-524162/+merge/20858 being reviewed and landed | 02:02 |
| poolie | k thanks | 02:04 |
| * igc lunch | 02:08 | |
| parthm | poolie: does the bzr-grep textfile.text_file approach for checking binary seem reasonable to you? https://bugs.launchpad.net/bzr-grep/+bug/531336/comments/4 | 02:10 |
| ubottu | Launchpad bug 531336 in bzr-grep "bzr grep does not handle binary files cleanly" [High,Fix released] | 02:10 |
| poolie | parthm: isn't there something in osutils or similar to already do this? | 02:12 |
| poolie | oh obviously that's what you're doing | 02:13 |
| parthm | poolie: yes. i am just using a bzrlib implementation. | 02:13 |
| poolie | yes that looks good then | 02:13 |
| parthm | poolie: ok. thanks. | 02:14 |
| === wash is now known as wash-away | ||
| === Kilroo1 is now known as Kilroo | ||
| === fullermd_ is now known as fullermd | ||
| poolie | hi igc, lunched? | 03:39 |
| poolie | igc are you already doing something similar to bug 534320 | 04:04 |
| ubottu | Launchpad bug 534320 in bzr "Disable plugins for given command" [Undecided,New] https://launchpad.net/bugs/534320 | 04:04 |
| echo-area | hello, is there any explaination of stacked branches besides the documentation? | 04:12 |
| echo-area | the secion "using stacked branches" in the bzr manual doesn't explain it well, and many examples in it don't work | 04:13 |
| spiv | echo-area: those docs are the best I know of, but I'm happy to answer questions here | 04:16 |
| spiv | echo-area: the primary use case is pushing to a server where a trunk already exists (so most of your branch's revisions are already on the server), but you don't have write access to that repository | 04:18 |
| spiv | echo-area: so you can push (using the --stacked and --stacked-on options, or specially configure the remote .bzr directory) just the revisions unique to your branch to the server. | 04:19 |
| spiv | echo-area: launchpad for instance creates those specially configured .bzr directories automatically, so if I push a new branch to ~spiv/bzr/..., it will automatically be stacked on the bzr trunk. | 04:20 |
| echo-area | spiv: but I can't commit to a stacked branch | 04:20 |
| spiv | echo-area: yes, unfortunately :( | 04:21 |
| spiv | That's bug 375013 | 04:21 |
| ubottu | Launchpad bug 375013 in rosetta "Cannot commit directly to a stacked branch" [High,Triaged] https://launchpad.net/bugs/375013 | 04:21 |
| spiv | We'd like to fix that, but it will be a surprisingly large amount of work :/ | 04:22 |
| spiv | Oh, does the "Using stacked branches" doc suggest that you can commit to a stacked branch? Eek :( | 04:22 |
| spiv | That is confusing, I'm sorry. | 04:22 |
| echo-area | spiv: that's the main source of my confusion. I've created a stacked branch, by following the documentation, via the command "bzr branch --stacked source branch" | 04:23 |
| echo-area | spiv: but after making some changes, I can't commit them, nor can I push them. | 04:23 |
| spiv | echo-area: Right, because of that bug. | 04:24 |
| spiv | So, if you want to commit, you can't use a stacked branch yet, sorry :( | 04:24 |
| spiv | I'll submit a clarification to the docs now | 04:24 |
| spiv | In the meantime you'll probably be better off using a shared repository and unstacked branches. | 04:25 |
| echo-area | spiv: umm, stack branches aren't usable before we can commit to it, are they? | 04:25 |
| * fullermd suspects stacking should be rather more hidden... | 04:26 | |
| spiv | echo-area: There are uses for branches that don't involve committing to them | 04:31 |
| lifeless | and pushing is different to committing | 04:32 |
| spiv | echo-area: e.g. the scenario I described earlier (pushing to a server that has a suitable repository for stacking-on, but that you do not have permissions to write to) | 04:32 |
| lifeless | which is in fact why you can't commit to stacked branches. | 04:32 |
| SamB_XP | I just don't worry too much about stacked branches unless they make things go too slowly when I try and push something to launchpad ... | 04:34 |
| parthm | hello. i am planning to suggest the lp:parrot owner to upgrade the repo format to 2a. whats the suggested way to upgrade an lp branch. l believe lp:parrot is an svn imported branch. | 05:19 |
| parthm | https://launchpad.net/parrot | 05:20 |
| spiv | I think the owner of the branch can click an "upgrade format" button in the web UI now. | 05:23 |
| parthm | spiv: thanks. i will suggest that. | 05:25 |
| === BasicPRO is now known as BasicOSX | ||
| echo-area | spiv: I have not reproduced that scenario successfully yet. I did this: | 05:39 |
| echo-area | bzr init-repo --no-trees test-repo | 05:39 |
| echo-area | bzr init test-repo/trunk | 05:39 |
| echo-area | bzr init-repo test-branch | 05:39 |
| echo-area | bzr branch test-repo/trunk test-branch/trunk | 05:40 |
| echo-area | cd test-branch/trunk <-- and work here, commit | 05:41 |
| echo-area | then I did (in test-branch/trunk) bzr push --stacked ../../test-repo | 05:42 |
| echo-area | I got messages like these: | 05:43 |
| echo-area | Ignoring request for a stacked branch as repository already exists at the destination location. | 05:43 |
| echo-area | All changes applied successfully. | 05:43 |
| echo-area | Pushed up to revision 4. | 05:43 |
| parthm | hmm. i did suggest lp:parrot to upgrade the branch http://groups.google.com/group/parrot-dev/browse_thread/thread/1cc2f0bbb18b76fc | 05:44 |
| echo-area | but as I made another branch of test-repo/trunk, I didn't see the new revisions unique to test-branch/trunk | 05:44 |
| parthm | but i see the branch owner listed as 'VCS Imports' https://code.launchpad.net/~vcs-imports/parrot/trunk so is the upgrade to be done by the project owner or branch owner? | 05:45 |
| parthm | lp:parrot project owner is ~parrot-dev while branch owner is ~vcs-imports. | 05:46 |
| spiv | echo-area: that's not the scenario I was referring to | 05:47 |
| spiv | echo-area: because in that scenario you can (and did) push directly into the original repo (test-repo) | 05:48 |
| spiv | echo-area: I'm referring to a case like a server shared by several developers, but only one (or perhaps a non-human system account, like a gatekeeper bot) has access to the integration branch everyone branches off | 05:49 |
| echo-area | spiv: should I make test-repo a stacked branch, and so that pushing onto it is the same as pushing to the stacked-on branch of test-repo? | 05:50 |
| spiv | echo-area: e.g. if the trunk is on /srv/project/trunk on a host, and /srv/project is a repo made with init-repo, but you don't have access to write to /srv/project | 05:50 |
| spiv | echo-area: but you can read from it, so you can do e.g. "bzr branch sftp://host/srv/project/trunk local-branch", work on that, and then push it up with "bzr push sftp://host/home/myuser/my-branch --stacked --stacked-on=sftp://host/home/myuser/my-branch" | 05:52 |
| spiv | echo-area: in that case making local-branch will still copy the full history, but you don't have to push the full history back to the server, you use stacking to point to the history the server already has | 05:53 |
| spiv | (and also you don't waste space on the server by keeping a second copy of the history) | 05:54 |
| spiv | echo-area: does that make sense? | 05:54 |
| echo-area | spiv: I'm reading and understanding. It definitely makes sense. Thanks | 05:55 |
| spiv | Cool. Glad I could help :) | 05:56 |
| spiv | It's an optimisation that most people don't need, I think. | 05:56 |
| lifeless | thumper: will lp crash if we set merge proposal queue fields using APIs ? | 07:07 |
| lifeless | 'try it' is a good answer. | 07:07 |
| vila | hi all ! | 07:18 |
| echo-area | spiv: please take a look at this, does it elaborate the scenario you mentioned: | 07:23 |
| echo-area | bzr init-repo test-repo | 07:23 |
| echo-area | bzr init test-repo/trunk | 07:23 |
| echo-area | bzr init-repo stacked-repo | 07:23 |
| echo-area | bzr branch --stacked test-repo/trunk stacked-repo/trunk | 07:24 |
| echo-area | bzr init-repo local | 07:24 |
| echo-area | bzr branch test-repo/trunk local/trunk | 07:24 |
| echo-area | cd local/trunk <--- work here | 07:24 |
| spiv | echo-area: it doesn't make much sense to create a stacked branch in a shared repo (i.e. a directory you've made with init-repo) | 07:24 |
| echo-area | (in local/trunk) bzr push ../../stacked-repo/trunk | 07:25 |
| echo-area | spiv: so a stacked branch is better put in its own directory? | 07:26 |
| spiv | (I guess I can imagine uses for it, but it's certainly not how I would choose to explain it) | 07:26 |
| spiv | echo-area: I'd ignore init-repo entirely, really | 07:26 |
| spiv | echo-area: (for explaining how stacking works, not in general) | 07:27 |
| spiv | I'm not sure what you're asking, exactly. | 07:28 |
| spiv | I guess you're trying to test your understanding of stacking by constructing a scenario that uses it? | 07:29 |
| echo-area | spiv: in your last example, "bzr push sftp://host/home/myuser/my-branch --stacked --stacked-on=sftp://host/home/myuser/my-branch", are the following statements true or not? 1) sftp://host/home/myuser/my-branch contains the full history too; 2) only the local revisions that have not been synced will be transfered during that push, the previous history will come from my-branch on host; and 3) full history will be tran | 07:33 |
| echo-area | sfered in a normal push. | 07:33 |
| echo-area | spiv: kind of. I want to figure out the things not explained explicitly in your example, hoping to help myself fully understand stacked branches | 07:34 |
| spiv | 1) no, it only contains the history not in the stacked-on location (plus some small overhead), b) yes, only the history not already in sftp://host/home/myuser/my-branch and not already in its stacked-on location is pushed, 3) it depends; full history is transferred in a normal push when there is no shared repository (or that shared repository is empty or otherwise contains none of the relevant history) | 07:37 |
| echo-area | spiv: so sftp://host/home/myuser/my-branch is a stacked branch too? | 07:38 |
| spiv | To clarify for 3, I mean a normal *initial* push. Obviously subsequent pushes to the same branch don't have to re-transfer data that was already transferred. | 07:39 |
| spiv | echo-area: what do you mean "too"? I think that's the only stacked branch in my example. | 07:39 |
| spiv | echo-area: oh, I see I made a silly typo in my example | 07:40 |
| spiv | echo-area: that command ought to have been "bzr push sftp://host/home/myuser/my-branch --stacked --stacked-on=sftp://host/srv/project/trunk" | 07:40 |
| spiv | echo-area: I guess that was rather confusing! | 07:40 |
| echo-area | spiv: should be bzr push --stacked --stacked-on=sftp://host/srv/project/trunk sftp://host/myuser/myproject, right? | 07:41 |
| spiv | echo-area: right | 07:42 |
| echo-area | spiv: whoa, I think I understand that now. Thank you! | 07:42 |
| echo-area | spiv: I think your example is the one that clarifies much about stacked branches. Maybe you can add it to the documentation. What do you think? | 07:45 |
| spiv | echo-area: or you could :) | 07:46 |
| spiv | Patches are always welcome :) | 07:46 |
| spiv | More seriously, I'm finishing up for the day, and will likely to have forgotten by tomorrow, so please file a bug asking for that, feel free to paste my IRC comments into it. | 07:47 |
| echo-area | spiv: okay, let me try to write one. I'll do what you said. Thank you very much. | 07:48 |
| spiv | echo-area: Btw, <https://code.launchpad.net/~spiv/bzr/stacked-commit-doc-update/+merge/21024> is the patch I wrote to that doc earlier. | 07:48 |
| echo-area | spiv: ok | 07:49 |
| spiv | echo-area: thank you, feedback on docs are very welcome, and offers to write them even more so! | 07:49 |
| thumper | lifeless: I don't advise it | 08:10 |
| === tro|| is now known as tro | ||
| * igc dinner | 08:45 | |
| lifeless | thumper: is staging sufficient to tell if its a problem? | 09:21 |
| thumper | lifeless: probably, but what are you trying to accomplish? | 09:22 |
| lifeless | thumper: streamline landing stuff | 09:22 |
| thumper | lifeless: I can't guarantee it won't be a problem | 09:24 |
| thumper | lifeless: but staging should be good enough | 09:24 |
| * lifeless makes a memo | 09:25 | |
| thumper | lifeless: if I lock a working tree for writing, does that take a lock on the branch as well? | 09:27 |
| lifeless | thumper: yes | 09:45 |
| lifeless | thumper: lock_tree_write will lock the tree only (and take a read lock on the branch) | 09:45 |
| thumper | lifeless: I'm trying to write a test that uses a working tree | 09:46 |
| thumper | lifeless: and I want some files in that working tree | 09:46 |
| thumper | is build_tree_contents the right thing to use? | 09:47 |
| thumper | it doesn't seem to take enough params | 09:47 |
| thumper | using TestCaseWithTransport | 09:47 |
| lifeless | self.build_tree_contents([(path1, content1), (path2, content2)]) | 09:47 |
| lifeless | there are a few similar thigns | 09:47 |
| lifeless | if you want versioned files, you need to also add them | 09:48 |
| thumper | lifeless: does that only work if you use make_branch_and_tree with '.'? | 09:49 |
| thumper | lifeless: also, where are the internal methods for working out if a fileid is a directory? or binary? | 09:49 |
| lifeless | thumper: just adjust the paths | 09:49 |
| thumper | ok | 09:49 |
| lifeless | tree.inventory[fileid].kind - internalish | 09:50 |
| lifeless | tree.kind() or something like that - public | 09:50 |
| thumper | ta | 09:50 |
| vila | thumper: alternatively, you can provide a transport to build_tree_contents, damn, no, you can't, that works for build_tree only, shame | 09:52 |
| vila | but if you're ok with arbitrary content and have a tree from make_branch_and_tree, you can then use transport=tree.bzrdir.root_transport and you don't need to prefix your paths anymore | 09:52 |
| thumper | I'm having trouble finding the options for return values for tree.kind() | 09:53 |
| lifeless | vila: if you want arbitrary, MutableTree.set_file_content is better | 09:54 |
| vila | thumper: 'file', 'directory', 'symlink', 'absent' | 09:54 |
| lifeless | thumper: osutils._kind IIRC | 09:54 |
| thumper | it'd be really helpful if that was part of the docs for the method :) | 09:55 |
| thumper | someone told me that bzrlib uses looks for a null withing 'x' amount of the content to determine if a file is binary | 09:56 |
| lifeless | thumper: patches loved | 09:56 |
| thumper | is that method public(ish)? | 09:56 |
| lifeless | yes | 09:56 |
| lifeless | tis in osutils | 09:56 |
| * thumper looks again | 09:56 | |
| vila | lifeless: set_[file_]content ENOTFOUND | 09:59 |
| lifeless | vila: meh; look at MemoryTree using tests. | 10:01 |
| vila | thumper: bzrlib/textfile.py ? | 10:02 |
| lifeless | ah yes | 10:04 |
| lifeless | thumper: ^ | 10:04 |
| thumper | ta | 10:04 |
| thumper | reading now | 10:04 |
| lifeless | vila: sanity check: bzrlib.textfile.check_text_path is bust | 10:14 |
| lifeless | vila: or perhaps just unclear | 10:14 |
| vila | lifeless: as in not mentioning that it checks the *content* of the path ? | 10:15 |
| lifeless | well | 10:16 |
| lifeless | looking at it, it looks like it calls a generator and discards it | 10:16 |
| lifeless | which isn't generally useful | 10:16 |
| spiv | It calls an iterator and discards it, but happily the constructor of the iterator contains the relevant check. | 10:17 |
| lifeless | it would be clearer, I think as | 10:17 |
| lifeless | 'if '\x00' in f.read(1024): raise BinaryFile()' | 10:17 |
| spiv | So, a little unclear, but given the overall simplicity of the module not a big deal either. | 10:17 |
| thumper | what is the right way to call check_text_path with a path and a working tree? | 10:18 |
| lifeless | spiv: I hope you and Mary will be available on the 27th | 10:18 |
| thumper | the method assumes the path is relative to the current working dir | 10:19 |
| lifeless | thumper: tree.get_file() -> check_text_file | 10:19 |
| thumper | lifeless: in my test, I want to have fines in the tree | 10:32 |
| thumper | lifeless: how do I add the files ? | 10:33 |
| thumper | tree.add() ? | 10:33 |
| thumper | smart_add perhaps | 10:36 |
| lifeless | tree.add([path, path], [id ,id]) | 10:37 |
| lifeless | usually | 10:37 |
| lifeless | or smart_add(['pathtotree']) if you just want versioned | 10:37 |
| lifeless | but at this point I'd smell aa case where branchbuilder might be ready | 10:37 |
| thumper | branchbuilder? | 10:40 |
| lifeless | yah | 10:45 |
| lifeless | self.make_branch_builder('relpath') | 10:46 |
| lifeless | grep for make_branch_builder in bzrlib.tests; its not well described yet | 10:46 |
| thumper | ok | 10:47 |
| thumper | prolly not tonight | 10:47 |
| thumper | 'tis getting late | 10:47 |
| mwhudson | remember to add the root as the first thing you do with the branch builder | 10:48 |
| mwhudson | or you will get very confused | 10:48 |
| * thumper puts laptop down | 10:57 | |
| spiv | lifeless: we are, yeah | 11:00 |
| lifeless | google invites ftw | 11:13 |
| lifeless | spiv: ^ | 11:13 |
| parthm | vila: ping | 11:14 |
| vila | parthm: pong | 11:15 |
| parthm | vila: hi. i have closed most of the review comment on https://code.launchpad.net/~parthm/bzr/376388-dot-bazaar-ownership/+merge/19691 | 11:15 |
| parthm | vila: regarding, the testing, i updated the tests as we discussed the other day ( http://pastebin.com/CKhiAgL4 ) but it seems a regular user doesn't have permissions to chown ( http://pastebin.com/ZPk2XGvv ) | 11:16 |
| * bialix waves hi all | 11:17 | |
| parthm | vila: i am out of ideas on the testing front. | 11:17 |
| * vila waves back at bialix | 11:18 | |
| vila | parthm: weird | 11:21 |
| vila | argh, my X server is... acting weird too | 11:21 |
| vila | ha, no, it was only FF | 11:23 |
| parthm | vila: how do you suggest we take this forward? the earlier _dummy_chown approach seems reasonable to me as os.chown is the lowest layer. | 11:25 |
| vila | parthm: if chown can't be used, then it's sure sign that *not* using it in tests... shows why it should be used in tests :) | 11:27 |
| parthm | vila: :-) | 11:28 |
| vila | ... that's the first time I see chown failing in a directory where I have write access... did posix changed overnight ??? | 11:32 |
| parthm | vila: i am not sure :-) ... generally i tend to use chown with sodo so i never really tried this before. | 11:33 |
| parthm | s/sodo/sudo | 11:33 |
| parthm | vila: i have also updated https://code.launchpad.net/~parthm/bzr/262450/+merge/19483 as per the review comments. so do i need to resubmit that? | 11:36 |
| vila | parthm: as a rule, if you modify a branch, you just push again and then check that the status is 'Needs review' | 11:37 |
| parthm | vila: thanks. i will do that. | 11:38 |
| vila | parthm: then you nag the patch pilot if nothing occur :) | 11:38 |
| parthm | vila: sounds like fun :-) so i will nag poolie this week. | 11:38 |
| parthm | vila: so for https://code.launchpad.net/~parthm/bzr/376388-dot-bazaar-ownership/+merge/19691 should i just put it up for review for now? we can discuss it further over review. | 11:40 |
| parthm | its 'work in progress' now. | 11:41 |
| vila | parthm: as you feel, we at least to understand why os.chown doesn't work or your fix won't either anyway | 11:42 |
| parthm | vila: yes. we do have a better understand of the tests now. will do that. thanks. | 11:42 |
| parthm | regarding https://code.launchpad.net/~parthm/bzr/262450/+merge/19483 i have updated the code based on your comments. feel free to relook at it anytime :-) | 11:43 |
| parthm | vila: hmm. you raise a good point. normally chown won't work so a user foo can't chown to bar. however in this case we are going to chown to based on the containing folder which would be users home (and owned by the user). | 11:47 |
| parthm | so that should work i think. unfortunately we don't seem to have a thorough way of testing it. | 11:47 |
| vila | parthm: it would be quite risky to introduce untested code especially code for .bzr.log and .bazaar access... | 11:51 |
| parthm | vila: i agree. i does seem somewhat brittle. i will set the status to 'Needs Review' in case there are any more ideas. i would be happy to work some more if something comes up or we can reject it. | 11:52 |
| vila | parthm: sounds fine, don't forget to mention the chown problems you encountered in a comment | 11:53 |
| vila | a comment on the merge proposal I mean | 11:53 |
| parthm | vila: will do that. | 11:53 |
| parthm | vila: thanks for taking the time to review this. | 11:53 |
| === mrevell is now known as mrevell-lunch | ||
| jml | does bzr have a shorthand for doing 'bzr merge -r N..(N-1) .' | 12:36 |
| jml | in svn, I think you can do 'svn merge -c -N .' | 12:37 |
| jml | where N is a revno | 12:37 |
| parthm | jml: if you want to merge a specific revision then '-r N' should work IIRC. | 12:40 |
| jml | parthm, unmerge | 12:41 |
| jml | parthm, I want to revert a particular revision | 12:41 |
| parthm | jml: ah. :-) maybe 'bzr revert -r N'? I haven't tried it though. | 12:42 |
| spiv | jml: I suppose -r N..before:N | 12:42 |
| spiv | jml: which is shorthand if N is sufficiently long :) | 12:42 |
| spiv | jml: I think a --reverse/-R switch would probably be a reasonable addition to 'bzr merge', although I haven't thought about it carefully. | 12:43 |
| spiv | We already use -c as shorthand for -r (N-1)..N | 12:44 |
| spiv | jml: I'm off to bed... if you like the -R idea please file a bug asking for it :) | 12:45 |
| jml | spiv, ok | 12:46 |
| spiv | (And if you think it should be --backwards or --unmerge or something instead, do bikeshed in the bug report as appropriate) | 12:48 |
| awilkins | Best place to report packaging bugs still the bugs for bzr? | 13:37 |
| jelmer | awilkins: hmm? | 13:37 |
| jelmer | which packaging specifically? | 13:37 |
| awilkins | Windows | 13:40 |
| awilkins | The current 2.1.0-2 package contains bug 526740 | 13:40 |
| ubottu | Launchpad bug 526740 in bzr-xmloutput "XML-RPC service broken by bzr-2.1" [High,Fix committed] https://launchpad.net/bugs/526740 | 13:40 |
| awilkins | I guess bzr-windows-installers | 13:44 |
| parthm | hello. i am trying to create a series 0.0.1-final for lp:bzr-grep. i have already created series 0.0.1-final via web ui. | 13:48 |
| parthm | when i try to push my trunk (with tag 0.0.1-final) to lp:bzr-grep/0.0.1-final I get the error bzr: ERROR: Invalid url supplied to transport: "lp:bzr-grep/0.0.1-final": 0.0.1-final has no default branch. | 13:49 |
| parthm | what am i missing? | 13:49 |
| bialix | partm: you need to create a bracnh first, then assign it via series interface | 13:56 |
| bialix | there is no magic lp:bzr-grep/0.0.1-final branch created when you created a series | 13:57 |
| bialix | so just push to lp:~user/bzr-grep/0.0.1-final first | 13:57 |
| bialix | then assign this branch as *the* branch for the series | 13:58 |
| bialix | not vice versa | 13:58 |
| bialix | parthm: ^ | 13:58 |
| === mrevell-lunch is now known as mrevell | ||
| parthm | bialix: I knew I was missing something silly :P thanks. that worked out fine. | 14:01 |
| bialix | silly milly | 14:01 |
| === kirkland` is now known as kirkland | ||
| === salgado is now known as salgado-lunch | ||
| === oubiwann` is now known as oubiwann | ||
| === IslandUsurper is now known as IslandUsurperAFK | ||
| === salgado-lunch is now known as salgado | ||
| rioch | I have a file listed as modified in bzr status, but the filename has a * after it, which I don't normally see. What does that mean? | 17:27 |
| Peng | rioch: Exec bit changed. | 17:30 |
| Peng | I think. | 17:30 |
| rioch | ahhhh yeah that's true I did a chmod as well :) | 17:31 |
| Peng | I'm pretty sure the * is explained somewhere | 17:32 |
| slangasek | lifeless: doing the needful on the extra_headers patch; stuck now because I can't figure out how to *run* the test suite to verify that the test works :) | 17:39 |
| swathanthran | i have a local bzr checkout of emacs. where should i look to know which url it is pointing too? | 17:39 |
| swathanthran | i had a try through the .bzr directory but found nothing useful.. | 17:40 |
| === abentley_ is now known as abentley | ||
| jelmer | swathanthran: try 'bzr info' | 17:42 |
| jelmer | slangasek: "bzr selftest bzrlib.plugins.email" | 17:43 |
| slangasek | jelmer: thanks :) | 17:43 |
| swathanthran | jelmer: http://bzr.savannah.gnu.org/r/emacs/trunk/ is this trunk "proper" at the moment? | 17:44 |
| slangasek | oh neat, my patch makes *other* tests fail :) | 17:44 |
| slangasek | tests are great! | 17:44 |
| === beuno is now known as beuno-lunch | ||
| swathanthran | jelmer: assuming it can be said by looking at there or something.. | 17:44 |
| swathanthran | bzr: ERROR: No WorkingTree exists for "http://bzr.savannah.gnu.org/r/emacs/.bzr/checkout/". and bzr: ERROR: No WorkingTree exists for "http://bzr.savannah.gnu.org/r/emacs/trunk/.bzr/checkout/". as i tried bzr update http://bzr.savannah.gnu.org/r/emacs/ and bzr update http://bzr.savannah.gnu.org/r/emacs/trunk | 17:45 |
| swathanthran | bzr update says Tree is up to date at revision 99318. | 17:45 |
| === IslandUsurperAFK is now known as IslandUsurper | ||
| swathanthran | bzr pull does it:) | 17:50 |
| jelmer | swathanthran: specifying a URL to 'bzr update' will try to update that remote URL :-) | 17:51 |
| swathanthran | uh:) i thought it the opposite way:) | 17:54 |
| vila | slangasek: 'bzr selftest -s bzrlib.plugins.email' should be faster | 17:57 |
| vila | slangasek: you can also do 'bzr selftest -s bp.email -s bt.<the other failing tests>' | 17:57 |
| vila | slangasek: 'bp' and 'bt' are known shortcuts | 17:58 |
| slangasek | vila: ok, cheers :) | 18:00 |
| Peng | (FYI, 'bzr selftest foo' loads the entire list of tests and then filters it. 'bzr selftest -s foo' only loads those tests starting with the module 'foo'.) | 18:01 |
| vila | slangasek: I'm not sure what you're working on, but be aware that part of the plugin has been moved to bzr-core but the plugin still has that code (mostly the smtp connection stuff from memory) | 18:06 |
| vila | slangasek: But if you're modifying something else, no worries | 18:06 |
| jelmer | 'evening vila | 18:07 |
| slangasek | vila: hum, I'm adding a new feature to the plugin, and basing my work on lp:~bzr/bzr-email/trunk/; where would I see that things have moved? | 18:07 |
| vila | jelmer: hey :) | 18:07 |
| vila | slangasek: nothing has moved from the plugin yet, that's the point :-/ Some code has been taken from there, put in core, and enhanced there | 18:07 |
| slangasek | ok... :) | 18:08 |
| vila | slangasek: let me check | 18:08 |
| slangasek | vila: lp:~vorlon/bzr-email/extra-headers/, if you want to comment on the appropriateness | 18:08 |
| slangasek | but lifeless mentioned nothing to me yesterday about this code moving :) | 18:08 |
| vila | slangasek: ok, so you should be fine :) | 18:08 |
| vila | slangasek: hmm, smtp_connection.py seems to have diverged, I can't be more precise at first glance | 18:12 |
| slangasek | ok | 18:12 |
| * vila looks at lp:~vorlon/bzr-email/extra-headers | 18:13 | |
| vila | slangasek: hmm, well, it's late, but it looks like your additions will be welcome in bzrlib/email_message.py ... | 18:20 |
| vila | slangasek: bah, one more thing to backport from the plugin ... | 18:20 |
| === beuno-lunch is now known as beuno | ||
| slangasek | vila: mumble; well, I'm at least going to wait until lifeless is satisfied with the merge on bzr-email first | 18:32 |
| slangasek | vila: fwiw, this patching is all tied to moving the Debian Samba team off of svn, greatly simplifying the workflow we discussed at UDS :) | 18:33 |
| vila | slangasek: sure, that's what I meant. I didn't imply you had to do the backport | 18:33 |
| vila | slangasek: great news, thanks | 18:33 |
| === radoe_ is now known as radoe | ||
| kjcole | Is there a way to get bzr to eliminate unnecessary .bzr/ files? (Say, for example, in the case of using rsync or scp independently of bzr with different versions of bzr, or upgrades that didn't quite go as planned.) | 19:09 |
| === zekopeko_ is now known as zekopeko | ||
| * kfogel is away: bbiab | 20:09 | |
| lifeless | slangasek: bzr selftest email | 20:28 |
| lifeless | slangasek: or, to be a bit faster, the less discoverable 'bzr selftest -s bp.email' | 20:28 |
| slangasek | lifeless: done - merge request resubmitted. Good morning :) | 20:29 |
| lifeless | slangasek: good morning :) | 20:29 |
| === salgado is now known as salgado-afk | ||
| xeviox | can somebody help me understanding the bzr 2a format? | 22:24 |
| xeviox | I've seen that there is a folder called "branch" that holds basic information like the last revision | 22:25 |
| xeviox | I've also seen that there is a "repository" folder that seems to hold the data | 22:25 |
| xeviox | as far as I can understand the contents are stored in the "packs" subfolder of "repository" | 22:27 |
| Peng | xeviox: Some data is stored in the indices as well. | 22:27 |
| xeviox | ok | 22:27 |
| Peng | FWIW, the basic meta dir format (.bzr/branch, .bzr/repository, .bzr/checkout) has been around for ages. | 22:28 |
| xeviox | how is the information stored in indices and packs? | 22:28 |
| Peng | Cleverly. | 22:28 |
| Peng | .bzr/repository/{packs,indices} have existed since pack-0.92, though the actual format has changed several times. | 22:28 |
| xeviox | it seems to be compressed, but I don't see using what .. | 22:28 |
| Peng | zlib. | 22:28 |
| xeviox | are you a developer of the project? | 22:29 |
| Peng | Not really. | 22:29 |
| xeviox | k | 22:29 |
| xeviox | anyways thanks for the background info :D | 22:29 |
| Peng | It's not super-simple, and even if I wasn't half-asleep, I don't know all of the answers. | 22:29 |
| xeviox | so there is some metadata in front of the data, any idea what it is? | 22:30 |
| Peng | There is documentation, at the very least in the code, developer docs and mailing list. | 22:30 |
| Peng | Look up btrees, packs and groupcompress. | 22:30 |
| xeviox | "records" look like "gcblz\n324\n442\nData... | 22:31 |
| xeviox | Peng: ok I'll check | 22:31 |
| xeviox | the problem is that the project is very complex | 22:31 |
| xeviox | and my skills in python are very basic :( | 22:31 |
| xeviox | I just try to build up a readonly script in php | 22:32 |
| xeviox | as there a few people that want to share there codes but couldn't use bzr on their webpages .. | 22:32 |
| Peng | Trying to re-implement bzr is not a fun task. | 22:33 |
| xeviox | Peng: sure :), but I hope that a read-only script is not that hard .. | 22:34 |
| Peng | It is that hard. :P | 22:34 |
| xeviox | :( | 22:34 |
| Peng | What exactly are you trying to build? | 22:34 |
| xeviox | I just want to build a script that is able to "read" a bazaar respository | 22:35 |
| xeviox | a little web interface for bazaar | 22:36 |
| xeviox | as there is nothing that is usable with php only | 22:36 |
| xeviox | maybe I'm able to release a working solution for one format and encourage others to help to support more .. | 22:38 |
| lifeless | xeviox: there is a xml interface to bzr; you are probably better off using that than reimplementing the core in php | 23:02 |
| poolie | hello all | 23:02 |
| xeviox | lifeless: the problem is that people can't use it at their webserver without installing bzr .. | 23:03 |
| lifeless | 'seems reasonable to have bzr installed to use bzr' :P | 23:13 |
| poolie | yeah | 23:16 |
| poolie | is it hard to install? | 23:17 |
| poolie | i guess python can be hard | 23:17 |
| fullermd | That's SO 20th century... | 23:17 |
| ronny | poolie: every sane linux distribution ships recent bzr packages, so its absolutely easy to install | 23:19 |
| mneptok | and not only every sane distro, but even Gentoo. | 23:20 |
| ronny | mneptok: i'd argue that gentoo is sane | 23:21 |
| mneptok | ronny: ah, so you work for an electricity company. ;) | 23:21 |
| ronny | mneptok: no, but i support carbon-free global warming | 23:22 |
| mneptok | ronny: hmmm ... does Gentoo have a SPARC port? | 23:23 |
| ronny | no idea | 23:23 |
| mneptok | that would get the job done. | 23:23 |
| ronny | haha | 23:23 |
| ronny | i prefer crowdsourcing (read everyone please install gentoo - i want the snow outside gone tommorow) | 23:24 |
| mneptok | $ emerge spring | 23:24 |
| ronny | \o/ | 23:25 |
| poolie | oh hi ronny | 23:40 |
| poolie | amazingly enough some people still use other OSs | 23:40 |
| jelmer | whoa, using the indexes to store the cache for bzr-git is *significantly* faster | 23:53 |
| dvheumen | is anyone familiar with the class _RelockDebugMixin and for what it is used? | 23:54 |
| dvheumen | i mean, i can read the comments, but is it actually *super* important, or just for the occasional debugging? | 23:54 |
| dvheumen | (_RelockDebugMixin can be found in lock.py) | 23:55 |
| lifeless | jelmer: which indices? | 23:55 |
| jelmer | lifeless: the bzr Btree indexes | 23:56 |
| lifeless | jelmer: custom use of ? | 23:56 |
| jelmer | for a certain definition of custom | 23:56 |
| jelmer | I'm just using their public API but storing different keys of course | 23:56 |
| lifeless | jelmer: right | 23:56 |
| jelmer | in .bzr/repository/git | 23:56 |
| lifeless | a la bzr-search | 23:56 |
| lifeless | yes, our btree's are pretty good | 23:56 |
| jelmer | yeah, but without actual content in packs | 23:56 |
| lifeless | content schmontent | 23:57 |
| poolie | dvheumen: it certainly sounds like it's for debugging | 23:57 |
| poolie | why? | 23:57 |
| poolie | well, you can see it is in fact mixed in to man yclasses | 23:58 |
| poolie | so we shouldn't break it | 23:58 |
| poolie | and -Drelock is useful | 23:58 |
| jelmer | lifeless: So, lsprof shows the amount of time spent deal with the cache is now ~1%, down from >20% | 23:58 |
| lifeless | jelmer: awesome | 23:58 |
| lifeless | brb | 23:58 |
| jelmer | Although adding repack triggering will increase it a bit once I add that | 23:59 |
| dvheumen | I'm exploring the classes around branches, trees and repository objects. I've got this idea to create a super class of which all derive, where this super class contains those high-level lock hooks, but in the case of the Repository class this class is in the way :P | 23:59 |
| lifeless | dvheumen: I don't think thats a particularly good idea. | 23:59 |
| dvheumen | and it seems feasible to put this functionality in the same super class as the lock hooks | 23:59 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!