| beuno | heya poolie! | 00:07 |
|---|---|---|
| beuno | knittl, heh, ingenious | 00:08 |
| knittl | beuno: well, it worked fastest :> | 00:12 |
| knittl | and so i made sure nothing is left | 00:12 |
| lifeless | knittl: bzr clean-tree --ignored | 00:15 |
| spiv | Good morning. | 01:02 |
| poolie | hi there spiv, lifeless | 01:06 |
| poolie | spiv, would you care to give a second opinion on https://code.launchpad.net/~mbp/bzr/ui-factory/+merge/34956 | 01:11 |
| === poolie 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 | Release Manager: jam | bzr 2.2.0 is officially out | patches welcome: http://webapps.ubuntu.com/employment/canonical_BSE/ | ||
| spiv | poolie: sure | 01:18 |
| lifeless | poolie: the apport one might be usable | 01:48 |
| poolie | lifeless: apport what? | 01:51 |
| lifeless | it has a dup detection demon | 01:52 |
| lifeless | for detecting things with the same backtrace | 01:52 |
| poolie | so, spiv, what do you think? | 02:31 |
| * poolie is going to see about getting scriptrunner to test interactive ui stuff | 02:31 | |
| spiv | poolie: comment added | 02:50 |
| poolie | thanks for the review, and i think that's a nice statement about kwargs | 02:57 |
| poolie | i'd almost paste that into hacking | 02:57 |
| poolie | actually i will paste that into hacking | 02:57 |
| spiv | Ok :) | 02:58 |
| spiv | It took me a few goes to get my thoughts on kwargs reasonably clear. | 02:58 |
| poolie | yes, it's pretty much what i was trying to say | 02:59 |
| grettke | Hi folks. Just insalled bzr on the olpc-xo-1. When I try running bzr, I get ""bzr does not support python -OO." What did I do wrong? | 03:49 |
| spiv | grettke: bzr 2.2 should work with python -OO | 03:55 |
| spiv | It seems a bit unusual that bzr would be installed to be run with python -OO by default, but I guess it's an attempt to avoid wasting space on the XO. | 03:56 |
| spiv | grettke: how did you install bzr? As a workaround, you can probably do "python /usr/bin/bzr", although if there are only .pyo files and no .pyc files it could be quite slow. | 03:57 |
| grettke | I did a yum install bzr. | 04:02 |
| spiv | Sounds like a bug in the rpm package, then :/ | 04:03 |
| grettke | oh ok, good to know, thank you | 04:03 |
| spiv | But it wouldn't matter with the current release of bzr, which should work fine in those conditions. | 04:03 |
| spiv | (And thus also allow the space saving that -OO provides) | 04:04 |
| spiv | (And memory saving as well.) | 04:04 |
| spiv | On most systems I'd say those wouldn't matter, but they probably do help on the XO :) | 04:04 |
| poolie | is it just me or does lp-propose fail if there's already a proposal for the branch? | 04:28 |
| poolie | spiv, where was your testdoc branch? | 05:18 |
| spiv | poolie: it's in trunk now | 05:19 |
| poolie | oh, just lp:testdoc? | 05:19 |
| spiv | poolie: (also, jml made me the maintainer) | 05:19 |
| poolie | i like the idea of using it to review what i changed | 05:20 |
| poolie | tag :) | 05:20 |
| poolie | wow, very nice | 05:28 |
| spiv | Hooray :) | 05:29 |
| * poolie resolves to make his docstring slightly better | 05:29 | |
| spiv | vila tells me it's unreadable with a light-background terminal ;) | 05:29 |
| poolie | :/ | 05:30 |
| poolie | that's such a mess | 05:30 |
| poolie | i mean it's probably true but it's a shame unix lets you say "yellow" when you want "a bold contrasting color" | 05:30 |
| spiv | Yeah. | 05:30 |
| poolie | i guess he could write a formatter that either uses just bold/underline/etc, or that uses emacs to rewrite stuff into its own face markup | 05:31 |
| poolie | actually you could write the whole thing inside emacs quite well | 05:31 |
| poolie | i'm kind of surprised jml didn't | 05:31 |
| spiv | Yes, for interactive use the editor is in a way a better home for it. | 05:31 |
| spiv | I think perhaps jml wasn't thinking of using it interactively initially (given that the original output format was Moin markup). | 05:32 |
| spiv | Also I can imagine writing elisp to invoke Python to do fiddly introspection might trip some "that's too gross" thresholds... | 05:33 |
| poolie | i probably wouldn't use real python introspection, just regexps to find the methods and docstrings | 05:34 |
| poolie | but i'm glad it's standalone, since i no longer use emacs | 05:34 |
| poolie | much | 05:34 |
| spiv | I think ideally it wouldn't use introspection, but it certainly makes it easier to write. | 05:37 |
| vila | hi all ! | 07:37 |
| vila | woohoo, connected to pratchett (.freenode.net) The day will be fun :) | 07:37 |
| === 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 | Release Manager: vila | bzr 2.2.0 is officially out | patches welcome: http://webapps.ubuntu.com/employment/canonical_BSE/ | ||
| bialix | hi | 07:49 |
| vila | hmm, is it me or is lp using a new font in same places ? (the mp links at https://code.edge.launchpad.net/bzr/+activereviews for example) | 07:52 |
| vila | bialix: _o/ | 07:52 |
| lifeless | vila: the ubuntu font? | 07:53 |
| bialix | vila: \o_ | 07:53 |
| vila | lifeless: hehe, looks like so to me, the funny thing is that I just installed it myself ;) | 07:53 |
| lifeless | vila: thats why you just noticed. | 07:54 |
| vila | lifeless: haaa, you mean the font change is older ? When did it occur ? | 07:54 |
| lifeless | 2 weeks I think | 07:55 |
| vila | lifeless: wow | 07:56 |
| vila | lifeless: haa, right, I see the font *because* I installed it... | 07:58 |
| mgz | morning all. | 08:14 |
| mgz | see from planet debian Robert's done an interesting post on what he's been up to | 08:20 |
| lifeless | I meant to edit it more, but it escaped due to wordpresss | 08:20 |
| poolie | > Bazaar is a tool anyone can install locally | 08:21 |
| poolie | > Launchpad, by contrast | 08:21 |
| poolie | is a tool no one can install :) | 08:21 |
| lifeless | hah | 08:21 |
| poolie | jk | 08:23 |
| poolie | vila, are you up? | 08:30 |
| poolie | is there some trick about matching blank lines in test scripts? | 08:30 |
| vila | poolie: yup ! | 08:30 |
| === beaumonta is now known as abeaumont_ | ||
| * bialix waves at poolie | 08:31 | |
| vila | poolie: hmm, ring a bell... | 08:31 |
| poolie | hi there bialix | 08:31 |
| bialix | new qbzr release hits the street | 08:31 |
| vila | I vaguely remember that initially blank lines were ignored when there was no '$' prefix for commands... Not sure we fixed that now that the expected output lines don't have a prefix | 08:32 |
| vila | poolie: what do you observe ? | 08:32 |
| vila | poolie: An expected output blank line not respected or detected or... ? | 08:32 |
| poolie | there's a blank line in the output | 08:33 |
| poolie | it seems to be a bug: by the time we run the checker, it's not in the 'expected' variable | 08:33 |
| bialix | poolie: check http://stackoverflow.com/tags/bazaar/info ; is it ok for you? | 08:33 |
| poolie | looks good | 08:34 |
| poolie | did you just set that up? thanks | 08:35 |
| bialix | actually, yesterday | 08:35 |
| bialix | I've got enough bazaar karma for this | 08:35 |
| bialix | ddaa asked me to do so... | 08:36 |
| vila | poolie: right, so I think my bell was right, want me to look at it ? | 08:40 |
| poolie | no it's ok, i think i see it | 08:41 |
| vila | poolie: bzrlib.script.py line 87 | 08:41 |
| poolie | yeah :) | 08:42 |
| poolie | just working out what level to test that at | 08:42 |
| vila | poolie: right, and line 112 smells like an additional test would be good | 08:42 |
| poolie | i put up a branch ~mbp/bzr/script, that tests user interaction | 08:42 |
| vila | poolie: like... test_empty_line_is_ignored ? :-D | 08:43 |
| poolie | exactly | 08:43 |
| poolie | i think in some contexts it should be ignored | 08:43 |
| poolie | i guess only at the start of the document | 08:43 |
| vila | poolie: but I think this one should be kept... yeah, you got it | 08:43 |
| vila | i.e. output can exist if a command as been seen, otherwise, just ignore | 08:44 |
| poolie | so as simple as just saying, we'll ignore one initial blank, but no more? | 08:46 |
| poolie | at the _script_to_commands level? | 08:46 |
| === mthaddon` is now known as mthaddon | ||
| vila | poolie: lp:~mbp/bzr/doc approved if you remove the 'I think' occurrences, I don't think we ever say 'I' in these docs ;-p | 09:04 |
| mgz | "I don't think we ever say 'I' in these docs" <- maybe you should add that to the docs | 09:05 |
| lifeless | -lol- | 09:06 |
| vila | mgz: my man ! Can you have a look at your mps ? There are some tweaks, but otherwise you have several you can land | 09:06 |
| mgz | yeah, I'm short news again aren't I? | 09:07 |
| vila | hehe | 09:07 |
| lifeless | probably | 09:07 |
| mgz | I'll add what's lacking and push. | 09:07 |
| vila | mgz: s/I don't think// applies to your remark :) | 09:07 |
| mgz | when you next poke babune vila, lifeless has released a new pyjunitxml version. | 09:08 |
| vila | mgz: already done, but thanks for the heads-up and thanks to lifeless for the upgrade ;) | 09:08 |
| mgz | ...you're always ahead of me | 09:09 |
| vila | I try to avoid running private branches for babune or I lose... track ? my mind ? my sanity ? | 09:09 |
| vila | mgz: not at all, just following closely instead :-p | 09:09 |
| vila | mgz: ... which may mean I'm ahead when you stop :D | 09:10 |
| mgz | pqm has news merge on right? otherwise I'm going to conflict horribly here. | 09:13 |
| poolie | vila: proposal updated | 09:14 |
| poolie | vila :) | 09:15 |
| poolie | well, it was kind of quoted | 09:15 |
| poolie | but not very clearly | 09:15 |
| vila | poolie: sure, but lp doesn't show any changes yet, you've pushed right ? | 09:16 |
| vila | wow, I'm already in love with the new Ubuntu font :) | 09:16 |
| poolie | oh i meaont the scripts one | 09:16 |
| poolie | did it change again? | 09:16 |
| vila | ha | 09:16 |
| vila | poolie: ok, wasn't there yet | 09:17 |
| poolie | do you think that's a reasonable position about string interpolation? | 09:17 |
| vila | "args are split in to words" ? into ? | 09:17 |
| vila | poolie: hmm, I really dislike the idea of removing the first and final line | 09:19 |
| vila | """\ works great for the first one | 09:19 |
| poolie | vila, and you can do the same for the last one | 09:20 |
| poolie | it just seems unfortunate to make every caller type that | 09:20 |
| poolie | especially because it's meant to be an easy way to get good tests, and because i don't think tracking them will ever be useful | 09:20 |
| vila | they shouldn't need that if we ignore the first one (but take care of it if we need error reporting with correct line numbers) | 09:20 |
| vila | your note about the comment handling is right though... | 09:21 |
| poolie | oh, so you're saying you don't mind ignoring them, but you don't like the implementation of trimming the list | 09:22 |
| poolie | because it will change the line numbers? | 09:22 |
| vila | well, it will always be impossible to distinguish a comment *preceding* a command, from a comment in the expected output of the *previous* command | 09:22 |
| vila | yes, I think it's fine to ignore the first line if it's empty (while keeping track of line numbers) knowing that anal script writers can use """\ | 09:23 |
| vila | but I think we shouldn't ignore the last one until someone encounter problems with it (which hadn't occur yet right ?) | 09:23 |
| poolie | it does happen | 09:25 |
| vila | and for the comments, well, the only robust solution I can think of is to allow \# when you want to use it literally | 09:25 |
| poolie | now that i don't ignore all blank lines, a bunch of tests fail | 09:25 |
| poolie | """ | 09:25 |
| poolie | $ echo foo | 09:25 |
| poolie | foo | 09:25 |
| poolie | """ | 09:25 |
| poolie | fails | 09:25 |
| poolie | because '\n'.split(that) has a '' at the end, after the last newline | 09:26 |
| vila | rhaa, bogus split | 09:26 |
| spiv | Trim leading and trailing blank lines? | 09:26 |
| poolie | a bit surprising hey | 09:26 |
| poolie | that's what i'm doing | 09:27 |
| spiv | Or use """\ ;) | 09:27 |
| poolie | yes, but i'd rather write the trim once, not \ a hundred times | 09:27 |
| poolie | especially because the message is confusing if you miss it | 09:27 |
| vila | poolie: you have 'if line == '': continue' indented, is that intended | 09:28 |
| vila | wow, look mom, no typo ! | 09:28 |
| vila | poolie: and the tweak in _check_output looks suspicious too | 09:31 |
| poolie | the indenting is actually intentional | 09:40 |
| poolie | it's a somewhat misleading diff | 09:41 |
| poolie | we want to skip lines that are blank only because they contain a whole-line comment | 09:41 |
| poolie | why suspicious? | 09:41 |
| vila | poolie: yup, I'm digging | 09:42 |
| poolie | that's the change i was originally trying to make :) | 09:42 |
| poolie | so the interaction test works | 09:42 |
| poolie | test_confirm_action | 09:42 |
| poolie | needs it | 09:42 |
| vila | is that because test_confirm_action doesn't require that the user type <enter> ? | 09:43 |
| poolie | no, it's because bzr doesn't write out a \n at the end of the prompt | 09:44 |
| poolie | it leaves the cursor there and the user presses enter for us | 09:44 |
| vila | ouch, that's "expected output does not end with \n', ok | 09:45 |
| vila | right, that's what you say in the comment :) | 09:45 |
| vila | almost | 09:46 |
| poolie | isn't that nice? :) | 09:49 |
| poolie | then i can pop back one fram | 09:54 |
| vila | poolie: right, it's not clean but 100% DWIM | 09:55 |
| poolie | so my goals, which i suppose are yours too | 09:55 |
| poolie | are that it's easy to use | 09:55 |
| vila | poolie: what about http://paste.ubuntu.com/492989/ ? | 09:55 |
| poolie | when it fails, gives a decent message | 09:55 |
| poolie | and as much as possible lets you be precise if you want to | 09:55 |
| vila | poolie: totally, the alternative would be to allow specifying an expected output *without* a final new line which means rewriting _script_to_commands for a little benefit | 09:56 |
| poolie | vila so it seems like the only actual difference in behaviour there is that you tolerate multiple leading blank lines | 09:56 |
| vila | poolie: overkill | 09:56 |
| poolie | which does not seem useful to me | 09:56 |
| vila | try putting a several lines long comment at the start | 09:57 |
| poolie | ok, let's add a test for that | 09:58 |
| poolie | that works | 09:59 |
| vila | and an empty line after the opening comment ? | 10:00 |
| vila | http://paste.ubuntu.com/492991/ | 10:00 |
| poolie | vila i'm not convinced that should pass | 10:01 |
| poolie | istm letting people have a leading """ with no \ is useful | 10:01 |
| poolie | but letting them have arbitrary blanks is not actually helpful | 10:02 |
| poolie | and may get in the way of precision | 10:02 |
| vila | poolie: no, failing because they forgot to be precise before their first command is just annoying them for no good reason IMHO | 10:04 |
| vila | in _script_to_commands, the split is the bulk of the scanner while the loop is the parser, the comments are scanned in the loop to finish the scanning, and the parser should really kick in when the first command starts, but well, that's not so important, it just feels cleaner | 10:06 |
| vila | but the comment I deleted is obsolete and misleading now | 10:06 |
| vila | well cleaner and respecting newlines which del doesn't... | 10:08 |
| vila | anyway, don't spend time on it, this will matter more if/when we implement error reporting with linenos at which point whoever does it can fix it | 10:09 |
| lifeless | jml: so, testtools MP, I gave feedback, you seem undecided? | 10:12 |
| vila | lifeless, jml: As a data point, I came across 'a' and 'n' *this* wee-end and... found it akward | 10:15 |
| vila | week-end I don't even know what wee-end could mean... | 10:15 |
| lifeless | vila: EPARSE | 10:16 |
| vila | good :) | 10:16 |
| lifeless | I don't know what 'a' and 'n' you mean | 10:16 |
| vila | yeah 'b' :) | 10:16 |
| vila | at least this typo reveals my lack of understanding, I don't know what it's about so I can't type it properly :) | 10:17 |
| lifeless | vila: I'm still lost | 10:17 |
| vila | lifeless: I encountered 'a' and 'b' in assertEqualDiff and thought: "Wth ? Why not 'expected' and 'actual' ?" | 10:18 |
| lifeless | oh right | 10:18 |
| lifeless | yes | 10:18 |
| jml | lifeless, yes. | 10:27 |
| jml | lifeless, I'm otp atm. | 10:27 |
| poolie | hello jml! | 10:27 |
| lifeless | jml: yes | 10:27 |
| jml | poolie, hi | 10:27 |
| poolie | welcome back (if you are) | 10:27 |
| lifeless | jml: we can talk about it tonight/tomorrow if you want | 10:27 |
| poolie | vila i'd kind of like to just merge this | 10:27 |
| jml | lifeless, that'd be good. | 10:27 |
| poolie | that particular problem might be confusing but it hasn't bit me yet, anyhow | 10:27 |
| poolie | bug 636930 sounds familiar | 10:28 |
| ubot5 | Launchpad bug 636930 in Bazaar "Upgrading a repository fails with 'Inter1and2Helper' object has no attribute 'source_repo' (affected: 1, heat: 6)" [Undecided,New] https://launchpad.net/bugs/636930 | 10:28 |
| poolie | ah bug 513432 | 10:29 |
| ubot5 | Launchpad bug 513432 in Launchpad Bazaar Integration "AttributeError: 'Inter1and2Helper' object has no attribute 'source_repo' (affected: 13, heat: 23)" [Critical,Fix released] https://launchpad.net/bugs/513432 | 10:29 |
| poolie | spiv, if any, it looks like that has regressed in 2.2? | 10:30 |
| mgz | 633915 is the same bug and also new. | 10:31 |
| mgz | and 635874. | 10:33 |
| mgz | all of them involve launchpad, so the regression might be that side rather than in 2.2 | 10:35 |
| vila | poolie: as in: "Thanks for review, but still" ? :-D | 10:36 |
| vila | grr, %2Bbranch still ? | 10:36 |
| poolie | yes, "but still" :) | 10:36 |
| poolie | i feel like that's enough of that particular yak for today | 10:37 |
| vila | poolie: ok, I've shelved my patch and I can trivially break your test, that's good enough :) | 10:39 |
| vila | poolie: moreover I get a "SyntaxError: No command for line ''" which is a perfect case to implement better error reporting with line numbers :-D | 10:40 |
| poolie | yeah that would be higher up my list | 10:44 |
| poolie | also there's something strange happening with ellipsis | 10:44 |
| lifeless | I triggered the elusive bzr: ERROR: Tree transform is malformed [('missing parent', 'new-1')] | 10:45 |
| vila | lifeless: hmm, with bzr itself or builddeb ? | 10:45 |
| lifeless | with bzr | 10:45 |
| lifeless | 2.2b3 | 10:45 |
| lifeless | rev 5340 | 10:46 |
| lifeless | I had added a directory and files in the dir, and I did shelve --all | 10:46 |
| vila | that's a bug then (all MalformedTransform are :-/) | 10:46 |
| vila | oh, shelve... | 10:47 |
| vila | or... did you have .pyc files there ? | 10:47 |
| lifeless | ignored files yes | 10:47 |
| lifeless | foo~ - editor backups | 10:47 |
| poolie | oh, wow | 10:48 |
| lifeless | sounds like you have an idea about whats going on; perhaps you could file the bug ? | 10:48 |
| vila | lifeless: can you try again with lp:~vila/bzr/323111-orphan-non-versioned-files ? | 10:48 |
| poolie | an actual bug, not a test suite bug | 10:48 |
| poolie | but not a very big one | 10:48 |
| lifeless | vila: i will tomorrow | 10:48 |
| vila | lifeless: ok, waiting for your feedback then | 10:48 |
| lifeless | vila: you could try it yourself :P | 10:48 |
| lifeless | vila: trunk, and then your branch | 10:48 |
| vila | lifeless: yeah right :) I'm busy fixing my branch.conf files with lp spitting bzr+ssh://bazaar.launchpad.net/%2Bbranch/bzr/ urls everytime I create a new bzr branch :-/ | 10:51 |
| lifeless | vila: you might like to file a bug on that | 10:52 |
| lifeless | its good that private branches are supported, but its a bit annoying | 10:52 |
| vila | lifeless: there isn't already one ??? I thought you mention tim related to that when I mentioned it... friday ? | 10:52 |
| lifeless | I did | 10:52 |
| lifeless | have you communicated with him about it though? | 10:52 |
| vila | no, I thought you and I were already discussing it, rats, it's a bad bug | 10:53 |
| vila | lifeless: should I file against lp or lp-code ? | 10:53 |
| poolie | ok, and now i get to fix the n-1th yak | 10:53 |
| vila | lifeless: oooooh, but the urls work... | 10:55 |
| vila | no need to fix my branch.conf files (I get fooled in a particular setup) | 10:56 |
| vila | hmm, fooled twice even, if they work today, the problem I encountered friday was either transient or fixed since | 10:57 |
| vila | lifeless: so bzr+ssh://bazaar.launchpad.net/%2Bbranch/bzr/ will now always point to the dev focus right ? | 10:58 |
| lifeless | I don't know. | 11:00 |
| lifeless | I guess. | 11:00 |
| mwhudson_ | vila: yes | 11:00 |
| lifeless | and anothe bug | 11:00 |
| lifeless | :!bzr shelve --all debian/python-fixtures.install | 11:00 |
| lifeless | Selected changes: | 11:00 |
| lifeless | -D debian/ | 11:00 |
| lifeless | -D debian/python-fixtures.install | 11:00 |
| lifeless | bzr: ERROR: Tree transform is malformed [('unversioned parent', 'new-2'), ('missing parent', 'new-2')] | 11:00 |
| lifeless | (filed) | 11:00 |
| vila | mwhudson_: thx | 11:01 |
| bialix | poolie: still here? | 11:11 |
| poolie | hi, yes, though not for long | 11:14 |
| bialix | https://bugs.launchpad.net/bzr-website/+bug/636961 | 11:14 |
| ubot5 | Launchpad bug 636961 in bzr-website "www.bazaar.canonical.com URL does not work (affected: 1, heat: 6)" [Undecided,New] | 11:14 |
| poolie | really | 11:15 |
| poolie | it should | 11:15 |
| poolie | thanks | 11:15 |
| poolie | i can't fix it but i'll ask | 11:15 |
| bialix | so far I'll use URL without www. | 11:15 |
| poolie | good idea | 11:16 |
| poolie | ok good night all | 11:26 |
| spiv | poolie: yes, bug 636930 did sound familiar, thanks for finding the bug it may be a regression of | 11:38 |
| ubot5 | Launchpad bug 636930 in Bazaar "Upgrading a repository fails with 'Inter1and2Helper' object has no attribute 'source_repo' (affected: 3, heat: 26)" [Critical,Confirmed] https://launchpad.net/bugs/636930 | 11:38 |
| spiv | I'll look into it tomorrow if no-one fixes before then. | 11:38 |
| jml | poolie, good night. we should have a chat some time. | 12:16 |
| === Meths_ is now known as Meths | ||
| === oubiwann is now known as oubiwann-away | ||
| === oubiwann-away is now known as oubiwann | ||
| nlisgo | 'bzr remove --keep file.php' keeps the file locally but removes it from repository. Is there a way to have it removed from repository but it when the repo is pull within a branch the file file.php is not removed within the branch | 14:28 |
| nlisgo | I know it also needs adding to the .bzrignore file | 14:29 |
| === Ursinha-afk is now known as Ursinha | ||
| === mbarnett` is now known as mbarnett | ||
| rubbs | I'm looking for a way to create a shared repo system that allows for devs to have their own branches in the shared repo, but not have write access to a specific branch, for example, the trunk. what's the best way to go about doing this? | 15:44 |
| rubbs | I basically want the space saving abilities of the shared repo (or similar) but need a gate keeping sort of system. I'm the only one who should have commit access to the trunk. Is this possible? or do I need the trunk to be in a separate repo? | 15:45 |
| maxb | You'll need everyone to have write access to the repository. You could enforce some application-level constraint on people who can change a branch tip | 15:45 |
| rocky | what's the quickest way to see what repo a branch comes from? (ie where all the rev info is stored) | 16:01 |
| Meths | bzr info ? | 16:02 |
| rocky | bzr info on a branch does not tell me where it's repo is located | 16:02 |
| ddaa | rubbs: maybe have a look at stacked branches | 16:06 |
| ddaa | they were designed for this kind of use case: | 16:06 |
| ddaa | space saving of shared repo, without giving everyone write access to everything | 16:07 |
| ddaa | http://doc.bazaar.canonical.com/latest/en/user-guide/stacked.html | 16:08 |
| rubbs | maxb: ddaa thanks. I'll take a look at stacked. | 16:08 |
| ScottK | Feedback from a satisfied customer on a proprietary project I'm working on that uses bzr: "`bzr merge --uncommitted --force --interactive`s. Neat." <-- the commenter is generally a die hard svn/centralized VCS traditionalist. | 16:09 |
| ddaa | separatists of the world, unite! | 16:11 |
| Kinnison | splitter! | 16:11 |
| rubbs | Hmm... seems like binding to a stacked branch could cause some problems. | 16:11 |
| ddaa | generally, it's better to enforce this kind of constraint by policy, or to deal with the additional disk usage of having multiple independent repos | 16:13 |
| rubbs | ddaa: yeah I htink I'm going to do that later. We would have the policy and I do trust the devs here, but I want that safety net if possible. | 16:13 |
| rubbs | I think I'm going to have a dev repo and a release repo | 16:13 |
| rubbs | disk space is cheap ;) | 16:14 |
| ddaa | stacked branches were designed for launchpad, which has a relatively unique set of constraints and level of control. | 16:15 |
| ddaa | hi Kinnison. Do you really, really hate the Romans? | 16:18 |
| * ddaa goes out to look at the bright side of life | 16:21 | |
| maxb | rocky: Yes, it does, unless the repository is implicitly located within the branch bzrdir itself | 16:33 |
| === khmarbaise_ is now known as khmarbaise | ||
| === BasicPRO is now known as BasicOSX | ||
| === zyga is now known as zyga-dinner | ||
| === beuno is now known as beuno-lunch | ||
| dobey | can anyone help me figure out http://pastebin.ubuntu.com/493200/ ? the tarmac branch tests are all failing with this error in the PPA package builds. and rockstar and others seem to get the errors when running the tests, however, i am unable to get the errors to occur on my system. | 17:32 |
| * rockstar bets jam can help. | 17:33 | |
| rockstar | He is smart. | 17:33 |
| jam | rockstar, dobey: starting with bzr 2.2 we require a configured username to commit, because we had a lot of problems with people forgetting to enter it, and then getting committers they didn't want | 17:34 |
| jam | for test suitse | 17:34 |
| jam | the bzr TestCase sets BZR_EMAIL as part of setUp() | 17:34 |
| rockstar | dobey, we should be using the bzr TestCase in those examples. | 17:35 |
| dobey | ah | 17:37 |
| dobey | hmm | 17:37 |
| dobey | TestCaseWithMemoryTransport? | 17:38 |
| dobey | also, i'd still like to know wtf i'm not getting the issue while everyone else is | 17:38 |
| === Ursinha is now known as Ursinha-lunch | ||
| === deryck is now known as deryck[lunch] | ||
| jam | dobey: do you have the env variable set already? | 17:42 |
| Logomachist | Are we any closer to a bzr book getting released? | 17:42 |
| jam | again bzr's base TestCase clears out the environment variable while running | 17:42 |
| jam | I just double checked the code | 17:43 |
| jam | bzr's TestCase has a "_cleanEnviroment" function, called from TestCase.setUp() | 17:43 |
| jam | which sets BZR_EMAIL = None, and EMAIL=jrandom@example.com | 17:43 |
| jam | if you are inheriting from a bzrlib TestCase you should get that for free | 17:44 |
| dobey | jam: no | 17:44 |
| jam | if you are just inheriting from unittest.TestCase then you won't | 17:44 |
| jam | and you'll want to do something similar | 17:44 |
| dobey | jam: if i run 'bzr whoami' in os.system() in the test, it prints the message that it's unset | 17:44 |
| jam | dobey: right, but that is because there are multiple ways of setting it | 17:45 |
| jam | what does "set" give? | 17:45 |
| jam | we will accept, EMAIL, BZR_EMAIL, or 'bzr whoami "foo bar <foo@bar.com>" | 17:45 |
| dobey | none of those are in my env | 17:46 |
| dobey | and the tests are setting BZR_HOME to an empty dir | 17:46 |
| jam | dobey: IIRC, 'bzr whoami' only looks at the information you gave it | 17:47 |
| jam | (it doesn't look at the env vars) | 17:47 |
| jam | dobey: would you have an older version of bzrlib? | 17:48 |
| jam | like 2.1 ? | 17:48 |
| dobey | well it looks at the config too. and since it's printing the no value message, it is not reading it from my config | 17:48 |
| dobey | no, i'm on maverick and have bzr 2.2 | 17:48 |
| dobey | this broke when the 2.2 release went into maverick, and i did some work on the tarmac tests to make the error go away | 17:49 |
| dobey | but it seems to have cropped back up somehow, though i can't make it happen on my machine | 17:49 |
| jam | dobey: sorry, I got disconnected for a second, last thing i see: | 17:52 |
| jam | 11:49:11 AM) dobey: but it seems to have cropped back up somehow, though i can't make it happen on my machine | 17:52 |
| jam | (11:50:00 AM) jam: dobey: this is for the tarmac test suite itself, right? | 17:52 |
| dobey | yeah, a subset of the tests in tarmac | 17:52 |
| dobey | i'm happy to switch it to using the appropriate bzrlib testcase, but want to understand why i seem to be the only person not seeing the issue :) | 17:53 |
| === Ursinha-lunch is now known as Ursinha | ||
| rubbs | quick question, is there a way to make a branch on the remote server without having to make commands via ssh. I'm basically saying can I from computerA do this: rubbs@computerA$ bzr branch bzr+ssh://computerB/branch1 bzr+ssh://computerB/branch2? | 18:30 |
| jelmer | rubbs, you should be able to, yes | 18:31 |
| jelmer | it would probably be slower than ssh'ing out to computerB or computerC though | 18:32 |
| rubbs | jelmer: thanks, that worked. I know it may be slightly slower, but at this point it's easier to explain it to newbies. Long story short, I want all their branches to be on the server so I can back up their work. They will use bzr to create their branch on the server, then branch+bind to their local machine from the new server branch. If I can get them to do it all with bzr commands, it will make more sense to them. | 18:35 |
| rubbs | after they are more comfortable I'll make sure they know they can do it faster | 18:35 |
| rubbs | I'm also toying with the idea of giving them sftp access only to our repo server | 18:36 |
| jelmer | rubbs: well, s/slightly/a lot/ | 18:39 |
| jelmer | rubbs: rather than using local paths it would fetch all data locally to computerA only to send it off to computerB again | 18:40 |
| === beuno-lunch is now known as beuno | ||
| rubbs | jelmer: ah, I'll try to find another way around it. | 18:59 |
| === zyga-dinner is now known as zyga | ||
| === deryck[lunch] is now known as deryck | ||
| servilio | hi all! is there a [stable|reliable] way to have composite/nested trees? | 19:15 |
| lifeless | servilio: the externals plugin seems popular | 19:45 |
| servilio | lifeless: will take a look, thanks | 19:46 |
| servilio | lifeless: just found the lp:~jelmer/bzr/foreign branch, but doesn't have any linked blueprints or bug report, so no info on when to expect it to be merged in core bzr | 19:47 |
| === Ursinha is now known as Ursinha-brb | ||
| jelmer | servilio: What do you expect that branch do be? | 20:01 |
| servilio | jelmer: it is a hosting environment, I have one repo for the environment skeleton, and another for the different hosting buildouts | 20:03 |
| jelmer | servilio: I mean ~jelmer/bzr/foreign, what are you expecting it to do? | 20:03 |
| jelmer | servilio: it's just the branch where I keep changes to improve foreign branch support that haven't landed yet. | 20:04 |
| servilio | so, are there any options in the stock bzr to be able to create nested branches? | 20:04 |
| servilio | like "bzr co repo:hosting . && bzr co repo:buildouts/b1 b1" | 20:05 |
| servilio | and then being able to do bzr pull independently in b1 and its parent to pull updates | 20:05 |
| servilio | is that possible right now? | 20:06 |
| jelmer | servilio: no, see bug 402814 | 20:06 |
| ubot5 | Launchpad bug 402814 in Launchpad Bazaar Integration "Importing revisions with submodules is not supported (affected: 8, heat: 56)" [Wishlist,Triaged] https://launchpad.net/bugs/402814 | 20:06 |
| === lool- is now known as lool-webchat | ||
| servilio | jelmer: just read the bug report | 20:11 |
| servilio | jelmer: but I don't have anything clear yet | 20:12 |
| servilio | jelmer: I mean, of current support and if it is possible to use it | 20:12 |
| jelmer | servilio: there is no support in bzr core for by-reference nested trees. There are some plugins that provide alternatives. | 20:13 |
| servilio | jelmer: and what's the prospect for its support in the core? | 20:14 |
| servilio | jelmer: any plugin that has some kind of forward compatibility with the approach that core will head to? | 20:15 |
| jelmer | servilio: it's a much requested feature and I believe the core team has plans to work on it in the near future. | 20:15 |
| jelmer | servilio: there is no plugin that uses the same approach as core will use. | 20:16 |
| servilio | jelmer: do you know of one that at least won't cause problems when migrating to the way core will support this? | 20:16 |
| jelmer | servilio: I don't think any of them will cause problems. | 20:17 |
| servilio | jelmer: any specific suggestion? or links? | 20:19 |
| jelmer | servilio: personally I would suggest bzr-externals | 20:20 |
| servilio | jelmer: thanks a lot | 20:21 |
| jelmer | it's the simplest but also the most straightforward | 20:21 |
| servilio | great | 20:21 |
| TresEquis | jelmer: that plugin is stable / recommendable at this point? | 20:26 |
| TresEquis | I think the last time I looked it was still not-quite-there, but that was a while ago | 20:26 |
| jelmer | TresEquis: it's stable as far as I know | 20:27 |
| servilio | TresEquis: just looked at the page, and right now looks to be at a useful and usable state | 20:27 |
| jelmer | TresEquis: I'd still consider it a stopgap fix until proper nested tree support lands though. | 20:28 |
| TresEquis | maybe that's the caveat I was remembering | 20:29 |
| TresEquis | I have a bunch of SVN-backed checkouts which use svn:externals, would be nice to be able to track those in bzr-svn | 20:30 |
| servilio | jelmer: anything that could be done to get proper support into the core faster? | 20:30 |
| chx | hi. i am trying diff one file in a checkout against its HEAD counterpart. | 20:53 |
| chx | nevermind :) | 21:00 |
| jelmer | servilio: I think it's already high on the list of things to work on of the Bazaar core developers, for more details the mailing list or that bugreport are probably the right places to ask. | 21:02 |
| servilio | jelmer: ok, thanks | 21:03 |
| ali | hi bzr masters, what does this error mean? bzr: ERROR: bzrlib.errors.ErrorFromSmartServer: Error received from smart server: ('ShortReadvError', 'b22a569ce92096b22330c933808dc3b1.tix', '0', '772', '60') | 21:58 |
| ali | seems my repository is corrupted ("bzr check" reports the same thing, "bzr reconcile" failed with File "/usr/lib/python2.5/site-packages/bzrlib/index.py", line 1074, in _parse_lines | 21:59 |
| ali | raise AssertionError("%s %s" % (self._size, pos)) AssertionError: 772 59) | 21:59 |
| maxb | ali: Yes, that doesn't sound good. The first thing you could do is to try running "md5sum .bzr/repository/packs/*.pack" to check the status of some other files in your repository - for pack files, their name should be identical to their md5sum value | 22:16 |
| lifeless | maxb: hi | 22:25 |
| maxb | hello | 22:25 |
| lifeless | maxb: I've got your mail about packages on my to-read | 22:26 |
| lifeless | I've updated a couple of packages | 22:26 |
| lifeless | in sid | 22:26 |
| maxb | hmm, which ones? | 22:27 |
| lifeless | python-junitxml | 22:29 |
| lifeless | testrepository I think, or was it testtools | 22:30 |
| * lifeless checks archive mails | 22:30 | |
| maxb | Ah yes, I have tracked them down in debian-devel-changes@ now | 22:30 |
| lifeless | yes, those two | 22:31 |
| lifeless | I need to do a testtools one | 22:31 |
| lifeless | May wait a few days, get a small improvement in cleanups into it first | 22:31 |
| maxb | Ok, once that appears, I'll do the PPA uploads for it, and re-propose promotion of testtools/subunit from the beta ppa | 22:32 |
| maxb | That reminds me, bzr-svn is also languishing in the beta ppa, I should do something about that | 22:33 |
| ali | ni, maxd, i just ran "md5sum .bzr/repository/packs/*.pack", all files' md5 matches file name | 22:36 |
| maxb | Well, that's a start. You might want to read through https://answers.launchpad.net/bzr/+question/96346 next - I don't know any more than what's there, but others here can possibly help | 22:38 |
| ali | thx, maxb | 22:38 |
| RomanMoz | Hello! How to launch bzr-gtk or bzr-explorer on Windows systems? Ten years I used Linux and forgot many things in windows | 22:54 |
| RomanMoz | Please... | 22:55 |
| ali | maxb, "bzr dump-btree" is even failing on my other good repositories, any ideas? | 22:57 |
| ali | build@dev-001:/bzr/server/.bzr/repository/indices$ bzr dump-btree b8e9c1d28ae7c837d4f1472535a58a03.iix | 22:58 |
| ali | bzr: ERROR: b8e9c1d28ae7c837d4f1472535a58a03.iix is not an index of type <class 'bzrlib.btree_index.BTreeGraphIndex'>. | 22:58 |
| maxb | ali: hmm. odd. what format repository is that? | 23:08 |
| maxb | also, you could try dump-btree --raw | 23:08 |
| maxb | also, is the broken repository private data, or public? | 23:08 |
| ali | it is private. tried with "--raw", none of the indices are recorgnized | 23:11 |
| ali | i tried .six, tix, rix, iix files. bzr version 2.0.4 on 64-bit ubuntu, weird | 23:12 |
| lifeless | ali: what does 'bzr info -v' show - you can elide the paths, but we need the format data | 23:12 |
| ali | ali@dev-001:/bzr/server/.bzr/repository/indices$ bzr info -v | 23:12 |
| ali | Shared repository (format: pack-0.92) | 23:12 |
| ali | Location: | 23:12 |
| ali | shared repository: /glass/sfw/bzr/repo/server | 23:12 |
| ali | Format: | 23:12 |
| ali | control: Meta directory format 1 | 23:12 |
| ali | repository: Packs containing knits without subtree support | 23:12 |
| ali | Repository: | 23:12 |
| ali | 7522 revisions | 23:12 |
| lifeless | ok, so this is not a btree based format | 23:13 |
| lifeless | the indices are linear arrays with bisection used, instead of a btree. | 23:13 |
| ali | i see, the repository was created two years ago with old bzr version, i guess | 23:14 |
| ali | anyway i can migrate to the new btree repository? (if i can fix this one first) | 23:15 |
| maxb | upgrading's easy. fixing this, however, may be rather hard | 23:25 |
| ali | i reserved the crime scene, and just rolled back to this morning's backup. :-) If you need me to report a bug or something let me know | 23:26 |
| lifeless | ali: it looks like you had a write to an index get truncated by your filesystem | 23:27 |
| lifeless | ali: without notification to bzr | 23:27 |
| lifeless | the code in question is: | 23:27 |
| lifeless | for line in lines: | 23:27 |
| lifeless | if line == '': | 23:27 |
| lifeless | # must be at the end | 23:27 |
| lifeless | if self._size: | 23:27 |
| lifeless | if not (self._size == pos + 1): | 23:27 |
| lifeless | raise AssertionError("%s %s" % (self._size, pos)) | 23:27 |
| lifeless | so we got: | 23:27 |
| lifeless | - an empty line (EOF shows as this) | 23:28 |
| lifeless | - we know the size of index we -wrote- | 23:28 |
| lifeless | - must be at the end of the index, but its not | 23:28 |
| lifeless | 772 is the file size expected | 23:28 |
| lifeless | 59 is the file size found | 23:28 |
| ali | hmm, any reason why filesystem truncate the file? the file size is too big? | 23:29 |
| lifeless | not in this case, 772 bytes is very small :) | 23:30 |
| lifeless | 59 bytes is an odd amount to truncate too | 23:31 |
| lifeless | the other possibility is that there is garbage in the index (again, almost certainly a fs bug, we've not seen bzr write nonsense stuff out in the index as a bug) | 23:32 |
| poolie | hi | 23:32 |
| poolie | we have seen a few people complaining their fs truncated the files to 0 bytes | 23:33 |
| poolie | 59 is indeed odd | 23:33 |
| ali | i can send you the idx files if you want to take a look | 23:33 |
| ali | btw, the server was stable and running for the last 4 months, nothing weird today either | 23:34 |
| poolie | ali, if you record a bug and attach those files that would help | 23:43 |
| poolie | hi jam? | 23:55 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!