| zooko | igc: cool! | 01:07 |
|---|---|---|
| igc | zooko: please let us know if you have more ideas or anyone interested in being a GSoC student | 01:14 |
| zooko | Will do. | 01:15 |
| lifeless | igc: you have a present | 01:37 |
| arjenAU | ok, got a merge/rename issue | 01:42 |
| arjenAU | just trying to figure out how to make it jive | 01:42 |
| arjenAU | trying to pull a branch (including all its revisions) into another tree. now this has been done before (drizzle plugins) so I know it can be done. | 01:42 |
| arjenAU | I branch off the original, create a subdir of choice, then move files from the branch into that subdir, then commit (so the commit contains the creation of hte dir plus the renames). | 01:43 |
| arjenAU | branch off the mainline I want to pull in to. bzr merge -r1..-1 from the branch where I just did the rename foo | 01:44 |
| arjenAU | then it goes weird. | 01:44 |
| arjenAU | the subdir doesn' exist yet but its parent does, so the parent of the mainline gets renamed to .moved. but also the files inside the newly merged dir get shows as base/other. this makes no sense as there is no conflict | 01:44 |
| arjenAU | thoughts anyone? lifeless poolie | 01:45 |
| poolie | i think you want -r0..-1 there not -r1 | 01:45 |
| poolie | otherwise it will try to merge everything but the first revision | 01:45 |
| lifeless | arjenAU: I suggest the merge-into plugin | 01:46 |
| lifeless | arjenAU: it automates all of this | 01:46 |
| arjenAU | poolie: ah was stewart trying to confuse me ;-) this is what he wrote earlier | 01:47 |
| arjenAU | lifeless: oh does it! | 01:47 |
| igc | lifeless: ? in email? | 01:47 |
| igc | lifeless: fast commit maybe? | 01:48 |
| lifeless | igc: yes indeed | 01:48 |
| lifeless | jelmer: you too may be interested in CommitBuilder.record_iter_changes | 01:49 |
| lifeless | igc: btw | 01:50 |
| lifeless | + parents = graph.get_parent_map(revision_ids) | 01:50 |
| lifeless | + self.revision_ids = [r for r in revision_ids if r in parents] | 01:50 |
| lifeless | if you don't need the ordering | 01:50 |
| lifeless | self.revision_ids = list(parents) | 01:50 |
| lifeless | will be faster | 01:50 |
| arjenAU | poolie: ok your hint gets me a fair way there. apart from the plugin, how to resolve the .moved thing; which things do I move where to resolve it properly? | 01:50 |
| igc | lifeless: right. I haven't thought of that. I'm not sure if the ordering is important in send. abentley? | 01:53 |
| lifeless | igc: I suspect it topo sorts lower down tbh | 01:53 |
| igc | lifeless: and well done on record_iter_changes() | 01:54 |
| lifeless | igc: so you're likely causing multiple index reads with the current code; I'd suggest combining the filtering and topo sorting steps | 01:54 |
| lifeless | igc: thanks; proof will be in the pudding | 01:54 |
| igc | lifeless: I won't get it reviewed today sorry. I'm off in an hour | 01:54 |
| lifeless | igc: oh, I wasn't asking for you to review; just that you can merge it and use it in fastexport | 01:54 |
| lifeless | :) | 01:55 |
| * spiv just sent a patch for https://bugs.edge.launchpad.net/bzr/+bug/109143 | 01:59 | |
| ubottu | Ubuntu bug 109143 in bzr "hpss does not support ~ (tilde) for home dir access on bzr:// or bzr+ssh://" [High,Fix committed] | 01:59 |
| poolie | arjenAU: something like this | 01:59 |
| poolie | bzr mv parent parent.new | 01:59 |
| poolie | bzr mv parent.moved parent | 01:59 |
| poolie | bzr mv parent.new/subdir pante | 02:00 |
| poolie | (should be) bzr mv parent.new/subdir parent | 02:00 |
| poolie | then parent.new should be empty so | 02:00 |
| poolie | rmdir parent.new | 02:00 |
| poolie | also you could file a bug because we shoudl be able to do better | 02:00 |
| arjenAU | poolie: well the merge-into plugin apparently does it? says lifeless | 02:00 |
| arjenAU | just trying to do it without so I know hwat's going on | 02:01 |
| arjenAU | i'll try what you wrote. I did something similar but got something wrong along the way | 02:01 |
| lifeless | igc: send uses a set there | 02:02 |
| lifeless | igc: so its definitely not order sensitive | 02:02 |
| arjenAU | poolie: I think your method did the trick, thanks. | 02:04 |
| jml | spiv: re: Support bzr+ssh://host/~/path: thanks! now we're going to have to fix Launchpad :) | 02:09 |
| mwhudson | jml: you mean to make push bzr+ssh://bazaar.launchpad.net/~/launchpad/foo work? | 02:11 |
| jml | yeah. | 02:11 |
| mwhudson | well | 02:11 |
| mwhudson | Low | 02:11 |
| jml | :D | 02:11 |
| jfroy | spiv: awesome! | 02:16 |
| spiv | jml: easy to do, though | 02:16 |
| lifeless | orthogonal even | 02:16 |
| spiv | jml: set the initial working dir in your server to /~foo rather than / | 02:17 |
| spiv | jml: oh, and teach the server to accept --directory=/ in the bzr serve invocation | 02:17 |
| spiv | er, | 02:18 |
| spiv | jml: oh, and teach the server to accept --directory=. in the bzr serve invocation | 02:18 |
| lifeless | I hear VFS's are good at changing things | 02:19 |
| poolie | hm | 02:19 |
| spiv | as lifeless says, you could treat the path /~/ specially already for clients that don't interpret it specially. | 02:19 |
| poolie | i want to rethink almost always having the username in the branch url | 02:19 |
| poolie | many things that are not series are still project wide | 02:20 |
| jml | poolie: for Launchpad? | 02:20 |
| poolie | mm | 02:20 |
| poolie | but not this month :) | 02:20 |
| * lifeless breathes out | 02:20 | |
| lifeless | poolie: did my reply about your changes to test_remote make sense | 02:21 |
| poolie | yes i think so | 02:22 |
| lifeless | cool | 02:22 |
| poolie | i'll revisit it after lunch | 02:22 |
| poolie | was too tired to work out the right thing last night | 02:22 |
| poolie | heh, and ironically enough jml was distracting me by talking about whether anything is objectively right or not :) | 02:22 |
| jml | poolie: *I* was distracting *you*?! | 02:23 |
| poolie | very much :) | 02:23 |
| jml | see. that's subjectivism for you. | 02:24 |
| Peng_ | How much more efficient will BBC be over dumb protocols like http than btrees? | 02:26 |
| Peng_ | I've gotten really spoiled by the hpss streaming stuff, so now http feels slow. :P | 02:28 |
| Peng_ | You're planning to start versioning the Pyrex .c files? Why? So users won't need it? | 02:34 |
| BasicOSX | Because testsuite passed on 1.13final but the Pyrex stuff isn't in the tarball | 02:34 |
| Peng_ | That's a different issue. | 02:35 |
| Peng_ | Well, versioning the .c files is a way to solve it, I guess. | 02:35 |
| BasicOSX | Since I caused the problem, I'll beg to differ, ...exactly :-) | 02:35 |
| BasicOSX | I did open a bug about a warning that pyrex wasn't installed when I ran the test suite, but everything passed and a discussion between several developers presented versioning the .c as a way to prevent this sort of thing | 02:37 |
| spiv | Peng_: there was a brief discussion about it on the list about a week ago, IIRC. | 02:37 |
| Peng_ | spiv: Oh. I must've missed that. | 02:38 |
| BasicOSX | Bug #340209 | 02:38 |
| ubottu | Launchpad bug 340209 in bzr "The python package 'Pyrex' is not available under ubuntu when python-pyrex is installed" [Undecided,New] https://launchpad.net/bugs/340209 | 02:38 |
| spiv | Or perhaps in a bug? | 02:38 |
| Peng_ | It'll make for uglier diffs on the rare occasion they're changed. | 02:38 |
| BasicOSX | I got a tweak status on Bungle Buggy, I read the HACKING doc, still don't know what it means exactly, any more info? | 02:39 |
| spiv | It'll make tracking bzr.dev easier and the release process a bit simpler too. My main worry is that we wouldn't want the versioned .c files to get out of sync with their source .pyx files. | 02:39 |
| spiv | Peng_: bug 336933 | 02:40 |
| ubottu | Launchpad bug 336933 in bzr "version control the pyrex output files" [Wishlist,Triaged] https://launchpad.net/bugs/336933 | 02:40 |
| spiv | (hey cool, that bug number almost has rotational symmetry) | 02:40 |
| * spiv looks forward to bug number 886988 ;) | 02:41 | |
| Peng_ | spiv: Oh, thanks for the link. | 02:41 |
| * igc lunch and medical stuff for the rest of the day | 02:58 | |
| lifeless | spiv: I want pqm to update them, and noone else to | 02:59 |
| lifeless | BasicOSX: there is an older bug vis-a-vis the .c files, your incident is just meat for the grinder reinforcing it :) | 03:00 |
| lifeless | BasicOSX: it means 'make the recommended changes please [ unless you disagree in which case discuss ] and then submit it to pqm' | 03:06 |
| spiv | BasicOSX: http://bundlebuggy.aaronbentley.com/help describes the meaning of the different votse. | 03:24 |
| spiv | "votes", rather | 03:24 |
| === timchen119 is now known as nasloc__ | ||
| === abentley1 is now known as abentley | ||
| === abentley1 is now known as abentley | ||
| adelie42 | Ok, I screwed up. My initial commit was of the wrong package. How do I start over? | 04:00 |
| adelie42 | sorry in advance for the "save the noob" question" | 04:01 |
| lifeless | adelie42: uncommit or delete | 04:04 |
| lifeless | adelie42: e.g. rm -rf bad-branch :P | 04:04 |
| adelie42 | ok, that is what I ended up doing. deleted everything, did an uncommit, pulled the right trunk (well, source which wasn't bzr), bzr add, bzr commit, bzr push | 04:06 |
| adelie42 | guess that more or less took care of it | 04:08 |
| mwhudson | hey, do you know something | 04:12 |
| mwhudson | lazy inventories would be a really good idea | 04:12 |
| lifeless | mwhudson: we have them | 04:18 |
| lifeless | mwhudson: see --gc-chk255 | 04:18 |
| mwhudson | lifeless: yes i know | 04:18 |
| mwhudson | sadly, not every branch on launchpad is going to have them for a goodly while | 04:19 |
| lifeless | mwhudson: once we have a production format, we can nagware on them :) | 04:19 |
| Peng_ | What, you can't force everyone to upgrade or delete their branches? ;-) | 04:19 |
| lifeless | mwhudson: anyhoo; you're facing 'fast on xml' vs 'fast on chk' ? | 04:19 |
| mwhudson | Peng_: well, 'can' is a vague concept | 04:20 |
| mwhudson | lifeless: well, i think i can avoid loading inventories at all in quite a large number of cases, but it requires vague contortions | 04:20 |
| mwhudson | lifeless: it's 'fast on everything' vs 'fast on chk' | 04:20 |
| mwhudson | (well, text extraction is faster on chk right? so it will still be faster there) | 04:21 |
| * mwhudson goes to fix more obvious sillinesses | 04:22 | |
| lifeless | mwhudson: fast on everything is good; but I don't see how you can avoid inventories except when only showing revisions | 04:23 |
| mwhudson | lifeless: by slightly extending the information loggerhead already caches | 04:23 |
| lifeless | mwhudson: mmmmm if this is fileid,revid pairs, then its not a slight extension | 04:24 |
| mwhudson | i can avoid loading inventories on revision pages when the revision's been seen by the cache | 04:24 |
| mwhudson | lifeless: something like that | 04:24 |
| lifeless | mwhudson: I'd be happier hearing that your moving closer to the bzr metal, not further;) | 04:25 |
| mwhudson | yeah | 04:26 |
| mwhudson | i don't know whether it's worth it | 04:26 |
| lifeless | how many things in CS cannot be solved by adding a layer | 04:26 |
| mwhudson | anyway, let me go for sane use of bzr api first off, indeed | 04:26 |
| * mwhudson finds a todo in the bzr source from version 0.0.6 | 04:41 | |
| lifeless | mwhudson: which one | 04:44 |
| mwhudson | lifeless: unifying get_revision_inventory with get_inventory | 04:45 |
| mwhudson | lifeless: how evil is constructing revisiontrees directly? | 04:49 |
| mwhudson | eh, maybe i can just cache them somewhere (per request) | 04:49 |
| lifeless | mwhudson: repo.revision_trees([list]) should be very fast | 04:50 |
| mwhudson | lifeless: .25s per revision for launchpad | 04:51 |
| adelie42 | I got a new project I want to work on, but there is no bazaar trunk. There are three brances of the packaging information, but not for the osurce (https://launchpad.net/ubuntu/+source/kdegames). Is the best thing to do just to start a branch, call it source, and branch off of that? What is the way to be doing this? | 04:56 |
| pygi | adelie42, https://code.launchpad.net/kdegames | 04:59 |
| pygi | jelmer's branch doesn't seem to be packaging | 04:59 |
| * mwhudson wants bzr 1.13 on launchpad | 04:59 | |
| * pygi looks | 04:59 | |
| Peng_ | mwhudson: Why? Streaming? | 05:00 |
| pygi | yup, it seems code | 05:00 |
| mwhudson | Peng_: yes | 05:00 |
| mwhudson | Peng_: i feel fairly confident that roundtrips affect me more than you :) | 05:00 |
| adelie42 | https://code.launchpad.net/kdegames is only the code for the installation data, not kdegames source | 05:00 |
| lifeless | mwhudson: .25s for repo.revisions_trees(50 items), or .25s*50, or .25s for repo.revision_trees([1 item]) ? | 05:00 |
| Peng_ | mwhudson: Heh, good point. | 05:00 |
| Peng_ | The bad thing about all these performance improvements is that it makes old versions feel so slow. :( | 05:01 |
| pygi | adelie42, https://code.launchpad.net/~jelmer/kdegames/trunk | 05:01 |
| pygi | ? | 05:01 |
| mwhudson | lifeless: well, futzing with timeit, it's .25 for one revid, and .45s for two | 05:01 |
| adelie42 | ah | 05:01 |
| mwhudson | lifeless: i don't care about more than 2 :) | 05:01 |
| lifeless | mwhudson: oh, I'd assumed you'd care about the full page | 05:01 |
| pygi | adelie42, not sure it's most recent obviously :p | 05:01 |
| mwhudson | lifeless: ? | 05:02 |
| lifeless | Peng_: are you noticing improvements? | 05:02 |
| adelie42 | pygi: ok, it looks like that was what I was about to make | 05:02 |
| adelie42 | thanks | 05:02 |
| lifeless | mwhudson: revision_trees does one batch IO to read all the deltas, and then composes them separately, its _way_ faster than doing separate calls- N rather than N^2 roughly | 05:02 |
| lifeless | modulo constants etc | 05:02 |
| mwhudson | lifeless: no request in loggerhead (now, anyway) considers more than two revisions | 05:04 |
| mwhudson | uh | 05:04 |
| mwhudson | revisiontrees | 05:04 |
| lifeless | mwhudson: ok | 05:04 |
| lifeless | mwhudson: how do you populate the 'files changed' then, for the history view | 05:05 |
| mwhudson | lifeless: ajax | 05:05 |
| mwhudson | one revision at a time | 05:05 |
| lifeless | mwhudson: oh right; isn't that slow? | 05:06 |
| johnf | Can anyone test bzr 1.13 from the beta-ppa before I roll it out to the main ppa? | 05:06 |
| lifeless | johnf: does your build have the .so's ? | 05:07 |
| mwhudson | lifeless: if everyone who loads a changelog page clicks 'expand all', it's a pessimisation overall yes | 05:07 |
| johnf | lifeless: hmm let me check | 05:07 |
| Peng_ | lifeless: Pushing a handful of revisions to my bzr.dev server takes 11 seconds at the most (and that's including push-and-update). I pushed to LP today, and it took 28. So, yes, major improvements. :) | 05:07 |
| lifeless | Peng_: sweet. | 05:07 |
| lifeless | Peng_: how does that compare to hg now? still quite a bit slower I imagine | 05:08 |
| * mwhudson wonders when his commit to lp:loggerhead is going to complete | 05:08 | |
| Peng_ | lifeless: I have no clue at all. I haven't done any small pushes with hg recently. | 05:08 |
| spiv | Peng_: hooray | 05:08 |
| johnf | lifeless: _patiencediff_c.so ? | 05:10 |
| Peng_ | lifeless: Pushing ~17 revisions in hg took 3.41 seconds, so there's still a ways to go, I guess. | 05:10 |
| lifeless | johnf: should be 5 or so | 05:10 |
| lifeless | johnf: the 1.3 tarball failed to include many .c files - see the list | 05:10 |
| johnf | ok | 05:10 |
| lifeless | johnf: running 'setup.py build_ext -i' will generate the .c files | 05:11 |
| lifeless | as long as you have pyrex installed | 05:11 |
| lifeless | uhm | 05:11 |
| johnf | ahh that could be the problem I had earlier | 05:11 |
| lifeless | do this - read the release notes for release managers | 05:11 |
| lifeless | these tell you how to get the .c files | 05:11 |
| lifeless | then stash them into a patch for your 1.13 build | 05:11 |
| lifeless | and you can use your normal build procedure to do that | 05:11 |
| johnf | is that something new? or has it always been the case? | 05:12 |
| johnf | I'll update debian/rules to do it | 05:12 |
| lifeless | johnf: its a 1.13.tar.gz special | 05:17 |
| lifeless | won't be needed for 1.13.1 | 05:17 |
| johnf | lifeless: before I spend time on this is 1.13.1 coming out in the next few hours or next few days? | 06:03 |
| johnf | short on time at the moment. vquence product launch is tomorrow | 06:03 |
| johnf | actuallty I've worked it out so doesn't matter | 06:04 |
| lifeless | johnf: :P | 06:13 |
| poolie | johnf: congratulations :) | 06:14 |
| poolie | re the launch | 06:14 |
| johnf | poolie: thanks! | 06:14 |
| lifeless | johnf: indeed, grats | 06:16 |
| johnf | lifeless: what are your thoughts on the old packages for unsupported releases in the ppa. eg 1.12 package for feisty. Should we delete them? | 06:26 |
| * fullermd notes that he just shrugged and added a pyrex dependancy to building the 1.13 port. | 06:41 | |
| fullermd | It's so tiny, 's hardly worth even questioning about. | 06:42 |
| lifeless | johnf: no thoughts offhand - mail the list? | 06:44 |
| lifeless | spiv has headed off | 06:45 |
| lifeless | I'm halt()ing | 06:45 |
| lifeless | we got the smart server not making third party requests today, but that will land tomorrowish - some polish needed | 06:45 |
| lifeless | it reveals that branching from a stacked branch is actually only 23 hpss client calls | 06:45 |
| lifeless | poolie: ^ | 06:46 |
| === sabdfl1 is now known as sabdfl | ||
| poolie | lifeless: nice | 07:31 |
| poolie | johnf: is there any benefit in deleting them? | 07:31 |
| poolie | i wouldn't | 07:31 |
| johnf | poolie: nah just that they are hanging around and will be fairly old in a few months. | 07:32 |
| johnf | ok new bzr packages with .so files in. Could someone pease give beta-ppa a quick test? | 07:36 |
| poolie | oh i see and they're not being replaced by new ones | 07:39 |
| poolie | still, i probably wouldn't worry | 07:39 |
| poolie | maybe add a note to the ppa description that they're not being updated? | 07:39 |
| poolie | it might be better than nothing though... | 07:39 |
| johnf | ok good idea | 08:01 |
| johnf | ok on the basis that no one has complained or cares to check I'm going to release the 1.13 packages to ~bzr ppa | 08:02 |
| lifeless | mwhudson: where in python are files implemented? | 08:08 |
| lifeless | johnf: you've given it a spin ? | 08:09 |
| johnf | yup | 08:09 |
| lifeless | then its been tested :P | 08:09 |
| johnf | well an update, commit and bzr bd anyway :) | 08:09 |
| johnf | I haven't used copy between PPAs before. Should I just reuse existing binaries or rebuild | 08:10 |
| johnf | done | 08:15 |
| sabdfl | hi folks | 08:26 |
| sabdfl | bzr: ERROR: Specified file "arch/ppc/mm/Makefile" is outside the current view | 08:26 |
| sabdfl | how do i fix that? | 08:26 |
| sabdfl | all i'm doing is init and add of a large tree | 08:29 |
| lifeless | sabdfl: that looks like a bug in views; views only apply to the development tree format, so I'm assuming you are experimenting with brisbane-core | 08:35 |
| mwhudson | lifeless: Objects/fileobject.py | 08:35 |
| sabdfl | yup | 08:35 |
| lifeless | sabdfl: uhm to fix it, you could bzr remove-tree, bzr reconfigure --(looking) | 08:36 |
| lifeless | sabdfl: and please do file a bug that this happened, it suggests an issue with the default heaviour of views) | 08:36 |
| lifeless | bzr remove-tree && bzr reconfigure --tree | 08:36 |
| lifeless | doing that immediately after 'init' before add should fix it, I hope | 08:37 |
| lifeless | or perhaps 'bzr view --delete --all' | 08:37 |
| sabdfl | view --delete --all doesn't help | 08:41 |
| sabdfl | view --switch off doesn't help either | 08:41 |
| lifeless | sabdfl: we're mainly testing with large imports not fresh trees. I'll file a bug for you as it sounds like its generally borking in some respect | 08:41 |
| lifeless | sabdfl: what specific format is this with, and how are you invoking add - 'bzr add', 'bzr add .', 'bzr add *', something else? | 08:42 |
| lifeless | sabdfl: I'm sorry that I can't dig deeper right now, social event kicking off around me | 08:42 |
| lifeless | mwhudson: I was trying to figure out why my parallel test runner was buffering 90 odd lines (from a child process) | 08:44 |
| sabdfl | lifeless: am init'ing as follows | 08:44 |
| sabdfl | bzr init --format=gc-chk255-big | 08:45 |
| sabdfl | find [a-z]* -type f -exec $bzr --no-plugins add \{\} \+ | 08:45 |
| lifeless | sabdfl: I'd try just 'bzr --no-plugins add', as we scan for paths ourselves. Filing bug and am gone. (sorry!) | 08:46 |
| mwhudson | lifeless: good luck with that | 08:46 |
| sabdfl | ok thanks | 08:48 |
| sabdfl | bzr add Just Worked (nice!) but there are still problems with views later, when I try to add a specific file it fails | 08:51 |
| sabdfl | even if i switch views off | 08:51 |
| sabdfl | igc: ^^ | 08:51 |
| j^ | is it possible to merge two bzr repositories into one, keeping the history from both repos? | 09:04 |
| === thekorn_ is now known as thekorn | ||
| bob2 | j^: branch? yes | 09:25 |
| igc | sabdfl: I'll take a look | 09:27 |
| sabdfl | thanks igc | 09:33 |
| j^ | bob2, no not branch, guess it somewhat works with join/split | 09:40 |
| bob2 | j^: are you sure you don't mean branches? | 09:47 |
| bob2 | j^: "merging" repositories is just a matter of branching all the branches from one to another | 09:56 |
| igc | sabdfl: try rev 3889 of brisbane-core now | 09:59 |
| spiv | bob2: j^ thought you meant the command, "bzr branch" | 10:14 |
| bob2 | oh right | 10:15 |
| spiv | j^: your question doesn't quite make sense in bzr terms; perhaps you meant to ask "is it possible to merge two branches with unrelated history?". Yes; use "bzr merge -r0..-1 url/of/other/branch" | 10:16 |
| * igc afk - might be back later | 10:17 | |
| d-b | hi i'm trying to use bzr, i want to look at revisions not diffs and grab one... any guis ? | 10:42 |
| d-b | i get a float division if i put . for branch location | 10:43 |
| j^ | spiv, ah so i can merge branches with unrelated history, thats what i was looking for yes, have to projects that turned out to be one now. so wanted to get them in one branch | 10:45 |
| lamont | bzrlib/_dirstate_helpers_c.c:330: warning: cast from pointer to integer of different size | 10:45 |
| lamont | sigh | 10:45 |
| * lamont goes to see if the bug is filed already | 10:45 | |
| d-b | nm found olive | 10:46 |
| d-b | wait a second | 10:54 |
| d-b | can i have a branch within a branch ? | 10:54 |
| sabdfl | igc: that fixed it - thanks! | 10:56 |
| sabdfl | d-b: sure you can | 10:56 |
| sabdfl | you mean, you have your branch in ./ and then say a branch of zlib in ./libraries/zlib/ ? | 10:57 |
| d-b | well my gui isn't working for it and its really really annoying | 10:58 |
| d-b | mmm how about getting a certain revision ? | 10:59 |
| d-b | bzr pull is it ? | 10:59 |
| sabdfl | yup | 11:00 |
| sabdfl | -r revisionspec | 11:00 |
| sabdfl | try bzr help revisionspec | 11:01 |
| jelmer | lifeless: hi | 11:28 |
| jelmer | lifeless: your last reply to me about progress bars was empty, was that intentional ? :-) | 11:28 |
| === `6og is now known as Kamping_Kaiser | ||
| === thekorn_ is now known as thekorn | ||
| === thekorn_ is now known as hekorn | ||
| === hekorn is now known as thekorn | ||
| === vednis is now known as mars | ||
| clbry | hello, are nested trees supposed to work currently (in 1.13) or should I just move along? | 14:07 |
| clbry | I'm looking for a way to have external (referenced) branches inside a main branch, where I can work on them locally in the branch but also can push/merge/pull external changes | 14:12 |
| clbry | here's what I do: http://dpaste.com/16007/ | 14:20 |
| LarstiQ | clbry: if you only need that at one spot, and don't need operations to work on the entire collection, you could just use seperate branches | 14:20 |
| LarstiQ | clbry: http://launchpad.net/bzr-scmproj is another option (just like config-manager) | 14:21 |
| clbry | LarstiQ: I'd like to reuse the bar project without having to worry about crashing different projects if I modifiy the bar project inside the foo project (but beeing able to pull external changes and to push local changes in a controlled way). and I'd like to have a single checkout of the foo project, automatically including the bar project. perhaps I should give up the latter | 14:23 |
| LarstiQ | clbry: the former needs no exra support, the latter can be done with scmproj, and for bzr native worked on http://bazaar-vcs.org/NestedTreeProgress | 14:25 |
| clbry | thx, I'll look into scmproj | 14:28 |
| === kiko-afk is now known as kiko | ||
| === serg_ is now known as serg | ||
| Kobaz | Peng_: poke | 15:32 |
| jam | hey vila, how's it going? | 15:39 |
| vila | jam: I'm writing code so ugly I prefer to hide :) | 15:40 |
| vila | jam: quick call ? | 15:45 |
| jam | sure | 15:45 |
| adelie42 | is it necessary to register an ssh key for each machine that is going to connect to bazaar? Virtual or otherwise? | 16:06 |
| beuno | adelie42, only for write operations | 16:07 |
| adelie42 | So if I have 2 computers I use and each got 2 test environments and I want to be able to push from all of them, I need to register 6 individual keys? | 16:10 |
| beuno | yes, or use the same ssh key | 16:10 |
| adelie42 | I can just copy ~/.ssh/id_rsa* to whatever machine I want to use? | 16:11 |
| adelie42 | and set the email address to the local user? | 16:12 |
| LarstiQ | adelie42: yes | 16:13 |
| adelie42 | ok, thanks (This really makes me wish I just kept all my data on usb) | 16:15 |
| LarstiQ | adelie42: eh | 16:23 |
| LarstiQ | adelie42: now I'm not sure I said yes to what I said yes to :) | 16:23 |
| adelie42 | oh? with what regard? | 16:24 |
| LarstiQ | adelie42: you only need to have 1 key. | 16:24 |
| Ng | would it be reasonable to file a bug for more things (specifically I care about log) take -c? | 16:24 |
| Ng | +to | 16:24 |
| LarstiQ | adelie42: assuming you're talking about Launchpad interaction | 16:24 |
| Ng | I dislike having to remember different options to get info about a single revision :) | 16:24 |
| adelie42 | LarstiQ: yes | 16:25 |
| LarstiQ | Ng: that's reasonable. There has at least been discussion about it. log and diff have different inclusion rules | 16:25 |
| fullermd | Er? | 16:26 |
| fullermd | Somebody already added -c to log. | 16:26 |
| adelie42 | I have a computer at home, and a computer at work. Each computer has a test environment. Fhe best thing to do, it seems to me, is copy my private and public key from each of the hosts to the guests and just have the two registered | 16:26 |
| fullermd | More broken, IMO, since -c now means DIFFERENT things in the different commands. | 16:26 |
| LarstiQ | Ng: your desire is reasonable, I now hand you over to fullermd to settle the issue ;) | 16:28 |
| Ng | fullermd: ah, that could be my fault, the machine I was on only has 1.5 | 16:28 |
| LarstiQ | adelie42: push to where exactly? | 16:28 |
| fullermd | NEWS lists it for 1.8. | 16:29 |
| Ng | win, thanks :) | 16:29 |
| LarstiQ | while we're on -c, is there an invocation to svn for -1? It doesn't like HEAD for -c either :/ | 16:30 |
| adelie42 | pushing to launchpad | 16:32 |
| LarstiQ | adelie42: then you'll need 1 or more keys. More than one if they give access to other things than launchpad and/or have different security considerations. | 16:34 |
| LarstiQ | adelie42: you can live with just 1 if you don't care for seperation | 16:34 |
| adelie42 | The virtual machines in question are ONLY for patch testing | 16:34 |
| LarstiQ | adelie42: do they need to be able to push to launchpad themselves then? | 16:35 |
| LarstiQ | seems like they don't | 16:35 |
| Kobaz | mm | 16:35 |
| Kobaz | maybe you guys know | 16:35 |
| Kobaz | how wouldi change the http links in loggerhead to https | 16:35 |
| Kobaz | i've been digging through the code and i haven't found where that part in constructed yet | 16:36 |
| adelie42 | technically, I guess not. Though I don't see why it wouldn't just be easiest to have the machine saved clean with the hodt key, and when testing is good and done, push before resetting for next test | 16:36 |
| LarstiQ | Kobaz: are you using loggerhead behing apache proxying? | 16:37 |
| Kobaz | yeah | 16:37 |
| LarstiQ | Kobaz: https://bugs.edge.launchpad.net/loggerhead/+bug/260547 | 16:40 |
| ubottu | Ubuntu bug 260547 in loggerhead "start-loggerhead script doesn't properly set the wsgi.url_scheme from the server.webpath option" [Medium,Fix committed] | 16:40 |
| LarstiQ | Kobaz: though really a different bug should be filed for the issue you and I are seeing | 16:40 |
| jelmer | is there some way to enter the debugger when a test raises an (unhandled) exception? | 16:46 |
| jelmer | BZR_PDB doesn't work in that case at least | 16:46 |
| awilkins | Meh, I was just considering resurrecting my enhanced stack trace code, but I can't find it anywhere | 16:47 |
| awilkins | It wasn't much though, just changed the code that prints the stack trace so it listed the values of variables and parameters | 16:47 |
| LarstiQ | jelmer: it works, you just don't see what you're doing ;) | 16:48 |
| LarstiQ | jelmer: nose has -s for that, don't know offhand how to so for bzr | 16:48 |
| jelmer | LarstiQ: nose doesn | 16:49 |
| jelmer | 't work very well for bzr plugins yet though | 16:49 |
| LarstiQ | jelmer: ah, I hadn't tried it on bzr yet. | 16:49 |
| Lo-lan-do | Hi all | 17:15 |
| Lo-lan-do | jelmer: I seem to be running problems when rebasing a bound branch, is that expected? | 17:16 |
| vila | fullermd: that should be me, a couple of years ago :) Or at least many months | 17:17 |
| Lo-lan-do | (running *into* problems) | 17:17 |
| vila | fullermd: search bug number and see comments there | 17:17 |
| vila | fullermd: bug #248427 | 17:19 |
| ubottu | Launchpad bug 248427 in bzr "bzr log -r REVNO does what bzr log -c should do" [Wishlist,Fix released] https://launchpad.net/bugs/248427 | 17:19 |
| jelmer | Lo-lan-do: hi! | 17:23 |
| jelmer | Lo-lan-do: no, that's certainly not expected | 17:23 |
| jelmer | Lo-lan-do: unless you were expecting it to rebase between the local copy and the master branch | 17:23 |
| Lo-lan-do | Not really | 17:23 |
| Lo-lan-do | http://pastebin.com/f643767bf | 17:24 |
| Lo-lan-do | If I unbind, then rebase seems to work (in progress, but it's committed a few revs already) | 17:25 |
| Lo-lan-do | But then of course I need to push --overwrite afterwards :-/ | 17:32 |
| Lo-lan-do | It may (or may not) be relevant that "bound=True" is specified in my ~/.bazaar/locations.conf and that this setting seems to override any setting in the branch's branch.conf. | 17:32 |
| === ja1 is now known as jam | ||
| === thumper_laptop is now known as thumper | ||
| === nevans1 is now known as nevans | ||
| jelmer | Lo-lan-do: so where would it get the master branch? | 18:36 |
| === thekorn_ is now known as thekorn | ||
| Lo-lan-do | jelmer: Er, what? | 18:55 |
| jelmer | Lo-lan-do: the local of the master branch a branch on your machine is bound to | 18:58 |
| Lo-lan-do | Sorry, I didn't mean to sound rude. | 18:58 |
| jelmer | where would it get that? | 18:58 |
| jelmer | as I assume not all of your branches are bound to the same location.. | 18:59 |
| Lo-lan-do | I'm confused | 18:59 |
| Lo-lan-do | Could we reuse the terminology in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520302 ? | 19:00 |
| ubottu | Debian bug 520302 in bzr-rebase "bzr-rebase: Can't rebase a bound branch" [Normal,Open] | 19:00 |
| === beuno_ is now known as beuno | ||
| Lo-lan-do | Unrelated: I've seen quite a few commits on bzr-git recently, some of them mentioning file ids and sha checksums... does that imply that roundtripping is being worked on? | 19:28 |
| rockstar | jam, hi | 19:35 |
| jam | hi rockstar | 19:35 |
| rockstar | jam, could I call you? | 19:35 |
| jelmer | Lo-lan-do: I'll reply to the bug | 19:35 |
| jelmer | Lo-lan-do: no, roundtripping is not something I intend to work on soon | 19:35 |
| jelmer | Lo-lan-do: it's also a lot trickier with git since it doesn't have proper custom revision properties where we could stash bzr metadata | 19:36 |
| jam | rockstar: sure, can you give me about 5 minutes? | 19:37 |
| rockstar | jam, yeah. Skype? | 19:37 |
| Lo-lan-do | jelmer: Thanks, and thanks. | 19:39 |
| jelmer | Lo-lan-do: dpush already works to some degree though | 19:39 |
| jelmer | Lo-lan-do: well, it *works* but it breaks on some branches | 19:39 |
| mwhudson | Peng_: so i didn't break anything for you with yesterday's landing? :) | 20:29 |
| lifeless | jelmer: probably needs a flag added to bzr's test runner, its the debug() method in the test suite, and we should support it ok | 20:39 |
| lifeless | jelmer: you pinged last night too? | 20:40 |
| === thumper_laptop is now known as thumper | ||
| === nevans1 is now known as nevans | ||
| === kiko is now known as kiko-afk | ||
| mwhudson | i suppose it was inevitable that a thread about kB and KB and KiB would end up being not worth reading | 21:11 |
| jelmer | lifeless: I might have | 21:12 |
| jelmer | lifeless: but about something different then, can't remember what abour exactly | 21:12 |
| lifeless | lamont: its pyrex :( | 21:16 |
| lifeless | lamont: so the bug should be upstream with the code fragment that causes it | 21:17 |
| mwhudson | lifeless: did you and spiv work on the "server opens the branch" bug yesterday> | 21:22 |
| mwhudson | ? | 21:22 |
| fullermd | mwhudson: "end up"? :p | 21:23 |
| mwhudson | fullermd: well, if it was short, it might not be too painful :) | 21:23 |
| lifeless | mwhudson: yes | 21:23 |
| mwhudson | lifeless: successfully? | 21:23 |
| lifeless | mwhudson: yes | 21:23 |
| mwhudson | lifeless: awesome | 21:23 |
| mwhudson | lifeless: did patches get sent to the list? | 21:23 |
| lifeless | mwhudson: though we are not agreed on how to enforce the jail that drives the test | 21:23 |
| lifeless | mwhudson: no | 21:23 |
| mwhudson | ah, ok | 21:24 |
| mwhudson | but; awesome | 21:24 |
| lifeless | mwhudson: or rather, the jail is fine, but something somewhere needs to check 'if in jail, don't open references' | 21:24 |
| lifeless | we did a cheap hack to see the fallout, it passed tests | 21:24 |
| lifeless | spiv was going to work on a different approach | 21:24 |
| jelmer | SamB_irssi/SamB: Hi | 21:25 |
| lifeless | mwhudson: http://people.ubuntu.com/~andrew/bzr/bzrdir-open-gaol/ | 21:26 |
| mwhudson | lifeless: i don't really want to try the code, sorry, just interested in status :) | 21:27 |
| lifeless | heh | 21:27 |
| d-b | yay for cat | 22:29 |
| jelmer | spiv: You rock | 22:49 |
| jelmer | spiv: That ~ patch has been my no1 wishlist bug for ages :-) | 22:49 |
| spiv | jelmer: :) | 22:50 |
| lifeless | jml: http://paste.ubuntu.com/133303/ | 23:25 |
| lifeless | jml: is that something you could live to have in testtools? | 23:26 |
| jml | lifeless: in theory, yes. | 23:28 |
| jml | lifeless: in practice, I'd like to know that someone's using it for a non-small project and not hating it :) | 23:28 |
| lifeless | 30% faster bzr tests locally using it | 23:29 |
| jml | (with some grammar fixes, obviously :)) | 23:29 |
| lifeless | shes in the kitchen | 23:29 |
| jml | lifeless: did they confiscate all your apostrophes at the border? | 23:30 |
| lifeless | fell out over the ocean | 23:30 |
| lifeless | now they are all ,'s. | 23:30 |
| lifeless | :> | 23:30 |
| lifeless | jml: you could use it for launchpad, if only there was a way to run a) some tests and b) somewhere else | 23:31 |
| poolie | i sometimes think one should have an intentionally bike-sheddy thread every so often, or even almost contiuously | 23:45 |
| poolie | to keep that energy away from other topics | 23:45 |
| elmo | poolie: you do realise you just pointed ben at a launchpad list to continue discussing this on right? | 23:46 |
| poolie | do you mean "and now he's going to repeat everything there" or "and to subscribe he needs an account"? | 23:46 |
| poolie | :) | 23:47 |
| elmo | poolie: to _post_ he needs an account | 23:47 |
| elmo | I thought? | 23:47 |
| elmo | oh, clearly not, I'm on crack | 23:47 |
| poolie | oh i thought it was non-subscribers are moderated | 23:47 |
| poolie | as bazaar is | 23:47 |
| elmo | but still, to subscribe | 23:47 |
| poolie | apparently he is not subscribed to the bazaar list and reads it through some other way | 23:47 |
| elmo | ah, ok | 23:47 |
| poolie | like gmane or the web archive | 23:47 |
| poolie | so presumably he can do the same | 23:47 |
| elmo | presumably because our non-LP mailman doesn't implement openid ID either :-P | 23:48 |
| igc | is pushing to lp overly slow today? | 23:48 |
| igc | I kicked off a push of a brisbane-core derived branch 3+ hours ago now and it's *still* going | 23:49 |
| jml | igc: I wonder if there's a stacking format thing going on. | 23:50 |
| jml | igc: LP itself is not overly slow today. | 23:51 |
| igc | jml: my command was ... | 23:51 |
| igc | bzr push lp:~bzr/bzr/bris.faster-children | 23:51 |
| jml | igc: are you using -Dhpss perchance? | 23:51 |
| igc | It said "Using default stacking branch /~bzr/bzr/trunk at bzr+ssh://bazaar.launchpad.net/%7Ebzr/bzr/" | 23:51 |
| lifeless | igc: if that branch isn't stackable, it won't stack | 23:51 |
| lifeless | however, trunk is 1.9 now | 23:51 |
| lifeless | so... it should be | 23:51 |
| jml | igc: what's the format of your local branch for lp:~bzr/bzr/bris.faster-children? | 23:52 |
| jml | and repo | 23:52 |
| lifeless | jml: local isn't checked, stacked-on is | 23:52 |
| jml | lifeless: I'm still curious. | 23:52 |
| lifeless | jml: sure | 23:52 |
| lifeless | poolie: got more activity ui... | 23:53 |
| jml | lifeless: I've found that people who experience this often have old formats of the things they are pushing up | 23:53 |
| igc | jml,lifeless: my local repo looks like it's still packs ... | 23:53 |
| igc | Repository tree (format: pack-0.92) | 23:53 |
| lifeless | poolie: http://paste.ubuntu.com/133315/ | 23:54 |
| poolie | elmo: are you content with what was worked out re an edge codehost? | 23:54 |
| elmo | poolie: yeah | 23:54 |
| jml | elmo: cool. | 23:54 |
| elmo | I was very happy mwhudson fixed codehost | 23:54 |
| jml | igc: so, I bet if you upgrade, it will push much faster. | 23:54 |
| elmo | I just wish I was convinced codebrowse would be so easy ;-) | 23:55 |
| jml | elmo: me too. | 23:55 |
| poolie | elmo: oh the disconnect timeout had a big effect? that's good | 23:55 |
| jml | elmo: codebrowse won't be that easy, sadly. | 23:55 |
| poolie | i'd really like to try a forking wsgi process model | 23:55 |
| poolie | lifeless: i know, i'll probably work on it today | 23:55 |
| igc | jml: it's up to 32+M on the status bar for data transferred. The rate is 1-2 kB/s | 23:57 |
| mwhudson | elmo: codebrowse is my #1 priority, i have some changes brewing that i hope will help | 23:57 |
| mwhudson | elmo: but it's not going to be a "bing it's done" thing like codehost turned out to be | 23:57 |
| poolie | igc: you should put debug_flags = hpss in bazaar.conf | 23:57 |
| poolie | mwhudson: way to go! | 23:57 |
| poolie | which change was this exactly? | 23:57 |
| poolie | sending term rather than HUP? | 23:58 |
| mwhudson | no | 23:58 |
| mwhudson | killing idle connections after an hour | 23:58 |
| elmo | mwhudson: sure. I'm just happy y'all have been allowed to devote time to it is all | 23:58 |
| jml | igc: yeah, I've seen this bug before. | 23:58 |
| jml | igc: I haven't filed it since it's hard to reproduce once you've upgraded your repository. | 23:59 |
| mwhudson | speaking of loggerhead | 23:59 |
| mwhudson | anyone want to review a branch? | 23:59 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!