=== Edwin is now known as Guest15283 === Edwin is now known as Guest23072 === Edwin is now known as Guest40043 === Edwin is now known as Guest55748 [01:00] how does one delete files using sftp? [01:06] SamB: Which client? I use lftp, which works fine. === Edwin is now known as Guest93200 [01:06] well, I'd really like a one-liner to do it from the shell ... [01:07] You could probably do that with lftp, but there's also probably a better way. [01:34] hmm, pushing to 2a over smart-server involves an awful lot of Repository.get_parent_map calls ... [01:35] at least, it does when you have thousands of revs to push [01:38] * SamB tries again with trunk ... [01:56] wow, 2a repacks are amazingly stupid when done remotely ... [01:58] first, it evidently readv's each revision one-by-one [02:06] then (at the same time?) it does the repack locally ... [03:11] SamB: smart server should repack remotely [03:11] SamB: unless you ran 'bzr pack url' - don't do that. [03:20] lifeless: I don't! [03:20] lifeless: so, either launchpad's bzr is dumb, or bzr.dev is ... [03:22] SamB: file a bug with what happened then [03:22] include your .bzr.log contents for the event [03:22] lifeless: duh [03:22] that's the only place I can see the issue ;-) [03:23] * SamB makes sure nobody else has reported one like that ... [03:29] lifeless: are we still tagging these brisbane-core ? [03:34] doesn't matter [03:34] I'll look at it on monday :) [03:34] * lifeless is gone [04:02] https://bugs.edge.launchpad.net/bzr/+bug/410917 if anyone cares [04:02] Launchpad bug 410917 in bzr "inter-format push to remote 2a branch does packing on local end" [Undecided,New] === abentley1 is now known as abentley === abentley1 is now known as abentley [07:58] garyvdm :-) [07:59] Hi bialix [08:00] hi Gary [08:00] * bialix reviews qexport [08:27] garyvdm: nice exception reporter for validate method [08:34] * bialix reviews qunbind [08:46] garyvdm: do you know what's jam want to achieve in his branch: https://code.launchpad.net/~jameinel/qbzr/progress ? [08:48] bialix: If we call methods that provide progress information, it displays it. [08:49] E.g. Annotate [08:49] ah, ok [08:49] it's not finished yet? [08:50] It works - but I think we need to try do some formatting on the messages that it prints. [08:51] may be "Loading: %s" % message [08:51] ok, so when jam will be ready (after bzr release) we can ping it [08:51] garyvdm: what you think about https://bugs.launchpad.net/qbzr/+bug/406794 [08:51] Launchpad bug 406794 in qbzr "qlog shows error dialog when using * in search dialog when filtering on "Bugs"" [High,Confirmed] [08:51] it looks easy to fix [08:52] And I need to get qlog to show progress information like viz :-) [08:52] Gary, I don't know how viz works [08:52] never saw it in action [08:54] re: 406794 - I'll have to look at it. [08:54] what if we using fnmatch here instead of regexp? [08:54] so * will work [08:54] and something like 410??? will work too [08:55] or 410* [08:55] I don't know - never used fnmatch. [08:56] it can translate glob wildcards into regexp [08:57] so you can write *.png to match filenames [08:57] do you get the idea? [08:57] shell patterns [08:58] try: python -c "import fnmatch; help(fnmatch)" [08:58] Ok - That sound cool [08:58] I'll fix it then [09:05] Errors from qbzr now point to https://bugs.launchpad.net/qbzr/+filebug and errors from bzr-explorer now point to https://bugs.launchpad.net/bzr-explorer/+filebug :-) [09:06] nice [09:14] garyvdm: look at http://paste.ubuntu.com/250209/ [09:14] I wrote docstring. Is everything correct here? [09:14] Looks - good. You just missed how it searches for tags. [09:15] For message, author and tag it's used as regexp to search in corresponding metadata [09:15] it's not very clear? [09:16] Oh - sorry - my mistake [09:16] I think that we should also use glob wildcards for every thing. [09:17] I don't use it very often [09:17] I have no opinion here [09:17] but it's possible [09:17] you want this? [09:17] I've never used re's when searching. And I think that glob wildcards will make it more accessible. [09:19] what syntax bzr-search used? [09:21] bialix: No wild cards [09:22] so, I need to use fnmatch for everything except index, rigt? [09:22] right [09:22] I've allways wanted to add the ability to use wild cards when using bzr-search in qlog [09:23] and if people start whine about regex we get them back [09:23] Yhea [09:23] so [09:23] I'll update docstring accordingly [09:23] hai lifeless [09:23] you can lookup all possible matches for the wildcard in the index metadata [09:23] and then search for all of the resulting things [09:24] lifeless: Yes - thats what I planed to do. [09:24] cool [09:24] lifeless - I can also make it not case sensitive that way. [09:26] garyvdm: new version of docstring: http://paste.ubuntu.com/250216/ [09:27] bialix: great! [09:27] ok [09:29] it works [09:30] wow! we have a lot of bugs attached to revisions in qbzr [09:30] nice [09:31] we finally have equivalent to tags command [09:31] run qlog,select tag in search type, enter * [09:31] :-) [09:31] * bialix commiting [11:42] anyone experience with the illustrious error: "pack-names is not an index of type ." after bzr status, bzr log, etc..? [15:05] meh [15:07] jelmer: i just got started with playing with the subvertpy wc stuff, got pointers to different usages of it [15:18] hmm, guess i'll make a own example [15:22] jelmer: can you point me to the code thats usefull for doing checkouts? im a bit lost in the c code [15:22] ronny: jelmer is at a festival today [15:23] oh, i see [15:23] hmm, i think i just found the code i was searching for [15:23] (it was in client, i digged around in wc [15:24] right, wc I think would be operations on an existing wc [15:24] whereas checkout would be a network operation [17:10] hello [17:10] could someone please help me figure out why i can't pull from this repo via HTTP? http://noldorin.com/repos/olivaw-bot/ [17:10] pulling via FTP is no problem. [17:11] i get "bzr: ERROR: Not a branch" [17:12] Noldorin: looking at the page in a browser mentions we don't have access [17:12] LarstiQ: that's just denying the directory listing though [17:12] isn't it? [17:12] does bzr actually need that? [17:13] Noldorin: it also denies access to .bzr/ [17:13] Noldorin: (and .bzr/format so it is more than just denying directory listing) [17:14] hrmm [17:14] let me check [17:20] LarstiQ: i've checked permissions. they're frine [17:20] fine* [17:27] LarstiQ: any ideas? [17:28] Noldorin: neither .bzr/branch/format or .bzr/repository/format seem to exist, what kind of object is it supposed to be? [17:28] Noldorin: could your server be filtering out files starting with a .? [17:28] LarstiQ: it's possible [17:29] LarstiQ: what do you mean by object? [17:30] hrm [17:30] Noldorin: is it a branch, a repository, a working tree? [17:30] LarstiQ: it's a repository i believe [17:31] since i just did bzr push [17:32] LarstiQ: server seems to havbe no problems recognising files starting with . [17:32] http://noldorin.com/repos/.bar.txt [17:33] Noldorin: I get: File Not Found [17:34] LarstiQ: sorry, i just deleted it [17:34] http://noldorin.com/repos/olivaw-bot/.bzr/.bar.txt [17:34] there [17:35] ah ok, good [17:35] still not finding a format file though [17:35] yeah... [17:36] Noldorin: could you temporarily disable the denying of directory listing? It is making debugging guessing in the dark [17:36] LarstiQ: seems like extensionless files don't get recognised :S [17:37] Noldorin: oh &@#^ [17:41] LarstiQ: hrmm...unregistered mime type? [17:42] registered the mime type, and no problem now :) [17:43] LarstiQ: should it be text/plain or something else? [17:43] Noldorin: the mime-type of what exactly? [17:43] files with no extension [17:44] Noldorin: they can be anything [17:44] Noldorin: so I'd go with octet-stream [17:45] ok [17:45] will do [17:45] wonder why your server doesn't do that by default [17:45] yeah [17:45] who knows [17:46] LarstiQ: what's the prefix? [17:46] ???/octet-stream [17:46] Noldorin: application/octet-stream [17:46] thought so. [17:47] Noldorin: basically "we don't know what this is, treat it as binary" [17:47] yeah, makes sense really [17:47] thanks for the help :) [17:47] np [17:47] after all these FTP issues (no chmod) and now this, i should probably just change server [17:47] but oh well [17:48] what's life without a bit of a challenge :) [17:48] heh, quite [17:48] as long as there's not *too* many :) [17:48] right [17:48] Noldorin: and be sure to quit if your blood pressure is rising too much [17:50] lol, yep. [17:50] i just want to figure why dir listing isn't working now [17:50] then it's all sorted i believe [18:18] can I push a brand new branch to subversion using bzr-svn? [18:26] lifeless: is http://bazaar-vcs.org/bzr/bzr.1.17/ the right submit location for 1.17.1 pqm? [18:26] mxpxpod: I think so [18:26] also, the first time I push a branch, I have to supply the place I want to push it.. is there a way to set that up so I never have to supply it? [18:27] mxpxpod: you can have a push_location = foo and push_location:policy = appendpath for example [18:27] LarstiQ: what's that do? [18:27] I just want the push location to be set to where I branched from by default [18:28] mxpxpod: hmm, I don't think you can configure that [18:28] darn [18:28] mxpxpod: do have a look at `bzr help configuration` though [18:29] LarstiQ: thanks [18:29] mxpxpod: could you check if there is a bug filed on something like 'locations.conf should be able to work with push_location = :parent'? [18:29] LarstiQ: yeah, I'll check [18:31] oh, one last thing... let's say I make a branch of a subversion repo, then make a private branch from that branch [18:32] to keep the private branch up to date with trunk, I'd just do a pull of the initial branch I made, right? [18:33] and then do a bzr merge ../private within the initial branch to merge the changes from the private branch [18:34] and then once I do a push in the initial branch, it will create a check-in in the svn repo for each commit I did in the private branch, correct? [18:35] mxpxpod: that is the workflow I would use [18:35] LarstiQ: right, I'm just making sure I got my commands right [18:36] the commands would be different for a public branch, IIRC [18:36] mxpxpod: you need an additional setting for the individual bzr commits to be svn commits I think, let me check [18:37] since you'd have to merge from trunk instead of pulling from it [18:37] mxpxpod: NEWS mentions push_merged_revisions = True [18:37] like, if you had bzr branch trunk; bzr branch branches/someFeatureBranch [18:39] instead of pulling from the branched trunk, you'd have to merge from the branched trunk, right? [18:48] mxpxpod: unless you have no local commits, yes [18:48] right, ok, thanks [18:55] now, if I merge from a private branch, I'll probably want to rebase, right? [18:56] mxpxpod: the situation isn't clear to me, merge from the private branch into trunk? [18:56] yes [18:57] LarstiQ: oh, I figured out how to make each change a changeset... use bzr merge --pull ../private; bzr push; [18:57] mxpxpod: that only works if trunk has not diverged from ../private [18:57] mxpxpod: (in which case you could also just `bzr pull ../private`) [18:58] LarstiQ: right, but if you're constantly pulling from trunk and resolving, won't that keep it from diverging? [18:59] mxpxpod: right, but you will change the mainline, which svn might not lie [18:59] like [18:59] LarstiQ: ah, ok [19:00] mxpxpod: afaik you can't reorder the mainline on / for example [19:00] ah, gotcha [19:00] mxpxpod: but more recent svns have gotten better merge support [19:00] so maybe it is possible now [19:03] could be [19:03] IIRC, anything 1.5 or greater handles merges well === Toksyury1l is now known as Toksyuryel [21:25] lifeless: hey, you there? [21:54] Noldorin: hi? === _thumper_ is now known as thumper [22:13] lifeless: hi there [22:13] lifeless: i've done a few more tests with my ftp server [22:13] it seems that the problem is indeed nothing to do with CHMOD [22:16] Noldorin: go on [22:18] sorry, multitasking too much here :) [22:18] well [22:18] i'm getting the problem with locking again [22:19] it seemed it was a rare occasion when it actually didn't lock.. [22:19] hrmm [22:19] can't think what we did differently last time anyway [22:24] lifeless: i'd be glad to set up a temporary FTP account for you, if it might help [22:35] lifeless: ping? [22:53] Noldorin: hi [22:53] Noldorin: did you file a bug about this? [22:53] I think getting a failed run with -Dtransport is probably the most useful thing. [22:59] lifeless: not yetr [22:59] i will do though [22:59] lifeless: will do that right now [23:26] what does bzr expect for commit timestamps and timezones? same as git? [23:29] huh? [23:33] ronny: ? [23:40] lifeless: trying to figure what to pass to mutabletree.commit for timestamp and timezone [23:40] 'moin ronny, lifeless [23:42] sup jelmer [23:44] ronny: unless you need to control it, nothing [23:44] lifeless: this is my log with Dtransport turned on: http://pastebin.ca/1523363 [23:44] lifeless: i need to controll it [23:44] ronny: then its a float and an int [23:44] seconds since epoch and tz in seconds [23:45] Noldorin: and this was of a run that left it locked incorrectly? [23:46] lifeless: yep [23:46] hmm, meh, for now i'll set tz to 0 for all commits [23:46] ronny: please don't do that; its easy to get the local tz [23:48] Noldorin: your ftp server is broken [23:48] broken broken broken :( [23:48] rubbish [23:48] lifeless: in what way, exactly? [23:48] Noldorin: can you get a listing of the contents of .bzr/repository/lock ? [23:48] yeah one sec [23:48] Noldorin: if you look at the log, search for repository/lock/held [23:49] lifeless: ok, time to play figuring stuff [23:50] http://pastebin.ca/1523372 [23:50] thats just the held actions [23:50] sorry, lock actions :) [23:50] the make, put, rename sequence is how we take a lock out [23:51] lifeless: just /held/info [23:51] i see [23:51] rename remove remove-directory is how we release a lock [23:51] lock/held is the path of the directory that makes up a lock [23:52] lifeless: aware of good docs for datetime+timezones? [23:52] lock/held/info is the metadata about the lock - when, who, and a nonce to allow identification of 'my lock' [23:52] ronny: the python date and datetime module docs are quite good [23:52] theres also things like bzrlib.osutils.local_time_offset() [23:53] Noldorin: so looking in the abridged log I uploaded: [23:53] yeah... [23:53] step 17,19,20 releases a lock [23:54] held -> releasing.gzbwa6x1m3udf9nugpdm.tmp [23:54] rm releasing.gzbwa6x1m3udf9nugpdm.tmp/info, rmd releasing.gzbwa6x1m3udf9nugpdm.tmp [23:54] 23, 25, 27 make a new lock and put it into place [23:54] except it fails [23:55] can you cat /held/info ? [23:55] .bzr/repository/lock/held/info, that is [23:55] lifeless: is it reasonable to expect timezone infos on a datetime object insted of a separate offset [23:55] lifeless: erm, i'm on windows, so i guess not [23:56] Noldorin: well, show me the contents of the file :) [23:56] ok [23:57] sorry, not at all familiar with the unix tools like cat [23:57] ronny: the datetime module does that; though its a nuisance to work with - you have to subclass stuff yourself, all the time [23:57] Noldorin: no problem; I forgot myself is al [23:57] all [23:57] heh [23:57] hostname: Alex-Laptop-PC [23:57] nonce: 40qh66wqvotaj97h8gxa [23:57] pid: 7328 [23:57] start_time: 1249858210 [23:57] user: alexreg@gmail.com [23:59] lifeless: yes, seems broken