| mwhudson | hm | 00:00 |
|---|---|---|
| lifeless | ? | 00:05 |
| mwhudson | can't remember now :) | 00:10 |
| mwhudson | oh right | 00:10 |
| mwhudson | does anyone know git smart protocol well enough to use telnet to talk to a git server? | 00:10 |
| lifeless | yes [I don't, but someone does] | 00:11 |
| igc | morning | 00:18 |
| buttons840 | can i remove all unknown files from a directory? | 00:56 |
| spiv | buttons840: bzr clean-tree | 00:57 |
| buttons840 | thanks | 00:57 |
| jelmer | mwhudson, hi | 01:15 |
| mwhudson | jelmer: hello | 01:15 |
| mwhudson | jelmer: was poking at that libvdpau import failure | 01:16 |
| mwhudson | jelmer: comments on the bug; i don't have any questions left any more :-) | 01:16 |
| mwhudson | https://bugs.edge.launchpad.net/launchpad-code/+bug/445156 fwiw | 01:16 |
| ubottu | Ubuntu bug 445156 in launchpad-code "vcs-import of libvdpau (git) fails: bzrlib.errors.BzrError: The remote server unexpectedly closed the connection" [Medium,Confirmed] | 01:16 |
| jelmer | mwhudson, heh, ok | 01:16 |
| lifeless | hmm, break-lock on lp failing to unlock. | 01:39 |
| lifeless | mwhudson:d did lp recently have a rollout ? | 01:42 |
| lifeless | bzr: ERROR: Server sent an unexpected error: ('error', "Cannot lock LockDir(lp-64863248:///~lifeless/tribunal/view-subunit/.bzr/branchlock): File exists: u'/srv/bazaar.launchpad.net/push-branches/00/04/a9/58/.bzr/branch/lock': [Errno 17] File exists: '/srv/bazaar.launchpad.net/push-branches/00/04/a9/58/.bzr/branch/lock'") | 01:42 |
| mwhudson | lifeless: no | 01:43 |
| lifeless | note that its failing to lock the *lock* dir, not 'held' | 01:43 |
| mwhudson | well, unless spm is doing something with the cp i requested earlier | 01:43 |
| lifeless | spm: ^ | 01:43 |
| lifeless | mwhudson: drwxr-xr-x 2 1001 1001 4096 Jan 14 03:54 lock | 01:44 |
| lifeless | ohh interesting.. note the lack of / between branch and lock on the first line. | 01:44 |
| * lifeless wonders if someting messsy is happening | 01:44 | |
| mwhudson | jelmer: oh, i also remembered something i wanted to talk to you about | 01:59 |
| mwhudson | jelmer: but i guess you are or at least should be asleep now; i'll send mail :-) | 02:00 |
| jelmer | mwhudson, I'm actually still here | 02:00 |
| mwhudson | jelmer: so about the incremental code import thing | 02:00 |
| mwhudson | jelmer: i'm wondering about the best way to do it | 02:01 |
| mwhudson | it's easy enough to go bazaar_tree.branch.pull(foreign_branch, overwrite=True, revno=local_revno + 1000) or something | 02:02 |
| mwhudson | but you really need to know how many revisions there are in the remote branch so you can not error by overshooting and know when the import completed successfully | 02:03 |
| jelmer | sorry, perhaps we should continue this over email indeed | 02:04 |
| mwhudson | well, stop_revision = ... | 02:04 |
| mwhudson | ok | 02:04 |
| jelmer | I don't feel awake enough to think about this :-) | 02:04 |
| mwhudson | fair enough :-) | 02:04 |
| === khmarbaise_ is now known as khmarbaise | ||
| quotemstr | Wow. | 03:43 |
| quotemstr | bzr check has been running on the Emacs repository for *three days* | 03:43 |
| quotemstr | It's only about halfway done. | 03:43 |
| * igc lunch | 04:56 | |
| twb | "bzr checkout --lightweight lp:dosage dosage" is still taking over two minutes to run. | 05:42 |
| * spiv tries it | 05:42 | |
| twb | Is there any inter-repo caching or suchlike that I can enable? | 05:42 |
| twb | I'm only checking out upstream sources so I can compile them -- that is, I only need to use bzr enough to say "get the latest working tree" | 05:43 |
| spiv | Well, lightweight checkouts aren't designed to be very network efficient | 05:43 |
| spiv | Which is a shame, but optimising that case hasn't been a big priority. | 05:44 |
| twb | I'm using --lightweight because some years ago, I was told that was the most appropriate model for the workflow I described above. | 05:44 |
| spiv | FWIW, it takes less than 43s for me. | 05:44 |
| twb | spiv: you probably just have better throughput to lp | 05:45 |
| spiv | Well, they might well be the most appropriate, but at the same time we might not have optimised your use case :( | 05:45 |
| spiv | twb: possibly, although I'm on the other side of the world to the lp datacentre (I'm in Sydney, Australia) | 05:45 |
| twb | I'm in .melb.vic.au, on internode ADSL2+ | 05:45 |
| spiv | exetel ADSL2 FWIW. | 05:46 |
| spiv | I do see that bzr is making more round trips than it should, there is probably some low-hanging fruit there. | 05:46 |
| spiv | Oh, are you using bzr+ssh or http? | 05:46 |
| twb | spiv: I don't have an lp account, so I assume http | 05:46 |
| spiv | i.e. have you run 'bzr lp-login'? Ah. | 05:47 |
| spiv | Ok, well that's going to be a large part of it. | 05:47 |
| spiv | And there's probably not much improvement we can make in that case, really. | 05:47 |
| twb | No worries. | 05:47 |
| twb | I was just checking in to see if I was still doing it the bestest way | 05:47 |
| spiv | Well, lp could provide a smart server over http, I suppose :) | 05:47 |
| twb | I think hg does that by now | 05:48 |
| spiv | But for plain http it's always going to be a bit slow. | 05:48 |
| spiv | bzr has done it for ages, but for various mundane reasons lp hasn't deployed that yet. | 05:48 |
| twb | Ah. Stupid lp. | 05:48 |
| twb | Does bzr employ a packing technique to speed up fetching over "dumb" protocols? | 05:48 |
| spiv | (Partly because it's free and pretty easy to setup an lp account with an ssh key, so it's not hard to just use that and get all the benefits of bzr+ssh) | 05:49 |
| twb | I do have an lp account, actually, I just haven't bothered to dig it out and tell bzr about it. | 05:49 |
| twb | I only created it so I could talk to malone | 05:50 |
| spiv | Not sure exactly what you mean by "a packing technique", but bzr does compress data and try to keep it in relatively few files in a way that reduces the number of roundtrips required to find and extract revision contents. | 05:50 |
| twb | Well, supposing you basically have one file per revision, a "pack" will condense (say) all revisions between two tags into a single file. | 05:51 |
| spiv | Right, we don't keep one file per revision, we generally keep roughly log(num of revisions) pack files. | 05:52 |
| spiv | (Or something like that) | 05:52 |
| spiv | e.g. look at http://bazaar.launchpad.net/~dosage-dev/dosage/trunk/.bzr/repository/packs/ | 05:53 |
| twb | The obvious benefit being that dumb protocols like HTTP are better at "give me that 10MB file" than "give me those 100 1kB files" | 05:53 |
| spiv | Right. | 05:53 |
| spiv | And bzr tries hard to use things like HTTP range requests where possible too. | 05:54 |
| spiv | That particular repo has 833 revisions, but only 9 pack files as you can see. | 05:55 |
| twb | How about HTTP/1.1 pipelining? | 05:55 |
| twb | spiv: so the dosage guy could run some sort of "repack" command to improve new clone time? | 05:55 |
| spiv | Not sure off the top of my head, although it might depend on whether you have pycurl installed or not (if not bzr uses urllib) | 05:55 |
| spiv | twb: yes and no | 05:56 |
| twb | Certainly libcurl can do pipelining, as long as you're using the "advanced" (not "simple") API. | 05:56 |
| spiv | twb: in general, you can run 'bzr pack' to shrink a repo down to one pack file | 05:56 |
| twb | (And running libcurl 7.19.1 or higher.) | 05:56 |
| spiv | twb: but bzr autopacks regularly, so you shouldn't see a dramatic improvement from that most of the time | 05:56 |
| twb | That's good to hear. | 05:57 |
| spiv | twb: and in the case of a repo on Launchpad, the read-only copy of a repo you can see isn't the same as the writeable copy visible to the branch owner, so if the branch owner runs 'bzr pack' it won't affect the repo you're cloning from. | 05:57 |
| spiv | (which is just a peculiarity of Launchpad, not bzr in general) | 05:58 |
| spiv | And of course, if you're accessing a repo via the smart protocol, how many pack files there are is basically irrelevant. | 05:59 |
| spiv | Because the client doesn't access them directly, it just asks the server to stream revisions to it. | 05:59 |
| spiv | (Most of the time, but not for the 'checkout --lightweight' case yet because no-one has spent the time to optimise it like that yet...) | 06:00 |
| spiv | twb: any other trivia about our internals I can help you with? :) | 06:00 |
| twb | I think I'm good. | 06:02 |
| twb | I tend to work mostly with git and darcs and hg, so it's interesting to compare notes. | 06:02 |
| twb | Especially re. packing, since I'm involved in Darcs development and implementing packs is a goal for the next release. | 06:03 |
| spiv | twb: yeah, they really are a massive performance win. | 06:07 |
| spiv | twb: we didn't release 1.0 until a pack-based format was the default. | 06:07 |
| === quotemstr_ is now known as quotemstr | ||
| * igc dinner | 08:09 | |
| vila | hi all | 08:13 |
| lifeless | hi vila | 08:24 |
| vila | hey lifeless, up late ? | 08:24 |
| lifeless | yah | 08:25 |
| lifeless | about to crash() | 08:25 |
| vila | Is your sprint going well ? | 08:25 |
| gerard_ | bzr cleanhi | 08:38 |
| gerard_ | huh? | 08:38 |
| gerard_ | that bzr clean part must be from yesterday | 08:38 |
| Toksyuryel | so is somebody gonna ban that guy or what | 08:57 |
| * mneptok starts growing weary of this | 09:28 | |
| * mneptok jostles lifeless | 09:32 | |
| * mneptok summons staff | 09:50 | |
| Toksyuryel | You'd think with 123 people in the channel at least one would be on the access list | 09:53 |
| jelmer_ | none of them seems to be awake at the moment though | 09:54 |
| jelmer_ | poolie: ping | 09:54 |
| chx | lifeless: hi | 09:57 |
| vila | gerard_: jam should review your patch soon (he's preparing 2.1.0rc3 so be patient :) | 10:03 |
| gerard_ | vila: good | 10:05 |
| === radoe_ is now known as radoe | ||
| poolie | hello jelmer | 10:59 |
| jelmer | poolie: hi - we were looking for an op to kickban welterde | 10:59 |
| jelmer | poolie, he seems to be reconnecting every minute for the last couple of hours | 11:00 |
| poolie | is it still happening? | 11:00 |
| jelmer | poolie, just did :-) | 11:01 |
| jelmer | poolie: depending on your client you should have a kickban command | 11:01 |
| spiv | jelmer, poolie: if I'm reading /msg chanserv access #bzr list correctly, lifeless or abentley are your best bet. | 11:02 |
| Peng | Well, so much for that. | 11:05 |
| spiv | Ooh, K-Lined. | 11:08 |
| AfC | I need disk space. Can I safely remove the 100s of MBs in .bzr/repository/obsolete_packs/ around and about? | 11:54 |
| poolie | vila, i can be pilot next week if you want | 11:58 |
| poolie | afc yes | 11:58 |
| poolie | but only from tuesday | 11:58 |
| poolie | maybe i'll just do it the week after | 11:58 |
| jelmer | are imports from the upstream debian packaging branches considered part of UDD as well? | 12:00 |
| jelmer | it's impossible to register imports for packaging branches at the moment :-( | 12:00 |
| AfC | poolie: thanks | 12:01 |
| Peng | AfC: It's only kept around in case the repo is packed and your computer loses power before the new files are written to the disk or something. | 12:04 |
| vila | poolie: I'm ok to do it until Friday, you can start from there instead if that's fine with you | 12:05 |
| vila | Friday next week I meant | 12:05 |
| poolie | in other words the 12th? | 12:06 |
| vila | exactly | 12:06 |
| AfC | Peng: I had 700 MB across two projects where I'd done *nothing* but bzr-git checkout upstream. Brutal. Alas. | 12:10 |
| maxb | Out of interest, if you ever did need to rescue a repository via moving in obsolete packs, what would you do with the pack-names file? | 12:10 |
| Peng | maxb: My plan is to ask lifeless to summon a magic solution. | 12:12 |
| maxb | heh | 12:12 |
| Peng | Seriously. | 12:13 |
| Peng | It'd be nice if obsolete_packs kept a copy of pack-names. | 12:17 |
| === deryck is now known as deryck[lunch] | ||
| napster | How to remove all the bzr tracked files from directory? | 12:56 |
| === mrevell is now known as mrevell-lunch | ||
| === sven is now known as Guest77279 | ||
| sven_sandberg | hi! i'm pushing and pulling from a remote repo that uses format "1.14 or 1.9" (and bzr 1.17dev). locally, i'm using bzr 2.0.2 and repo format 0.92. would it be safe to upgrade to format 2a locally? | 13:58 |
| jelmer | sven_sandberg, not unless you upgrade the remote repo to 1.14-rich-root or 2a | 13:59 |
| sven_sandberg | jelmer, ok, thanks! | 14:00 |
| Peng | You could upgrade to 1.9 or 1.14 for a mild performance and disk space improvement. | 14:00 |
| sven_sandberg | Peng, thanks, i'll do that | 14:01 |
| Peng | 2a would be much better, but you'd have to upgrade the remote repo too, as jelmer said. | 14:02 |
| sven_sandberg | if i ask the maintainers to upgrade the remote repo to 2a, what is the minimal version that everyone else must upgrade their local repositories to first? | 14:03 |
| rubbs | I believe it's >= 2.0 | 14:04 |
| * rubbs runs off to double check | 14:04 | |
| Peng | You'll need bzr 1.18 or so to interact with it. | 14:05 |
| Peng | You could downgrade your repository all the way back to rich-root from, like, about 0.17, but that would be stupid, and you'd still need 1.18 to interact with the 2a repo. | 14:05 |
| rubbs | I'd suggest everyone use 2.0 or above though. There are a lot of performance increases since that release. | 14:06 |
| Peng | Indeed. | 14:07 |
| rubbs | The current stable is 2.0.4 | 14:07 |
| rubbs | I've never had a problem with it. | 14:07 |
| rubbs | and interacting with old repositories works just fine too. | 14:07 |
| Peng | 2.0.4 mugged my parents when they were coming out of a restaurant! | 14:08 |
| rubbs | ha | 14:08 |
| sven_sandberg | Peng, rubbs, it wouldn't work to ask everyone to upgrade at the same time. is there a "safe path" of incremental compatible upgrades? | 14:09 |
| sven_sandberg | like, would it work if everyone upgrade to 1.18, then remote upgrade to 2a, then everyone upgrade to 2a? | 14:09 |
| Peng | The current format has poor roots. 2a has rich roots. So, no. Everyone has to upgrade to a rich-root format. | 14:11 |
| sven_sandberg | Peng, ok | 14:13 |
| sven_sandberg | Peng, are both directions problematic, or can i pull from poor to rich root? | 14:14 |
| Peng | sven_sandberg: You can pull from poor to rich. | 14:14 |
| Peng | sven_sandberg: It'll be a little slow, but whatever. | 14:15 |
| rubbs | yes you can pull | 14:15 |
| rubbs | but you can't push | 14:15 |
| sven_sandberg | ok, good | 14:15 |
| rubbs | and you can merge from poor to rich IIRC | 14:15 |
| Peng | Rich root formats store a little bit of extra meta data, so it's impossible to push back to a poor format. | 14:15 |
| rubbs | so you could almost create a mirrored rich repo | 14:15 |
| rubbs | but you could run into some issues that way | 14:15 |
| Peng | rubbs: Merging shouldn't be a problem. There might be stupid bugs breaking it -- I dunno -- but they could be fixed. | 14:16 |
| rubbs | Peng: that's what I was thinking. | 14:16 |
| rubbs | maybe as a "steping process" you could mirror any changes made in the poor to the rich. and make the rich the new target for dev. Until everyone has upgraded. | 14:17 |
| rubbs | then you can just merge in the changes from the "old" repo | 14:17 |
| rubbs | pretty messy though. | 14:17 |
| rubbs | One thing to do might be to have everyone use the poor repo and start upgrading. | 14:18 |
| rubbs | and say in two weeks the repo will be changed to the new format | 14:18 |
| rubbs | that gives everyone some time to get upgraded | 14:18 |
| rubbs | just some ideas | 14:18 |
| Peng | Upgrading to rich roots is a pain no matter what. Hopefully we'll only have to do it once! | 14:18 |
| sven_sandberg | rubbs, thanks. i think it wouldn't work when someone starts pushing from their rich trees though? | 14:19 |
| sven_sandberg | i mean from the local rich trees. they'd have to push to the remote rich trees, so people who are still using poor wouldn't be able to access the changes | 14:21 |
| rubbs | sven_sandberg: correct, my first idea actaully kind of sucks. | 14:21 |
| rubbs | but you can force 2.x to use a poor repo | 14:22 |
| Peng | sven_sandberg: You're correct. | 14:22 |
| rubbs | so maybe get everyone to switch to 2.x but use poor local repos | 14:22 |
| rubbs | until you are all ready to switch | 14:22 |
| Peng | Sure, 2.0 doesn't automatically upgrade stuff. | 14:23 |
| sven_sandberg | rubbs, do you mean bzr version 2.x or is there a repo version 2.x? | 14:23 |
| maxb | Unfortunately unless you're specifically aware of the rich-root problem, it's incredibly easy to accidentally create a rich-root repository locally with 2.x | 14:23 |
| Peng | It's worth noting that "bzr init-repo" and "bzr init" will use 2a by default. | 14:23 |
| Peng | But you can do "bzr init-repo --dirstate" if you like painful old formats. | 14:23 |
| Peng | Or, you know, --1.9 or whatever. :P | 14:23 |
| rubbs | true | 14:25 |
| sven_sandberg | rubbs, not sure i get it... do you mean it would work if everyone upgrade to bzr 2.x but keep repositories poor, then upgrade remote to 2a, then upgrade everyone's local repo format to 2a? | 14:25 |
| rubbs | sven_sandberg: sorry I meant client (bzr) version 2.x | 14:25 |
| rubbs | sven_sandberg: correct. Everyone upgrade clients to 2.x, but keep local and remote repos poor( this will take some coordination). Then when everyone has upgraded bzr, then upgrade the remote repo, then upgrade local repos | 14:26 |
| rubbs | the problem comes that 2.x (bzr) will by default create a 2a (rich) repo. So you'll have to make it clear that if they wish to init a repo they ahve to explicitly make it a poor repo | 14:27 |
| sven_sandberg | rubbs, cool! that actually seems doable. i think almost everyone is using a shared repository anyways, so we're never running bzr init | 14:28 |
| rubbs | I'd run some backups too just to be safe | 14:29 |
| MvG | FYI: I've just make a bzr-bash-completion release---the first ever, version 1.0.0. | 14:29 |
| MvG | So anyone of you frequently using bash to enter bzr commands might consider getting a copy to get proper completion of command options. | 14:29 |
| Peng | The danger is creating a new repo with "bzr init-repo". | 14:29 |
| bialix | scary | 14:29 |
| Peng | bialix: You had to use CVS?! | 14:29 |
| Peng | Sorry. | 14:29 |
| bialix | have used TortoiseCVS in the past | 14:30 |
| bialix | hi Peng, and all bzr | 14:30 |
| rubbs | sven_sandberg: I'd possibly clone everything to a test directory and do some testing with that workflow, but I think that should work. | 14:30 |
| bialix | but I never created CVS repo with bzr init-repo | 14:30 |
| rubbs | sven_sandberg: at least it should in theory. I'm pretty sure otherhave done it too. | 14:30 |
| rubbs | bialix: hello | 14:30 |
| bialix | hi rubbs | 14:30 |
| Peng | bialix: I was just joking. What's scary? | 14:31 |
| sven_sandberg | rubbs, good idea. yes, i'll suggest that | 14:31 |
| sven_sandberg | rubbs, Peng, thanks a lot | 14:31 |
| bialix | Peng:the first thing I saw when connected was: `The danger is creating a new repo with "bzr init-repo".` It was scary. What's dnager? | 14:31 |
| bialix | *danger | 14:31 |
| Peng | bialix: Ahh. From my client's point of view, you joined after I said that. | 14:32 |
| Peng | bialix: The danger is that you'll unintentionally upgrade to 2a. | 14:32 |
| bialix | no, I don't. I have format1 plugin | 14:32 |
| Peng | Heh. | 14:33 |
| bialix | yep, it's not funny | 14:33 |
| poolie | vila, hi? | 15:27 |
| vila | poolie: hey | 15:27 |
| poolie | vila, does scriptrunner not allow whitespace before the commands? | 15:28 |
| poolie | in other words they can't be indented? | 15:28 |
| vila | possibly, I don't think there is a good reason for that though | 15:28 |
| poolie | k | 15:29 |
| vila | poolie: quick look at the code seems to even reveal that as long as the prefix is there ($) we shouldn't care about the leading spaces (we use split)) | 15:30 |
| vila | poolie: so just try indenting them leaving the $ at the beginning | 15:31 |
| poolie | vila, also, is there something strange about its handling of blank lines_ | 15:37 |
| vila | poolie: they are ignored ? | 15:38 |
| vila | poolie: they are ignored. | 15:38 |
| vila | poolie: is that what you feel strange ? | 15:39 |
| poolie | hm | 15:42 |
| poolie | it looks like if there is a blank line in the output, the only way to make it match is to put a '...' | 15:42 |
| poolie | which is a bit gross? | 15:42 |
| vila | rhaaa, damn, I knew there was a trick about prefixing the *commands* instead of the output :-/ | 15:43 |
| vila | poolie: file a bug ? | 15:44 |
| vila | poolie: looking at the code, there is another potential problem if # are needed in the input or the output lines (they will be considered as comments) | 15:47 |
| vila | poolie: may be a good time to use a parser a bit less spartan and be able to report line numbers on errors too | 15:48 |
| poolie | vila, i think giving a diff across the whole thing would be good | 15:50 |
| vila | poolie: ECONTEXT | 15:51 |
| vila | a diif of the script ? against what ? | 15:51 |
| poolie | of the expected output against the actual output | 15:55 |
| poolie | oh but i see what you mean | 15:55 |
| poolie | at what point in the script did it fail? | 15:55 |
| poolie | good question | 15:55 |
| vila | yeah, I've already encountered ambiguous cases where only the *line* can help, and even there, ideally we are not interested of the relative line into the script but by the line in the file where the script is inlined with """ """ | 15:56 |
| vila | but once the first problem is addressed te second one is more about finding a python trick to avoid forcing the user to provide the starting line | 15:57 |
| bialix | hi poolie, vila | 16:01 |
| vila | hey bialix | 16:01 |
| bialix | anybody knows the status of abentley work of adding less than hunk shelving support? | 16:01 |
| poolie | vila, what do you think of https://code.edge.launchpad.net/~gerard-/bzr/update/+merge/18464 | 16:01 |
| abentley | bialix, it landed. | 16:02 |
| bialix | abentley: I don't see it in 2.1.0rc1? | 16:02 |
| vila | poolie: I asked jam to review it as I was surprised by the simplicity of the fix and was wondering if I was missing something obvious | 16:03 |
| abentley | bialix, it landed in 2.1.0b3 | 16:03 |
| bialix | abentley: there is nothing in shelve --help, and interactive short help does not suggest anything | 16:04 |
| bialix | what I'm missing then? | 16:04 |
| abentley | You need to specify a "change_editor" in your config, e.g. "change_editor = vimdiff -fo @new_path @old_path" | 16:05 |
| bialix | what this command line means? | 16:05 |
| bialix | I don't use vimdiff | 16:06 |
| bialix | is there some documentation on this feature available? | 16:07 |
| bialix | or this feature is not supposed to be used by mere mortals? | 16:07 |
| bialix | abentley: ^ ? | 16:08 |
| bialix | anybody? | 16:08 |
| abentley | bialix, "vimdiff -fo" is vimdiff-specific. "@new_path" is replaced with the path of the new version of the file, "@old_path" is replaced with the path of the old version of the file. | 16:08 |
| abentley | bialix, please give me a chance to answer your question before becoming frustrated. | 16:09 |
| bialix | there is bug: if I press ? then long short help does not mention editor, and pressing e don't launch it. Should I file it? | 16:10 |
| abentley | bialix, there isn't any documentation at the moment. The feature is meant to be used by mere mortals. | 16:10 |
| abentley | bialix, have you configured a change editor? | 16:10 |
| bialix | I'm trying | 16:11 |
| bialix | bzr traceback all the time | 16:11 |
| bialix | because there is windows path | 16:11 |
| abentley | If an editor is configured and e is not shown, that would be a bug. | 16:11 |
| abentley | specifically, change_editor must be configured for e to be shown. | 16:12 |
| bialix | ok, I finally found the right combination for windows path and it launch winmerge for me. | 16:12 |
| bialix | abentley: e is not expanded after I press ? | 16:12 |
| bialix | see: Shelve? [yNefq?] | 16:13 |
| abentley | bialix, you're right, the expanded help is buggy. | 16:13 |
| bialix | after ?: Shelve? [(y)es, (N)o, (f)inish, or (q)uit] | 16:13 |
| bialix | now I press `e` and it going for next hunk | 16:14 |
| bialix | abentley: so I need to edit @new_path to the state I want it to be after shelving, right? | 16:14 |
| abentley | bialix, right. | 16:14 |
| bialix | I will file a bug about ? | 16:14 |
| bialix | abentley: thanks for explanation | 16:15 |
| abentley | bialix, np | 16:15 |
| quicksilver | sftp branches in 30 seconds, bzr+ssh takes 4 minutes | 16:18 |
| quicksilver | expected? | 16:18 |
| quicksilver | I thought bzr+ssh was more efficient. | 16:18 |
| bialix | abentley: https://bugs.launchpad.net/bzr/+bug/517652 | 16:20 |
| ubottu | Ubuntu bug 517652 in bzr "bzr shelve with editor support: short hunk help lists "e" but long help does not" [Undecided,New] | 16:20 |
| vila | quicksilver: not expected file a bug with your .bzr.log, the server one and possibly some ls -lR of the .bzr/repository on both the client and server | 16:20 |
| vila | quicksilver: which bzr version ? | 16:21 |
| quicksilver | vila: 2.0.3 locally; just checking the remote version | 16:21 |
| quicksilver | 2.0.2 remotely | 16:21 |
| vila | quicksilver: repo format ? | 16:21 |
| vila | quicksilver: repo format for client and server ? | 16:21 |
| quicksilver | pack-0.92 hmm that's a surprise | 16:22 |
| quicksilver | obviously this one is an old one we didn't upgrade yet | 16:22 |
| vila | quicksilver: on both sides ? | 16:22 |
| vila | quicksilver: see, bzr is nice with you, only it didn't find the right words, it was working happily instead ;-) | 16:23 |
| quicksilver | ah ok | 16:23 |
| quicksilver | so the thing is, sftp just uses the remote format | 16:23 |
| quicksilver | so the sftp version was pack-0.92 locally | 16:23 |
| vila | quicksilver: I think there is a warning now about conversions on-the-fly but it may be in 2.0.4 or even 2.1 | 16:23 |
| quicksilver | but bzr+ssh hybrises it | 16:23 |
| quicksilver | hybridises it, I mean | 16:23 |
| quicksilver | so the bzr+ssh ends up as unamed (1/6/6/knit) | 16:24 |
| quicksilver | vila: I should upgrade it remotely and see if that helps? | 16:24 |
| quicksilver | s/remotely/at the remote end/ | 16:24 |
| vila | certainly | 16:24 |
| quicksilver | ok, doing that. Will report new results in a moment. | 16:25 |
| poolie | vila, could you try to pilot it soon? | 16:32 |
| vila | what ? | 16:33 |
| quicksilver | vila: 7 minutes to upgrade! Now testing branching. | 16:34 |
| gerard_ | bye | 16:35 |
| vila | poolie: which patch ? gerard_'s one ? | 16:35 |
| vila | hu ho, is that related ? | 16:35 |
| quicksilver | vila: still looks slow. "372KB/s" | 16:35 |
| lifeless | moin moin | 16:36 |
| quicksilver | vila: sftp was attaining more like 12000KB/s; this is a local 100M network | 16:38 |
| vila | quicksilver: ha ha ! | 16:38 |
| vila | quicksilver: ok, well, bzr+ssh is better than sftp when the bandwith and latency are... closer to the internet ones than a local one | 16:39 |
| quicksilver | vila: OK, it's slightly better with the new repo format | 16:40 |
| quicksilver | btu still a big difference | 16:40 |
| quicksilver | 38 seconds for sftp, 3:14 for bzr+ssh | 16:40 |
| vila | hmm | 16:40 |
| quicksilver | over 3 minutes is a long time to copy a branch :-/ | 16:40 |
| quicksilver | I *am* in a shared repo locally, I guess that gives it a little more work to do. | 16:42 |
| vila | quicksilver: I think it's worth reporting your numbers if only to help reproduce the case for a next round of performance tuning | 16:42 |
| quicksilver | OK. Will do. Thanks. | 16:42 |
| quicksilver | with a little care I suppose I can do initial branches via sftp and make commits/pushes via bzr+ssh | 16:43 |
| vila | quicksilver: wait, if your local shared repo is already populated, branch should be fast and as fast for sftp than for bzr+ssh | 16:43 |
| quicksilver | local shared repo should have all but one or two of the revisions, yes | 16:43 |
| quicksilver | it was a "very similar" branch I was checking out | 16:43 |
| poolie | vila, yes | 16:44 |
| vila | wow, try -Dhpss and look at .bzr.log | 16:44 |
| quicksilver | well, and for my second and subsequent checkouts *all* the revisions would be there | 16:44 |
| quicksilver | after all, I just did one! | 16:44 |
| vila | poolie: jam told me he'll review it yesterday | 16:45 |
| vila | poolie: I'll check with him | 16:45 |
| quicksilver | vila: I don't think my shared repo is working correctly. | 16:46 |
| quicksilver | vila: how do I check? | 16:46 |
| vila | bzr info | 16:46 |
| poolie | he's away at the moment | 16:46 |
| quicksilver | vila: I guessed :) but what is the magic word I'm looking for? | 16:47 |
| vila | quicksilver: repository branch linbe | 16:47 |
| vila | quicksilver: repository branch line | 16:47 |
| vila | and shared repository line | 16:47 |
| quicksilver | vila: OK. I think I broke it all. No idea how. Building a new repo which is really shared and testing again. | 16:48 |
| vila | poolie: rats just found jam's mail :-/ | 16:48 |
| quicksilver | don't let the rats into your mail! They'll ruin it. | 16:49 |
| vila | yeah add a comma after them :D | 16:49 |
| poolie | :) | 16:56 |
| quicksilver | vila: YAY | 17:01 |
| quicksilver | vila: with shared-repos working properly it takes 7 seconds | 17:02 |
| quicksilver | vila: (either sftp or bzr+ssh) | 17:02 |
| vila | quicksilver: ha, better | 17:02 |
| vila | quicksilver: you had standalone branches under your shared repo ? | 17:02 |
| quicksilver | vila: my shared repo wasn't shared at all; no idea how I broke it | 17:03 |
| quicksilver | vila: it's literally as if I accidentally rm -rf'ed the .bzr directory | 17:03 |
| quicksilver | vila: quite mystified but I'm glad it all works now. | 17:03 |
| vila | scary | 17:04 |
| quicksilver | vila: thanks again :) | 17:07 |
| vila | quicksilver: ;D | 17:09 |
| lifeless | hi poolie | 17:16 |
| lifeless | vila | 17:16 |
| orattue | Hey, my repo is running revno 105. My web server checkout is running 99. I want to update to 102. bzr update can't be passed a revision number. I can't update a specific file to the latest revno like you can in svn. What's the best way to do this? | 17:52 |
| gerard_ | orattue: use merge? | 17:54 |
| jpds | orattue: bzr [pull|merge] -r 102? | 17:54 |
| gerard_ | the latest development version adds -r support to update btw | 17:54 |
| orattue | gerard_: yeah -r parameter on update is a really useful one | 17:56 |
| doctormo | How can I check if a --fixes= has worked, before I upload the code? | 19:43 |
| lifeless | doctormo: bzr log | 19:47 |
| doctormo | lifeless: I can't see any fixes metadata in the log I'm seeing, what does it look like? | 19:49 |
| lifeless | you may have a too-old bzr | 19:50 |
| lifeless | or I may be imagining | 19:51 |
| lifeless | hang on | 19:51 |
| lifeless | fixes bug(s): https://launchpad.net/bugs/513432 | 19:51 |
| ubottu | Ubuntu bug 513432 in launchpad-code "AttributeError: 'Inter1and2Helper' object has no attribute 'source_repo'" [Critical,Confirmed] | 19:51 |
| lifeless | ^ | 19:51 |
| doctormo | lifeless: So you check the bug in launchpad to see if the --fixes has been attached? | 19:52 |
| lifeless | doctormo: huh? what are you asking | 19:53 |
| lifeless | What I pasted was output from bzr log | 19:53 |
| doctormo | lifeless: I've done a commit with --fixes=lp:123 and I want to confirm that the meta data for the fixes is there in my local repository | 19:53 |
| lifeless | run bzr log and look for 'fixes bug' | 19:53 |
| lifeless | if you have an old bzr this may not show | 19:54 |
| lifeless | but its not something that *can* fail | 19:54 |
| lifeless | it goes into the rev object, so commit fails if you have an unknown bugtracker | 19:54 |
| doctormo | lifeless: Anything I can look at if I'm using an old bzr? 2.0.3 btw | 19:55 |
| luks | if you have qbzr installed, try bzr qlog | 19:55 |
| doctormo | thanks luks, that's shows fixes and shows my code didn't work :-D | 19:58 |
| doctormo | luks: Are you involved in the devel of qbzr? | 20:13 |
| luks | doctormo: kind of, I started the project, but I'm not very active anymore | 20:41 |
| chx | hi. is there something like "glip, the git library in PHP, provides read and write access to Git repositories without using exec() or system() calls. Therefore it works on many shared web hosting accounts." for bzr? people want to push git and i need to push back :) | 21:32 |
| NeverGone | hello | 21:58 |
| NeverGone | somebody? | 21:58 |
| rubbs | hello, | 21:58 |
| rubbs | unfortunatly I have to go, but others here can help you if you have a question. | 21:59 |
| NeverGone | :) | 22:00 |
| doctormo | NeverGone: somebody isn't here, perhaps I can help? | 22:03 |
| doctormo | luks: I wanted to remark upon gbzr's good design, it seems better than bzr-gtk and olive. | 22:04 |
| NeverGone | my problem: bazaar and localised (hungary) windows | 22:04 |
| doctormo | NeverGone: Such as? and are we talking about bzrgtk, bzr or bzrlib? | 22:05 |
| NeverGone | http://ggg.pastebin.com/d65785178 | 22:05 |
| NeverGone | bazaar 2.0 and 2.1, standalone installer | 22:06 |
| doctormo | NeverGone: According to that, you've not done a "bzr init" | 22:06 |
| NeverGone | ? | 22:07 |
| doctormo | NeverGone: Or it could be that bzr has freeked out because of the รณ | 22:07 |
| NeverGone | hm | 22:08 |
| Paal | hi | 22:08 |
| NeverGone | Paal: http://ggg.pastebin.com/d65785178 | 22:09 |
| NeverGone | this is error | 22:09 |
| NeverGone | bazaar (or python) and localised windows | 22:09 |
| NeverGone | i found: https://bugs.edge.launchpad.net/bzr/+bug/340394 | 22:10 |
| ubottu | Ubuntu bug 340394 in bzr "want an option to set the output encoding, especially on win32" [Medium,Confirmed] | 22:10 |
| NeverGone | and https://answers.edge.launchpad.net/bzr/+question/63601 | 22:10 |
| NeverGone | but not help | 22:11 |
| Paal | yes, but if I use the letters without accentuated, I have one other error message | 22:11 |
| Paal | check this: http://drupal.pastebin.com/d2e55a864 | 22:12 |
| Paal | I try to use the Bazaar 2.0.4 stable | 22:13 |
| NeverGone | good night... | 22:30 |
| Paal | bye | 22:31 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!