[00:33] morning === t0mm13b is now known as t0mm13b|ZZZzzz [00:58] igc: morning [01:33] hi spiv [01:42] spiv: was last monday a public holiday? [01:44] lifeless: yeah, Labour Day in NSW [01:46] ]thanks [02:08] -< food >- [03:13] * igc lunch === timchen1` is now known as nasloc__ [03:54] Lately, Loggerhead is such a memory hog that running it is impractical. It's getting killed for hitting ~250 MB daily. [03:54] * Peng_ whines [03:56] ("Lately" being "some time from 2009-07-07 to ~2009-09-07". Maybe it has to do with upgrading everything to 2a?) [03:57] Sorry, I'm done now. [03:58] That's the kind of thing I should put on Twitter where nobody has to read it. :P [04:01] Peng_: it's probably 2a related at a guess [04:05] It ran for 10+ weeks with no intervention, then I upgraded to 2a and it (well, presumably it) OOMed my VPS within a day. :D [04:05] Hmm, when there is a MemoryError traceback, it does tend to be 2a-related. [04:06] But it could just be that something else uses too much memory, and then that's what pushes it over the edge. [04:12] Peng_: you could try jam's static tuple branch i guess [04:12] * igc dentist - bbl [04:13] Being lazy here, how much RAM does that save per tuple? [04:14] Peng_: lots ;) [04:15] It has a significant number of lists, too, though not nearly as many as the tuples. [04:15] I think at least 16 bytes per tuple, and that doesn't count the interning. [04:15] Currently 320,000 tuples, 100,000 lists. :D [04:16] Whee! [04:16] The peak number of tuples is 460,000. [04:17] This might crash your browser/X/monitor/desk, but you can see for yourself at http://bzr.mattnordhoff.com/loggerhead/_dozer/index if you want to. [04:18] (Adblock http://bzr.mattnordhoff.com/loggerhead/_dozer/chart/ctypes.CFunctionType to avoid the crashiness.) [04:31] (FYI, I just blocked the image server-side.) [04:41] Oooh, jam has lots of interesting memory-related branches in development. [04:45] Peng_: IIRC there's just one big branch that's been split into pieces for review [04:45] Peng_: If I were experimenting with it I'd just jump straight to the end result. [04:55] spiv: I'm not sure all of it is merged into the big branch, though. [05:26] * RenatoSilva can't understand very well stuff like this :( http://fourkitchens.com/blog/2009/04/20/alternatives-rebasing-bazaar [05:28] * RenatoSilva still thinks rebase is a very nice way of keeping a private feature branch updated with mainline. [05:31] RenatoSilva: well, if it works well for you, then keep doing that. [05:32] RenatoSilva: personally, I find I'd rather keep the original history intact, but I don't mind having a history that's slightly more complicated than linear. [05:35] ok I just mean that a good reason against rebase in private branch still misses, I fell like it's the natural way of keeping up-to-date with mainline, that's a bit weird when you see all the folks out there saying it's bad [05:36] hey folks. how do i back out a particular change from a particular file? in subversion this would be: svn merge -c - ; svn commit [05:36] I think I shoulld follow you folks and use merges, but rebase "is still in my heart" :D [05:39] RenatoSilva: well, I don't really understand why you don't like merges [05:39] RenatoSilva: and you don't really understand why some people don't like rebase, so I guess we're even ;) [05:41] johnjosephbachir: you can do "bzr merge -r X..X-1" [05:41] Er, [05:41] johnjosephbachir: you can do "bzr merge -r X..X-1 ." [05:41] The "." is important :) [05:41] spcool, just encountered the X..X+1 case in the docs, and was going to try the case you mentioned (and was expecting failure : ) ) [05:41] got it, thanks [05:42] johnjosephbachir: oh, and you can specify a file name at the same time, of course. [05:42] s/spcool/spiv cool/ [05:42] :) [05:42] spiv, okay [06:08] back === abentley1 is now known as abentley [07:44] hello all [07:53] hi all, hi bialix [07:57] igc: hi, Ian - are you free for a moment, please? [08:11] * spiv wonders why Python will make sure numbers will always compare lower than other objects if both sides give NotImplemented... [08:12] (Oh, except for None, of course, which is special-cased before that special-case...) [08:23] Oof, it takes a while to review C code. [08:23] But then, it was > 1000 lines of diff, so maybe it's nothing to do with C :) [08:23] spiv: whats id(34) for you [08:24] 148469204 [08:25] Or thereabouts, anyway ;) [08:26] bonjour vila [08:28] spiv: I'd guess that your objects have a higher id [08:29] lifeless: by a factor of ~20, it seems ;) [08:30] spiv: so I don't think its a deliberate thing :) [08:30] lifeless: hah! [08:30] lifeless: you'd think that... [08:30] spiv: did you find a check for it in the core? [08:31] lifeless: read the definition of default_3way_compare in http://svn.python.org/projects/python/trunk/Objects/object.c [08:32] (that function is invoked when both sides don't implement tp_richcompare or they do and it returns NotImplemented) [08:32] spiv: I'll assume thats a yes [08:32] lifeless: here's the highlight: /* different type: compare type names; numbers are smaller */ [08:33] i.e. PyNumber_Check(v) it uses "", otherwise v->ob_type->tp_name; [08:33] bleep [08:33] s/i.e./i.e. if/ [08:33] After special-casing None, of course. [08:34] If the type names match, it will compare type pointers, so you weren't totally on the wrong track ;) [08:35] how did you end up down there [08:35] Reviewing jam's StaticTuple patch, he has a test that at one point asserts that 10 < some static tuple. [08:35] lol [08:36] Which seems a bit insane to me, but seeing as I had the Python source handy I thought I'd quickly check to see if it was going to be fragile across runs or platforms as well... [08:37] is it deliberate or a typo? [08:37] oh, how i miss that phrase in repsonse to my e-mails to Canonical lists. [08:37] And, at least with CPython 2.6, it seems reliable, but yeesh... [08:37] lifeless, spiv: Working on thread leaks, I realize the root cause of many test bugs is that: SocketServer is *not* intended to be used with a client thread in the same process... [08:37] mneptok: which phrase? [08:37] "seems a bit insane to me" [08:38] lifeless: deliberate, but I pretty questionable IMO. [08:38] spiv: what does it do for us? [08:38] lifeless: I can understand testing that comparison with arbitrary types doesn't blow up, but then asserting that they should be always less or greater doesn't seem valuable to me. [08:39] is it a proxy for 'the result of __cmp__ is an int', perhaps? [08:39] mneptok: you're considered wholly sane at your new workplace? [08:39] seems a bit insane to me [08:39] spiv: i report to Monty Widenius. by comparison, i seem somewhat well-adjusted. [08:39] vila: really? yeesh. [08:40] vila: can we work around it? [08:40] vila: I always assumed SocketServer was a toy, but I figured that was because I was a bit biased being a Twisted dev :) [08:40] spiv: ill try to get Monty angry and record him swearing in a pidgin of Swedish, Finnish, and C++ [08:40] mneptok: nice [08:40] mneptok: you having fun there? [08:40] It's fixed, that was scary though and hard, hard, hard to not become insane :) [08:41] lifeless: very much so. [08:41] vila: *insaner* [08:41] mneptok: "may your compiler always fail with inscrutable template errors!" [08:41] vila: :) [08:41] lifeless: although i miss Woody. we need a company pony. [08:41] spiv: not a toy, just one assumption was missed: the client can be in the same process [08:41] lifeless: right :) [08:41] we don't have woody now, AIUI [08:41] vila: I told you I was biased ;) [08:41] vila: what did they do to make that an assumption that matters? [08:42] spiv: "Hjorsorn bjarrtor type identifier; [08:42] lifeless: the point is about what they did *not* ... They did not synchronize their threads [08:43] vila: meep; unsafe always [08:43] vila: I basically don't trust anyone except Twisted to get portable sockets and concurrency in Python right. [08:43] lifeless, spiv : the good news is that synchronizing the threads was easy once I understood what was needed [08:43] lifeless: huh ? not symcing is unsafe or do you mean even syncing result in an unsafe system ? [08:44] i rented a movie called "Portable Sockets." i thought it would help me learn Python network programming. it was a porn film about hitch-hiking. :( [08:45] mneptok: I doubt you'll fare much better with titles involving "Twisted" or "Python"... [08:45] spiv: I don't have experience with twisted to speak, but indeed, I fixed a bunch of micro-bugs around with sockets and threads with spectacular variations in test failures.... [08:45] Well, maybe they'll have less hitch-hiking. [08:46] vila: right [08:46] spiv: something tells me lifeless is away from IRC editing the quotes page. [08:46] so in the end, our code base is safe, our test code base is magnitude *safer* with respect to http, ftp test servers... [08:47] vila: using objects across threads is a bad bad bad bad bad bad idea without mutexs [08:48] lifeless: that's the GIL, right? ;) [08:48] spiv: I wish! [08:48] it would be great if the GIL only released a thread when C code was reached. [08:48] stuff would be so much more debuggable :P [08:48] but the GIL is no magical bullet, you had to have stronger sync points, I used threading.Event objects for that [08:48] lifeless: Hmm. [08:49] lifeless: you can approximate that, perhaps... [08:49] lifeless: sys.setcheckinterval(sys.maxint) [08:49] spiv: evil evil man [08:50] lifeless: check that in your site.py and tell me how it works out for you ;) [08:50] be an interesting way to find bugs [08:50] lifeless: hey, they wouldn't put those two symbols in the same module if they didn't want them to be used together! [08:50] [08:50] s/-.*/> [08:51] :) [08:53] remind me never to share a hotel room with spiv [08:56] mneptok: They give you shampoo... and a shaver only wall socket! These *must* belong together... [08:57] mneptok: 'they wouldn't put those two employees in the same room if...' ? [09:03] lifeless: exaaaaaactly [09:34] mneptok: mariadb on home page now [09:35] * igc dinner [09:51] * spiv wonders why Python will make sure numbers will always compare lower than other objects if both sides give NotImplemented... [09:51] spiv: it's so different numeric types end up "next to" each other [09:51] so sorted([1, 1.5, 'bob']) keeps the numbers together [10:06] I thought it just compared type(x).__name__ or something silly like that === mthaddon` is now known as mthaddon [10:13] idnar: naive! [10:13] mixed type comparisons are inherently as insane as a sack of cats anyway [10:16] * idnar giggles to hide the hysteria in his voice [11:03] mwhudson: *boggle* [11:05] mwhudson: because it would be terrible if sorted([1, 1j, 'bob']) didn't keep 1 and 1j together... ;) [11:10] spiv: also see my comment about cats === t0mm13b|ZZZzzz is now known as t0mm13b === statik` is now known as statik === mrevell is now known as mrevell-lunch [13:18] Is there any bzr specific documentation covering workflows tied to the Eclipse IDE? Having read the 'known issues' for bzr-eclipse I opted to try qbzr-eclipse but I can not see how I would take an existing eclipse project, create feature-branches and switch between them. I raised this over the weekend and am no further... I'd be happy for the bulk of my bzr interaction to be via bzr explorer but even that doesn't help the feature branches show as ec [13:18] projects without a lot of manual importing each time. [13:25] Zand3r: is your existing eclipse project is under bzr control? [13:27] perhaps you want to use workflow with one lightweight checkout and many treeless branches in shared repo? [13:28] bialix: Currently no (I've tried putting it under bzr control using qbzr-eclipse and bazaar explorer.... the former litters it with a couple of directories like 'trunk' but bazaar explorer seems to initialise it correctly..... what I do after that I am stuck (ultimately I will upload the project to a central bazaar repository but that doesn't solve the issue of switching branches so that the eclipse project represents the current branch). [13:30] bialix: Am I correct in thinking that 'many treeless branches' will mean a directory per branch... if so then there does not seem to be a way to have eclipse show all branches and/or have my currently active project 'become' the branch I want to use unless I'm totally missing something obvious. [13:30] I don't use eclipse, so I can be totally wrong, but IIRC author of qbzr-eclipse said he's using approach of light checkout of many branches [13:30] Zand3r: current bzr model is always 1 directory per branch [13:31] bialix: Ok... Someone at the start of the weekend also suggested lightweight checkouts for use with eclipse so there must be something in that I just can't see how it works with Eclipse - I need to play some more I think. [13:31] lightweight checkout can switch between branches [13:31] wait a sec [13:32] Zand3r: http://doc.bazaar-vcs.org/latest/en/user-guide/organizing_your_workspace.html#local-sandbox [13:33] one lightweight checkout allows you to have one working directory for Eclipse [13:34] and you can create as many feature branches in separate repo as you need [13:34] to visualize branches in repo bzr-explorer is very good [13:35] I really don't have experience with bzr eclipse plugins and I dunno if any of them capable to show you shared repo content [13:35] but you can file a bug as wishlist ;- [13:35] but you can file a bug as wishlist ;-) [13:36] Interesting... I think I need to create a repository elsewhere on the disk temporarily for testing, import my project into that and perform a lightweight checkout in Eclipse (depending on how well the gui tools support this - if at all) [13:36] I'll have a play and see what happens - thanks for the pointers [13:36] mmm, I think it's better to create light checkout from command-line (or bzr explorer) and open it in eclipse then [13:39] I'm looking at this from the perspective of my colleague who i'm going to ask to use this system alongside me so I'm trying to do everything via a gui which would be within his comfort zone (as opposed to the command line) however bzr explorer looks 'really' nice so I see no issues with relying on that for the bzr interaction and using Eclipse only for code editing, etc. assuming Eclipse doesn;t have a problem with that (I'll have to see if Eclipse [13:39] refresh the project files when bzr explorer switches the branch) [13:41] qbzr-eclipse and bzr-explorer use dialogs from qbzr plugin under the hood, so there is possible overlap in functionality [13:42] what is your OS? === mrevell-lunch is now known as mrevell === EdwinGrubbs2 is now known as EdwinGrubbs [14:33] is the ability to do a bzr branch on an svn repo built-in, or do you need the bzr-svn plugin? [14:34] faldridge: you need the bzr-svn plugin [14:34] jelmer: ok, thanks. [15:01] Currently while trying to pull from a remote branch to a Windows XP machine, bzr is never able to complete that pull no matter what. I've tried this on several different installs of Windows. Everytime is raises a Memory.Exception error after churning on the pull for several minutes. Any ideas what this means? [15:01] the same task on Linux or OS X finishes fine, only does this on Windows [15:59] Can anyone please advise if it is possible to perform a lightweight checkout (and branch/switch) in Bazaar Explorer as detailed here http://doc.bazaar-vcs.org/latest/en/user-guide/organizing_your_workspace.html#local-sandbox - it would appear not but I am new to bzr (and by extension the explorer gui) so want to make sure I am not missing something. [16:06] Zand3r: sure [16:07] Zand3r: use menu Bazaar -> Start -> Checkout [16:09] to switch Bazaar -> Work -> Switch Checkout [16:09] there is excellent tour, did you saw it? [16:10] Zand3r: http://doc.bazaar-vcs.org/explorer/en/visual-tour-windows.html [16:10] there is also pages for GNOME, KDE and MacOSX [16:12] so why does `bzr switch` require access to the old url? [16:13] use case: switching from a non-absolute DNS reference to a server ('dev') to an absolute one: ('dev.domain.com') ... switch bailed on trying to resolve 'dev', but unbind/bind worked [16:13] so no problem really just curious [16:14] hmmm " For heavyweight checkouts, this checks that there are no local commits versus the current bound branch, then it makes the local branch a mirror of the new location and binds to it. [16:14] i guess that would do it, so bzr switch --force would probably work [16:15] bialix: I saw the bzr explorer tour thanks... Bazaar -> Start -> Checkout does not give an option to make it lightweight [16:15] Zand3r: IIRC it will create lightweight checkout by default [16:16] bialix: Oh! - doh! - Thanks. [16:16] phinze: there is bug about this problem [16:16] phinze: this partially fixed in bzr 2.0 (--force flag) [16:17] Zand3r: it's not obvious, I know [16:17] Zand3r: try it [16:57] if i get AttributeError: 'module' object has no attribute 'ProgressBarStack' in a local loggerhead install with bzr 2.0 is this a known problem and is there an easy fix? [17:10] It probably means a plugin is out of date. [17:18] hi. I'm new to using bzr and I would like to know the signature checking works. I asked on the mailinglist but noone answered. Does someone know how it works? === EdwinGrubbs is now known as Edwin-lunch [17:29] I configured bzr to sign every commit which works fine. But setting the option check_signatures=require don't seem to activate signature checking. [17:49] jelmer: hi. any suggestions on making svn-import take less than 10G of RAM? :) (using bzr-svn 1.0) [17:52] joke: Once upon a time check_ didn't do anything. I don't know that it's ever been changed to, but I haven't really been paying attention. [17:52] Is it safe to "cp -R repoA repoB"? [17:53] I mean, even if people are using repoA? [17:53] In an absolute sense, probably not, since there's no guarantee that cp would walk things in the same order as bzr updates them. [17:54] You'd probably have to do something like 'loop rsync until nothing has changed' to be certain. [17:58] fullermd: thanks. bzr 2.0 help configuration says bzr should check if signatures are present and valid if set to require. so there should create_signature should create them. [17:58] fullermd: so there should be a different between both options. [18:54] I've read the workflow for bzr-svn at but this talks about committing feature branches to the trunk. What if I want to checkout trunk, create a branch locally, and then only push my branch back up? [18:57] faldridge: ...to a non-trunk branch? [18:57] Tak: yes, I want to create the branch in the remote repo [18:57] verterok: I'd like to add the fastimport plug-in to the standard core distro [18:57] yay or nay on that? [18:58] Tak: the idea being to submit the branch to the server for code review and then let the trunk committers approve or reject the branch [19:00] hmm, my gut feeling is that it should Just Work with `bzr push svn://path/to/feature/branch` , but I'm not sure [19:01] Tak: ok, I'll give it a shot, thanks. [19:18] Crap, the archaic build system on one of my machines doesn't like _simple_set_pyx.pxd. [19:20] Wait, what are .pxd files? Pyrex? That's simple enough to upgrade. [19:26] What's the minimum Pyrex version that bzr supports? === EdwinGrubbs2 is now known as EdwinGrubbs [20:34] I'm using bzr-git. Is there a way to make bzr produce the git version of a bundle? [20:36] Try "bzr send --format git" or so. [20:36] Dunno if it's still experimental or not. [20:37] If we have deploy.bat in .bzrignore and we change the file name to deploy_server.bat, will bzr know somehow that no deploy.bat exists in the tree and tehrefore the user should either update or delete the pattern? (update in this case) [20:37] * Peng_ /away! [20:40] Peng: thank you! [20:41] RenatoSilva: yes if you use "bzr mv deploy.bat deploy_server.bat" [20:41] or bzr mv --help if you already moved the file [20:44] gioele: interesting! what other shell-like commands bzr has? [20:44] Peng: ping [20:45] not many: ls and mkdir for example. I'd love to have bzr cp but it is not ready yet. Have a look at bzr help commands [20:53] bzr mkdir is like mkdir + add? [20:53] RenatoSilva: yes, exactly [20:54] How can I tell bzr that I want to diff my current branch with a non-tip revision of a different branch? [20:54] ok, thanks all [20:55] maxb: bzr diff --old revno:431:/path/to/branch [20:55] aha [20:55] thanks [20:56] maxb: bzr help revisionspec [20:56] np [20:56] however, I think in some point bzr could check the ignore changes even if not using bzr mv [20:56] RenatoSilva: ? [20:56] look at my example and forget bzr mvc [20:57] maxb: or bzr diff -r 431:/path/to/branch [20:57] bzr mv [20:57] I still don't get it. Are you suggesting bzr should automatically do "bzr mv --auto" (<- this command really exist)? [20:57] jam: <3 [20:58] gioele: somehow bzr could tell the user the pattern is not being used anymore, probably because you have moved or deleted the underlying files [20:59] Peng_: So what platform are you on that had pyrex 0.9.5? (and an easy upgrade to 0.9.6, but not to > 0.9.6.3?) [20:59] hi lifeless [20:59] ah, you would like to clean up the list of ignore files... I think there are pros and cons to that, it is not a clear-cut situation [20:59] jam: Your average, everyday old, out-of-date platform. There's nothing wrong with dropping support for it. And both upgrades were easy, just installing from source. [21:01] jam: (Ubuntu Gutsy, but you didn't hear that from me.) [21:02] gioele: at least the ones matching single files (without regex) [21:03] RenatoSilva: on you branch. How can bzr know about what is happening on other people's working trees? [21:05] jam: FYI: bzrlib/_static_tuple_c.c:693: warning: function declaration isn’t a prototype === BasicPRO is now known as BasicOSX [21:10] Peng_: can you try to just remove the 'void' from init_static_tuple_c(void) and see if that makes the warning go away? [21:10] line 650 by my count [21:12] 737 for me. [21:13] Err, wait, from .h or .c? [21:13] Never mind. [21:13] Peng_: .c [21:13] jam: Did that. Now it warns twice, lines 693 & 738. [21:14] Peng_: hmm... so 693 maybe you want to put *in* the 'void' and leave it for line 737 [21:15] jam: 693 is _workaround_pyrex_096, fyi [21:15] does bzr have a default ignore list? [21:16] jam: And that does indeed fix it. [21:16] hi jam [21:16] RenatoSilva: Yes. It's dumped to ~/.bazaar/ignore too. [21:16] RenatoSilva: Or was, anyway. Dunno the situation now. [21:16] Id like to print the list, but found nothing in bzr help ignore [21:17] jam: I've been wanting to ask you, I'm interested in trying out your memory reduction stuff. Which branch(es) should I try? [21:17] Peng_: wait about 1hr and then try bzr.dev :) [21:17] memory reduction? this is relevant to my interests [21:18] well ok, memory _usage_ reduction would be. Not so much ejecting SIMMs from my motherboard. [21:18] jam: <3 [21:19] dash: Basically, python 'tuple' objects carry around a large Garbage Collector header [21:19] I wrote a 'StaticTuple' class that refuses to reference objects that could create a ref cycle [21:19] and drops the GC header [21:19] which [21:19] a) reduces peak mem about 20% [21:20] b) Turns out to have a major impact on performance w/ large projects [21:20] because the python "GC" is no longer evaluating these 500k nodes [21:20] "time bzr branch launchpad-2a" was 11m => 8m for me, and about 17% less peak mem [21:20] I'm still looking at other places to improve [21:20] but that was a decent start worth landing... :) [21:20] hm, what about long-running processes using bzrlib? [21:21] luks: I would still expect a decent memory + performance improvement [21:21] luks: what about them? [21:21] I don't have any numbers on it [21:22] Loggerhead is my main interest in RAM usage. Over the last 3 months it's gotten nearly unusable. [21:22] but it would leak memory wouldn't it? [21:22] luks: no [21:22] luks: It isn't going to leak more memory than what we are already doing [21:22] how does it get deleted? [21:22] as these objects cannot participate in ref cycles [21:22] luks: same as usual [21:22] luks: standard ref counting [21:22] python has 2 ways to track objects [21:22] luks: they just don't participate in GC; refcounting still happens [21:23] I thought you mean they are completely outside fo the GC system [21:23] luks: well, there are 2 "GC" in python [21:23] they are :P [21:23] refcounting ,and cycle detector [21:23] jam: I know, I thought you mean both [21:23] it still is refcounted [21:23] I don't think you can avoid that [21:23] without using some sort of proxy object [21:24] and if you have a proxy object... you have a refcounted object [21:24] so if you want to reference one of these individually [21:24] ... [21:24] if we wanted to think harder about it, we could do like "nodes[10]", but you still need that 10 handle, which requires a python object... [21:25] Peng_: the code to expose StaticTuple to the btree reader is in pqm now, so barring any issues, 20-30min it will be in bzr.dev [21:28] jam: you've seen the progress bar? [21:29] jam: looks like it failed [21:29] How does Launchpad restrict users from accessing the shell while still offering the bzr+ssh transport? [21:29] it does not use openssh [21:30] lifeless: what does it use? [21:30] being stupid here, but how can I specify a new remote location (for pull) for an existing working tree? [21:30] twisted conch [21:30] more or less [21:30] vxnick: "bzr pull --remember ..." [21:30] vxnick: bzr pull URL --remember [21:30] vxnick: bzr pull --remember URL [21:30] Jinx! [21:30] that's the one, thanks all :) [21:31] lifeless: thanks [21:31] lifeless: yes, it is very nice to see [21:31] (the progress bar) [21:31] what about for a checkout? there's no --remember flag in the help for that [21:31] vxnick: bzr switch URL [21:31] thanks [21:32] lifeless: I had not seen that you have the failure/error tracker, though [21:32] well that and you don't stop on the first error now [21:33] jam: I didn't think we'd changed the stop on first error [21:33] Running [ 22% 4836 test(s) 107 failure(s) 127 errors(s) ] Current test ... [21:33] lifeless: ^^ sure looks like it is not stopping [21:33] jam: yeah [21:33] Some of those are XFAIL/unsupported features, right? [21:33] though: check-nodocs: extensions [21:33] $(PYTHON) -Werror -O ./bzr selftest -1 --subunit $(tests) [21:33] jam: skips/missing dependencies will report as failures normally [21:33] Peng_: yes [21:34] jam: I smell a bug in the subunit integration [21:34] still, I prefer it this way [21:34] lifeless: prefer... ? [21:34] you can run the error mail through subunit-filter | subunit2pyunit [21:34] w/ subunit? Or getting "failures" for skips? [21:34] jam: not stopping [21:35] tells you all the issues in one roundtrip [21:35] lifeless: yeah, long ago it was that way [21:35] I think we changed it because the round-trip time was too long [21:35] by the way, nobody else is stepping up to be the 2.1.0b1 RM, right? [21:35] (so I should start focusing on that tomorrow) [21:36] I think you're it, yes [21:36] TypeError: can only concatenate tuple (not "StaticTuple") to tuple [21:36] Looks like there are some real errors. [21:39] That's not the only one, either. [21:45] Grr [21:45] The Loggerhead for bzr.dev isn't working :\ [21:47] http://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev/ WFM, if that's what you mean [21:48] Can I cherrypick multiple sets of revisions? [21:49] something like bzr merge revX..revY,revN..revM branch [21:49] ? [21:50] yes [21:50] do the first one [21:50] then the second with --force [21:50] lifeless: are you talking to me or someone else [21:50] lamalex: You. [21:51] how do i do one with --force and one without. two seperate commands? [21:55] thanks lifeless [21:57] Peng_: Yeah, it looks like we have more code that expects an explicit "tuple()" object that I didn't catch yet [21:57] like (foo,) + value [21:57] which thought it was concatenating tuples, etc [21:58] and bencode(StaticTuple) fails as well... [21:59] lifeless: can I use subunit without bootstrapping autoconf onto my windows machine? [22:03] argh.... [22:03] jam: yes [22:03] UnavailableFeature: Internally performed glob expansion [22:03] ... :( [22:03] jam: the python stuff is in python/ [22:03] lifeless: yeah, I set PYTHONPATH and got it to work [22:03] then do: [22:04] but there is no "setup.py" that I could find for subunit itself [22:04] cat trace | subunit-filter --no-skip | subunit-ls > failing.list [22:04] ./bzr selftest --load-list failing.list [22:05] jam: right, its got C and perl and c++ all in the one project; setup.py is epic fail for that [22:05] lifeless: but it should would be nice to put the 'subunit' module into my PYTHONPATH [22:05] "sure would" [22:06] and the pure-python scripts into the Scripts dir [22:06] since I'm not building anything else... [22:06] also, it fails a bit because if I do: [22:06] --no-passthrough [22:06] then it strips the extra context per failing test [22:06] but if I don't [22:06] then I get all the "make" garbage at the beginning [22:06] anyway, I'll work through that [22:07] what 'extra context' ? [22:07] lifeless: when a blackbox test fails it includes the log [22:07] ah, perhaps --subunit is stripping that out entirely? [22:07] jam: --subunit drops that [22:07] AssertionError: Unexpected return code 0 != 3 [22:07] not helpful [22:07] my protocol branch of subunit is working towards supporting that [22:07] Is there an equivalent to --tunnel-user= for bzr? [22:08] davidstrauss: I don't know what --tunnel-user= is [22:08] davidstrauss: so I can't answer the question === dorins_ is now known as dorins [22:09] lifeless: It's an option for svnserve allowing multiple users to use the same Unix user while forcing the user mentioned in commits, etc. [22:09] davidstrauss: no; because commits are done on the client [22:09] lifeless: Like a global --author [22:09] davidstrauss: 'commit' to a smart server is actually 'push' [22:09] ah [22:10] you can write a pre tip change hook to reject users [22:10] or you could write a post tip change hook to rebase-and-alter [22:10] [though the latter may find bugs/limitations in what that hook is expected to do :P] [22:18] lifeless: Hmm. Thanks for the suggestions. I think Bazaar will eventually have to find a way to enforce accountability for stuff like this. (Even if it's a separate field like "apparent user.") [22:18] Pack -> 2a conversion seems really slow in 1.18. [22:18] Update to 2.0 [22:18] Okay. :-) [22:18] mkanat: its largely that 'pack' is much slower. [22:19] mkanat: but 2.0.0 is somewhat better at the conversion [22:19] lifeless: Ah, okay. :-) [22:19] Yeah, I have an Intel X25-M SSD and it's still taken like 3 minutes and isn't done converting 6000 or so revisions yet. [22:19] What are the best documents to read to get started in bazaar development? [22:23] davidstrauss: People push others' revisions all the time, though. [22:23] davidstrauss: I guess requiring GPG signatures would do it. [22:23] yeah :-/ [22:24] are you looking for undeniability? [22:26] Hmm. I just did "bzr reconfigure --use-shared" on a packs branch above a 2a repository, and it seems that my repository simply disappeared and no longer exists now. [22:26] Not my 2a repository. [22:26] The packs repository in the subdirectory. I just get: bzr: ERROR: No repository present: "file:///home/mkanat/projects/parse-stacktrace/" [22:28] You might have a .bzr/repository.backup somewhere. [22:28] Peng_: Actually, not that I see. [22:28] I mean, it's ok, this was a checkout, but.... [22:28] file a bug please [22:29] its probably because it was a checkout [22:29] mkanat: the output of ls -R would probably be helpful [22:29] lifeless: Okay. [22:29] I suspect it changed it from checkout to standalone and didn't add a repo [22:29] jam, lifeless: Okay. I'll see if I can reproduce. [22:31] mkanat: firstly please just file the bug with all the data you have so far [22:31] lifeless: Okay. [22:34] Okay, filed: https://bugs.launchpad.net/bzr/+bug/449886 [22:34] Launchpad bug 449886 in bzr "Converting packs checkout to use 2a shared repository loses checkout repository" [Undecided,New] [22:34] And yes, it's reproducible. [22:38] hey bzr folk, what's everyone using for developer code reviews? [22:39] basically i'm looking for something that can do a diff between two branches with nice links out to the source code for when the reviewers want context [22:39] right now we're doing gist.github.com + manual hops to loggerhead, but wondering if there's anything out there people are using [22:40] phinze: launchpad code review [22:40] used to use Bundle Buggy [22:40] phinze: I think review-board also supports bzr. [22:42] jam: oh you guys moved past bundle buggy? that must have been recently? [22:42] phinze: a few months ago... [22:42] can't understand the purpose of bzr merge --pull [22:42] ah gotchya, how are you liking it [22:43] mkanat: thanks for the review-board reference -- will check it out [22:45] phinze: things to like, things to not like, I guess. The integration w/ the rest of launchpad is nice. It is missing a few bits that we used to use [22:46] it has been getting better, though [22:47] There are a lot of references to the bundle buggy on the site [22:47] can I have an alias in the branch rather than ~? [22:48] is there a command for that or will I need to manually edit branch.conf? [22:53] lifeless, jam: It seems to be happening with branches too, not just checkouts. [22:56] Oh, hmm, I might have an idea of what's going on. [23:05] It might not actually be so severe. [23:13] mkanat: why are you using reconfigure anyhow? [23:13] mkanat: I thought you wanted to upgrade? [23:16] lifeless: I did the upgrade and it kept it in the repo, didn't realize, and then did a reconfigure. [23:16] lifeless: I mean, kept it in the standalone repo. [23:17] Okay, I explained what happened, on the bug. [23:19] Is there a way to include function names in preview patches with "bzr send"? [23:23] davidstrauss: not at the moment, there is a general request that we support function names in diffing; that would follow on [23:24] lifeless: In the mean time, it seems like it would make sense to offer --diff-options for send, just like with diff. [23:25] davidstrauss: file a bug :) [23:27] lifeless: Done :-) https://bugs.launchpad.net/bzr/+bug/449923 [23:27] Launchpad bug 449923 in bzr "bzr send should offer the --diff-options option" [Undecided,New] [23:43] I'm trying to find where bzr send creates the diff [23:43] Could someone help me out === Zand3r_ is now known as Zand3r [23:48] Does send create its diff with MergeDirective._generate_diff [23:51] IDEs would help on that [23:52] Nah, they love to take over the project structure [23:52] Not something I want to do [23:53] unfortunately Eclipse has not a good Python IDE [23:55] I left Eclipse [23:55] Now I just use emacs [23:55] Bit more primitive, but you can get everything done