[00:08] is there a way to fetch a branch but not pull any history? [00:08] --depth [00:08] hm, maybe it only works for clones [00:12] i don't seem to be able to find any documentation about --depth [00:12] oops, wrong channel, sorry =) [00:13] anyhow, I think what I'm looking for is --lightweight checkout [00:13] I don't think "history horizons" has been implemented yet, but the lightweight checkout plugin might be good enough [00:13] or you could stack [00:14] what do you mean by stack? [00:15] http://doc.bazaar.canonical.com/latest/en/user-guide/stacked.html [00:17] ohh, nifty [00:18] that'll involve me finding a place for the stacked branch though... [00:18] well, I'll see if the lightweight checkout works... [00:25] Noldorin: Funnily enough, I just needed to replace my system dulwich with a newer version [00:25] maxb: oh right? [00:25] you on linux though, i take it? [00:26] I came up with the idea of creating a file .bazaar/plugins/AAAusedulwich.py containing "import sys; sys.path.insert(0, '/my/path/to/dulwich') [00:26] Seems to work :-) [00:26] oh cool [00:26] i was thinking something along those lines too, but don't know any python, so meh [00:27] maxb: also, are you using the binary/python version of bzr? [00:39] I don't think that question has any meaning on Linux [01:00] maxb: heh, fair enough [01:00] maxb: i'll give that a go shortly. thanks for the tip :)] [01:12] maxb: wait. this AAAusedulwich.py file... it's just in C:\Program Files\Bazaar\plugins ? [01:20] I imagine that would be the relevant windows location [01:38] maxb: ah ok. what's with the AAA bit...? [01:47] To make it sort first [01:55] ah fair enough [02:12] maxb: i get this error now: [02:12] No module named protocol [02:12] Unable to load plugin u'dulwich' from u'C:/Program Files/Bazaar/plugins' [02:12] bzr: ERROR: exceptions.AttributeError: 'InterRepository' object has no attribute [02:12] 'fetch_objects' [02:12] hi Noldorin [02:12] Noldorin: did you see my reply to your bug comment? [02:15] hi jelmer [02:15] yes i did. i was just going to do a bit more testing before i replied :) [02:16] jelmer: i noticed shortly after that it seems to be a problem with dulwich [02:21] Noldorin: uhm, it shouldn't be loading dulwich itself as a plugin [02:21] if you have a C:/Program Files/Bazaar/plugins/dulwich, get rid ot it [02:21] *of [02:22] hmm [02:23] maxb: but i don't... [02:23] i did previously, but i deleted it then [02:23] * maxb is confused, then [02:25] yeah, odd... [03:09] jelmer: just update the bug report: https://bugs.launchpad.net/bzr/+bug/449507 [03:09] Ubuntu bug 449507 in bzr-git "bzr-git causes crash in bzr when sync'ing to directory" [Undecided,Incomplete] === Jordan_U is now known as all === all is now known as Jordan_U [08:19] I am prob being dense, is there a command to give a list of all files in the repository [08:24] hi. i want to back out a revision that changed lots of stuff ... 700+ revisions ago. I have reverted to the previous revision and planning to apply the revisions since in a loop. i was thinking to do a 'dry run' check for error and if it applies flawlessly then apply otherwise record for later manual work. [09:15] chx: Well, if by 'reverted' you mean 'bzr revert', it's almost certainly not doing what you think it is... [09:15] chx: Sounds more like a rebase-type operation. [09:16] andrewblack: You presumably mean 'in a branch', not 'in a repository'. See "bzr ls". [09:22] cheers fullermd . i havent quite got hang of bzr terminology [09:27] andrewblack: Generally, anything you do, you do it to a branch or a working tree; you almost never do anything to a repository directly. [09:31] ok. ls -V does what i want. ls by itself gives unknown files too whic confused me === chx is now known as chx_food === chx_food is now known as chx [12:46] jelmer: hello? [13:05] Noldorin, hi [13:29] hey [13:30] jelmer: i saw youre reply to the bug report... [13:30] wondering how my installation of dulwich got borked though.... [13:30] if you could help me figure out how it needs to be setup on windows, that would be great. [13:56] Noldorin: I've never used it on Windows I must admit [14:14] jelmer: hehe ok [14:15] jelmer: well what would you suggest i do if i were on linux? [14:15] (maybe i can translate for windows) [14:20] Noldorin, I'd run "python setup.py install" in the dulwich source dir [14:20] Noldorin: and copy bzr-git to ~/.bazaar/plugins/git [14:21] jelmer: ooi, what would you suggest for a per-user install of dulwich? [14:22] maxb: I've aliased bzr to 'PYTHONPATH=$PYTHONPATH:/home/jelmer/pylib /usr/bin/bzr' [14:23] Ah. I've done sys.path manipulation in ~/.bazaar/plugins/AAAusedulwich.py [14:52] jelmer: sorry, lost internet conn [14:53] Noldorin, did you see my reply? [14:54] jelmer: looks like using cygwin to compile puts things in the wrong place [14:54] http://pastebin.ca/1736212 [14:54] Noldorin: and copy bzr-git to ~/.bazaar/plugins/git [14:54] that's the last message i got ^ [15:00] jelmer: look right/wrong to you? [15:02] Noldorin: So far [15:03] jelmer: don't i really want the .egg in C:\Python25\... though? [15:03] i'm still getting No module named dulwich.errors [15:03] when i dpush [15:04] Noldorin: If you want the egg in c:\python25 I don't think you should be using cygwin [15:04] jelmer: yeah...i really want to run the bzr on windows in (c:\program files) to use bzr-git [15:04] Noldorin: are you using bzr in cygwin? [15:04] what is the alternative? [15:04] i don't have VS 2003... [15:04] Noldorin: in that case, you shouldn't be using cygwin - that's completely independent [15:04] ok [15:05] i guess i just wanted to use cygwin for the GCC compiler [15:05] hmm [15:05] Noldorin: binaries generated by that C compiler won't be usable with the python in c:\python25 [15:05] i sere [15:05] see* [15:06] i don't even know if c:\program files\bazaar\bzr.exe uses the python in c:\python25 though [15:06] what i really want is to install bzr-git and dulwich *for bzr.exe in program files* [15:06] i think i have succeeded with bzr-git, but not dulwich... [15:06] Noldorin: bzr-git doesn't require compilation [15:07] jelmer: indeed. just pasting it into c:\program files\bazaar\plugins seems to work [15:07] Noldorin: you might want to ask on the mailing list about this issue, I'm afraid I don't know enough about the bzr windows installer [15:07] hmm ok [15:08] jelmer: by the look of it, i need to use VS 2003 to compile though no? [15:08] Noldorin: Yeah, I think you need to compile with the same comp[iler that was used to compile the rest of bzr [15:08] unless i can somehow get bzr-git to use the *uncompiled* (python source) of dulwich [15:08] ok [15:08] * Noldorin thinks it should really be looking for VS 2008 nowadays [15:08] Noldorin: Yeah, you should be able to use dulwich without the extension as well [15:09] Noldorin: but that'll be slower [15:09] yeah.. [15:09] not the biggrest problem atm [15:09] jelmer: any idea how to tell bzr-git to use dulwich source rather than binaries? [15:09] (if possible) [15:09] to do that, copy the 'dulwich' directory from the dulwich source tarball to some path that is in your python path [15:09] Noldorin: if the extensions aren't there it should just not use them [15:10] right [15:11] jelmer: in this case i now get... [15:11] No module named protocol [15:11] Unable to load plugin u'dulwich' from u'C:/Program Files/Bazaar/plugins' [15:11] bzr: ERROR: exceptions.AttributeError: 'InterRepository' object has no attribute [15:11] 'fetch_objects' [15:11] dulwich relies on a module called 'protocol' perhap? === gutworth_ is now known as gutworth [15:13] Noldorin: Where is the "No such protocol" bit raised from? [15:13] ~/.bzr.log should be able to tell you [15:14] Noldorin: You shouldn't install dulwich in your plugins directory [15:14] (that might explain the error, actually) [15:15] jelmer: oh, there's a traceback too [15:16] jelmer: it iwsn't installed in plugins. at least, i don't think so [15:16] if it is, maybe i need to uninstall it somehow... [15:16] Noldorin: the error suggests otherwise, is there no C:/Program Files/Bazaar/plugins/dulwich directory? [15:16] jelmer: nope :S [15:16] http://pastebin.com/m406420d5 [15:17] Noldorin: See line 4, there's a plugin there [15:18] jelmer: there is a C:/Program Files/Bazaar/plugins/git dir but definitely no C:/Program Files/Bazaar/plugins/dulwich :S [15:18] Noldorin, do you still get that error if you remove the git directory ? [15:18] * Noldorin tries [15:19] jelmer: yep [15:19] slightly different but similar: [15:19] No module named dulwich.errors [15:19] Unable to load plugin u'dulwich' from u'C:/Program Files/Bazaar/plugins' [15:19] (dulwich.errors instead of protocol now) [15:19] Noldorin: Any other places on your system where you might've installed dulwich ? [15:20] jelmer: i'll do a search [15:27] jelmer: this is really weird: windows explorer shows nothing in C:\program files\bazaar\plugins, but ls does :P [15:28] well, that certainly explains a lot :-) [15:28] heh yep [15:31] jelmer: 'cannot find module' error is gone now :) [15:31] now just one more... [15:31] http://pastebin.com/m4ceb1ad2 [15:34] jelmer: bzr-git should be using the dulwich source under c:\libs\dulwich-0.4.0 [15:35] obviously, there is another version (compiled) under c:\cygwin\lib\python2.5\site-packages ... [15:35] but that's not being used i think [15:41] ping? [15:53] hi jelmer. what's the last message of mine you got? [15:57] now just one more.. [15:57] Noldorin, what's left? [15:58] jelmer: http://pastebin.com/m75bfdf4c [15:59] jelmer: i.e. now i *only* have the error given in https://bugs.launchpad.net/bzr-git/+bug/449507 [15:59] Ubuntu bug 449507 in bzr-git "bzr-git causes crash in bzr when sync'ing to directory" [Undecided,Incomplete] [15:59] (whereas before i had multiple errors) [15:59] Noldorin: can you paste "bzr info" again for the source and target repositories? [16:00] s/repositories/branches/ [16:00] sure [16:01] jelmer: http://pastebin.com/m1bccdfbd [16:01] sorry, clipboard fail [16:01] try http://pastebin.com/m6f1205ca [16:02] jelmer: the second paste is correct [16:04] Noldorin: I think you might need to upgrade to a rich root format before you can push [16:04] jelmer: hmm i see. [16:04] Noldorin: The source branch, that is [16:04] no idea what that is/how to use it. :)\ [16:05] Noldorin: in the source branch, run "bzr upgrade --2a" [16:05] and then try the dpush again [16:06] jelmer: could this cause any problems elsewhere? [16:07] Noldorin: If you push to other branches they need to be in the 2a format (or something newer) as well [16:07] oh fair enough [16:07] well what's the newest? [16:07] i might as well upgrade to that :) [16:09] jelmer: "No new revisions to push." - i guess this means success [16:11] Noldorin: 2a is the newest [16:11] ok great [16:13] jelmer: well, only issue remaining now is to push to github [16:13] i'm trying this: [16:13] C:\Users\Alex\Documents\Visual Studio 2010\Projects\IRC.NET\devel>bzr dpush git+ [16:13] ssh://git@github.com:Noldorin/IRC.NET.git [16:13] Permission denied (publickey). [16:13] bzr: ERROR: The remote server unexpectedly closed the connection. [16:15] i have my SSH key in pageant, so i'm not sure of the problem... [16:16] Noldorin, that's not a valid URL [16:16] Noldorin, you need a / rather than a : after the hostname [16:16] ah right [16:17] same error... [16:18] Noldorin: what error exactly? [16:18] what i just pasted: bzr: ERROR: The remote server unexpectedly closed the connection. [16:18] erm [16:18] Permission denied (publickey). [16:19] bzr-git should be using the same ssh keys that bzr itself would use [16:19] that's what i thought hrm [16:19] must be the URL wrong still? [16:19] no, the URL looks ok [16:19] Noldorin is your username on github? [16:19] jelmer: yes [16:19] jelmer: the project is http://github.com/Noldorin/IRC.NET [16:20] Noldorin: No idea then, sorry [16:21] no worries [16:23] jelmer: maybe i need to do http://github.com/blog/180-local-github-config ? [16:25] Noldorin: no, the API isn't relevant here [16:25] and bzr-git doesn't use the git config [17:04] jelmer: hmm. who *should* i ask about this then? [17:04] it doesn't seem to be a git problem heh [17:04] Noldorin: does pushing to e.g. launchpad work ok? [17:04] does pushing using git to github work? [17:05] jelmer: yep [17:05] in both cases, no problemxs [17:06] Noldorin: the other people on the general mailing list or on the bzr-windows mailing list might have aan idea [17:06] ok [17:06] it's odd tha this problem should be occuring [17:06] jelmer: i just tend to think if you, the author of the lib, doesn't know, then who does ;) [17:06] maybe i can turn on verbose to get some debugging info or such? [17:07] Noldorin, I haven't written the ssh bits [17:07] Noldorin: we're just calling out to the generic functionality in bzrlib for that [17:07] and there's windows-specific code in bzrlib for handling ssh [17:08] jelmer: mm, fair enough [17:08] jelmer: it would be helpful to see *which* ssh key it's trying to use though [17:08] if i can somehow [17:14] jelmer: i will try #git, then maybe the mailing list. thanks for all your help :) [17:14] Noldorin: does ssh'ing into that server work? [17:15] i look forward to the next release of bzr-git.. [17:15] jelmer: erm...will try now [17:18] jelmer: "no supporteed auth methods available" [17:18] on putty [17:19] Noldorin: looks like the keys aren't available [17:19] jelmer: well pageant is running, and i can push to bzr [17:19] launchpad* [17:19] Noldorin: github doesn't seem to have them then [17:20] ah [17:20] hm [17:20] jelmer: oh, it seems i *cannot* push with normal bzr to launchpad now :S [17:21] You upgraded in the middle? [17:22] fullermd: what do you mean? [17:22] Since the last time you could. [17:22] upgrade the branch, yep [17:27] No, upgrade bzr. [17:28] Specifically, across 2.0.0, which stopped using Putty as the default ssh implementation on Windows. [17:29] fullermd: oh i see. [17:29] yes i have indeed [17:31] fullermd: so how can i tell it to use putty/pageant now? [17:31] or should i be using something else? [17:32] BZR_SSH env variable (or some name like that) [17:42] fullermd: set BZR_SSH = plink for putty right? [17:44] Your guess is as good as mine 8-} [17:44] fullermd: gah, i get an error 2 now :( [17:44] when pushing [17:44] bzr: ERROR: [Error 2] The system cannot find the file specified [17:45] Noldorin: bzr can't find the ssh/plink executable locally I think [17:45] Rule 16: If you can't solve the problem, redefine the error. [17:45] My work here is done. [17:45] jelmer: i need to put c:\program files\putty in my path then? [17:46] fullermd: :P [17:46] hehe [17:50] jelmer, fullermd: http://pastebin.com/m1064404a - hmm? [17:52] 'bout what it says, I reckon. [17:52] You can't interact with the ssh process through bzr, so you can't agree to accept the host key. Have to invoke it manually to do that. [17:52] fullermd: seems to be thsi problem here: https://bugs.launchpad.net/bzr/+bug/237297 [17:52] Ubuntu bug 237297 in bzr "Putty refuses to connect to unknown host with "The server's host key is not cached in the registry"" [Medium,Won't fix] [17:52] but i don't understand the solution [17:53] Use plink to manually connect to LP, so you ahve to chance to accept the key. [18:01] fullermd: meh, seems i should really be using paramiko now [18:01] installed it, but i see no info how to configure it for my key :S [18:01] documentation is somewhat lacking there it seems [18:05] bah [18:05] putty was so much easier to use [18:08] * fullermd finds openssh nice and easy to use :p [18:08] fullermd: yeah, it's all good on linux, but windows is a different story :P [18:09] fullermd: if you can point me to a guide for paramiko on windows, that would be good heh [18:09] Noldorin: how did you use your key with putty? [18:09] luks: just ran pageant and added the PPK file [18:09] the same will work for paramiko [18:09] it will use the key from pageant [18:09] doesn't seem to :( [18:11] luks: Permission denied (publickey). [18:12] I'm afraid I can't help with finding the problem, but it's supposed to work [18:12] (I know, because I submitted a patch for bzr a long time ago to enable it) [18:13] ah right [18:13] hrm [18:15] luks: who might be able to suggest a solution then? [18:16] jam might be a good bet. He may be back around tomorrow. [18:16] ok [18:16] thanks anyway [18:23] Noldorin: check your .bzr.log [18:23] it should say that it's using paramiko, and then list all available keys in messages like "Trying SSH agent key ..." [18:24] luks: hrm [18:24] 3.000 ssh implementation is OpenSSH [18:24] could be the problem :P [18:24] :) [18:24] i thought it default to paramiko though, no? [18:24] I don't know [18:24] BZR_SSH=paramiko should fix it [18:24] yep, just doing that now [18:27] luks: success. thanks very much [18:27] I just noticed that you mentioned you were using cygwin [18:27] adding the key to your cygwin's ssh config would be another solution [18:28] luks: was just using cygwin to compile stuff [18:28] normally on native windows though [18:28] is it not in %PATH%? [18:28] it is [18:28] it obviously tried *some* openssh ssh client [18:28] mm [18:33] ok, so it's just github not recognising my ssh key now... [18:35] bah [18:40] hi, when i do [bzr info] i see among other things [18:40] "Repository branch (format: unnamed)" [18:41] what does "format: unnamed" mean, and is this ok? [18:41] Yes, it's fine. [18:41] It means bzr doesn't have a rollup name for what you have there. [18:42] hm, ok. because the original branch on my computer shows [18:42] "Standalone tree (format: pack-0.92)" [18:43] If you branch that standalone with a current bzr, you'll still have that repo format, and (I think) that branch format, but you'll have the new WT format. Thus, unnamed. [18:44] Use bzr info -v for individual format information on repo, branch and WT [18:45] 'unnamed' is dramatically unhelpful, I wish it said something like 'pack-0.92+wt6' [18:46] hrm, i still seem to be having the wrong URL format for bzr-git: [18:46] git+ssh://git@github.com/Noldorin/IRC.NET.git [18:46] ok, thank you very much. [18:50] maxb: Well, but it would actually be pack-0.92-wt4+wt6 or something. Falls over soon's you wander off the beam. [18:56] huh? [18:56] It can't be wt4 and wt6 simultaneously [18:56] Thus my point :p [19:00] um? [19:00] By pack-0.92+wt6 I mean pack-0.92 modified by the wt version being replaced by 6 [19:01] Sure, but + doesn't mean modify, it means add. So you have to subtract wt4 before you can add wt6. [19:02] I am less strictly algebraic [19:04] Bazaar doesn't track that it used to be WT4. [19:04] Best you can do is a heuristic. [19:09] fullermd: that sounds confusing [19:09] That would be the meta-point... [19:10] fullermd: as each slot can only be filled once I don't see why you'd need a - operator [19:10] Whole point of a rollup name is to avoid combinatorics. Adding combinatorics to the rollup kinda squirrels up the idea. [19:23] fullermd: that I don't agree with [19:24] IMO, anything less vague than 'unnamed' is an improvement [19:30] That reminds me, someone should file a bug about it saying "format: unnamed" for remote branches... [19:31] Peng: no, someone should fix it :P [19:32] Yes, but if that someone is me, the former is much more likely than the latter. :P [19:38] Didn't someone say it was fixed in bzr.dev? [19:40] Not exactly. [19:40] It reads the real format names over the smart protocol now. [19:40] maxb: The detailed information is useful now (e.g. "branch: Remote: Branch format 7"), but the summary is not. [19:41] But since it never reads WT's remotely, it doesn't get that format, so there's never a matching rollup name. [19:41] ah [19:41] Oh. [19:57] fullermd: huh, its not about reading WT's remotely. [19:57] fullermd: its just info being borked. [19:58] Howzat? There's no defined rollup format name without a WT format, is there? [19:58] So how would you expect to ever get anything but 'unnamed'? [20:05] fullermd: try it locally [20:16] Try it remotely locally? [20:21] try it locally locally [20:21] bzr init; bzr remove-tree; bzr info [20:29] Bah. [20:36] fullermd: do you see ? [20:39] init --no-tree still isn't supported? [20:39] Heh, thought that'd been changed. [21:31] hi jelmer === khmarbaise_ is now known as khmarbaise [22:16] Noldorin: hi [22:36] jelmer: not sure if you got the messages, but i think aLmost evrything is sorted now... [22:36] everything, except it's regusing my ssh key it seems. [22:36] Noldorin, cool [22:37] what's the URL meant to be for github repos? [22:37] i'm currently using git+ssh://Noldorin@github.com/IRC.NET.git [22:37] erm [22:37] git+ssh://git@github.com/Noldorin/IRC.NET.git [22:37] but if wonder if this is wrong [22:42] that seems right [22:42] I'm using something similar to push to github [22:43] jelmer: i've set things up to use paramiko with pageant.... [22:43] perhap's it's not communicating right? [22:43] hmm ok [22:43] C:\Users\Alex\Documents\Visual Studio 2010\Projects\IRC.NET\devel>bzr dpush git+ [22:43] ssh://git@github.com/Noldorin/IRC.NET.git [22:43] Permission denied (publickey). [22:43] bzr: ERROR: The remote server unexpectedly closed the connection. [22:45] Noldorin, did you manage to get pushing to launchpad working again? [22:52] Good morning === spiv changed the topic of #bzr to: Bazaar version control | try https://answers.launchpad.net/bzr for more help | http://bazaar.canonical.com/ | http://irclogs.ubuntu.com/ | Patch pilot: spiv | bzr 2.1.0b4 and 2.0.3 released