/srv/irclogs.ubuntu.com/2009/09/14/#bzr.txt

pooliehello igc00:20
igchi poolie00:20
spivGood morning.01:06
lifelesshai01:09
pooliehi spiv01:15
timClickshi all, sorry for n00b q - how to I overwrite locally modified files with the trunk?01:20
RaimtimClicks: you can use bzr revert to go back to the unmodified version01:25
timClicksthanks Raim01:26
Raimor if you are talking about pulling new changes and forgetting any local changes, bzr pull --overwrite01:26
timClicksI didn't quite trust revert01:26
lifelesspoolie: quick call ?01:30
pooliehi, sure01:30
fullermdvila: py25 on this system doesn't make any difference either.01:38
Stavroshello01:45
Stavrosi pushed my repo somewhere, creating a branch, and now i want to create a workingtree there, how can i do it?01:45
Stavrosanyone? :/01:48
davidstraussStavros: Where do you want the working tree?01:48
Stavrosin the branch i pushed01:48
davidstraussStavros: Can you SSH and cd to the directory?01:48
Stavrosyes, i just need the command01:48
Stavrosbzr up stopped working for some reason01:49
davidstraussStavros: bzr up won't create a working tree01:49
fullermdup doesn't create a working tree, it just updates an existing one.01:49
davidstraussStavros: Run bzr checkout01:49
Stavrosit used to work in earlier versions01:49
Stavrosah, that's it, thanks01:49
Stavrosi kept trying revert and up, but nothing01:49
Stavrosthanks01:49
pooliespiv, how's stuff?02:12
spivpoolie: ok... I started bumping into unexpected obstacles with the homedir-relative hpss patch; I'd forgotten just how many layers there are between cmd_serve and SmartServerRequest to pass new options through.02:16
spivpoolie: so I decided I should take a look at implementing it as a transport decorator after all, as that is already passed through just fine.  But that too is hitting some obstacles; I have written a generic path filtering transport decorator but it isn't quite passing tests yet.02:17
poolieok, that sounds good02:19
pooliei wondered if that would be the case02:20
pooliespiv, i'm just thinking that many transports do abspath(arg) or similar before using paths02:20
poolieie some common filtering02:20
pooliethis seems to have some connection to wanting to do common policy on paths, but i'm not sure precisely what02:21
spivYeah, possibly.02:24
spivI hope to have more firmly formed ideas on the subject Real Soon Now...02:27
spivHmm, if a patch to add "--pdb-on-failure" to selftest dropped out of the sky right about now, I wouldn't complain...02:28
SamBspiv: heck yeah!02:28
SamBthough personally I would think it would make more sense to just make BZR_PDB=y work then too02:29
SamBbut either way would be really useful02:29
SamB... probably would have done it if I had been able to see how ...02:29
spivSamB: the problem is BZR_PDB really means something slightly different.02:39
spivSo making it do this for selftest would be a bit hackish.02:39
pooliespiv, i'd love that too02:41
pooliehigh on my list of post-2.0 wishes02:41
pooliemaybe this week02:41
pooliealso --pdb-before02:41
lifelessI think reusing BZR_PDB would be ok, really.02:50
lifelessits not that conceptually different.02:50
lifelessI will note that the 'stock' way to do it is to use debug() rather than run()02:52
lifelessand then just run under pdb02:52
lifelessI'm not convinced that this is the most elegant/appropriate way to tackle it02:52
pooliesaying "debug() rather than run()" is fine, but that's an api, not a ui02:56
lifelessyes02:56
lifelessthe theory behind the debug() approach is that you would do 'python -m pdb bzr selftest --debug'02:57
pooliedo you mean, start pdb from the python repl, then construct a test, then02:57
lifelessbut, as I say, I have doubts.02:57
poolieinteresting02:57
pooliei had no idea you could use pdb as a module02:57
poolieits docstring doesn't mention it02:57
pooliei think having a way by which other debuggers can run the right thing is highly worthwhile02:59
lifelessso the problem with debug centres around finally & cleanup code02:59
poolieoh i realized the reason all my work is unmerged, because lp was having a bad day on friday03:00
spivIdeally I think a pdb prompt for a failed test would be started before cleanups are run.03:04
lifelessspiv: yes; this depends on the precise interaction of 'finally' and 'pdb.pm', for using 'debug()' as an API to do this.03:05
lifelessspiv: which is one [but not all] of the reasons I don't like debug03:05
lifelesshttp://paste.ubuntu.com/270620/03:06
lifelessspiv: ^ enjoy.03:06
lifelesshooking into self.fail() would work too, but that has the problem that not all errors invoke fail, some raise directly.03:07
naoki_http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/index.html#getting-help03:12
naoki_s/bzr help/bzr help topics/ ?03:12
lifelessspiv: also https://code.edge.launchpad.net/~lifeless/bzr/selftest-pdb/+merge/1167303:16
pooliewhat's the pqm trunk branch?03:22
lifelesslp:pqm ?03:22
poolienaoki_, you're right, the 'list of topics' is different03:22
poolienaoki_, file a bug/03:23
naoki_OK03:23
poolieactually nm03:23
pooliei'll change it here03:23
poolielifeless: what i actually meant is, what should i put in locations.conf?03:24
lifelessoh :)03:25
pooliei think i have it now03:26
lifelessits in my docs proposal03:26
lifelesshttps://code.edge.launchpad.net/~lifeless/bzr/docs/+merge/1128403:26
lifelesssubmit_branch = http://bazaar.launchpad.net/~bzr-pqm/bzr/x.y03:27
naoki_https://bugs.launchpad.net/bzr/+bug/42915103:28
ubottuLaunchpad bug 429151 in bzr "'bzr help' in "getting help" section should be 'bzr help topics'" [Undecided,New]03:28
AfCNow that we have a stable default format, is there any need for `bzr init` to list off 21 options all relating to different formats possibilities?03:34
AfC[I thought we fixed that, but they're back]03:34
poolieafc, in its' help?03:37
poolienaoki_, https://code.edge.launchpad.net/~mbp/bzr/doc/+merge/11674 thanks for pointing it out03:37
pooliecheck that phrasing if you like03:37
spivTime for lunch.04:07
* igc lunch04:54
jamfullermd: are you sure that you're going to "write something someday" http://www.over-yonder.net/05:23
jam:)05:23
jamanyway, night all. I'm headed to bed, and then off to Canada tomorrow05:23
spivjam: Canada, eh? :)05:26
jamspiv: I think I'll be training some people, eh?05:26
jamdoes anyone know how to tell 'setup.py' that one of your extension needs the library built in a previous step?05:40
jam  libraries=['extension']05:40
jamis easy enough05:40
jambut I have to also give the path to the lib05:40
jamand the temporary directory where everything is being built doesn't seem to be on the default lib path05:41
SamB_XP_jam: I don't think you're supposed to need symbols from other modules directly; I think you're supposed to use some Python-side APIs to find the other modules?05:42
SamB_XP_the part I can't remember is how they're supposed to provide C-level APIs to other extension modules ...05:43
jamSamB_XP_: the point is that one C level api is using another C level api, and I need the .lib so that the compiler can resolve the imported symbol05:45
SamB_XP_jam: oh, you mean they're already doing that in Linux but it doesn't work in Windows ?05:45
SamB_XP_well, I think they're not supposed to do that ...05:46
jamSamB_XP_: I have 2 python extensions. I want to write a Key_New() function05:46
jamsimilar to PyTuple_New()05:46
SamB_XP_... isn't this covered in extending and embedding ?05:46
jamand I want to make use of that function in the next lib05:46
jamSamB_XP_: I can get it exported, and I can get it imported *if* I do:05:47
SamB_XP_you probably want to do something like what the numeric library does now -- whatever it's name is these days ;-)05:47
jamadd_pyrex_extension('bzrlib._btree_serializer_pyx',05:47
jam                    libraries=['_keys_type_c'])05:47
jamext_modules[-1].library_dirs.append('build/temp.win32-2.6/Release/bzrlib')05:47
jamObviously that "library_dirs" isn't going to be a stable path05:47
jamI haven't yet found out how to find that path properly05:48
jamhence the questions here05:48
jamScons, for instance, when you create a build node, you can pass that to the next build node05:48
SamB_XP_jam: I really, really don't think you're supposed to directly link extension modules like that ...05:48
jamto make it a dependency, and it has attributes like "this is where my lib is built"05:48
jamSamB_XP_: Not much different from linking python26.lib to get the functions from python26.dll05:49
jamit is just another dll05:49
jamjust named .pyd (or .so)05:49
spivSamB_XP_: but consider the case of a plain C lib that is shared between multiple Python C modules05:49
spivSamB_XP_: which is certainly valid, and I think would encounter the same issue?05:50
jamspiv: though you have some potential issue if/when 'import' is triggered05:50
jamanyway05:50
jamas near as I can tell05:50
jamdistutils has no concept of 'dependencies'05:50
jamwell, I found this from 2004: http://osdir.com/ml/python.distutils.devel/2004-02/msg00116.html05:51
jamwhere they were talking about adding it05:51
lifelessjam: this is to build an extension that build-deps on another extension?05:51
jamlifeless: yeah, and links to it05:51
SamB_XP_jam: http://docs.python.org/extending/extending.html#providing-a-c-api-for-an-extension-module05:51
lifelessspiv: does my selftest-pdb gelp you?05:51
SamB_XP_jam: that's the officially sanctioned approach05:52
SamB_XP_dumb as it may seem05:52
spivlifeless: not yet, as I dealt with my immediate issue the old-fashioned way (import pdb; pdb.set_trace()) and haven't needed that again today.05:52
bialixigc: https://launchpad.net/bzr-explorer/trunk/0.8/05:54
jamSamB_XP_: that is so... very... awful05:55
SamB_XP_jam: so's the (\forall OS, dynamic linking) story05:56
jamSo couldn't you just store it in PyCFunction, and then get the raw pointer out of that?05:57
igcbialix: awesome, thanks.05:57
bialix:-)05:58
bialixwhat about bzr installer?05:58
bialixigc: ^05:58
igcbialix: I've merged your stuff to trunk and patched in explorer 0.805:58
igcbialix: I'm trying to build it now on my vista VM05:59
bialixigc: I hope you re-enabled TBZR05:59
lifelessjam: this is what pyd files do, I thought05:59
lifelessjam: the pyrex header stuff05:59
igcbialix: I will but I haven't yet05:59
bialixigc: ok05:59
bialixigc: English messages is OK?05:59
jamlifeless: pyd files are just a .dll named differently (for windows)05:59
igcbialix: likewise I need to put back the other installers according to jam's email05:59
jamah, you mean pyrex pyd files05:59
lifelessjam: yes :)05:59
jamI haven't specifically played with them06:00
bialixigc: do you mean build all installers from your project?06:00
jamand there is also .pxi, IIRC06:00
jamor something like that, pyxi? pyi?06:00
bialixigc: it will be non-trivial06:01
bialixigc: also I was forced to disable your settings to use mingw06:02
igcbialix: we *might* be able to build the other installers from 2.0.0 trunk - dunno06:02
bialixigc: I believe you can set such settings in distutils.cfg06:02
igcbialix: I'm still learning how all this stuff hangs together06:02
bialixigc: it hangs together very badly06:02
SamB_XP_bialix: that's probably why he's still learning ;-p06:03
igcbialix: it's challenging that's for sure06:03
bialixSamB_XP_: no06:03
SamB_XP_if it hung together well, it probably would be a breeze to learn ;-P06:04
igcbialix: it will be good as we gradually reduce the dependences, etc.06:04
bialixigc: it won't help much06:05
bialixigc: removing cog is just a tiny change06:05
igcbialix: right. But I'd like other clean-ups as well so build-installer.bat was python say.06:06
bialixigc: be back online after 2-3 hours06:06
igcbialix: then we can perhaps use it for os x, etc.06:06
bialixigc: unlikely06:06
* bialix bbl06:07
igcbye06:07
lifelessjam: is this for meliae?06:11
lifelessI'd look at pyrex's interface stuff06:12
fullermdjam: :P   Someday encompasses a lot   :p06:16
* fullermd boggles.06:30
fullermdSelftest is using 120 threads?  That CAN'T be right, can it?06:30
lifelessfullermd: if they aren't getting gc'd06:31
fullermdWell, it's on 9222/22518, and it's been running for almost 5 hours.06:31
fullermdIt's eating a hundred thousand context switches a second, so it's actually getting about 3% of the CPU.  I'm thinking something's not quite right.06:32
lifelessthat would be the GIL06:32
fullermdAnd it's spit a giant pile of "Can't assign requrest address" from various per_transport tests.  Related?06:32
lifelessyes06:32
lifelessserver threads not winding up properly.06:33
fullermdSo those errors are symptom, not cause?06:33
lifelessreported as 'selftest hanging on windows' I think, but not debugged/pinned down06:33
lifelessyes, i think they are a symptom06:33
fullermdIs there something I can try now while it's running to get info about the cause, or should I just murderlize it?06:34
lifelessgdb06:34
lifelessget a pystack in some of the threads06:34
fullermd'cuz I ain't letting my server sit on its knees for another 7 hours to finish...06:34
fullermd'k...   I'll look into that after I finish lunch.06:35
jmlhow big is the bzr 2a repo?06:35
lifeless30MB06:36
jmlthanks.06:37
fullermdYou have a handy ref on doing that?  I've never used gdb with python.06:38
lifelesshttp://wiki.python.org/moin/DebuggingWithGdb06:38
fullermdMmm.  Would pdb be easier?  It would take a little doing to get a debug symbol'd python...06:39
fullermd(that matches the running one)06:39
lifelessyou could try ctrl-\ and debug06:39
lifelessno guarantees that it will do anything sensible with other threads.06:40
lifelesspdb is rather more capable ;)06:40
lifelesssorry06:40
lifelessgdb is ...06:40
vilafullermd: not fully awake yet, but first thing *I* would try is: '--parallel=fork' which is known to work around the thread issue (see gentoo)... (be back after coffee)06:41
fullermdWell, _fixing_ it would work around the thread issue too   :p06:41
fullermd's I can help in that direction...06:41
fullermd'k, running just -s per_transport.TransportTests seems to be doing the same thing; every HttpServer_urllib test spits the error, and the thread count is climbing.06:42
fullermdSo I guess it's easy to reproduce in this instance.06:42
lifelessvila: We should fix this06:43
fullermdHow odd.  It gets the error calling socket.shutdown()?!06:43
lifelessfullermd: don't worry about working around; try to get to the bottom of it.06:43
fullermdWhat a bizarre place to get a Can't assign error.06:43
vilalifeless: the bottom of it is to call transport.close()  :-) Pending that, it's to properly shutdown (as you pointed in some bug)06:44
vilafullermd: what error in shutdown() ?06:44
lifelessvila: I don't agree vis-a-vis close()06:44
vilalifeless: let's talk about it (but let me have a coffee and a shower first :)06:45
fullermdvila: http://paste.ubuntu.com/270691/  is what the tracebacks look like on the failed tests when I ^C.06:45
vilafullermd: 8-) That's when I realize I'm dreaming...06:46
* vila won't be back before 2 coffees now06:47
fullermdOh my god, the best thing I can dream of now is not just bzr selftest, but bzr selftest _FAILING_?!06:47
* fullermd . o O ( Down, then across... )06:47
=== beuno-on-vacatio is now known as beuni
=== beuni is now known as beuno
lifelessvila: if t.close() is needed, production servers will leak resources.07:11
vilalifeless: I agree. t.close() and s.shutdown() are both valid ways to fix the issue. I'd like to try *both* separately once I'm able to reproduce the problem reliably (I'm there on gentoo). But s.shutdown() is to be prefered, yes. Nevertheless t.close() is needed in other contexts (or if not strictly needed is the most natural to use, pullers were involved in the two cases my memory brings back)07:15
poolielifeless: still here?07:15
pooliecan you explain to me what you mean by using debug() for debug support in selftest?07:16
pooliehi vila07:16
vilahello poolie07:16
vilafullermd: so, just to be sure, I understand your context correctly: 1) You now have brz.dev in 2a format, 2) you're running python-2.5, 3) You're experiencing thread leaks,07:19
vilafullermd: what about the revision not found errors then ?07:20
fullermdThis is separate from that.07:20
vilafullermd: but 1 & 2 are correct, right ?07:20
fullermdI get the RevNotFound with 2.5 and 2.6 on my workstation (8/amd64).  Trying to see what I get on my server (7/i386/py25) that I'm seeing the thread leak stuff.07:20
fullermd(on both bzr.dev and installed 1.18)07:20
fullermdIt only got partway through the test suite on the server due to that problem, but I haven't seen any RNF's there _yet_.  And at 9k and change, I'm pretty sure I would have if they were coming up with near the same frequency.07:21
* fullermd is working on a debug build of python at the moment to see if anything pops out of that.07:22
vilafullermd: hmm, well, the thread leaks generally make a lot of noise but most importantly make the tests fail early, so once you start getting one such error, most of the subsequent ones are 100% noise07:22
fullermdYah.  But my backscroll has none of the RNF's.  I'm pretty sure I saw then in the first thousand at least on my workstation.07:23
fullermdNow, there's two variables there; 7.x vs 8.x, and i386 vs amd64.  But you're running 7.x/amd64 and not seeing them, right?07:24
fullermdSo that suggests 7/8 is the culprit.07:24
vila7/amd64 yes (in a VM but hopefully that's unrelated)07:25
fullermdHopefully.07:25
vilafullermd: checking again, you built the C extensions right ?07:25
fullermdIt's a working theory anyway.07:25
fullermdYah.07:25
fullermdOK, there's a debug build...07:26
vilaso we need at least some test names to start searching further07:26
fullermdEasy peasy.07:27
fullermdActually, I don't think the list has much changed since previous runs...07:27
vilajust thinking aloud :)07:27
fullermdBut there's a copy just in case you're too far from your mail quota   :p07:28
fullermdAs a guess, I'd say that EVERY problem there is the same thign.07:28
vilamy mail quota is my local disk available space :)07:28
fullermdThe 82 ERROR's that got sorted together obviously are.07:28
fullermdBut the other 9 FAIL's seem like they could actually be the same thing, expressed differently.07:28
fullermd(e.g., all the test_statistics, that got 0 revs instead of 3, the 2 unreferenced texts instead of 0...  all sound like they could be the result of the same 'revisions going off into lala land' problem)07:29
fullermdWhich sadly, suggests it may not be as simple as a broken test or two, but may be a real problem   :|07:30
fullermdThough I should note that I've NEVER seen revisions disappear in _using_ bzr.07:30
fullermdNow, let's see how this gdb stuff woiks...07:32
fullermdlifeless: OK, what am I...     Urg.07:36
fullermdpystack on a thread hanging around from an error throws gdb into a tight loop.  Loverly.07:37
fullermdbialix: Hey there.  Quit pinging me and running off before I can reply 6 hours later   :p07:37
bialixfullermd: ok07:37
bialixfullermd: my hosting admins are unable to install bzr correctly07:38
vilabialix: +1 on that, it would be nice if you could find a way to be more reliably pingable on IRC :-/07:38
bialixafter 3 mails from me about wrong chmod bits they finally fixed problem07:38
vilabialix: hi by the way :)07:38
bialixvila: bonjour07:38
bialixvila: it was joke?07:38
bialixfullermd: what is the right way to install bzr on BSD?07:39
fullermdFrom the port?  Just like any other port.07:39
fullermdWhat chmod issues were cropping up?07:39
vilabialix: like fullermd I often wish I can ping you, but since you're not always online, it makes rather hard to reach you that way, and sometimes writing a mail is not appropriate ,nothing serious, just wanted to echo fullermd's feeling07:40
bialixfullermd: they install bzr only for root. my account even can't read bzrlib modules. therefore I've got consistent ImportError07:40
bialixvila: you can ping me and hope that I'll read irclogs07:40
bialixvila: or use gtalk07:40
vilabialix: haaaa, I see07:40
fullermdMmm.  You mean the .py{,c,o} files are 600 or something?  What about the 'bzr' script itself?07:41
bialixfullermd: yeah, something like that07:41
bialixfirst time (2 years ago everything was nice)07:41
fullermdPorts assumes that root means what they say with their umask, so if they have it set to 077 or something, and bzr's build doesn't explicitly override it, you could end up with that result.07:41
bialixfullermd: yes, admin told something about umask07:42
fullermd(bzr would hardly be the only thing affected by that; lots of ports will do what they _say_ rather than what they may think they _mean_ in that situation)07:42
fullermdIt does give warnings when you build/install with restrictive umasks, but if you're not watching the build, it's fairly easy to miss.07:43
bialixit seems so07:43
bialixso next time I'll asking about upgrade of bzr I need to tell them: "remember about umask"07:43
bialixfullermd: heh, ok. thanks07:44
fullermdYeah.  They really should remember about that all around; lots of things meant to be run by non-root will be screwy in that case.07:44
* bialix stopped ping fullermd for next 6 months or so07:44
fullermdOf course, you'd never notice with something like apache or a MTA or such, since they DO get run by root, but...   heck, _python_ could be seriously impacted, unless it overrules umask.07:45
fullermd(that would be 2 wrongs making a right, I guess   :p)07:45
bialix:-)07:45
* igc out for a bit07:46
bialixvila: I really have no idea how to solve this ping problem07:46
vilabialix: stay connected ?07:46
bialixubottu: can you work as irc postmaster?07:46
ubottuError: I am only a bot, please don't think I'm intelligent :)07:46
bialixvila: no way for work computer07:47
vilabialix: end of discussion :-D07:47
fullermdfreenode has a MemoServ.  But that's probably more trouble than email.07:47
bialixvila: and even if I'll let my home laptop working 24/7 it won't help me while I'm at work07:47
fullermdSure it will, that's what screen is for   :p07:47
* bialix run away screaming07:48
vilayeah or any other irc proxy (not that I used one myself, but I understand that's one of their duties)07:48
bialixirclogs.ubuntu.com btw has dealy around 2-3 hours07:48
bialixso it's not very reliable07:48
vilayeah, that makes quite a high latency :-/07:48
bialix*delay07:48
fullermdAnyway, nothing jumps out at me from screwing with gdb here.  So I'll shelve that for now.07:49
* bialix hides07:49
vilafullermd: so I can work on the leak issue from gentoo, but the RNF are out of reach until I setup an 8/amd64...07:51
fullermdYeah.  Wonder what triggers that leak.07:52
fullermdNever happened on my workstation, but is reliable on server.  And the server isn't setup much different from your VM.  Wacky.07:52
fullermdWell, i386/amd64 I guess, but that hardly seems a likely culprit.07:54
fullermdPerhaps academic now, but re: your setting up 25 and 26; that would be...  well, possible, but you don't wanna try it.  Lots of manual frobbery needed there.07:57
fullermd(though why you wouldn't just want to go 2.6...   :p)07:57
beunopoolie, hi08:04
pooliehi!08:04
poolieand bye, unfortunately08:04
beunopoolie, :)   I'll catch up on the website emails then08:05
pooliewelcome back btw08:06
pooliewere you on holidays?08:06
vilafullermd: I suspect you have a different  *limit* for the threads, we're leaking reliably almost everywhere, we're just rarely caught doing that :-D08:06
fullermdI'm not explicitly setting one.  And wouldn't I get those address assignment errors whether or not it was hitting a limit?08:07
vilafullermd: What are the steps to upgrade from 7.2 to 8 ? I should be able to clone my VM to start a 8 one08:07
fullermd(I mean, I only have 2 threads when first I get one...)08:07
fullermdvila: Basically, checkout the source, build and install.08:07
fullermdYou could grab an ISO or such for ...  BETA4 I think is the latest?  if you wanted to go the binary way.08:08
vilaok, let me prepare things first (if you expect to still be online for a bit that is)08:08
vilahmm, I don't know which one will be the shortest...08:08
fullermdOh, yes.  I've got coffee, and I'm settling down for an afternoon of working.08:09
fullermdThe build will probably be shortest in time you have to pay attention to it, though it'll presumably take longer in a VM than on bare iron.08:09
vilamay be worth starting again though08:09
vilahttp://lists.freebsd.org/pipermail/freebsd-stable/2009-September/051801.html sounds full of good advices for upgrading no ?08:15
spivHmm, I think have a reasonable implementation of /~/ (and /~user/) expansion for bzr serve now.08:15
vilaspiv: good to hear !08:16
fullermdvila: Could work.  I've never used freebsd-update(8), so I don't know what (if any) hitches or tricks there might be in it.08:17
fullermdspiv: beer++!08:17
=== Pilky_ is now known as Pilky
vilafullermd: is that a "good for me"/"good for noobs" dichotomy which shouldn't discourage me to try ? :)08:18
fullermdWell, freebsd-update is basically a tool for binary updates between releases.  It requires that you're using the distributed binary bits, since it uses bindiffs.08:18
fullermdBeing as I never run releases, and always have locally compiled stuff, it's just not applicable to me   :p08:19
fullermdOTOH, I have faith in the authors and maintainers, and have no reason to disbelieve that, in those cases, it works as advertised.08:19
vilaright, but since I installed from a 7.2 ISO and didn't update (as far as I recall) I should be able to just follow that right ?08:20
fullermdJust that I have faith that all software has gotchas somewhere, and I don't know where they might be in f-u.08:20
fullermdYah.08:20
vilaSo I\ll try that first, if that fails, I'll went the checkout/build/install route :)08:20
fullermdSounds like a plan.  What's the worst that could happ*SLAP*08:26
vilafullermd: :-D Nothing, one more broken VM is not a big deal :)08:33
vilafullermd: Does this look reasonable (y/n)?08:46
vilafullermd: gee, yes, I guess :-D08:46
* fullermd is always tempted to see what 'n' does to questions like that :p08:49
=== spiv_ is now known as spiv
* igc dinner09:50
Stavroshello11:11
fullermdNo, you say _goodbye_.  _I_ say hello.11:11
SamB_XP_fullermd: why's that ?11:14
fullermdI dunno.  John Lennon made me do it.11:15
SamB_XP_in soviet russia, hello says you11:18
awilkinsjelmer: "Unexpected keyword argument '_override_hook_source_branch'" ; does this ring a bell?11:20
awilkinsjelmer: A colleague is getting this trying to push a revision to an SVN repository11:21
SamB_XP_awilkins: would there happen to be a file and line attached to the error ?11:22
awilkinsSamB: I've got a trace coming to me ; http://pastebin.ubuntu.com/270796/11:23
* SamB_XP_ curses bzr for not using cgitb...11:26
awilkinsIt did it with both 1.16 and 1.18-111:30
awilkinsI'm suspicious11:30
SamB_XP_of what ?11:31
SamB_XP_... anyway, there sure doesn't seem to be a bug for that ...11:34
awilkinsOk, it happens for lightweight checkouts but not heavies11:53
awilkinsLooks like a path in the code that the test suite must pass over11:54
SamBawilkins: lightweight checkouts of SVN repositories themselves ?11:54
SamBthat sounds like a phenominally bad idea ;-)11:54
awilkinsLightweight checkout of a branch mirrored from an SVN repo11:54
SamBoh11:54
SamBI do that all the time on Linux ...11:54
awilkinsI don't think it's necessarily linked to bzr-svn11:54
SamBwell, I think it's highly likely that bzr-svn is at least triggering it11:55
awilkinsThe bug is line 2468 of remote.py (in 1.18 at least)11:55
SamBbecause it looked like at least 90% of tracebacks with that keyword argument in them were in bugs filed against bzr-svn11:55
awilkinsIf bzr-svn is exercising the API in a legitimate way there should be a unit test that's doing the same thing11:56
SamBwhen I say "triggering", I just doing what it should, but triggering a bug in bzr itself ;-)11:56
SamByeah, true11:56
SamBor a similar sort of thing11:57
SamBis that method supposed to accept any keyword arguments whatsoever ?11:57
fmi have a bzr-pipeline. now i want to create a patch for every pipe, how is it done.11:58
fm?11:58
SamBfm: does bzr-pipeline have no docs???11:58
fmi cannot find docs about how to generate a patch series ....11:59
fmthere are neither docs how to reorder the pipes in the pipeline ...12:00
jelmerawilkins: please file a bug12:01
=== beuno is now known as beuno-lunch
SamBfm: you checked http://bazaar-vcs.org/BzrPipeline ?12:03
SamBthat's what launchpad has for the homepage of bzr-pipeline12:03
SamBfm: anyway, if you can't see how to do something even after reading all the docs you can find for bzr-pipeline using `bzr help' *and* reading the wiki page, go ahead and file a bug12:05
fmSamB: i have read http://bazaar-vcs.org/BzrPipeline#id3 but they do it manually. i am looking for a command bzr export-pipes which creates a patch for every part of the pipe. i thought that was the use case of bzr-pipeline?12:06
fmshould i file a feature request for that, or do i miss something?12:07
SamBfm: feel free to file a bug about that too ;-)12:07
SamBgo ahead12:07
fmbzr help pipeline does not help alot ...12:07
SamBwell, if it's thare and help pipeline doesn't help you find it, that's also a problem12:07
SamBso yeah, go ahead and file a bug about how you expect such a command and can't find it12:08
jamlifeless: actually it is for bzr, so that I can have a "Key" type, and have btree_serializer create them directly. It is 738ms => 720ms for 'bzr log -n0 -r-1' if you build a tuple to pass it to Keys.__init__ versus using Key_New() and then setting the values.12:09
SamBjam: that doesn't sound like much of a difference12:15
fmhttps://bugs.launchpad.net/bzr-pipeline/+bug/429301 SamB12:23
ubottuLaunchpad bug 429301 in bzr-pipeline "export pipeline as a series of patches" [Undecided,New]12:23
=== beuno-lunch is now known as beuno
=== mrevell is now known as mrevell-lunch
=== Pilky_ is now known as Pilky
=== james_w` is now known as james_w
bialixSamB: be careful when talking about soviet russia. somebody watching you14:06
jelmerbialix: :-)14:08
fullermdIn Soviet Russia, you watching SOMEBOD...   wait, that doesn't quite work...14:08
bialixjelmer: hi, sorry, have no chance to run git tests fro you yet14:09
bialixfor you14:09
jelmerbialix: np14:09
jelmerare you subscribed to the windows bugreport for bzr-git by any chance?14:10
jelmerThere were some folks commenting on it the other day14:10
bialixjelmer: subscribed to windows bugreports? how it's possible?14:11
bialixIIUC lp allows me subscribe to all project bugmails, but it's not intelligent enough to distinguish between OS bugs14:12
jelmerbialix: one particular bug report I mean14:12
bialixerr, I think no, but I'd like to14:13
bialixwhich one?14:13
jelmerbug 38212514:14
ubottuLaunchpad bug 382125 in bzr-git "Can't branch from remote repository on Windows" [Undecided,New] https://launchpad.net/bugs/38212514:14
bialixjelmer: if you think I will be interested in particular bug report you can subscribe me freely. I know how to unsubscribe if I found that bug unrelated to me14:14
* bialix looking14:14
bialixI saw it other day but not yet was subcribed. Now subscribed14:15
bialixjelmer: as comments say it's wrong approach to open memory-mapped file in w mode14:15
bialixjelmer: actually you can't14:15
bialixon Windows14:15
bialixonly r+14:16
bialixyou even can't memory map the file of 0 length14:16
jelmerbialix: Thanks, I'll do that in the future14:18
jelmerbialix: Sucks that memory mapping is readonly :-/14:18
jelmerso I guess we'll just have to read manually14:18
bialixjelmer: perhaps I'm not quite understand your intent14:18
bialixjelmer: python documentation on mmap module has many special remarks re Windows behavior14:21
jelmerbialix: yeah, I guess I should have a look at that14:21
jelmerwe mostly use it to read packs so I guess we should be able to solve this pretty easily14:21
bialixclearly RTFM case14:21
sidneijelmer, bialix: nowhere in the python documentation it mentions that mmap is read-only on windows14:21
bialixjelmer: well, in this case it seems so14:22
bialix[16:18]<jelmer>bialix: Sucks that memory mapping is readonly :-/14:22
bialixI'm not sure what jelmer means when he said "that"14:22
bialixsidnei: hi, btw14:22
sidneibialix: hi! :_14:23
sidnei:)14:23
jelmerbialix: sorry, I think I must've misunderstood14:23
jelmerbialix: you're saying that there can only be one person with a file opened for mmap write access at the time?14:23
bialixsidnei: after some experience with buildout for main bzr installer I wonder how to build smaller one to package just bzr-svn into installer :-D14:24
bialixjelmer: no, I don't say so14:24
sidneibialix: yeah, should be possible. i wish i had time to dedicate to this :(14:25
jelmerbialix: hmm, not sure I follow then. I guess I'll read the docs first :-)14:25
bialixjelmer: bug 382125 said about error while trying to open the mmaped file in "w" mode14:25
ubottuLaunchpad bug 382125 in bzr-git "Can't branch from remote repository on Windows" [Undecided,New] https://launchpad.net/bugs/38212514:25
bialixjelmer: J really have to look at your sources first14:26
bialixjelmer: but if your intent is read and write in the same file via mmap, then you can achieve this, but initially you should open the file in r+ mode14:27
bialixsidnei: yep :-(14:27
sidneii suspect the problem is that you can't open the same file for writing on windows twice (through the standard python api, you can open it in shared mode through pywin32), period. nothing to do with mmap?14:27
bialixsidnei: I suspect jelmer don't need to open the same file twice, because it's inprocess stuff, not IPC14:31
jelmerI suspect we're accidently opening the same file twice14:31
=== mrevell-lunch is now known as mrevell
bialixjelmer: lp:dulwich branch has very strange fomat: unnamed14:48
bialixjelmer: can you upgrade it to 2a14:48
bialix?14:48
fullermdYou sure it's not?  lp:anything is unnamed when you're logged in, since it's the smart server remote fake format.14:49
bialixfullermd: I've just branching it14:49
bialixand have 2a repo + branch 614:49
bialixlocally14:50
fullermdOh.  What's branch7?  Stacking?14:50
fullermd(except not, since you can stack on branch6, right?  Don't quite understand that...)14:51
bialixfullermd: you can see full info -v output here: https://bugs.launchpad.net/bzr-git/+bug/42939414:52
ubottuLaunchpad bug 429394 in bzr-git "If git plugin installed without dulwich it blocks usual bzr operations with bzr trees" [Undecided,New]14:52
bialixfullermd: do you remember which format supports views?14:52
fullermdDo views actually really work?14:53
fullermdI think it was side by side with content filtering anyway, so that would be wt5 or whatever it is in 1.14+.14:54
bialixI dunno, but I'd like use it14:54
bialixoh14:54
bialixjelmer: what's the strange combination in lp:dulwich: repo 2a, branch 6, wt 714:54
bialixbzr.dev in 2a has: repo 2a, branch 7, wt 414:55
fullermdI've got wt6 in my 2a bzr.dev.14:55
bialixerr dulwich: repo 2a, branch 6, wt 614:55
bialixfullermd: really?14:55
fullermdThe 2a rollup is 2a-rep/br7/wt614:55
bialixso it's 1.18 issue14:55
bialixfiling a bug is useless, core devs stopped support 1.18 already14:56
fullermd1.18 creates the same thing...14:56
fullermdThat's what the 2a rollup has always meant, I'm pretty sure.14:56
bialixfullermd: not for me14:56
fullermdOh, maybe it's different on Windows?14:57
* bialix branching lp:bzr again from scratch w/o shared repo14:57
bialixfullermd: do you think it's a joke?14:57
fullermdI dunno.  Wasn't Windows using a different WT format by default for a while?14:57
bialixnever heard this14:58
bialixAFAIC it's contradict to default policy of bzr.devs14:58
fullermdThe format registry for 2a lists Rep2a/Branch7/WT6, ans has since the revision that created the 2a format (4428.2.1)14:59
* bialix still branching15:03
fullermdNow, I can see how you might end up with WT4 using 1.18 to branch bzr.dev...15:04
fullermd(since there's no WT format on remote sides to copy, it'll just use the default, which in 1.18 is still pack-0.92, which uses WT4)15:04
fullermdBut that should show as unnamed, not 2a for the rollup name.15:05
bialixfullermd: it seems so15:09
bialixI've just finished to branch lp:bzr and again have: repo 2a, branch 7, wt 415:10
bialixdamned zoo of formats15:10
fullermdIf you upgrade --2a it you should get wt6 though.15:10
fullermd(or if you'd used 2.x+ to do the branch)15:11
bialixyes, after upgrade to --2a I've got wt 615:11
bialixreally really weird15:11
bialixI think I'll file a bug to see what core devs might say15:12
vilabialix: making 2a the new default is a significant step *away* from the zoo... you have good reasons for not taking that into account, but accept the consequences too then :D15:12
bialixvila: it's inconsistent15:12
vilafile the bug anyway, 'unnamed' is never good15:13
fullermdThe problem is that there're two behaviors here, and neither of them is (by current concensus) strictly a bug.15:13
bialixdo you really think the behavior I see is good?15:13
vilabialix: ^15:13
vilabseeing 'unnamed' is *never* good15:13
fullermdThe first is that branch'ing from remote creates the local WT in the default WT format for that release, since WT's that are remote don't exist to bzr, so it has no format to copy.15:13
bialixgetting inconsistent 2a branch is a bug for me15:14
fullermdAnd the second is that the 3 (or 4, I guess) formats are independent.15:14
fullermdSo as far as 1.18 is concerned, wt4 _is_ the proper WT format when you haven't requested anything else.15:15
fullermd(since that's what it's config'd to create)15:16
bialixI think it's a bug https://bugs.launchpad.net/bzr/+bug/29255315:21
ubottuLaunchpad bug 292553 in bzr "Format "unnamed" when creating "default" branches in newer repository formats" [Medium,Triaged]15:21
bialixvila: I understand that nobody will work on this bug because default policy is to use bzr 2.0+15:23
fullermdWell, it's more that nobody will work on it because what should be done is awful unclear.15:23
bialixvila: but from theoretical POV: is it possible to bzr doing the RIGHT thing? looking at formats registry, found matched combination of repo/branch formats and determine default wt format?15:24
fullermdNone of the 3 formats is dependent on the others, so you can't guess what the WT format 'should' be based on the repo and branch format you see.15:24
bialixfullermd: there is registry of formats15:24
bialixfullermd: if you see repo 2a and branch 7 it's natural to expect this is 2a branch?15:24
fullermdNot necessarily.  If you see a knit repo and a branch5, what wt format do you create?15:25
bialixwt is special for treeless central repos, so bzr can be more smart about detecting the right format, rather than using defqult one15:25
bialixfullermd: I dunno?15:25
bialixbut maybe bzr devs care to provide special registry then?15:26
bialixto lookup default wt format based on repo+branch combination?15:26
fullermdThe point is, nobody can know.  It could be wt3 OR wt4.  Both are defined with that branch/repo combination.15:26
bialixyou really talk about ancient things15:27
fullermdAnd there's no reason to believe the 'right' answer isn't wt7 for that branch either, just because you don't have a defined rollup format for it.15:27
bialixI'm talking about new things15:27
bialixurgh15:27
fullermdThere's no rule that multiple WT formats for given repo/branch combinations are only historical.15:27
bialixI don't care15:28
bialixI wanna have consistent 2a branch after branching lp:bzr15:28
bialixI can't15:28
fullermd1.9 and 1.14 both use pack6 and branc7, but they have different WT formats.15:28
bialixbzr is broken then15:28
bialixI hate it15:28
fullermdWho cares?  The WT works just fine.15:28
bialix1.14 never was in favor15:28
bialixit was experimental thing nobody really used15:28
vilanot at all, it wasn't providing the same benefits to all cases so it was promoted mostly where it was15:29
fullermdEverybody's [will be] using it, since it's contained in the 2a WT format.15:29
vilabut 2.0 was already worked on anyway so there was little incentive is pushing everybody to upgrade to 1.1415:30
bialixzoo of formats zoo of formats zoo of formats15:30
vilas/2.0/2a/15:30
fullermdThe repo and branch formats, taken in combination, tell you nothing about what the WT "should be", if that's even a meaningful question in the first place.15:30
bialixwhy not create all possible permutations then?15:30
fullermdFor me, I think the rollup format name is the problem in the first place.15:30
* bialix reallyhave to shut up15:31
vilayeah sure, you can repeat that ad nauseam, we are working to get out of that anyway15:31
fullermdI think it just causes way more trouble than it saves.15:31
vilafullermd: I agree. It should be fixed nevertheless.15:33
vila(including replacing it by several parts if needed)15:33
fullermdWell, that just opens the question of "what's the fix"; if the problem is "'unnamed' is alarming", then just not showing a rollup line is a fix   :p15:34
vilanot sure we can get two votes on that one :-D15:34
bialixis not this simply hides the problem deeper?15:36
fullermdA matter of perspective.15:37
bialixif wt7 is filter-aware format and you expect to have proper filtering and...15:37
bialixnaoki_: hi16:03
naoki_hi16:03
bialixnaoki_: small proposal re tbzr16:04
naoki_what's?16:05
bialixwill be nice if you will update version info after some changes you made16:05
bialixso each bzr-X.Y.Z-setup build will be with more or less unique tbzr version16:05
bialixhaving 0.2 still while you doing many improvements does not sound right16:05
bialixat least it was my impression looking at recent bug reports16:06
naoki_I see.16:06
naoki_After releasing 2.0, version compatibility is more problem.16:07
bialixit will be much simpler to check bug reports16:07
bialixwhat do you mean?16:07
naoki_TortoiseBZR have released with newest bzr.16:08
naoki_There are no like 1.13.5 after 1.14 released.16:08
bialixI don't quite understand16:09
naoki_But after 2.0, 2.0.5 can released after 2.1 released.16:09
bialixthis is not problem per se16:09
bialixhaving 2 branches: one for stable 2.0.x and other for trunk16:09
naoki_So, TortoiseBZR should define compatible bzr version like other plugins.16:09
bialixsomething like that will be nice, yes16:10
bialixbut TBZR is not plugin16:10
bialixso you need to show the error message in different (GUI) way16:10
naoki_Yes, but relying to bzr api.16:10
bialixand unless TBZR can be build separately of bzr.exe, it's not a problem16:10
naoki_hmm.16:11
bialixigc has started separate windows-installer project, so you can stick specific tbzr version to specific bzr release16:11
naoki_So, I can use simple version number for TBZR.16:11
bialixanything that will work for you is good16:12
naoki_OK.16:12
naoki_I'll branch and tag 0.216:13
bialixthis is just suggestion based on my qbzr release manager experience16:13
bialixversion numbers is just numbers16:13
bialixthey are needed solely to distinguish between them16:13
bialixno more no less16:14
bialixversion numbers like 1.0 and 2.0 is more than numbers16:14
bialixthey are MESSAGE to the worls16:14
bialixworld16:14
naoki_Yes, people feels "1.0" is stable.16:15
naoki_I have not done some operation on Launchpad, like series, release, etc...16:21
naoki_Now I tagging release-0.2.0 and push.16:22
naoki_It will compatible with bzr-1.18, 2.0, and qbzr-1.1416:22
bialixit's ok16:23
bialixjust mention these dependencies in README or somewhere16:24
bialixhave to go. bye all16:24
igcnight all16:25
naoki_good night16:25
=== deryck is now known as deryck[lunch]
=== deryck[lunch] is now known as deryck
bialixgood evening18:51
bialixI want to ask about mainline idea18:51
bialixanybody knows where from it comes? originates?18:51
=== davidstrauss_ is now known as davidstrauss
malibuHi there...19:07
malibuuse bzr break-lock chroot-19383696:///r/repo/bzr/work/.bzr/branch/lock19:07
malibu"19:07
malibuwhen I do this, I get invalid protocol for chroot-1938369619:08
malibuWhen I go to the root of my repo and just do 'bzr break-lock', it hangs19:08
malibuIs there a way for me to just go into the repo and manually clear the lock?  I have full access to it19:08
bialixchroot-xxx is temp protocol for bzr+ssh19:14
bialixuse bzr break-lock url19:14
bialixit should not hang19:15
fullermdbialix: I would guess at least some of it comes from arch.19:15
bialixbut it asked you about confirmation: y/N19:15
bialixfullermd: I'm not familiar with arch19:15
bialixfullermd: do you have any docs/links?19:16
fullermd(not that I have more than a passing knowledge of it myself, but AIUI it did have some level of similar dichotomy between 'happened here' and 'grabbed from elsewhere')19:16
fullermdNo, just a general sense from some reading way back when and mentions of it since.19:17
bialixis it correct if I assume mainline is like trunk in svn when UQDS used?19:17
fullermdYour best bet may be to corner poolie and see how much was planned or emergent.19:17
bialixfullermd: mainline in your country is more like man railroad or high way?19:18
bialixs/man/main/19:18
bialixhmm19:18
fullermdI don't really think of it as either; without context it just strikes me kinda abstractly...19:18
bialixpoolie maybe will be good person for this question, but he's in oz time :-/19:19
LarstiQI'm not sure where the thinking that mainline is imported came from19:19
bialixfullermd: ok, can you provide me some expressions with this word, please?19:19
LarstiQimportant19:19
bialixLarstiQ, fullermd: I'm writing article about mainline concept in bzr and its impact on daily work19:20
bialixI want to provide some simple explanation19:21
fullermdI'm not sure.  I don't think of it as a strong analogy to some other thing; just the hazy concept of a privileged path compared to others...19:21
bialixin Russian I've translated mainline as main branch or main development line19:21
bialixas line of revisions19:21
fullermdNow, my understanding of how it applies in bzr in particular and version control in general, and why it's important and useful, didn't come from any docs I read or discussions I saw, AFAICT.  It just sort of built itself up from fiddling.19:21
malibubialix: Do I use the url to the actual file, or just to the root of my repo?19:22
bialixmalibu: root of branch or repo19:22
LarstiQmalibu: to your branch19:22
malibuok..19:22
fullermdYeah, there's some ambiguity there; it's sometimes used as 'main branch' (e.g., 'trunk' or the like).  But in this context, it's more like....    mmm...   'primary path through history', maybe?19:22
fullermdIt's the antithesis of relativity; a privileged frame of reference   ;p19:23
bialixfullermd: it's mentioned on b-v.o wiki in Workflows document19:23
bialixprimary path through history -- very poetic, I like it19:23
bialixtechnically it's just left hand revisions chain19:24
bialixbut this is ugly technical detail19:24
fullermdIt's a cross-section of the history that, if you work in a certain way, allows you to get a good high-level view of what's happened, much more quickly than if you have to read every page.19:25
fullermdCliff Notes to a branch (I wonder how well that translates...)19:25
fullermdI think that's mostly a US-ism.19:25
bialixhttp://en.wikipedia.org/wiki/CliffsNotes -- this one?19:26
fullermdYah.19:26
bialixyes, it's hard to translate19:27
bialixI'm little worried about dark side of mainline though19:27
bialixyou should use only mainline otherwise you will be screwed19:28
bialixor your history will be hard to read/undersatdn19:28
bialixunderstand19:28
fullermdWell, it's a mechanism to ignore information.  If you ignore the right stuff, it can be a big aid.  If you ignore the wrong stuff, you're in trouble.19:28
bialixhow people deal with it?19:28
fullermdAnd (tautologically) if you work in a way that mainline doesn't end up holding the right information, you won't get the right information from it (FSVO 'right').19:29
bialixfullermd: well, log -n1 now default, so it's possible to say by default bzr ignores both right and wrong dtuff19:29
bialixstuff, sorry19:30
LarstiQbialix: does your audience have experience with hg or git log?19:30
bialixLarstiQ: I'm writing articles so it's self-contained19:31
fullermdIt can be simpler if they don't, since that brings biases.19:31
bialixI don't do explicit references to hg or git19:31
LarstiQok19:31
bialixI often compare with svn though19:31
bialixbecause it makes some examples simpler19:32
bialixLarstiQ: btw, do you heard about group extension for hg?19:32
fullermdThat can be more useful; it's easier to describe the capabilities it provides as "svn log"++, rather than a sort of "git log"--.19:32
LarstiQbialix: I haven't19:33
fullermdAnyway, it's way past my bedtime; I'm too far gone to dream up good analogies tonite   :|19:33
bialixalthough I'm writing for newbies mostly I'm trying to explain things not for dummies, so even experienced people can get some new info19:33
LarstiQfullermd: I was thinking of the non-discriminating nature19:33
bialixfullermd: what? are you going to sleep?19:34
fullermdI was planning more on staring muzzily at the ceiling for a few hours, but...   call it what you will.19:34
bialixLarstiQ: this extension aims to combine several revisions into logical group, something similar to bzr mainline19:35
bialixfullermd: lol :-D19:35
LarstiQbialix: cool :)19:35
bialixfullermd: ok, you win, bye19:35
zsquarepluscbialix: and you already have articles online?19:36
* fullermd quickly hides away so bialix doesn't ping him in his sleep...19:36
bialixzsquareplusc: yes, http://bzr-day.blogspot.com19:36
bialixfullermd: I've promised to not ping ou next 6 months19:36
zsquarepluscah, wrong encoding for me :-)19:36
bialix*you, err19:37
bialixzsquareplusc: ru_RU19:37
fullermdWell, if I'm really lucky, I'll sleep longer than that   ;p19:37
bialix:-D19:37
bialix:-D :-D :-D19:37
zsquarepluscbialix: yea i know, the characters look perfectly as they should. it's me that can't make any sense from them ;-)19:38
bialixyeah :-D19:38
bialixdon't try to use google translate service19:39
bialixresult is rather unpredictable :_D19:39
bialix:-D19:39
bialixespecially funny when it tranlsate "command" as "team"19:40
bialixjust because these words are sound the same in Russian19:41
bialix"bzr add team"19:41
=== kiko-afk is now known as kiko
bialixhow you can say "dotted revno" in other words?20:15
LarstiQ"revno with branchpoint information encoded"20:18
Takis checking WorkingTree.merge_modified against none or empty The Correct Way to determine if there are merges pending commit?20:18
bialixlook at cmd_push in builtins.py20:21
bialixthere is check that wt has no changes files or pending merges20:21
Takcool, thanks20:23
bialixTak: len(tree.get_parent_ids()) > 1)20:23
Takthanks more!20:23
Tak(prosiba? :-P)20:24
bialixTak: spasibo20:25
Takdamn20:26
bialixnm20:26
* Tak blame mumblers20:26
bialixRussian is close to English in one feature: what is written often spelled very differently20:27
bialixTak: so if you want to write use: spasibo, if you will spell it, then close to your original variant20:28
* Tak nod20:32
bialixWhat is codename of Ubuntu 8.04 ?20:32
jderosebialix: hardy20:33
bialixoh20:33
bialixit's from beginning of 2008?20:34
zsquarepluscyes the number IS the date20:34
bialixnice20:34
bialixwhat is LTS period? 5 years?20:34
bialixanybody knows how to install newer qt on hardy?20:35
bialixbug 42954920:35
ubottuLaunchpad bug 429549 in bzr-explorer "Opening Preferences: bzr: ERROR: exceptions.AttributeError: 'module' object has no attribute 'QFormLayout'" [Undecided,New] https://launchpad.net/bugs/42954920:35
zsquarepluscyou'll probably get better support in #ubuntu ;-)20:35
bialixmeh20:36
Takso what behavior would one expect from a review/commit dialog on a tree with pending merges?20:36
bialixI'll leave this question for igc20:36
bialixTak: review?20:36
LarstiQbialix: "see if I want to commit it as is"20:37
Takexamine changes20:37
bialixTak: look at qcommit?20:37
* zsquareplusc misses the checkboxes and easy diff as TortoiseSVN has it for commits20:38
bialixzsquareplusc: IIUC qcommit has checkboxes20:38
bialixTak: there is one big difference vs plain commit: when there is pending merges you always should commit entire tree, you can't select files for commit20:39
Takprecisely20:40
* bialix nods20:41
zsquarepluscbialix: a yes it has. i run the gtk gui more often than qbzr20:41
Takthe current dialog: http://img294.imageshack.us/img294/1847/mdbzrreviewcommit.png20:41
bialixTak: so what is your question about?20:41
TakI'm trying to figure out the most helpful way for the gui to behave when there are pending merges20:42
bialixzsquareplusc: try qbzr then20:42
bialixTak: it's not easy, indeed20:43
bialixTak: nothing better than suggesting show some explanation message about pending merges20:43
bialixcan you commit several files from your GUI?20:44
Takyes20:44
bialixso maybe forcing this mode when there is merge?20:44
Takright now, if there's a merge pending, it requires you to commit everything in order for the commit to succeed20:45
bialixdo you support per-file commit messages?20:45
Takno, not currently20:45
bialixon your screenshot there is prompt: Commit message for file 'vgtk'20:46
bialixthis can be misleading for pending merge case20:46
Takyeah, it is a little misleading20:46
TakWhat that actually does is create a commit message like: * blah.c: Fixed x.\n * blah.h: Fixed y. ...20:47
bialixsomething like per-file entries, I suppose20:48
Takyeah20:48
bialixand where is main commit message will be edited?20:48
Takit was originally designed for svn20:48
bialixhehe20:49
bialixI've reused svn support in FTE editor for bzr actions20:49
Takwhen "Commit" is pressed, a verification dialog pops up with the list of selected files and the full commit message20:49
bialixit was so easy and mostly work20:49
bialixTak: ok, so use this dialog20:50
bialixor invoke gcommit if this is gtk-based stuff20:50
Takyeah, bzr's ui maps nicely20:50
bialixI'm still not quite understand what is your question actually20:51
phinzeso i don't shoot myself in the foot: do shelves as stored `bzr shelve` survive a bzr switch in a lightweight checkout?20:53
phinzeor, alternatively, do they stick to their associated branches somehow (though i don't know how that world even work implementation-wise)20:54
phinzeuse case: jam-style setup, realize i started working on something that should be tracked in a new task branch, want to shelve, switch to new task branch, unshelve, selectively commit, reshelve rest, switch back, commit rest20:55
bialixjam-sttyle :-)20:55
bialixphinze: basically shelved changes stored in your checkout20:56
bialixso they keep intact on switch20:56
bialixthey can know about base revision though20:57
bialixso20:57
bialixif your new branch based on current --everything should be fine20:57
bialixold shelve1 working via plain patches20:58
bialixyou still can use it20:58
Takbialix: just wondering about the nicest way to present the user with the fact that 1) There are pending merges and 2) Commits have suddenly become all-or-nothing20:59
bialixTak: in qcommit we show list (graph) of pending merge21:00
phinzebialix: awesome thanks21:03
luksbzr could really support file selection even on merge commits21:04
luksyou can easily work it around by reverting/shelving the files before commit21:04
bialixluks: hi21:04
lukshi bialix21:04
bialixluks: why?21:04
luksI think it just unnecessarily restricts the user21:05
bialixI think this is downside of mainline paradigm we talked earlier21:05
bialixmaybe you're right, IIRC there is bug report opened long time ago21:05
TakI agree with luks21:06
bialixabout unshelve or about restrict?21:06
bialixfrom my experience I need selective commit on merge very rarely21:07
luksI would understand the behavior if revert/shelve refused to work on a merge21:07
Takbialix: about both, really21:08
bialixok21:08
lukshm, but revert is actually useful for resolving merges21:08
luksso that wouldn't work21:08
bialixwhat difference between log -n0 and log --include-merges?21:11
* luks hasn't used bzr log for ages :)21:13
* bialix too21:13
bialixqlog rules21:13
bialixbut for article I have to21:14
LarstiQbialix: less cryptic name21:15
bialixok21:15
=== Pilky_ is now known as Pilky
rockyjelmer: hey, is there a version of bzr-svn for bzr 2.0dev yet?22:00
lifelessmoinmoin23:01
pooliehi lifeless23:02
thefirstdudehi poolie23:03
pooliehi23:05
* davidstrauss joins the hi-fest23:11
davidstraussHi!23:11
jelmerrocky: yeah, the 1.0 branch of bzr-svn should work with 2.023:11
pooliejelmer: could you make at least an rc of it in the next couple of days23:19
poolieso that we will have something suitable to sync into jaunty?23:19
bialixpoolie: hi23:37
pooliehello bialix23:37
bialixseveral hours ago I've asked about mainline paradigm origin and fullermd suggested to asking you23:38
bialixcan you make some remarks about mainline and its roots?23:38
bialixI need this for my new article23:39
bialixpoolie: ^23:39
pooliesure23:39
poolieabout why people have a mainline at all?23:39
bialixno, about why bzr has mainline concept23:40
bialixand no one else dvcs seems to have it23:40
jam1hi all23:40
jam1ghost jam23:41
bialixand what is mainline in other words23:41
jam1sorry mt23:41
lifelessjam1: hi. I suggest looking at pyrexes interface stuff23:41
pooliehello jam123:41
bialixhello jam123:41
=== jam1 is now known as jam
pooliebialix: oh, mainline in the sense of having revisions numbered along the left side?23:41
pooliewell23:41
jamlifeless: sure, I'll probably poke into that next week23:41
lifelessthe amount of C we're writing..23:42
bialixpoolie: I eager to know everything, but even short vision from you as original author will help23:42
lifelessI am getting my feeling back of 'just do it in C' :P23:42
poolieit's a bit hard for people to visualize unrestricted dags, and a bit hard to represent them well in text mode23:42
poolieif you just give them arbitrary revision ids, they're impossible to compare23:42
poolieand dates are not reliable in a distributed system23:43
bialixesp when you have rebase23:43
poolieright23:43
bialixwhy collapsing merges revisions?23:43
pooliein the log?23:43
poolieany ideas about bug 429553?23:44
ubottuLaunchpad bug 429553 in bzr "bzr diff errors with "no revision"" [Undecided,New] https://launchpad.net/bugs/42955323:44
bialixum... yes23:44
jamis igc around?23:44
lifelessbialix: do you mean 'why -n1 by default' ?23:44
jamI wanted to ask a bit about cvs2bzr23:44
lifelessjam: haven't seen him yet this morning23:44
bialixpoolie: this question about bug for me?23:45
bialixpoolie: I dunno23:45
poolieno, more jam or lifeless23:45
pooliebialix: i think that merges are not perfectly symmetric from the human's point of view23:45
bialixlifeless: no, not -n1, about entire ideas of distinct clearly between left hand revs and merged revs23:45
pooliei don't think people see it as 'merge A and B' but more 'merge B into A'23:46
bialixit depends23:46
pooliewell,23:46
poolielet's say it's often the second23:46
jampoolie: I don't have a specific idea, but this line looks odd23:46
jam   File "bzrlib\repository.pyo", line 1826, in get_revision_reconcile23:46
bialixpoolie: I found mainline idea good for disciplined developers23:46
bialixbut bad for bad developers23:46
poolieif people often push or push overwrite it probably makes things confusing23:47
poolieis that the sort of thing you mean?23:47
jambialix: how is it worse for undisciplined developers than not having a mainline at all?23:47
jamhence you get the win with "disciplined" developers, but status quo for the rset23:47
jamrest23:47
bialixpoolie: I have one in my team, who prefer to use only one his branch instead of make features branches for every new feature23:47
poolieand he just merges to and from his branch?23:48
bialixwell, your idea about merge is not symmetric does not work when bad developer merge several weeks of work at once23:48
bialixi.e. merge several new features interlined23:49
bialixpoolie: he just merge trunk into his own branch and don't pay attention about mainline annotation23:49
poolieand then he pushes his branch to trunk?23:49
bialixwithout append_revisions_only things become nightmare23:49
bialixpoolie: in the past yes, pushed. now I've restricted him to use me as gatekeeper23:50
pooliehm23:50
bialixpoolie: hg has version numbers but does not have mainline23:50
pooliewhy does he do this?23:50
jampoolie: one possibility for the 'diff' is that it is trying to get the old revision so that it can fake a timestamp23:51
jamand perhaps that revision is a ghost?23:51
poolieright, in hg i think the versions are numbered in arbitrary topo-sorted order23:51
bialixand hg guys "invent" group extension which does similar thing23:51
jampoolie: right, they are the 'order the revision appeared in my repo'23:51
jamand your numbers and mine are not the same23:51
jamfor the same rev23:51
bialixi.e. add group comment to the several revisions to make them logical group in log23:51
bialixpoolie: I mean hg reinvent our wheel here: some sort of history annotation (as fullermd said)23:52
bialixwe have this for free from hardcoded mainline support23:52
pooliebasically i think the view you get from a bzr trunk branch is very good23:53
pooliefirst this happened, then this happened, then this happened...23:53
bialixso basically what is bother me a lot is this hardcoded mainline paradigm.23:53
poolieand you can look at the details of all of the individual commits leading up to any of them23:53
bialixyes, bzr follow this paradigm very well23:53
bialixbut not all projects are so disciplined23:54
bialixwhat is your suggestions then?23:54
lifelesspoolie: in hg changes are in repo-add order23:54
bialixand yes, default log -n1 makes the things a bit harder for undisciplined devs23:54
poolielifeless: i know23:54
lifelessbialix: why not set 'append_only' on your branch ?23:54
bialixlifeless: I did23:55
lifelesspoolie: sorry :P you said 'I think' :P23:55
bialixbut it's not default23:55
bialixI understand reasons behind log -n1 (dotted revnos), I', just trying to understand mainline as word and paradigm23:56
bialixis not it too restrictive?23:56
pooliethe idea is that when you're looking at a particular branch, it focuses attention on revisions that were actually committed in that particular branch (or its parent), rather than merged into it23:57
pooliei think this is useful23:58
pooliebut if it turns out to be restrictive, we should try to relax those restrictions23:58
malibuWhen I do break-lock from command line, bzr hangs23:58
pooliein other words bzr should never hold you back from seeing or working with the real graph23:58
malibubialix: I think you were helping me before.. it does in fact hang23:58
malibuI've been leaving it sit for 2 hours now23:58
bialixmalibu: many core devs around, please show us some pastebin23:59
bialixyou can file a bug though23:59

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