[04:27] hello. do blackbox tests to something special to cause hooks to not get invoked? i am trying to write a test for bug #403687 [04:27] Error: Could not parse data returned by Launchpad: The read operation timed out (https://launchpad.net/bugs/403687) [04:27] it works well on command line but test case doesn't show the status info. http://pastebin.com/98h4RSMG [04:28] bug #403687 is to add shelve summary in status. [04:28] Launchpad bug 403687 in Bazaar "bzr status should show shelved changes (affected: 6, heat: 24)" [Wishlist,In progress] https://launchpad.net/bugs/403687 [04:28] or am i doing something wrong in the test case? [05:04] nevermind. found setUp(): self._clear_hooks() in class TestCase [05:04] will add the hook specifically in this test case. [05:06] parthm: thats almost certainly wrong [05:06] parthm: the hook should be in the hooks registry or it won't show in bzr help hooks either [05:07] lifeless: oh. so it looks like i added the hook in the wrong place. where is the hook registry? [05:08] lifeless: ah. hooks.known_hooks. [05:09] lifeless: thanks :-) [05:11] lifeless: hmm. i think i am confused now. the StatusHook is already added. i am just looking to add a predefined show_status_summary hook using installed_named_hook. whats a good place to do that. [05:12] lifeless: right now i am just calling install_named_hook at the bottom of status.py [05:14] http://pastebin.com/iUXKsg1t [05:20] parthm: Installed hooks are cleared before/after tests [05:21] if you want/need a hook to always be installed, do that in the constructor of the relevant class, or in the relevant tests [05:23] lifeless: will do. for status.py there isn't a class so i suppose that will have to be module level. for the tests i will do it in the constructor [05:25] there should be a Hooks class still [05:29] lifeless: yes. i could add it there. i looked at smart.request. that seems to be adding the its jail_info handler at the module level. i wonder whats the suggested practice for pre-defined hooks that ship with bzr [05:29] s/pre-defined hooks/pre-defined hook handlers/ [05:30] class Hook mainly defines the hook. adding a handler there doesn't seem clean. [05:32] thats right [05:34] lifeless: ok. so for the tests i will do it in the constructor so that all status tests get the behavior. thanks. [05:37] parthm: I don't know what you mean by that [05:38] parthm: but I'm sure it will get sorted in review :P [05:39] lifeless: yes :-) ... basically, for the bb test i am writing i can either add the hook in the test itself, or on the test class level (__init__). doing the latter seems correct as all status tests will get the behavior of bzr as seen by the user. [05:44] parthm: __init__ on test classes cannot be used. [05:44] parthm: perhaps you mean setUp ? [05:45] lifeless: yes. setUp :P [05:46] lifeless: perhaps, _clear_hooks shouldn't be clearing the default hook handlers? i suppose thats a topic for the mailing list :-) [05:46] lifeless: thanks. [05:55] parthm: it totally should clear them [05:55] parthm: test isolation [05:56] If you want to test something with a specific thing installed; install that thing in the test. [05:59] lifeless: but if bzr always hooks in some handlers than thats default behavior? [06:02] parthm: that sounds weird [06:02] parthm: take the command hooks for instance; the ones to return bzr commands are *not installed* in tests. [06:03] parthm: run_bzr calls through the codepath that installs them at process startup; calling the public functions directly in a test that hasn't registered them or called run_bzr will find 0 bzr commands instaled. [06:05] lifeless: ah. yes. that makes sense. thanks. === beuno_ is now known as beuno === wgrant_ is now known as wgrant [10:03] jelmer, exactly that. " the new revision does the copy *and* the changes as opposed to creating the branch in a separate revision" [10:30] jml: welcome back to the land of the living [10:31] lifeless, thanks. [10:31] lifeless, although technically work doesn't start for another day :) [10:32] ha! [10:33] jml: can we have a work catchup your tomorrow evening then ? [10:34] lifeless, definitely [10:34] lifeless, what time? [10:34] my 8am is free, as flacoste is still awl [10:35] you're still in NZ, right? [10:35] 35 1/2 hours from now [10:35] yes [10:36] lifeless, ok. 9pm my time. we'll talk then. [10:37] \o/ [10:37] on testtools [10:37] have you seen fixtures 0.2 ? [10:37] jml: ^ [10:38] lifeless, no, I haven't. [10:38] so there is a limit with addCleanup that became clear [10:39] james_w felt that fixtures that swallowed exceptions would be unusable, and in fixing that I realised I swallowed exceptions because delegated cleanups can only report one exception [10:39] but non-delegated cleanups can report all exceptions [10:40] jml: https://code.edge.launchpad.net/~python-fixtures/python-fixtures/trunk is the branch [10:40] have a look at the last two commits [10:41] lifeless, looking [10:41] lifeless, I used a nasty hack to get around this in the Launchpad fixtures code [10:42] specifically, I want a way, with testtools cooperation, to do self.addCleanup and when the cleanup runs be able to report on multiple exceptions [10:42] rather than just one [10:43] lifeless, right. I see the diffs now. [10:43] whats in fixtures will work I think, but its only a first sketch. [10:44] lifeless, I've a got a "fail last" behaviour in Launchpad's fixtures model. [10:45] errr raise last. [10:45] * jml is still pre-cofee [10:46] jml: I chose the first one because its more likely to be the trigger [10:46] lifeless, yeah. I wanted to make sure that everything got run. [10:46] anyway, I'm not too clear what recursive finally behaviour is anyway :) [10:46] jml: me too :) [10:46] to both :P [10:47] brb [10:47] so, I'm proposing we change run_cleanups to look for a return value of a list, and if there is one, pass each element to record_traceback [10:53] a return value of a list? [10:55] yeah, as I did in fixtures [10:59] ok. the last two revisions you pointed me at seem to have little to do with what you're talking about :) [11:01] http://bazaar.launchpad.net/~python-fixtures/python-fixtures/trunk/revision/4 ; http://bazaar.launchpad.net/~python-fixtures/python-fixtures/trunk/revision/5 [11:02] Hi, I'm not sure if I understand it corectly in the sample workflow http://doc.bazaar.canonical.com/bzr.2.2/en/user-guide/organizing_your_workspace.html#local-sandbox, the 'sandbox' checkout isn't ever actually used for anything directly, right? It's just just a temporary name before I make real branches and switch what 'sandbox' is pointing to? [11:10] jml: http://bazaar.launchpad.net/~python-fixtures/python-fixtures/trunk/revision/3 [11:39] dsuch: sorry, its late here and I've a million things to do before sleeping, hopefully someone else will answer [11:47] sure thing [12:41] could a bzr revno like 123.1.4.2.3 exist? [12:42] third rev of second branch of fourth revision of first branch of rev 123? [13:48] knittl: http://doc.bazaar.canonical.com/latest/en/user-guide/zen.html#understanding-revision-numbers [13:48] spiv: yes, i'm reading that, but i'm still in doubt [13:57] knittl: as it says, "Dotted revision numbers have three numbers" [13:57] spiv: so what happens to the branch of a branch? [13:58] knittl: (unless you are using a > 2½-year-old version of bzr) [13:58] that's in the docs. but i still don't know how they would be represented? [13:59] x.2.y [13:59] or x.3.y, etc. [13:59] but that when they are branched from the same commit [13:59] It might be easiest to experiment with some toy branches? [13:59] hm no, it isn't [13:59] Ok :)' [13:59] spiv: yes i did. but having only one branch in a dir is confusing [14:00] There have been some posts on the mailing list about this, with ascii art diagrams, hopefully google can find them. [14:00] * spiv -> zzz [14:52] I have a (svn-imported) project that in its master branch has "a" and "b" directories. is it possible to split "a" and "b" into separate branches, keeping revision history? there aren't many commits to "b", so manual solution is plausible. using bzr 2.2. [14:56] janisozaur: see the "bzr split" command [14:57] jelmer, thanks [14:58] another question: is it possible to see the commit log (also diffs?) for the incoming changes? equivalent of "hg incoming" or "svn log -r BASE:HEAD" [16:45] I've performed a "bzr split a" and "bzr split b" but the commit log for "a" and "b" still lists diffs as "a/somedir/somefile.cpp" while it should list it as "somedir/somefile.cpp" (disregarding top-level "a" or "b" respectively, also splitting diffs where they change both "a" and "b"). do I have to execute any other command to fix it (repack, update or whatever?), can it be fixed or should it be considered a bug? === Ursinha is now known as Ursinha-afk === Meths_ is now known as Meths [20:26] I am trying to use bzr now that I have let bzr know who I am. But it [20:26] didn't work, it's not trusted. It gave me this: [20:26] jaso@Familyroom:~$ bzr whoami "Jason Odoom " [20:26] PLEASE HELP! [20:26] jaso@Familyroom:~$ bzr launchpad-login jasonodoom [20:26] jaso@Familyroom:~$ bzr whoami "Jason Odoom " [20:26] jaso@Familyroom:~$ bzr launchpad-login jasonodoom [20:26] jaso@Familyroom:~$ bzr branch lp:ubuntu-tour [20:26] The authenticity of host 'bazaar.launchpad.net (91.189.90.11)' can't be [20:26] established. [20:26] RSA key fingerprint is 9d:38:3a:63:b1:d5:6f:c4:44:67:53:49:2e:ee:fc:89. [20:26] Are you sure you want to continue connecting (yes/no)? y [20:26] Please type 'yes' or 'no': yes [20:27] Warning: Permanently added 'bazaar.launchpad.net,91.189.90.11' (RSA) to [20:27] the list of known hosts. [20:27] Permission denied (publickey). [20:27] bzr: ERROR: Connection closed: Unexpected end of message. Please check [20:27] connectivity and permissions, and report a bug if problems persist. [20:27] jaso@Familyroom:~$ [20:27] jasono, so [20:27] do you ave your ssh key up on launchpad? [20:27] Yes, I do. [20:28] jasono, so the "whoami" command isn't used for authentication [20:28] the lp-login one is [20:28] how do i do it [20:28] well, it looks correct [20:29] It didn't work. [20:29] is this a new ssh key? [20:29] have you ever used it? [20:29] I guess so. I took it from the Ubuntu Project on Launchpad. [20:34] BUeno. [20:43] is it possible to see the commit log (also diffs?) for the incoming changes? equivalent of "hg incoming" or "svn log -r BASE:HEAD" [20:46] are there known problems with bzr/launchpad today? [20:46] both are fine here [21:00] I am trying to use bzr now that I have let bzr know who I am. But it [21:00] didn't work, it's not trusted. It gave me this: [21:00] jaso@Familyroom:~$ bzr whoami "Jason Odoom " [21:00] jaso@Familyroom:~$ bzr launchpad-login jasonodoom [21:00] jaso@Familyroom:~$ bzr whoami "Jason Odoom " [21:00] jaso@Familyroom:~$ bzr launchpad-login jasonodoom [21:00] jaso@Familyroom:~$ bzr branch lp:ubuntu-tour [21:00] The authenticity of host 'bazaar.launchpad.net (91.189.90.11)' can't be [21:00] established. [21:00] RSA key fingerprint is 9d:38:3a:63:b1:d5:6f:c4:44:67:53:49:2e:ee:fc:89. [21:00] Are you sure you want to continue connecting (yes/no)? y [21:00] Please type 'yes' or 'no': yes [21:00] Warning: Permanently added 'bazaar.launchpad.net,91.189.90.11' (RSA) to [21:00] the list of known hosts. [21:00] Permission denied (publickey). [21:00] bzr: ERROR: Connection closed: Unexpected end of message. Please check [21:00] connectivity and permissions, and report a bug if problems persist. [21:00] jaso@Familyroom:~$ [21:00] PLEASE HELP. THANK YOU! [21:01] jasono: please answer beuno's questions [21:01] janisozaur: 'bzr missing' may do what you want [21:01] lbieber: there was something going on last night [21:02] lbieber: are you having issues? #launchpad if so [21:03] jasono, have you ever succesfully used the key to connect to anything? [21:03] NO. [21:03] I just tried it yesterday to join the Ubuntu Tour project on Launchpad. I got it from: http://www.ubuntutourproject.org [21:04] jasono, and how did you generate the key? [21:04] INto the terminal. C + V [21:05] These were the instructions: Set up a Launchpad account [21:05] If you don't have a Launchpad account yet, you can register here. [21:05] You'll need to set up an SSH key. To do so, run: [21:05] sudo apt-get install openssh-client [21:05] to install openssh. Then, make a key with: [21:06] ssh-keygen -t rsa [21:06] Press enter to use the default name. You will need to provide a password and confirm it to protect the key. You now have your SSH keys. Upload the public key to Launchpad. To do this, open ~/.ssh/id_rsa.pub in a text editor, and paste it into the text box on your SSH keys page. [21:06] Then, join our team here. [21:07] lifeless: ok, will check there [21:07] Hello. [21:07] bueno [21:07] jasono, that sounds about right, but something seems wront with your ssh key set up [21:08] what's the output of: sftp bazaar.launchpar.net [21:08] The Terminal told me it was a security problem. [21:08] Output: sudo apt-get install bzr [21:08] Now you'll need to tell bzr who you are. To do this, run: [21:09] bzr whoami "Your Name " [21:09] bzr launchpad-login your-launchpad-username [21:19] bueno [21:19] what is the tool or command to delete any file in the tree which is not in the repository? [21:20] rumbert: bzr clean-tree ? [21:21] lifeless: yes, thanks. [21:22] jasono: you need to answer beuno's questions, he is trying to help you. [21:22] Unfortuneately, that does not seem to suffice to do the merge i wish. I don't think any files are changed by me, I'm only using bzr to mirror. there could be additional files created by a build. [21:23] rumbert: that shouldn't worry bzr [21:23] Sorry, everything's going too fast. I missed it then. What was it? [21:23] rumbert: you could do bzr ls --ignored | xargs rm too ? [21:23] jasono: 08:09 < beuno> jasono, that sounds about right, but something seems wront with your ssh key set up [21:23] 08:09 < beuno> what's the output of: sftp bazaar.launchpar.net [21:24] I gave him the output, atleast I tried to. [21:24] Or did. [21:24] lifeless: interesting idea. [21:25] jasono: you need to run the command [21:25] and paste hwat it shows [21:25] Can you please give me the command? [21:26] rumbert: or add --ignored to clean-tree, its already there ;) [21:26] jasono: 08:24 < lifeless> 08:09 < beuno> what's the output of: sftp bazaar.launchpar.net [21:26] jasono: sftp bazaar.launchpad.net [21:27] to only maintain a mirror and make no changes, does one still need to use 'merge'? [21:27] no [21:27] just bzr pull [21:28] lifeless: pull won't change the working tree though. I need to update the working tree. Maybe 'switch' ? [21:29] pull will change the working ree [21:29] The output: jaso@Familyroom:~$ bzr launchpad-login jasonodoom [21:29] jaso@Familyroom:~$ bzr whoami "Jason Odoom " [21:29] jaso@Familyroom:~$ bzr launchpad-login jasonodoom [21:29] jaso@Familyroom:~$ bzr branch lp:ubuntu-tour [21:29] The authenticity of host 'bazaar.launchpad.net (91.189.90.11)' can't be [21:29] established. [21:29] RSA key fingerprint is 9d:38:3a:63:b1:d5:6f:c4:44:67:53:49:2e:ee:fc:89. [21:29] Are you sure you want to continue connecting (yes/no)? y [21:29] Please type 'yes' or 'no': yes [21:29] Warning: Permanently added 'bazaar.launchpad.net,91.189.90.11' (RSA) to [21:29] the list of known hosts. [21:29] Permission denied (publickey). [21:29] bzr: ERROR: Connection closed: Unexpected end of message. Please check [21:30] connectivity and permissions, and report a bug if problems persist. [21:30] jaso@Familyroom:~$ [21:30] opps sorry [21:31] lifeless Output: http://paste.ubuntu.com/492755/ [21:32] http://paste.ubuntu.com/492755/ [21:32] jasono: you need to run 'sftp bazaar.launchpad.net' [21:32] Okay. I'll try. [21:33] lifeless Can you help me with that command? http://paste.ubuntu.com/492757/ === soren_ is now known as soren [21:35] jasono, so, what we need to do is debug why your ssh key isn't working [21:35] it is not a bzr issue [21:35] Oh. [21:35] in order to get more information [21:35] How do I do that? [21:35] I need you to type in a terminal the following command, and pastebin the result: [21:35] sftp -vv bazaar.launchpad.net === Daviey_ is now known as Daviey [21:38] jasono, did that make any sense to you? [21:39] Yeah it did. I figured out what paste bin was for. :) Here it is: http://paste.ubuntu.com/492760/ [21:40] jasono, ok, so it seems you are sending launchpad the wrong username [21:40] try running this command: [21:40] bzr launchpad-login jasonodoom [21:40] and then [21:40] again: sftp -vv bazaar.launchpad.net [21:40] uhm [21:40] hold on [21:40] ignore that [21:41] try this instead: sftp -vv jasonodoom@bazaar.launchpad.net [21:41] just that command [21:41] If it helps, my Launchpad: https://launchpad.net/~jasonodoom [21:41] and pastebin the result [21:43] Result: http://paste.ubuntu.com/492762/ [21:45] hrm [21:45] lifeless, do you know what this means? [21:45] debug2: we did not send a packet, disable method [21:46] jasono: can you try beuno's new one [21:46] 'sftp -vv jasonodoom@bazaar.launchpad.net' [21:46] OKay. [21:46] With the ' [21:46] no [21:46] lifeless, he did [21:46] Quick question. So if someone gives me a command with ' and ends with' don't copy and run '? [21:47] beuno: check the command at the top of the pastebin [21:47] that pastebin is both times [21:47] just smashed together [21:47] oh I see [21:47] thanks [21:47] threw me off for a bit as well :) [21:48] beuno: the disable method - note that the dsa key is nill [21:48] Gave me this: http://paste.ubuntu.com/492765/ [21:48] default is rsa for new keys isn't it ? [21:49] yes, and he ran: ssh-keygen -t rsa [21:49] yes [21:49] and the one on lp is rsa [21:49] so there are two possibilities [21:50] jasono: did you run ssh-keygen more than once ? [21:52] Yes I did. Before, I thought I was suppose to run these commands in the password encryption tool in accessories. When I found out (realized) what I was doing was wrong I ran it. When I typed the commands and it didn't work I retried the processed over. [21:52] ok [21:52] ssh-keygen makes a new key; its like going to the locksmith and changing all your locks [21:52] Wow. [21:52] so we need to check that the key you are using is the lock that you have given launchpad [21:52] https://edge.launchpad.net/~jasonodoom/+sshkeys [21:53] that page shows the key(s) that launchpad knows about [21:53] if you run [21:53] cat .ssh/id_rsa.pub [21:53] it shouls show you some similar text [21:53] please see if they are the same. [21:53] Yeah it does. [21:54] Gave me this: http://paste.ubuntu.com/492769/ [21:55] ok they are differnet [21:55] what you need to do [21:55] on your https://edge.launchpad.net/~jasonodoom page [21:55] go edit ssh keys [21:56] and paste in what you have in .ssh/id_rsa.pub [21:56] How do I edit? And edit to what? [21:56] https://edge.launchpad.net/~jasonodoom/+editsshkeys [21:57] in the 'add an ssh key' box [21:57] Got it. [21:57] Type what? [21:57] The pub........ [21:57] Type this: .ssh/id_rsa.pub [21:57] the [21:57] ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuyiffpiyaanm4 (and all the text that followed [21:57] copy and paste is probably easiest [21:57] The one from the Terminal?\ [21:58] yes [21:58] Coo. OKay. [21:58] I hit import and it added the Key. [21:58] try [21:59] sftp jasonodoom@bazaar.launchpad.net [21:59] again [22:00] Gave me this:http://paste.ubuntu.com/492772/ [22:00] jasono, you didn't run the command lifeless just told you [22:00] run: sftp jasonodoom@bazaar.launchpad.net [22:00] Okay I'l do it [22:01] wants my password [22:01] that is good news [22:01] it means it's fixed [22:02] can i check automatticall yunlock when im logged in? [22:02] so type my password right [22:02] sure [22:02] so, the bzr command should work now [22:02] sftp> [22:02] gave me [22:03] good [22:03] close the terminal [22:03] and now try the bzr command again [22:05] lifeless and bueno sorry i crashed [22:05] that's fine [22:05] I was saying that it should all be fixed now [22:05] try running the bzr command [22:06] the one that lets it know who iam right [22:06] no [22:06] the last one that was failing [22:06] bzr branch lp:ubuntu...etc [22:10] bueno not sure if ican find it, let me see [22:11] jasono, all this stared because you wanted to get a bzr branch [22:11] bzr branch lp:ubuntu-tour [22:11] that was the command [22:12] From here: http://ubuntutour.org/contribute/branch/ JUst wanted to join the project [22:13] gave me this http://paste.ubuntu.com/492782/ [22:13] jasono, ok, so run: bzr branch lp:ubuntu-tour --use-existing [22:14] told me theirs already a branch ubuntu tour [22:14] ok, so lets remove it: [22:14] rm ubuntu-tour -r [22:14] after that, run again: [22:14] bzr branch lp:ubuntu-tour [22:15] Fetching revisons................... [22:15] 52 branched revisons [22:16] great [22:16] congratulations [22:16] it works [22:16] you can go back to what you where doing now :) [22:16] Thanks!!!!!! [22:16] Wait [22:17] I didn't register [22:17] Now you'll need to tell bzr who you are. To do this, run: [22:17] bzr whoami "Your Name " [22:17] bzr launchpad-login your-launchpad-username [22:17] jasono, that is done [22:17] don't worry [22:17] didnt do this [22:17] you did that previously [22:17] cool [22:17] what about................. hod on [22:17] hold [22:18] this [22:18] Press enter to use the default name. You will need to provide a password and confirm it to protect the key. You now have your SSH keys. Upload the public key to Launchpad. To do this, open ~/.ssh/id_rsa.pub in a text editor, and paste it into the text box on your SSH keys page. [22:18] did i do it [22:18] jasono, yes [22:18] you're done with all that [22:19] Thanks man. But how do I upload and edit? [22:19] jasono, those instructions should be on the project page [22:20] I don't really know how that works [22:20] dont get it [22:20] i dont know how to revise and where this all goes [22:24] thank you bueno [22:24] are you on launchpad? [22:25] jasono, I work for Canonical [22:25] on the Ubuntu One team at the moment, but I've been in different places :) [22:25] oh cool. okay so i guess you were trained on this? [22:26] I have to learn all this stuff. Thanks. :) [22:26] jasono, np [22:53] where can i find docs on bzr inventory and such? [22:53] pydoc bzrlib.inventory [22:54] lifeless: looks good. thanks [23:47] how can i make bzr display all untracked files in a working dir? [23:57] knittl, bzr ls --unknown [23:58] beuno: i deleted everything and did bzr revert [23:58]