[00:00] lifeless: well done! [00:01] lifeless: I'll review that other patch this morning [00:01] morning all [00:01] good morning. [00:03] I've got what is probably a dumb question, but I haven't been able to find an answer in any online docs or mailing list archives. Is there a way to put a setting into branch.conf, commit it (or something to that effect) so it is shared? [00:04] thanks for releasing 1.17 jml [00:05] faceprint: not currently [00:10] faceprint: you can push it some where that is shared though. What do you want to do exactly? [00:12] i've written a plugin, and I want to put some settings for it into branch.conf so the entire team doesn't have to manually keep settings in sync [00:13] Ok - Now I understand. Sorry - can [00:13] 't help === beuno_ is now known as beuno [00:14] faceprint: you could have your plugin read from the tree [00:21] james_w, my pleasure. [00:31] hi igc [00:31] hi poolie [00:31] can I set a submit branch without editing locations.conf? [00:32] jml, i don't think so [00:32] sending mail for a new rm [00:33] thanks. [00:34] thanks jml, it's been good [00:34] jml: bzr send --remember? but probably not what you were looking for... [00:35] Raim, it's pretty close actually, if I tack on a --no-bundle and -o- [00:36] hmm. I get a warning about masked values. [00:37] * jml sets this problem aside === edcrypt is now known as edcrypt_ [00:40] jml, our 4w schedule would have 2.0rc1 on 6 August and the final on the 13th [00:41] any comments on how that fits with lp rollout? [00:42] * jml checks out the calendar [00:42] launchpad isn't going to rollout in august most likely [00:43] Next roll-out after 2.2.7 is 2.2.9 on Sept 23rd. Someone's going to announce this properly on the blog soon. [00:43] mm i saw that [00:43] well, let's say not 'rollout' in particular, but lp's development cycle in general [00:44] poolie, a bzr upgrade is going to have to be special-cased no matter when it is. [00:44] poolie, so, those dates are just fine. [00:44] k thanks [00:45] you know some people at canonical would not have said the second sentence and would have just left me wondering :) [00:46] poolie, well, in this case I was figuring it out as I went along. the idiosyncrasies of a synchronous medium, don't you know? === Toksyury1l is now known as Toksyuryel [01:24] http://paste.ubuntu.com/223141/ [01:24] poolie: ^ [01:24] I'm about to ring to double check this [01:24] and talk about the other stuff you msged me [01:24] to ring me [01:24] * poolie braces [01:24] ok then === faceprint1 is now known as faceprint === photon is now known as Guest82724 [02:53] more things that aren't thread safe in bzrlib! [02:54] progress bars [02:55] * mwhudson attempts to phrase this more usefully [02:55] hm [02:56] basically i think one wants a ui factory per thread [02:57] i also don't know if the consequences of the unsafety are at all important [03:04] * igc lunch [03:05] seems likely it's pretty harmless [03:21] mwhudson: it's not clear to me what kind of threadsafety it ought to work [03:22] poolie: the [03:22] warnings.warn("%r is not the active task %r" [03:22] % (task, self._task_stack[-1])) [03:22] warning trips occasionally [03:23] yeah [03:23] this uifactory assumes the code is singlethreaded [03:23] so the warning is saying, you need something else [03:23] GTK isn't threadsafe either [03:23] the text mode progress bars will be unhappy if you run multiple threads there [03:23] it freaks out if you call the it from more than one thread [03:23] if this happens even when you have them off, as it probably does, it's a bug [03:23] that i may fix sometime === mlh_ is now known as mlh [03:24] but more seriously, lots of code in bzr has state that's unsafe to run concurrently [03:24] thats ok, python can't do it anyway [03:24] there's not really any contract that you're allowed to do it [03:24] or to do it under particular conditions [03:25] poolie: just stop mutating stuff [03:25] then you're fine! [03:28] poolie: this happens with SilentUIFactory too [03:29] ok i agree that's a bug; probably not worth filing as i'll probably fix it next time i refactor there... [03:29] cool [03:29] i got a bit worried that it was screwing things up, but that was something else [03:29] if it just produces a warning now and then (which i think is what it does) i don't really care [03:30] if you're keen you can change silentuifactory not to have that code [03:31] i still owe you a patch to make TextProgressView more parameterizable i think [03:35] hm, is merge --preview broken? [03:46] mwhudson: details [03:47] lifeless: https://bugs.edge.launchpad.net/bzr/+bug/402022 [03:47] Ubuntu bug 402022 in bzr "merge --preview fails with TypeError: _do_preview() takes exactly 2 arguments (3 given)" [High,Confirmed] [04:00] $ bzr log -r -1 lp:rivenx/trunk/0.8 [04:00] bzr: ERROR: bzrlib.errors.ObjectNotLocked: _KnitGraphIndex(CombinedGraphIndex()) is not locked [04:00] :sad: [04:01] Objects just wanna be free. [04:14] mwhudson: looks like a qbzr problem, try updating that first? [04:15] hi jfroy, look for an existing bug, it sounds familiar and may be fixed [04:15] well not in 1.17 :| [04:15] not a huge deal [04:16] poolie: seems you are right [04:16] sorry for the noise [04:17] maybe apport should automatically google for the exception :) [04:17] jfroy: https://bugs.edge.launchpad.net/bzr/+bug/389413 [04:17] Ubuntu bug 389413 in bzr "ObjectNotLocked: _KnitGraphIndex(CombinedGraphIndex()) is not locked running diff across hpss" [High,Confirmed] [04:18] Similar, though my command was log [04:19] Added a comment to say so. [04:29] jfroy: I think jml or mwhudson filed one about log recently [04:30] I did. [04:30] Possibly the same bug, possibly not. [04:30] It's probably a dupe. [04:32] missing doesn't take a -d parameter. woe. :( [04:45] grr ... latest bzr nightly seems to make the bzr-fastimport tests fail [04:59] igc: did you notice that bzr-fastimport breaks w/ the latest nightly PPA bzr? [05:00] samB: no, but I half expected it [05:00] bad deltas? [05:01] samB: please raise a bug and I'll look at it soon [05:01] lifeless: I'd expect so [05:01] Is the expected half the fast or the import? O:-) [05:01] fullermd: the import [05:02] fullermd: it will be *real* fast I expect [05:02] Shucks. Oh well, at least it's still fast. [05:02] igc: I'd hope not [05:02] fullermd: it will exit quickly I suspect :-) [05:03] fullermd: it just won't work as such [05:03] igc: I also discovered that bug #401249 is worse than I thought [05:03] Launchpad bug 401249 in bzr-fastimport ""tag from " gives KeyError" [Undecided,New] https://launchpad.net/bugs/401249 [05:03] well, that might also be better, though [05:04] since it means I definately don't have to untangle anything from the head-tracking code ;-) [05:05] igc: what format would you like the test results pasted in? [05:05] samB: not sure I understand the question [05:06] just regular, or subunit, or? [05:06] SamB: regular is fine [05:07] :P [05:16] https://bugs.launchpad.net/bzr-fastimport/+bug/402041 [05:16] Ubuntu bug 402041 in bzr-fastimport "selftest breaks with bzr 1.17~rc1+4554+118" [Undecided,New] [05:17] ubottu: that's not an ubuntu bug! [05:17] Error: I am only a bot, please don't think I'm intelligent :) [05:17] I sure don't! [05:34] SamB: wheee, fun [05:34] lifeless: the selftest errors? [05:34] yah [06:39] EOD For me [06:39] see youall tomorrow [06:39] https://code.edge.launchpad.net/~lifeless/bzr/bug-367632/+merge/8928 still needs review [06:48] jml: any chance you'll review my subunit branch this avo? [06:48] lifeless, a reasonably strong one actually. [06:48] woo [06:48] thanks [06:49] I'm going to do another patch tonight to output time: [06:49] would you enjoy a subunit talk @ slug? [06:50] I haven't been to slug since 2007 [06:50] :) [06:50] lifeless, but it sounds like a good idea. [07:49] lifeless, all the cool kids go to fp-syd now :) [07:49] it's just about functional too :) [07:50] poolie: sadly, fp-syd is on thursdays [07:56] wow [07:57] poolie: ? [07:57] the release [07:57] that's great [08:00] which release? [08:00] :D [08:01] 57408 .bzr/repository [08:01] 174084 backup.bzr/repository [08:01] ^ good work [08:01] welcome to bzr 2 [08:17] igc: helllo [08:18] hi bialix! How are you? [08:18] I'm still trying to enter work-mode [08:18] sorry for delay with tarballs [08:19] I'll upload them now [08:19] bialix: yes, it took me several days last week to get going again - well after the 900 emails in my inbox were triaged :-) [08:19] the same here [08:19] bialix: the tarball is done, the Windows installer is not [08:20] ok [08:20] will do [08:21] last night I've realized there is hidden bug in my check of bzr version [08:23] igc: so what revno I should package to installer? rev 191 tagged as release-0.5, but there is also rev 192 [08:23] bialix: 192 [08:24] I'll update the tag [08:24] I tried to move the tag using qtag but it may not have pushed correctly [08:25] push --overwrite should do. I've pushed updated tag. please, check it [08:28] igc: there is two test package now? [08:28] one in the root and other in lib [08:31] Hi bialix/igc [08:32] hi garyvdm [08:35] igc: installer has been uploaded [08:35] bialix: thanks [08:35] hi garyvdm! === poolie changed the topic of #bzr to: Launchpad's source released today! | Bazaar version control system | 1.17 released 20th July, 2009 | http://bazaar-vcs.org | http://irclogs.ubuntu.com/ [08:49] garyvdm: I'd like to have buttons Refresh and Diff swapped in qcommit [08:50] hi bialix, garyvdm [08:50] hi poolie [08:53] garyvdm: btw, your error dialog is very nice, but I wonder if we should suggest to users file bugs against qbzr and not bzr itself? [09:06] bialix: can you detect which part the bug lies? [09:07] well, I mean errors in GUI very often occurs because of internal qbzr error [09:07] anyway we can reassign bug later [09:08] * LarstiQ nods [09:08] bialix: it sounds good to me. [09:08] bialix: but detecting where the problem lies would be cool. Even better if you can detect why, next step is automatically fixing it! ;) [09:08] by recompiling python bytecode! [09:09] like in Chrome browser [09:09] changing running programs I sometimes really miss [09:22] * igc dinner [09:24] * bialix bbl [12:01] lifeless: can you upload bzr 1.17 to Debian, or should someone else do that? [12:01] LarstiQ: someone else should :) [12:01] ok [12:01] little busy atm [12:01] * LarstiQ will see if he can prepare that [12:03] LarstiQ: I've got it prepared here, just need to find my gpg key [12:03] jelmer: sweet! [12:04] bzr: ERROR: http://bazaar.launchpad.net/~launchpad-pqm/launchpad/db-devel/.bzr/repository/packs/c0ae45a26df55c3bfbb79c0523c4de78.pack is redirected to https://launchpad.net [12:04] jelmer: does anyone over there know anything about openpgp cards with non-sha1 yet? [12:05] jelmer: could you try again? some admin fiddling was going on [12:06] * jelmer tries again [12:09] jelmer: we had a server issue [12:10] jelmer: its resolved-for-now, but the root cause requires code changes. mwhudson is working on those. [12:10] lifeless: ah, thanks === gdmfsob is now known as mishok13 [12:42] is there another way to push to a branch other than lp:~? its stalling at 43% [13:07] Hi all [13:09] does a bzr+ssh server require regular ssh accounts on the server (i.e. user accounts) [13:13] yes [13:13] it is over ssh, after all ;) [13:15] so is there a way to tell sshd to only accept bzr connections, but not shell connections? I would prefer if my various users were not able to have shell access to my server [13:18] TheJosh: Make the default shell for their user /bin/false [13:18] thanks [13:28] gnomefreak: I think you can push to lp using sftp. [13:28] bob2, TheJosh: you can also use a custom ssh server [13:29] gnomefreak: try changing the the bzr+ssh://bazaar.lau... address to sftp://bazaar.lau... [13:29] gnomefreak: It will probably be much slower. [13:31] garyvdm: as long as it doesnt stall im happy. ill try now [13:32] Now I'm getting "bzr: ERROR: Connection closed: please check connectivity and permissions" when I try to checkout. I thought I read something about that somewhere, but I cannot remember where [13:32] garyvdm: this command? bzr push sftp://bazaar.launchpad.netgnomefreak/firefox/firefox.dev [13:33] yes [13:33] garyvdm: thanks [13:34] im getting permission denied and i know my ssh key passphrase is right [13:35] gnomefreak: you're missing a slash there [13:35] and a ~ [13:35] bzr: ERROR: Permission denied: "/gnomefreak/firefox/firefox.dev": [Errno 13] mkdir failed [13:35] gnomefreak: ~gnomefreak/ [13:35] LarstiQ: i fixed the slash [13:35] ah thanks LarstiQ [13:35] TheJosh: does it mention a public key? [13:36] Nope. What I pasted is the entire error message [13:36] LarstiQ: thats working ill let you know if it stalls too [13:36] gnomefreak: I suspect that launchpad may be slow today due to a rush to download the launchpad code. [13:36] * garyvdm checks if it's on slashdot yet. [13:37] Nope not on slashdot yet. [13:37] garyvdm: this would be an opportune moment to make use of the decentralized nature of bzr [13:38] TheJosh: could you pastebin the complete transcript from the point where you enter the command used? [13:38] sure [13:39] larstiq: But of course people will want to get it from the _canonical_ location... [13:39] http://pastebin.com/d67cd919 [13:39] lame... [13:39] * awilkins beats garyvdm with the punstick [13:39] fwiw I have a copy I could seed [13:40] I've already decided to grab the LP sources _later_ [13:40] Not least because the dependancies are huge and my ISP will throttle my connection unless I download them after 2100 [13:40] TheJosh: k, you could try and see if adding -Derror enlightens more, but at this point I would try and see if `ssh TheJosh@chaoticrage.com` works [13:41] From #launchpad : < wgrant> Currently downloading Launchpad at 0KB/s [13:41] It connects, and then dies instantly - because I set the shell to /bin/false [13:41] Methinks LP is doomed to be rather slow for quite a few hours [13:42] Hi bialix [13:42] hi Gary [13:44] bialix: Can't reproduce bug 402103, and I have no idea what it could be. [13:44] Launchpad bug 402103 in qbzr "qcommit: refresh producing traceback" [High,Confirmed] https://launchpad.net/bugs/402103 [13:45] Can you try a minimal test case: [13:45] cb = QtGui.QCheckbox() [13:46] cb.setCheckState(0) [13:46] you want me to check it in python shell? [13:46] yes please [13:46] it will be not fair experiment [13:46] because I'm running bzr.exe [13:48] TheJosh: can you ssh in? [13:48] I can SSH in [13:48] LarstiQ, I can SSH in, but the shell exits straight away because I set the shell to be /bin/false [13:49] garyvdm: QWidget: Must construct a QApplication before a QPaintDevice [13:49] I have segfault [13:49] TheJosh: ah, that may be it. [13:50] TheJosh: have a look at contrib/bzr_access instead [13:50] (Pdb) cb.setCheckState(0) *** TypeError: argument 1 of QCheckBox.setCheckState() has an invalid type [13:52] bialix: Please can you try: [13:52] LarstiQ, How does that help my problem? [13:52] cb.setCheckState(QtCore.Qt.Unchecked) [13:52] TheJosh: instead of setting to /bin/false, which I'm rather sure is what is denying you to login [13:52] or well [13:53] run bzr over ssh [13:53] bialix: I suspect that if you upgrade to PyQt4.4 it will be fixed. [13:53] garyvdm: I'm already running PyQt 4.4.3 [13:53] LarstiQ, isn't that what i'm trying to do, run bzr over ssh (i.e. bzr+ssh://) [13:53] Oh [13:53] TheJosh: yes, but you can't, because your shell is /bin/false [13:54] TheJosh: I might be wrong, but that is how I analyze the situation [13:54] garyvdm: as discussed we stopped to support 4.3, and I've switched to latest available [13:54] LarstiQ: That might be my fault... I was of the opinion that it would prevent shell logins.. .but not running bzr [13:54] or I just run through sftp:// [13:55] awilkins: hi, can you explain what's wrong with qconflicts so you don;t use it? [13:55] bialix: Didn't know it was there! [13:55] bialix: Ooh, shiny [13:55] bialix: IT was absent when I first started using qbzr [13:55] garyvdm: cb.setCheckState(QtCore.Qt.Unchecked) is worked [13:56] awilkins: it was added many months agop [13:56] using sftp im getting Connection to bazaar.launchpad.net closed by remote host.d 1211/1295 [13:56] TheJosh: sure, that is an option, though slower [13:57] * garyvdm wonders how many other cool qbzr feature there are that people are not aware of. [13:57] btw vila broke qpush [13:57] list them in bzr --help? [13:57] * awilkins awilkins runs `bzr help commands | grep q` [13:57] So why does bzr not have any decent access controls, thus preventing me from using the bzr:// smart-server directly. Argh so annoying! [13:58] and vila away on vacation, rats, I have no person to poke [13:58] awilkins: Not just commands. [13:59] i dont get it sunbird pushed fine but firefox branch wont push [13:59] TheJosh: The only access you can control in a DVCS is to transports, so it doesn't make sense for bzr to implement access controls when there are so many nice implementations on existing transports [13:59] awilkins: the first version of qconflicts was actually written for you exclusively, because you were complaining how that's the only thing you use bzr-gtk for :P [13:59] hi luks [13:59] hey [14:00] * awilkins blsuhes [14:00] gnomefreak: I suspect that this is a hosting issue. Maybe they will be able to help you at #launchpad [14:00] Hi luks [14:00] garyvdm: thanks ill ask [14:01] bialix: How is qpush broken? [14:01] qbzr and external merge apps ; does it permit selection on patterns? [14:02] And does the definition permit formats? [14:02] garyvdm: push complains when wt is not clean, me working with lightweight checkout, but qpush is started in the root of the master branch that has out-of-date tree [14:02] so now we have to "fix" qpush, thanks to vila [14:03] bialix: --no-strict? [14:03] maybe, but anyway it's not there right now [14:04] awilkins: I'm not sure I understand the question, but it uses the same format as extmerge [14:05] luks: I patched bzr-gtk for my own use to accept a python format-string because the way it built args didn't work too well on windows [14:06] luks: Looking at the implementation in qbzr it looks similar only it uses replace instead of format [14:11] luks: I also use a patched version of extmerge. And I could not get conflicts to do what I wanted - I should just fix it my self but I've not had time. [14:12] I want it to run meld bar.py.THIS bar.py bar.py.OTHER [14:14] "meld %t %r %o" doesn't work? [14:18] btw, qconflicts does not support winmerge [14:18] awilkins, surely a 'smart' server, which provides its own transport, should be able to proved basic authentication [14:20] TheJosh: very little people run bzr:// [14:20] hmm, that came out wrong [14:21] LarstiQ, perhaps because it doesn't have authentication [14:21] TheJosh: rather, because we alread have ssh I think [14:21] yeah, but then I am opening up everyone to my entire VPS. [14:22] TheJosh: but have a look at http://pypi.python.org/pypi/ClueBzrServer/0.2 [14:23] thanks [14:25] bialix: please will you see if lp:~garyvdm/qbzr/bug402103 works [14:29] garyvdm: it works, but strange [14:29] bialix: Your PyQt is more fussy than mine. [14:30] if I have tree w/o changes and then change file and refresh there appears additional columns: date/size etc [14:30] bialix: TreeWidget never shows the size. [14:31] Is this is qcommit? [14:31] *in [14:31] garyvdm: it seems like PyQt4.4.x Windows build is much worse than 4.3.1 [14:31] in qcommit, yes [14:32] bialix: That's surprising. Please will you imagebin a screenshot. [14:33] may be I need file a bug? [14:34] bialix: ok [14:34] garyvdm: http://imagebin.ca/view/5nu7sR.html [14:35] bialix: it should be easy to change qpush to change subprocess starting dir, instead of using -d [14:36] bialix: that is a bug. [14:36] I'll file it [14:37] speaking of qci, would somebody object if I get rid of the help text in the Branch group (when committing to a checkout)? [14:37] garyvdm: any ideas about bug 402100? [14:37] I don't think it belongs there and it takes space [14:37] bialix: looking at that screen shot, I realized that Bug 402100 [14:37] Launchpad bug 402100 in qbzr "qcommit: filename is not fully visible and column is not resizable" [High,Confirmed] https://launchpad.net/bugs/402100 [14:37] is due to your pyqt version [14:38] I'll boot into windows just now to fix it. [14:38] luks: it was idea of Mark Hammond, I never was big fan of big texts there [14:38] What do you dudes use to make the UI? QtCreator? [14:38] QtDesigner [14:38] I'd rather write a manual than have that text in UI [14:38] aqilkins: some times [14:39] some dialogs hand written [14:39] ^^^ most of the time. [14:39] :-) [14:39] Designer is very good to mock UI [14:41] garyvdm: btw about your cool idea to show revision message in qdiff: may be we need to do it all the time when qdiff running as qdiff -cN ? [14:42] Yes [14:42] yeah, I'd like that too [14:43] I personally don't use that very often. I normally go into qlog - then dbl click on a rev. [14:44] IIRC gitk shows diff right in the log window when user selects revision [14:44] and vis shows it in a tab [14:45] garyvdm: https://bugs.launchpad.net/qbzr/+bug/402218 [14:45] Ubuntu bug 402218 in qbzr "qcommit: after refresh there is additional columns in file view" [Medium,Confirmed] [14:45] bialix: thanks [14:45] gitk can do that, because git is fast enough :) [14:46] even getting the revision delta is slow in bzr [14:46] hi guys. I took a branch, and I've made a number of commits to it. I've now made a change to a single file, and I'd like to merge that single change into the parent branch. Is this possible? [14:47] CaMason: Yes, for given values of yes [14:47] luks: meld %t %r %o - gives me "Error while running merge tool (code 0)" [14:47] hm [14:47] would you mind explaining the process at all? [14:47] CaMason: You can i) Cherrypick that revision into parent, ii) start a new branch off parent, make the change there and merge it into both branches [14:47] brilliant, thanks I'll look that up [14:50] with option2, should I uncommit from my branch before merging it in from the new new branch? [15:05] bialix: I can't reproduce bug 402218. [15:05] Launchpad bug 402218 in qbzr "qcommit: after refresh there is additional columns in file view" [Medium,Confirmed] https://launchpad.net/bugs/402218 [15:05] I tried in a lw checkout [15:06] Where the wt tip is older than the master branch tip [15:07] bug 402218 is not related to lt checkout I guess [15:07] Launchpad bug 402218 in qbzr "qcommit: after refresh there is additional columns in file view" [Medium,Confirmed] https://launchpad.net/bugs/402218 [15:07] Ah - bialix: If you scroll to the right, do you see the status column [15:07] I think that all columns are visible [15:08] I originally thought that it was because it had a RevisionTree, and not a WorkingTree. [15:08] garyvdm: yes, the status column here [15:09] I've used small window size to reduce screenshot [15:10] garyvdm: additional columns appears only if you start qci in clean tree (without any changes) [15:52] * GaryvdM reading the comments in http://news.slashdot.org/story/09/07/21/1224259/Canonical-Fully-Open-Sources-the-Launchpad-Code while I wait for bzr to pull lp:qbzr very slowly... [15:59] heh [16:35] GaryvdM: another problem with qci: when I have pending merge and many many renamed files in subfolder then scrolling wt view does not repaint it until I click mouse on some item [16:36] bialix: Ok - please will you try get a screenshot [16:36] screenshot? [16:37] I'm not sure [16:37] it's need to see in action [16:38] bialix: ok - Please log a bug. [16:39] I just managed to fix one of the column bugs. - Looking up the bug number. [16:44] bialix: Bug 402218 fixed :-) [16:44] Launchpad bug 402218 in qbzr "qcommit: after refresh there is additional columns in file view" [Medium,Fix released] https://launchpad.net/bugs/402218 [16:44] Launchpad bug 402218 in qbzr "qcommit: after refresh there is additional columns in file view" [Medium,Fix released] https://launchpad.net/bugs/402218 [16:45] Launchpad bug 402218 in qbzr "qcommit: after refresh there is additional columns in file view" [Medium,Fix released] https://launchpad.net/bugs/402218 [16:45] Ubuntu bug 402218 in qbzr "qcommit: after refresh there is additional columns in file view" [Medium,Fix released] [16:45] Ubuntu bug 402218 in qbzr "qcommit: after refresh there is additional columns in file view" [Medium,Fix released] [16:45] Launchpad bug 402218 in qbzr "qcommit: after refresh there is additional columns in file view" [Medium,Fix released] https://launchpad.net/bugs/402218 [16:45] lol [16:45] ubottu fight with ubott2 [16:45] These bots need to chill! [16:45] Error: I am only a bot, please don't think I'm intelligent :) [16:49]