/srv/irclogs.ubuntu.com/2008/09/10/#bzr.txt

Verterokok, I'm on it, thanks!00:00
poolielifeless, spiv, jam, igc, call in a minute if you want00:00
spivGood morning.00:02
lifelesspoolie: sure, call me00:06
lifelessjam: ping00:08
jamlifeless: pong00:10
jampoolie: Just made it back into the house, is the call still going?00:10
lifelessjam: it is00:10
jamlifeless: can someone on the call ring me? I can at least listen in00:11
jam(silent jam)00:11
lifelessjam: thanks for tweaking my patch; is the rest ok with you? time to land ...00:12
Yasumotothanks for the help guys, turns out I hadn't unlocked my ssh key00:17
* beuno wished Loggerhead had tests00:20
jambeuno: *write* them :)00:21
beunojam, I'm trying wishing first00:21
beunomwhudson, does it seem sensible that TemplatedBranchView finds the last revid if none is provided, instead of each controller?00:22
mwhudsonbeuno:  yes, i think00:24
jammarkh: was there anything you specifically wanted for 1.7 that hasn't landed? I'd like to cut 1.7rc1 and i just want to make sure things aren't missing.00:29
markhjam: those setup changes would be nice00:29
markhI just mailed the list00:29
jammarkh: I did the TBZR ones00:29
jamnot sure what other ones00:29
markhalex's - remove survey etc00:29
markhand maybe the icon? ;)00:29
jammarkh: I did the icon as well00:30
markhthx!00:30
jammarkh: Well, BB says that Alexander's change is already merged00:30
jamso I'm tempted to say it is already there00:30
jamis it missing for you?00:30
markhI guess I was trusting bundle-buggy - lemme look...00:30
markhit wasn't a few days ago iirc00:31
markhjam: we still on bzr.dev right?00:31
jammarkh: well, we do have a branch, but it is 99.99% bzr.dev00:31
markhoh - I missed word of that too.00:32
jammarkh: As near as I can tell, it is in bzr.dev00:33
jamBB says 8/21 it landed00:33
markhjam: yes, it looks to me like it has too - thanks!00:34
jammarkh: K, cutting tarballs00:34
markhyeah, BB says it is merged, but I don't see a mail from BB in that thread saying it was merged.  Oh well, at least it is - thanks!00:35
fullermdWell, good thing we did 1.6.1...00:35
lifelessjam: thanks for tweaking my patch; is the rest ok with you? time to land it?00:37
beunomwhudson, http://bazaar.launchpad.net/~beuno/loggerhead/abstract_paths/revision/22000:58
wasabiHey. Managed to cause bzr to crash. 1.3.1 on hardy.  I tried to --force remove a directory that had already been removed by hand.00:59
wasabibzr: ERROR: exceptions.AssertionError: Could not find target parent in wt: tests/gupnp-test01:00
wasabiNow I cannot use bzr status at all01:00
wasabiAny way to patch the branch up?01:00
james_whi wasabi01:01
james_w"tests/" was what you removed?01:01
wasabino. tests/gupnp-test01:01
wasabitests is still there01:01
james_wmkdir tests/gupnp-test; bzr add tests/gupnp-test; bzr st; bzr rm tests/gupnp-test;01:01
james_wthat should fix it I believe01:01
wasabithat did it01:02
james_wthe bug is fixed in later versions01:02
james_w1.6 I believe01:02
wasabiK.01:02
wasabiThanks. ;)01:02
james_wno problem01:02
james_whappy hacking01:02
lifelessspiv: any reason your faster branch isn't up for review?01:05
* beuno_ -> home01:06
=== beuno_ is now known as beuno
mwhudson_gar01:16
mwhudson_beuno: the stuff to do with all_same_author is cruft since the new_theme landing?01:16
mwhudson_oh right, it says so in the commit message01:16
mwhudson_beuno: you don't need to call fix_revid in annotate_ui01:17
mwhudson_        path = None01:19
mwhudson_ 01:19
mwhudson_ 01:19
mwhudson_8101:19
mwhudson_        if len(args) > 1:01:19
mwhudson_ 01:19
mwhudson_ 01:19
mwhudson_8201:19
mwhudson_            path = args[1]01:19
mwhudson_oops01:19
mwhudson_beuno: ^ that doesn't look right01:19
mwhudson_for e.g. annotate/100/file/in/subdir01:19
* jml reads the startup time RFC01:23
jmlit would be nice if that got summarised into a more static document.01:23
lifelessI didn't expect *quite* that enthusiastic a discussion01:24
jmllifeless: it's an interesting topic :)01:27
jmllifeless: speaking of enthusiastic discussions, when can we bury the adsorbSuite hatchet?01:27
lifelesslunchtime?01:33
spivlifeless: because it was just idle hackery, and I haven't (yet) re-read what I've done to make sure it's not too hackish.01:34
jmllifeless: sounds good to me.01:37
lifelessjml: shall we say 12:30?01:39
jmlcool core.01:40
beunomwhudson_, you're right. I'll fix it01:40
lifelessspiv: be useful to write up notes :P01:41
mwhudson_beuno: i think that you can just path_info_pop the revid, then take the rest of the environ['PATH_INFO'] as the path01:41
mwhudson_beuno: also, there's some confusion about whether path should start with or end with a /01:41
mwhudson_beuno: i suggest normalizing it in TemplatedView and then getting rid of the silliness in the subclasses01:42
beunomwhudson_, cool, will do. Cleanups are always fun01:42
mwhudson_right01:42
=== mwhudson_ is now known as mwhudson
=== mw is now known as mw|out
lifelessmwhudson: is there a good 'am I leaking references from my C module' tester?02:05
mwhudsonlifeless: not really02:05
lifelessbugger02:05
lifelessdo you know02:06
mwhudsonlifeless: there's a trackrefs class somewhere02:06
lifelessdoes PyTuple_SetItem02:06
lifelessdereference the old value at that place?02:06
lifelessor refuse to set the item altogether?02:06
mwhudsoni don't know02:06
mwhudsonbut overwriting a tuple item is kinda breaking the rules...02:07
lifelessdo you know where the tuple code is defined02:07
lifelessmwhudson: I'm creating it in a long winded way02:08
mwhudsonlifeless: Objects/tupleobject.c02:08
lifelessand writing to the C api, so kthxblah02:08
mwhudson(though it might even be a macro)02:08
lifelessok cool02:08
lifelessit dereferences an old tuple item02:08
lifelessyay for sanity02:09
mwhudsonlifeless: it decrefs the old value02:09
mwhudsonthe python/c api is *mostly* sane02:09
lifelessI *Love* open source02:10
lifelessbeing able to check that code myself, FTW>02:10
lifelesslol02:13
lifeless:!PYTHONPATH=. python -m timeit -s "from bzrlib.osutils import _walkdirs_utf8 as walkdirs" "print len(list(walkdirs('../test-repos/mozilla')))"02:13
lifelessTraceback (most recent call last):02:13
lifelessCommand terminated02:14
Verteroklifeless: about startup-time, cleaning up a bit xmloutput plugin, 0.20s gain in 'bzr rocks'. WOW!02:18
Verterokmaybe a major call to plugin developers, could help a bit on that area :)02:20
lifelessVerterok: so thats good; better would be 0.2s gained on 'bzr st'02:27
lifelessVerterok: which xmloutput also hooks into, yes ?02:27
Verteroklifeless: indeed02:27
Verteroklifeless: not any more02:27
lifelessmwhudson: how do I found out the refcount of an object?02:27
Verteroklifeless: xmloutput don't override any builtin :)02:28
Verteroknow it provides it own hidden command xml*02:28
lifelessVerterok: oh cool, its the rpc service one right?02:28
Verterokyes02:28
lifelessexcellent news, thank you :)02:28
lifelesscan I pull the new one yet ?02:29
lifelessrevno 99?02:29
Verteroklifeless: the point I tried to higlight was that those 0.2s came from not using lazy_import :)02:30
lifelessVerterok: ah right02:31
Verteroklifeless: what branch?02:31
mwhudsonlifeless: sys.getrefcoutn02:31
lifelesshttp://bazaar.launchpad.net/~guillo.gonzo/bzr-xmloutput/xmlrpc/02:31
Verteroklifeless: branch from lp:bzr-xmloutput, I moved xmlrpc branch to trunk02:32
lifelessVerterok: so the theory of lazy import is 'defer reading code that is not needed', which is good; but its granularity is limited02:33
lifelessVerterok: which is my somewhat more troubling point :)02:33
Verteroklifeless: while moving things to lazy_import I foudn some corner cases, like the need to import SimpleXMLRPCServer (the module) and then doing SimpleXMLRPCServer.SimpleXMLRPCServer :p02:35
lifelesspoolie: down to 888ms02:35
lifelessVerterok: yah, moving those to separate modules that you only load when you actually need the subclass might help02:36
markhjam: where should I put the 1.7 binaries for windows?02:36
lifelessVerterok: but only if you only need the subclass sometimes02:36
markh(bzr's launchpad page has the most recent announcement as 1.6rc4 being released...)02:36
Verterokbecause if I lazy_imported SimpleXMLRPCServer (the class), I get: "TypeError: Error when calling the metaclass bases"02:37
lifelessVerterok: heh02:38
lifelessVerterok: thats a bug in something, I don't recall if its the class machinery or lazy import02:38
Verteroklifeless: yes, I did exactly that, moved all cmd_* to __init__.py, and most heavy imports into modules not used in cmd_* declaration02:38
spivpoolie: you're welcome to work from here tomorrow, btw.02:39
Verterokhttp://rafb.net/p/7lNeKY31.html02:40
Verteroklifeless: the traceback, in case it helps ^02:40
lifelessmwhudson: you'll probably shoot me when you see my code :P02:40
lifeless848ms per loop now02:41
poolielifeless, relative to what?02:43
pooliespiv, thanks very much02:43
pooliespiv, if i'm organized enough to go before rush hour i'll turn up just before the 9am call, otherwise later02:44
poolie(in which case i may miss it)02:44
jmlyou could turn up here if you'd like.02:46
jmlbeing something close to a midpoint02:47
lifelesspoolie: 1000ms in bzr.dev02:47
lifelessjml: where is here now?02:47
lifeless812ms now02:47
jmllifeless: lindfield.02:48
pooliei assume he means pymble or lindfield02:48
pooliei'm taking my bike to the shop in hornsby, so it's logically closer02:48
jmlpoolie: oh, I see.02:49
poolieto get a new shlock absorber so i can cope with robert's puns02:49
jmlheh02:49
pooliebut it would be nice to come over some time02:51
lifelesspoolie: schlock mercenary ftw02:54
beuno_damn02:59
beuno_I locked myself out of my server02:59
lifelesslol02:59
=== beuno_ is now known as beuno
beunodamn03:00
lifelessreal world result:03:01
lifeless:!python -m timeit -s 'import subprocess' 'subprocess.call(["./bzr", "st", "../test-repos/mozilla/"])'03:01
lifeless10 loops, best of 3: 3.68 sec per loop03:01
lifeless:!python -m timeit -s 'import subprocess' 'subprocess.call(["./bzr", "st", "../test-repos/mozilla/"])'03:01
lifeless10 loops, best of 3: 3.84 sec per loop03:01
lifelessI'm going to keep driving it down03:02
=== beuno_ is now known as Guest88559
lifelessjml: now ok?03:26
beunodinner!03:35
jmllifeless:  * resource dirty markers on non current resources - ignore? keep a history ?03:50
mlhI want to keep some db schemas in a nicely diffable format04:02
mlhdoes anyone know of something good that will do that?04:02
mlh(sorta OT I know)04:02
pooliemlh, do you mean as an alternative to sql data definition language (if that's the right name)04:03
poolie(replying to this naming thread)04:06
lifeless745ms04:09
lifelessEFOOD04:09
mlhpoolie: well ddl defines the db, I want to go the other way; db-> ddl04:17
mlhI know of a bunch of products that would do it ok, but I'm particularly looking for a complete, portable (ok, oracle) version04:18
mlhmature04:18
pooliei don't know04:20
poolieaiui launchpad commits to a bazaar branch a series of 'alter table' etc statements which are replayed in order to update the database04:21
pooliethen from time to time they checkpoint the entire definition04:21
mlhyeah that's what we do currently (except the for checkpointing :-)04:21
mlhbut rather than commit 'alter table' statements, I'd rather commit the state of the db everytime and derive 'alter table' statements from that04:22
mlhso I could generate sql ddl but it might not be so easy to derive the 'alter ...' statements04:24
lifelessright04:24
lifelessin particular explicit relations are not enough to define logical sanity04:24
mlhIDEALLY, you'd build the entire database every time, like you'd do a compile04:24
pooliemlh, the alter statements have information about how to update existing data that's not present in the creation from scratch04:24
mlhbut it's just far too expensive for any decent size database04:24
lifelessdeltas -> snapshot is possible, snapshots -> deltas isn't, unless all possible constraints are defined within the db04:24
pooliewell, that's not enough if you need to update existing data04:24
mlhpoolie: example?04:25
poolieuhm04:25
pooliemy syntax will be wrong but04:25
pooliealter table customers rename column hair to hair_color;04:26
mlhwell I won't disagree, but I'm thinking it's not a fundamental restriction04:27
pooliewell, a diff between the overall ddl would presumably just drop and add that column04:27
poolieso, at some level the information about how they relate needs to be captured04:27
mlhoh ok.   I could infer a rename, git style :-)04:28
lifelessthis is what I mean, that you can start with deltas, but not with snapshots04:28
poolieand we know how well that works :)04:28
pooliebut that is kind of a trivial example, suppose you're renormalizing to split a table into two or more04:28
mlhwell fair enough04:29
mlhat a first passt (and possibly ultimate) I was more interested in validating a schema rather than producing it04:29
mlhso I upgrade the db as usualy with 'alter ...' and whatever04:29
mlhat some point I'd save the ddl04:30
mlhI can then double check the upgrade operation by dumping the ddl and comparing to what's in bzr (dumped from the 'official' db)04:31
mlhfwiw, in my experience tables hardly ever get normalized .. it's just too hard04:34
poolieheh04:34
lifelessmlh: theres a bunch of stuff in the xp world on managing db evolution04:34
lifelessmlh: basically revolves around having a apply, revert methods on a class per evolution step04:35
lifelessyou could generate a 'is this correct' by doing that to an empty db and dumping the resulting schema04:35
lifeless3.51 seconds for st now04:36
lifelessdown from 3.8404:36
=== jam changed the topic of #bzr to: Bazaar version control system | http://bazaar-vcs.org | bzr-1.6.1 now available! please test bzr-1.7rc1 | http://irclogs.ubuntu.com/ | http://planet.bazaar-vcs.org/
jammarkh: https://edge.launchpad.net/bzr/1.7/1.7rc105:25
jamI just uploaded the official tarball05:25
markhI just saw the svn plugin die a strange death (but it wasn't obvious it was the null-pointer issue in that bug).  I might see if I can repro that again...05:28
markhthe svn plugin seems very slow doing tests - I'm currently at "[590/982 in 65m26s,..." :(05:29
jampoolie: ping05:32
pooliejam, oh, hi05:32
pooliecongrats on the release05:32
jamthanks05:32
jamI still need to get the email out.05:32
lifelessmwhudson: how do people profile extension modules.05:33
lifelessmwhudson: its driving me batty05:33
pooliejam, shall we talk?05:35
pooliei'm a bit distracted by these disk errors tbh05:35
mwhudsonlifeless: i don't know05:35
jamlifeless: I inspect the raw C code to make sure it doesn't have stuff like "PyGetAttr" all over the place.05:35
mwhudsonlifeless: callgrind?05:35
jampoolie: I'd like to talk sometime, but it's almost midnight here, so I'm fine doing it some other time05:36
jampoolie: do we have an idea on 1.8 RM?05:37
lifelessjam: I know thats what you do; its laughably primitive compared to what I'd do on a regular C program with symbols.05:37
lifelessjam: because its slow, manual, prone to errors05:38
lifelessjam:05:38
pooliejam, i'm happy to do it again, though it sounded like you might want to?05:38
lifeless:!PYTHONPATH=. python -m timeit -s "from bzrlib.osutils import _walkdirs_utf8 as walkdirs" "print len(list(walkdirs('../test-repos/mozilla')))"05:38
pooliei think we should work out if we want to keep the changes you did or not05:38
lifeless10 loops, best of 3: 695 msec per loop05:39
lifelessdown from 1000ms05:39
poolielike having a trunk freeze period05:39
jamlifeless: sounds good, just make sure you have a good test suite behind it :) I've certainly gotten caught up in benchmarking only to find out it was fast because it was wrong.05:39
jampoolie: I'm fine relaxing some of that freeze. I think I was mostly coming off of the 1.6 delay and wanting to not have 10 more regression releases.05:40
jamI *do* think we want it to be "1 week of minimal disruption"05:40
jamAnd was sort of thinking that way going towards 1.805:40
jamBut 1.6rc5 and 1.6.1rc2 was not particularly pleasant.05:41
jam(And that was after what, 1.6b3 ?)05:41
pooliei'm sure05:41
poolieit wasn't very nice for me either leading up to that05:41
lifelessjam: thats another reason I want to avoid putting complex C logic in pyrex; its kinda hard to test from python, given that the whole speed thing is about not exposing each logical step to python05:41
pooliei guess i'd rather branch earlier and leave trunk open05:42
pooliei can understand the temptation to try to make robert work on the release but it didn't seem to work :-)05:42
markhjam: uploading now05:42
pooliei can't believe Windows has no builtin ability to write an iso to disk05:43
poolieamazing05:43
lifelesspoolie: 'antitrust'05:43
jampoolie: I think it started to05:43
jamIn XP or so05:43
jamBut no built-in DVD player, etc.05:43
jamEven if you *buy* a DVD drive, you always get some random 3rd party tool05:43
jamwhich you may forget about when re-installing.05:44
poolienot in vista afaics - you can write single files but not an iso05:44
markhimgburn is a reasonable freebie for burning05:44
jampoolie: ah, you're right. It supports a different method.05:44
jammarkh: Is that upload from the official tarballs, or did you use bzr.dev?05:44
lifelessjam: I'm currently writing a pure C walk-and-stat-loop05:44
markhjam: from the branch05:45
lifelessjam: I want to have an accessible 'this is what we should expect'05:45
jammarkh: I just want to make sure you had the latest tip. I had to fix NEWS as a last commit.05:45
jamI accidentally called it 1.7 instead of 1.7rc105:45
jamlifeless: Depending on what you want, I'll wrap the inner functions in a python wrapper so I can test them directly05:45
jambut the C code ignores the python form05:46
pooliemarkh, thanks05:46
jamcdef versus def05:46
jametc05:46
pooliei can get around it, i probably have a copy of nero somewhere, i just think it's bizarre05:46
pooliebut it's probably antitrust as robert says05:46
markhjam: nope, I missed that last change.  I've cancelled the upload.05:47
markhshould only take a few mins to rebuild05:48
jampoolie: Well, I'd rather they had a synaptic style package manager, too... :)05:48
jamGetting bootstrapped on win32 is always a pain.05:48
markhmost nero oem versions know the drive model they were sold with!05:48
markhand refuse to work on others05:49
markhwell - I've seen that more than once, so I'm calling it "most" :)05:49
jampoolie: what is our general policy about 3rd-party announcements?05:49
jamI just saw a "bzr-gedit" email on bazaar-announce05:50
poolieonto our announce list?05:50
pooliei think it's ok for plugins05:50
lifelesswhats its there for really ;)05:50
poolieunless you think it's too noisy, in which case maybe ask them to throttle back05:50
jamI'm thinking to let it through.05:50
jamJust have to be careful, because I almost hit a spam entry.05:51
jamWell, *I'm* the noisy one in the bzr-1.6 release.05:51
jamWith what, 7 announcements in a week?05:51
jamThough I throttled myself.05:51
spivjam: that sounds uncomfortable ;)05:52
jamspiv: It can be, but you pass out before you cause real harm :)05:52
pooliejam, so you should go to bed05:54
pooliei'll be working from spiv's couch as i said but just ping me tomorrow05:54
poolieand we'll talk05:54
jampoolie: sure05:55
jamI'm just getting 1.8 opened in bzr.dev05:55
lifelessmy vote is less stress on releases06:00
lifelesslet the steady state drive things06:00
lifelessif that state is too low, stressful releases won't fix it06:01
mwhudsonpoolie, jam: is the fix for https://bugs.edge.launchpad.net/bzr/+bug/261315 going to be in 1.7 ?06:03
ubottuLaunchpad bug 261315 in bzr "getting a stacked branch over the smart protocol fails with "Could not install revisions"" [Critical,Fix committed]06:03
jamI approved it, but I don't think Martin submitted it.06:04
* jml frowns.06:07
jamrc2 is just a release away if it is important :)06:12
mwhudsonit's important06:12
lifelessok06:26
lifelessnow this is interesting06:26
lifeless:!time ./readdir06:26
lifelessCount: 576906:26
lifelessreal    0m0.662s06:26
lifelessuser    0m0.232s06:26
lifelesssys     0m0.428s06:26
lifeless:!time find ../test-repos/mozilla/ -size 0 -size 106:27
lifelessreal    0m0.344s06:27
lifelessuser    0m0.092s06:27
lifelesssys     0m0.236s06:27
lifeless><06:27
lifelessstill, this is encouraging, that a naive C program is slower in sys time than find :P06:27
lifeless(than find's total time)06:28
lifelessfar out06:34
lifelesstime to mail this out06:34
mlhfind caches some stuff dunnit?06:38
mwhudsonalso avoids stat-ing things if it can06:42
lifelessmlh: fchdir() is the magic06:49
lifelessmwhudson: nothing to do with it06:49
lifelessmail to the list, enjoy, taking a breather06:52
lifeless615ms now06:52
vilaGood morning readdir07:04
vilaerrr bazaar07:04
Verterokmorning vila07:09
vilahi Guillermo !07:10
samuraiERROR07:25
lifelessand st is down to 3.34 seconds from 3.8408:14
strkERROR: No such file: '/srv/bzr/gnash/.bzr/repository/pack-names': [Errno 2] No such file10:48
strknow what ?10:48
strkI killed while committing....10:48
strkam I lost ?10:48
strkcan I copy the file from another developer ? or regenerate it ?10:49
strkactually, I've no /srv/ dir, so could be on the server side10:51
speakmanhi folks !10:52
strkERROR: No such file: '/srv/bzr/gnash/.bzr/repository/pack-names': [Errno 2] No such file10:53
strkspeakman: any idea about the above ? (I killed 'bzr' while committing)10:53
james_wstrk: hmm, it seems you killed it at a very bad time10:55
james_wlifeless: ^10:55
james_wstrk: and it does sound like it is server side then10:55
speakmanI've got an issue which I'm not sure how to deal with; If I have one mainline called "trunk" and a branch of that called "new_feature", both laying in my homedir like "~/myproject/trunk" resp. "~/myproject/new_feature". Now, if there has been some greate improvments on the trunk - is it okay to first merge all new stuff from "trunk" into "new_feature", and when all conflicts are solved merge the "new_feature" branch into "trunk"?10:55
james_wstrk: you can probably regenerate the file10:55
strkand it made *every* shared branch unusable :(10:55
james_wspeakman: yes, that's perfectly fine10:56
speakmanjames_w: is it the prefered way to go?10:57
speakman(aka, or are there any other way to do it?)10:57
james_wspeakman: either way works10:57
james_wyou could just merge "new_feature" in to "trunk"10:58
speakmanbut i might still need to continue working on the "new_feature" branch, but I also need the improvments from "trunk" to make it work (conditions has changed, and fixes are in "trunk"). Thats my issue right now.10:59
=== kiko-fud is now known as kiko-zzz
speakmanthe former way seems to do the trick, but I wasn't sure about how messed up the "trunk" log will be when merging "new_feature" branch since "trunk"'s already in "new_feature".11:00
speakmanI'm pretty new to VCS if it wasn't obvious :)11:01
speakmanI just wanted to know if it will mess up anything to regulary merge trunk into feature-branches.11:04
lifelessjames_w: I'm really not here11:12
lifelessjames_w: please look at the rename code, it probably wrote to a temporary name, so its recoverable11:12
james_wspeakman: not at all, and it won't mess up your "trunk" log11:13
james_wlifeless: thanks11:13
strkjames_w: can you help with fixing the broken thing ?11:13
lifelessjames_w: start with the method in pack-repo, which does the insertion, follow it into sftp transport11:13
james_wstrk: yes, just looking11:13
lifelessstrk: you're using sftp right ?11:13
strklifeless: yes11:13
strkdoes james_w have access to the server ?11:14
lifelessstrk: sftp prevent atomic renames (acts likes windows not posix) so there is an an unavoidable race11:14
strkI wonder why they switched to it then11:14
lifelessstrk: he'll learn a little about the guts of this, then probably get you to use 'sftp' or 'hitchiker' or some such to do the recovery11:14
lifelessstrk: no idea, they did not discuss with me, or any bzr dev I know of11:15
james_wstrk: so, there should be a temporary file 'at /srv/bzr/gnash/.bzr/repository/%s.tmp.%.9f.%d.%d' % (abspath, time.time(), os.getpid(), random.randint(0,0x7FFFFFFF))11:21
james_wthere may actually be two11:21
james_wstrk: lifeless seems to suggest that you don't have ssh access to the server, is that correct?11:21
* kinkie is away: lunch11:25
strkno idea, I might have it11:25
strklemme try11:25
strkuhm, Permission denied (publickey).11:25
strknever logged before11:25
strklemme ask on #savannah too11:26
james_wyou clearly have sftp access, which should be enough, but I have never used it to give you exact instructions11:27
strktrying to ssh into bzr.savannah tells me I'm not allowed to execute commands11:28
strktried no command and /bin/sh...11:28
james_wwe'll have to use sftp then, do you have any experience with that?11:29
strkentry-level11:30
james_wbetter than me then11:30
* strk trying to connect in sftp11:30
james_wyou need to look in /srv/bzr/gnash/.bzr/repository/11:30
strkok, I'm in11:30
strkI'm there11:31
james_wfor files with the pattern "<path>.tmp.<pid>.<random>"11:31
james_wthere may be more than one11:31
strktmp.pack-names.1221039958.462796926.26759.lg3cf8o30811:31
strkpack-names.tmp.1221039957.749309063.26759.101457853111:31
strkEND11:31
james_wok, let me get this right11:32
strk-rw-rw-r--    0 69570    6469          844 Sep 10 11:46 pack-names.tmp.1221039957.749309063.26759.101457853111:33
strk-rw-rw-r--    0 69570    6469          794 Sep 10 11:39 tmp.pack-names.1221039958.462796926.26759.lg3cf8o30811:33
james_wI think we need "pack-names....". I think "pack-names...." will have one more line than "tmp..."11:33
james_wok, so could you rename "pack-names...." to "pack-names" please?11:33
strkcan I copy ?11:34
james_wthat will work too11:35
strkuhm, sftp doesn't know how to copy, I'll get for backup and rename11:35
strkdone11:35
james_wit got killed just before it renamed that file to "pack-names", just after it renamed "pack-names" to the other one to allow for rollback11:36
james_wgreat, you should now be able to start work again11:36
strkit seems to be working11:37
strkgreat. thanks a lot.11:37
james_w"bzr log sftp://bzr.savannah/srv/bzr/gnash/trunk" or whatever would be a good sanity check11:37
james_wcheck that the latest revision is the one that you committed when you got the problem11:37
strkbzr viz succeeded. wheter there's anything missing I dunno11:38
lifelessjames_w: the rename code will tell you the difference11:38
lifelessjames_w: please also file a bug - this 'theoretical' race is clearly a problem11:38
lifelessI've been suspicious of this magic method for a while11:38
james_wlifeless: the difference in what?11:38
lifelessjames_w: which is the old and which is the new11:39
james_wdo you want the bug about pack-names, or about sftp put?11:39
james_wlifeless: yeah, I was just double checking I was reading the code correctly.11:39
lifelesswhat ever method failed epically11:41
lifelessshould not exist as-is11:41
james_wok, I'll file it and you can fix it up appropriately11:41
speakmannow I got stuck into a strange "resolve" behaviour: Conflict: can't delete languages because it is not empty.  Not deleting.11:41
speakman"languages" is a subdir which contained a few files. They were deleted on the "trunk" and now med "trunk" was merged into "new_feature" branch, it said it couldn't delete the subdir.11:42
speakmanremoving it manuallt didn't help11:43
strkyou don't compile the list of changes for upgrades ?11:43
speakmannot even recreating it empty will make "bzr resolve" fall trough11:43
strkthe update manager always says "The list of changes is not available yet. Please try again later." for bzr11:43
strkfetching from the 'bleeding edge' repository11:43
strk(deb http://ppa.launchpad.net/bzr/ubuntu hardy main)11:44
lifelessstrk: it looks for a special file,I don't think ppas create it, no11:44
unangzhello master211:55
unangzi get stuck probelm11:55
unangzhow to checkout from windows repository to ubuntu linux11:56
lifelessspeakman: it probably can't be deleted cause your branch has more files, or local files11:59
lifelessspeakman: jst bzr resovle  <path> it11:59
lifelessspeakman: *then* bzr rm it11:59
unangzi was tried use ftp to checkout from windows, but when i commit, i get problem12:02
unangzthe message error indicate bzr is locked12:02
speakmanhm, that did work, thanks12:17
speakmanwhy didn't "bzr resolve" work?12:17
lifelessspeakman: with conflicts in the text of a file we can tell when you have deleted them12:17
lifeless(the <<<< is gone :)12:18
speakmanunangz: paste your output to a pastebin12:18
lifelesswith files on disk, we haven't written logic to tell when you've made it go away satisfactorily. It's probably doable12:18
speakmanlifeless: oh, i see :)12:18
lifelesss/files/file-names/12:19
speakmanone more question; what's your favorite "conflict resolver" tool? ;)12:20
lifelessfor paths, 'mv' and 'bzr mv/bzr rm' :)12:20
lifelessfor inside a file, I usually just read with vim12:21
lifeless<- not sophisitcated in that area12:21
speakmanoh, okay :)12:22
lifelessI believe aaron uses vimdiff12:23
speakmanI use kdiff3 alot, but I do all my development in emacs and I think emacs is almost as capable as kdiff3, just havn't had the time to learn how to.12:23
lifelessand there is an emacs mode12:23
awilkinsspeakman: I like Beyond Compare 312:29
awilkinsspeakman: Payware, but cheap, and IMHO the best file/folder compare tool I've used.12:29
lifelessawilkins: nice rant :P12:49
jelmerlifeless, what happened to your index work?12:53
jelmerlifeless, I'm looking at how hard to expose the git working tree and index to the user atm12:54
lifelessbtrees? its landed12:54
lifelessoh, marks.12:54
lifelessmarks != i12:54
lifeless'index'12:54
lifeless'index' bad12:54
jelmerheh12:54
lifelessreread the 'marks' thread - 'review support' I think it was12:55
bob2btrees is in 'development'?12:55
lifelessBTreeGraphIndex is in bzr.dev12:55
lifelessnight all12:55
speakmanbtw, any trac-bzr ppl here? :)13:24
jelmerspeakman, hi13:29
jelmerjames_w, ping13:31
james_whey jelmer13:31
jelmerjames_w: What's your preferred branch layout for debian packeges in bzr branches?13:31
james_wyou mean full-source vs. debian only?13:32
jelmerjames_w: yeah13:32
jelmerit seems we're using both for pkg-bazaar at the moment, it would be nice to standardise13:32
jelmerat least for new packages13:32
james_wI prefer full-source13:33
james_wI can't remember the discussion we had at the time to know what the arguments really were13:33
jelmerthe main thing was disk usage and performance I think13:34
* LarstiQ would probably lean towards just regular branches of upstream too, nowadays.13:36
jelmerLarstiQ, Cool13:37
jelmersiretart, Do you prefer either?13:37
kenyonWe have a problem: this is what happens: http://paste.ubuntu.com/45311/ when I  say "bzr branch lp:~federico-pelloni/ejecter/main"13:43
kenyonso i need to activate launchpad's server certificate - but how?13:44
kenyonwhere can i get that cert and where do i put it?13:45
james_wkenyon: install ca-certificates if you are on Ubuntu or Debain13:45
siretartjelmer: I also prefer full source. I remember that lifeless preferred debian only, though.13:45
awilkinsAny of you chaps know which/whether "time" is in GNUwin32 and which package?13:46
siretartjames_w: I think the best argument of 'debian'-only is that it is trivial to mount it over a more recent bzr checkout and build upstream snapshots with it.13:47
james_wsiretart: yes, I guess it is easier13:47
kenyonjames_w: thank you - it seems it was already there - dpkg -l|grep cert said:  ii  ca-certificates 20061027-0ubuntu0.213:47
kenyoni would maybe try and disable pycurl cert verification13:48
siretartjames_w: however, with debian only we now have a very hard time to import the last NMU to the debian package :-(13:48
james_wsiretart: doing the merge and failing if there are conflicts is more robust in the face of patches to the source13:48
james_wkenyon: sorry, I didn't actually look at your error. That's on I've not seen before13:49
kenyoncant i just download via ftp or http form lp ?13:49
james_wkenyon: do you have a proxy in the way?13:49
james_wkenyon: if you run "bzr launchpad-login <your lp id>" and try again it should work13:49
* awilkins answers his own question ; "time" is a bash command, not a GNU util.13:50
james_wawilkins: I think it's both13:50
awilkinsjames_w: Maybe they haven't ported it to win32 then ; I know it's in Cygwin bash but I can't find an obvious package for it in gnuwin3213:51
* awilkins considers writing a PoSH version13:51
james_wawilkins: % dpkg -S /usr/bin/time13:51
james_wtime: /usr/bin/time13:51
james_wso it's in the "time" package on Ubuntu13:51
kenyonjames_w  thank you  - seems my bzr is too old, it does not recognize the launchpad-login command13:51
james_wkenyon: what version are you using?13:52
kenyonBazaar (bzr) 0.15.0 on feisty13:52
james_woh, ok13:53
kenyonjames_w i think i will give up on this and use a different newer machine13:53
=== mw2000 is now known as mw
poolievila, hello?14:37
vilahey !14:37
vilaI'm not used seeing you up so late :)14:38
poolieheh14:38
pooliei shouldn't be up so late14:38
poolievila, meet pmatulis14:38
vilahis client quited  it seems14:39
pmatulisah14:40
poolieding14:41
vilapmatulis: oh, you're here, hi :)14:41
=== kiko-zzz is now known as kiko
speakmanjelmer: ure still there?15:22
jelmerspeakman, yep15:23
speakmanjelmer: great, i found a bug with trac-bzr, but I just recalled I posted a bugreport on LP: https://bugs.launchpad.net/trac-bzr/+bug/26770015:25
ubottuLaunchpad bug 267700 in trac-bzr "Can't view changesets on branches" [Undecided,New]15:25
speakmanupdated it...15:28
=== kiko is now known as kiko-phone
HippySurferHi, Newbie Alert. I am trying to work out how to use bzr to enable myself and a friend to collaborate. We are not able to host a shared repository anywhere. So I thought that I could give him a mirror branch and then send him merge directives created from my branch. But it does not work, when he attempts to merge my merge directive he gets an error message: zr: ERROR: Invalid url supplied to transport: "file:///Users/rjt/Tmp/bzr_test/m15:45
HippySurferain/": Win32 file urls start with file:///x:/, where x is a valid drive letter". This suggests that bzr is trying to access my main branch, which he does not have. I am a bit lost ...15:45
=== doko_ is now known as doko
=== kiko-phone is now known as kiko
abwesend_0http://www.hanf-spiel.de/13769516:29
abwesend_0http://www.hanf-spiel.de/13769516:34
=== mw is now known as mw|brb
=== BZ|nortune is now known as jfroy|chickenlit
=== mw|brb is now known as mw
jamdoes anyone know what Ubuntu package to install to get man pages for stuff like "stat" ?17:54
jamI guess I'll try "manpages-dev"17:55
LarstiQjam: manpages-posix-dev?17:55
jamI'm just used to them being installed by default17:55
jamfrom 'ages' ago17:55
jamLarstiQ: thanks for the pointer. Weird "manpages-dev" is a standard package, but "manpages17:56
jam"manpages-posix-dev" is not17:56
jamIt's a "multiverse" package17:56
jamanyway 'manpages-dev' had what I needed. Now to figure out the exact size of "off_t" :)17:58
=== kiko is now known as kiko-fud
=== mark1 is now known as markh
=== rocky1 is now known as rocky
jamthanks statik, now I can take over the world with bzr nightlies :)18:49
jambtw, do you have any plans to abort the build if the revno hasn't changed?18:49
statikjam: np, just added the others to the team as well. right now what i think will happen is the PPA will reject the upload if the version hasn't changed18:50
jamstatik: well I think 'dch' will also abort18:51
jamunless you supply the '-b' flag18:51
jamotherwise it doesn't let you supply a version string that sorts <= the current string18:51
statikin that case, moving from a plain script to a makefile would make this cleaner, so the first failed command stops things18:51
james_wset -e18:52
=== jfroy|chickenlit is now known as jfroy
statikjames_w: will that make my script stop at the first error?18:54
jamstatik: yes18:54
statikawesome18:54
james_wstatik, if you want to override it for a specific command add "|| true" at the end18:55
statikoh nice18:55
=== kiko-fud is now known as kiko
=== mark1 is now known as markh
=== mw is now known as mw|food
willyyamis there an easy setting to get bzr to add files with unicode filenames?20:10
jelmerwillyyam, it should already be able to add files with unicode names20:12
jelmerwillyyam, perhaps the file names are not valid characters within your current system encoding?20:13
willyyamvery possibly - I've got windows users putting files into a samba share20:14
willyyambzr is running on the linux side - I'll look into my LANG20:15
james_wwillyyam: bug 187267 may interest you20:16
ubottuLaunchpad bug 187267 in bzr "UnicodeDecodeError with non-ASCII character in filename" [Medium,Confirmed] https://launchpad.net/bugs/18726720:16
willyyamthe bug mentioned by james_w and ubottu seems to be on the money - my LANG is en_CA.UTF-8, which should be allright, no?20:21
willyyamis there a way to check the encoding of an individual samba share?20:21
james_wI'm not sure20:21
willyyambasically, bzr is using the ascii codec to inpret the file list - is there a way to force utf8 interpretation?20:22
willyyams/inpret/interpret20:23
willyyamtrailing characters :-)20:23
LarstiQwillyyam: setting your locale20:24
LarstiQwillyyam: at commit time it needs to be correct that is20:25
willyyammy locale is correct - en_CA.UTF-820:28
=== jakob is now known as grutte_pier
=== grutte_pier is now known as Jakob
=== Jakob is now known as grutte_pier
=== mw|food is now known as mw
jamabentley: I'm getting 404 errors with wget and bzr when trying to merge a BB patch20:48
jamAh, I might know why20:49
jamjust a sec20:49
jamnope, quoting it wasn't the solution20:49
jamah, single quoting was20:49
jamthe problem is this one: http://bundlebuggy.aaronbentley.com/request/%3C021201c90ff8$df217e30$9d647a90$@com.au%3E20:49
jamIt has "$" characters in it20:50
jamso you have to use '' around the URL. :(20:50
jamWould it be terrible to munge the URL a bit more?20:50
abentleyjam: I've been meaning to make the URLs be based on numeric ids, rather than message-ids.  With the current mechanism as a fallback.20:56
abentleyI suspect if I %encoded $, browsers would "helpfully" decode it.20:57
gotgenesI bound my bzr branch to my branch on Launchpad. It gave me some business about my format being deprecated, and to run bzr upgrade. I just ran a bzr upgrade, which failed. I moved the file backup.bzr to .bzr. Now Bazaar tells me "no repository present".20:59
gotgenesSuggestions?21:00
lifelessgotgenes: I am just leaving, but you'll probably need to give the url to people to have a look themselves21:05
lifelessgotgenes: also, I encourage you to file a Question on launchpad-code21:05
gotgeneslifeless: the problem is on my own machine, not LP21:05
pickscrapeCould it be that a different .bzr needs moving? i.e. if you're using a shared repository? Just a guess.21:06
gotgenesCould be, but I followed the directions to the t:21:07
gotgeneshttp://rafb.net/p/VEHgWf58.html21:07
gotgenesUgh, here's a better paste http://paste.pocoo.org/show/84956/21:09
pickscrapeDoes a .bzr directory exist at all?21:10
gotgenespickscrape: yes21:10
pickscrapeIf so, what's in it?21:10
pickscrapeI'm betting there's a .bzr in it21:11
gotgeneshttp://paste.pocoo.org/show/84957/21:11
pickscrapeok, I think I know what's happened21:11
gotgenesThere's a "backup.bzr" in it21:12
pickscrapemv .bzr/backup.bzr .21:12
pickscrapemv .bzr old-bzr21:12
pickscrapemv backup-bzr .bzr21:12
gotgenespickscrape: k, giving it a try21:13
gotgenespickscrape: brilliant! http://paste.pocoo.org/show/84958/21:14
pickscrapeSo when you thought you were moving the .bzr back, you were actually moving it under the failed upgrade .bzr, which needed moving away first.21:14
pickscrapexcellent!21:14
gotgenesah, well, I see now21:14
gotgenesthat makes sense21:14
gotgenesmany thanks, pickscrape!21:15
gotgenesBTW what guitars do you play?21:15
pickscrapeNo problem, glad it was so simple :)21:15
pickscrape:) I have a Les Paul Studio Lite M-III and a Charvel Model 3.21:15
gotgenesNice!21:16
gotgenesI've never played a Charvel21:16
pickscrapeThe Charvel needs new pickups and bridge though. Lovely neck though.21:16
pickscrapeDid that question stem from my nick?21:17
gotgenesMakes a huge difference if you love the neck21:17
gotgenesyes, it did21:17
pickscrapeI think you're the first person to actually get it and not think it's just plain weird :)21:17
gotgeneshaha21:17
gotgenesthat's okay, I play some, too, so I saw your SN and said, "Ah, a guitar player!"21:18
pickscrape:) I don't play anywhere near as much as I used to (and should). Just don't have time these days21:18
gotgenespickscrape: Same boat, but I still try and get in some playing every day, or at least every two.21:19
pickscrapeI'm lucky if I play every two weeks :(21:19
gotgenespickscrape: Anything's better than nothing. :-)21:21
pickscrapeTrue that21:21
jonnydeelifeless: Hi :) I'm glad to see your fix for bug 255656 has been merged into 1.7 series. Shall I change status to "Fix committed" or "Fix released"?21:24
ubottuLaunchpad bug 255656 in bzr ""bzr: ERROR: [Errno 22] Invalid argument" when "bzr pack" is executed manually or when "autopack" is triggered on a repository located on a windows network share" [Undecided,New] https://launchpad.net/bugs/25565621:24
=== kiko is now known as kiko-afk
rockstarjam, we need to make sure not to miss TWiB tomorrow.23:08
=== fta_ is now known as fta

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