lifeless | hmm | 00:01 |
---|---|---|
lifeless | so it is | 00:01 |
lifeless | and ist isn't | 00:01 |
jelmer | ? | 00:02 |
lifeless | not all log viewers show bugs | 00:10 |
lifeless | but yeah, I can see the case | 00:10 |
lifeless | so we want a | 00:10 |
lifeless | #bug:lp:3423423432 | 00:10 |
lifeless | or something | 00:10 |
lifeless | and a hook that can edit the message and rev props late | 00:10 |
jelmer | yeah | 00:16 |
aspidites | is there some setting that needs to be present before I can receive karma on launchpad for committing code? | 00:29 |
lifeless | no | 00:29 |
lifeless | but you ahve to push the code to lp | 00:30 |
jelmer | also, karma isn't updated instantaneously | 00:30 |
lifeless | bbiaw | 00:51 |
dOxxx1 | good evening | 01:24 |
=== dOxxx1 is now known as dOxxx | ||
dOxxx | when should bzrlib.trace.show_error etc be used instead of the ui_factory.show_error etc? | 01:25 |
sproaty | http://bazaar.launchpad.net/~sproaty/whyteboard/development/files how is my 'whyteboard' folder shown at version 170 when I've commited several times to files inside it since? | 01:47 |
bob2 | the dir was amde in 170 | 01:47 |
Peng | sproaty: Bazaar tracks directories as their own objects. Presumably it's showing when the directory itself was modified, rather than its contents. | 01:48 |
* Peng shrugs | 01:48 | |
sproaty | figured | 01:49 |
sproaty | kinda a shame# | 01:49 |
Peng | https://bugs.launchpad.net/loggerhead :D | 01:49 |
sproaty | heh, cheers | 01:51 |
sproaty | night | 01:51 |
Peng | I wasn't joking. | 01:56 |
dOxxx | if I'm writing a bzr plugin which works with launchpad branches via the lp api, should I be using the lp_api module from the launchpad plugin or just using launchpadlib direcrly? | 03:04 |
dOxxx | directly* | 03:05 |
dash | hi. I started 'bzr upgrade' on a launchpad branch to upgrade it to 2a, but I haven't upgraded the repo yet. will it be a problem to kill the upgrade and do the repo first? | 03:35 |
dash | oh, heh, it finished. Never mind! | 03:38 |
enli | i checked out a branch from launchpad to fix some bug and pushed changes to my own branch on lp. I would like to remove that revision from launchpad, is it possible? | 04:14 |
Peng | enli: Completely remove all traces of it? Is this just, like, you misspelled something, or did you accidentally commit the nuclear launch codes? | 04:15 |
enli | Peng: the code is working, its just that i want to change the commit message | 04:16 |
Peng | enli: Ah. How bad is it? Mostly it's not worth doing. You can see all sorts of fun errors in lp:bzr's history. | 04:17 |
enli | not too bad, i am just playing with it.. wondering if it is possible :D | 04:17 |
Peng | enli: It's not hard, but it's not clean either. | 04:20 |
Peng | enli: You'd have to "bzr uncommit", "bzr commit again" and then "bzr push --overwrite". This creates a completely different revision, so people who have already pulled the old one will get confused. | 04:21 |
Peng | enli: Like I said, it's usually not worth it. | 04:21 |
enli | ok, so if my latest revision was before uncomit, 198 and i do uncommit, commit, push what will be the revesion number? | 04:22 |
Peng | enli: 198 | 04:23 |
Peng | enli: But the ID and everything else will be different. | 04:23 |
enli | Peng: i dont know yet what ID and everything else is, but i will take your word and not uncommit it, thanks a lot | 04:25 |
Peng | enli: bzr log --show-ids will display it, FWIW. | 04:26 |
Peng | enli: It's not very interesting. It's just a more complicated, unique ID for the revision. | 04:26 |
enli | hmm, so if nobody has yet pulled my branch, it will be pretty safe to push --overwrite.. yes? | 04:27 |
enli | Peng: i am out, thanks again | 04:38 |
NyRy | having a problem when committing on my server that bzr hangs | 05:50 |
NyRy | Any help much appreciated | 05:50 |
meoblast001 | hi | 06:14 |
meoblast001 | is it possible, with the understanding that i will break trees, to remove a commit, and all subcommits, from a branch? | 06:15 |
dash | sure, uncommit | 06:16 |
meoblast001 | i'm not uncommitting that far back | 06:16 |
Peng | meoblast001: uncommit takes a -r argument. | 06:17 |
meoblast001 | Peng: so i can remove 1 specific commit, while keeping everything else in tact? | 06:25 |
bob2 | if it's the most recent one | 06:25 |
Peng | bob2: <3 | 06:25 |
meoblast001 | it's not | 06:25 |
meoblast001 | that's the problem | 06:25 |
bob2 | do you care this much |<------>|? | 06:25 |
Peng | If this is really the nuclear launch codes, you can use rebase or fastimport or somesuch to rebuild the branch. | 06:26 |
meoblast001 | care about what? | 06:26 |
bob2 | about removing this commit | 06:27 |
meoblast001 | yes, i suppose | 06:27 |
Peng | meoblast001: Just curious, why? | 06:28 |
meoblast001 | well, currently, until i get legal stuff worked out, i need to make sure i own copyright on every ounce of code in my project | 06:29 |
meoblast001 | there is a small amount of unnecessary code made by others | 06:29 |
meoblast001 | so i wanted to remove it completely | 06:29 |
Peng | Do projects usually complete expunge the old code in such situations? | 06:30 |
Peng | completely* | 06:30 |
meoblast001 | don't think so | 06:31 |
meoblast001 | but i'm very paranoid | 06:31 |
meoblast001 | already freaking out with stress | 06:31 |
bob2 | well, how will you separate it out? | 06:32 |
bob2 | e.g. if you branch from before the first potentially-dodgy commit, what do you want to do? just exclude the entire commits by other people? | 06:32 |
meoblast001 | well, it's only really one | 06:32 |
meoblast001 | i've been lucky enough to not get many contributors | 06:32 |
meoblast001 | which is good, considering i have copyright issues to work out | 06:32 |
bob2 | is this free software? | 06:33 |
meoblast001 | yes | 06:33 |
meoblast001 | i think i'll work this out tomorrow | 06:38 |
meoblast001 | i'm going to bed | 06:38 |
meoblast001 | good night | 06:38 |
NyRy | anyone know the syntax for drush generate-content | 08:33 |
mathrick | hey guys, is there something wrong with website? | 11:59 |
mathrick | I can't connect to it | 11:59 |
ralph | Hi, I've done 'bzr add foo' but haven't committed yet. I want to remove foo from the list of outstanding things to commit. How? | 11:59 |
ralph | mathrick: I concur. | 11:59 |
mathrick | ralph: bzr rm --keep --new foo | 12:00 |
ralph | mathrick: Thanks. I understand. Bye. | 12:01 |
parthm | vila: ping | 12:41 |
parthm | vila: ping: unknown host vila ... hmm maybe i will try later :-) | 12:53 |
Sheepherd | hey all | 15:08 |
Sheepherd | trying to install bazaar for the first time on win xp sp3 with this tutorial | 15:08 |
Sheepherd | http://wiki.bazaar.canonical.com/WindowsInstall | 15:08 |
Sheepherd | now unfortunately i got python 2.6 running and i cant seem to find the pycurl package for 2.6 only for 2.5 | 15:09 |
Sheepherd | what should i do? | 15:09 |
Sheepherd | or is there even a crucial reason to use the python based installation instead of the stand alone one?? | 15:11 |
starenka | hi, i'm desperate. how can i get branch base path in precommit hook? | 15:20 |
=== khmarbaise_ is now known as khmarbaise | ||
Sheepherd | just solved it. http://curl.haxx.se/mail/curlpython-2009-11/0001.html for a python 2.6 pycurl msi file | 15:21 |
=== goundy is now known as elgg | ||
=== elgg is now known as Guest91366 | ||
Sheepherd | its me again... i ran into following error while compiling bzr-gtk. http://paste.pocoo.org/show/186339/ | 15:58 |
Sheepherd | what shall i do now? | 15:58 |
=== Guest91366 is now known as TabMe | ||
Wellark | hi! does the rebase plugin have any active maintainer? | 16:45 |
Wellark | I tried to use it but could not get it working | 16:45 |
Wellark | using google does not bring up any tutorials or anything | 16:46 |
Wellark | ah, OK, it's maintained alright.. | 16:47 |
Wellark | http://people.samba.org/bzr/jelmer/bzr-rebase/trunk/ has had it's last update on Sat 2010-02-27 15:28:05 +0100 | 16:48 |
Wellark | oh, well.. maybe I some day have time to look in to the inner workings of the plugin to be able to use it | 16:49 |
jelmer | Wellark: yeah, it's maintained but there isn't much documentation other than the command-line help | 16:50 |
jelmer | it's quite similar to rebase in git and hg though | 16:50 |
Wellark | ok, well it's probably just a user error on my side | 16:51 |
marv | I saw that inkscape recommended keeping a checkout the remote branch, and doing development in a separate branch, and then merging that into the otherwise pristine branch and then pushing, instead of pushing from the branch you actually wrote the feature in. | 17:35 |
marv | and then i did some googling and saw this thread: http://www.mail-archive.com/maria-developers@lists.launchpad.net/msg00220.html | 17:35 |
marv | so i was wondering if the reverse merge thing they were talking about was on the roadmap | 17:36 |
mathrick | is there something like git's commit --amend? | 18:55 |
luks | bzr uncommit && bzr commit? | 19:00 |
mathrick | well, yeah, but it makes me write the commit message again | 19:02 |
luks | bzr uncommit && bzr qcommit :) | 19:02 |
mathrick | at least some links in 2.1 user guide are broken, they specify the old-style URLs: http://doc.bazaar.canonical.com/bzr.2.1/en/user-reference/bzr_man.html#revision-identifiers | 19:09 |
mathrick | which doesn't resolve, because this chapter is available at http://doc.bazaar.canonical.com/bzr.2.1/en/user-reference/revisionspec-help.html | 19:10 |
mathrick | the faulty link is here: http://doc.bazaar.canonical.com/bzr.2.1/en/user-guide/specifying_revisions.html | 19:10 |
=== radoe_ is now known as radoe | ||
goundy | #chromespot | 20:04 |
goundy | oupse | 20:04 |
goundy | sorry guys | 20:04 |
goundy | I missed the /join | 20:04 |
goundy | this is not advertisment -_- | 20:04 |
marv | https://blueprints.launchpad.net/bzr/+spec/nested-tree-support links to http://bazaar.canonical.com/NestedTreeSupport, which 404s | 21:06 |
MTecknology | For my own bzr server; how hard is it to convert something like this bzr+ssh://user@code.domain.com/home/user/connect/foo to something like this kalliki:~user/connect/foo ? | 21:30 |
MTecknology | I remember there being some nifty way to do something like that but I forgot how | 21:30 |
mathrick | MTecknology: what do you mean by "convert"? | 21:30 |
MTecknology | and never got it to work before | 21:30 |
MTecknology | mathrick: so I can do bzr branch kalliki:~user/connect/foo and it will change it to the really long one | 21:31 |
MTecknology | mathrick: sorry for the poor question - long day already | 21:32 |
mathrick | MTecknology: "converting" it as such is simple, as long as you have the access to a shell or smart server and install your own hooks | 21:34 |
mathrick | but no idea how hard it'd be to make bzr actually do that | 21:34 |
mathrick | you'd need plugins both on the client side and on the server side | 21:35 |
mathrick | because client needs to grok foo:bar as a remote ssh reference, and the server needs to do the actual translation | 21:35 |
mathrick | MTecknology: perhaps it'd be easier to make a plugin which just works on the client side and translates ~foo to /home/foo by default, unless you provide a map to override that for a particular host | 21:36 |
MTecknology | I'm just trying to make things simple for my users | 21:36 |
mathrick | then you definitely want to avoid relying on a particular server + client combination | 21:37 |
MTecknology | client side plugins sounds doable | 21:37 |
mathrick | make it a client-only plugin, it'll be a bit more manual for machines where ~foo isn't /home/foo, but at least it'll work with any host as long as you use the proper client | 21:37 |
mathrick | MTecknology: if you need to override the branch reference syntax, take a look at lp:bzr-colo | 21:38 |
MTecknology | I should be able to make something that can just be unpacked into ~/.bazaar/pulgins/, right? | 21:38 |
mathrick | it installs a colo: prefix | 21:38 |
mathrick | yes | 21:38 |
mathrick | oh, right, and beware of clashes with the built-in colon prefixes | 21:39 |
mathrick | date:, branch:, tag:, submit:, before: and last: at least | 21:39 |
mathrick | though of these I think only branch: and submit: are valid branch syntaxes | 21:40 |
MTecknology | I was thinking probably just k: or kalliki: | 21:40 |
mathrick | well, and lp: of course | 21:40 |
mathrick | MTecknology: but you want to provide that for any host | 21:40 |
mathrick | otherwise it'll be just confusing for users | 21:40 |
mathrick | well, maybe not more than lp: | 21:40 |
mathrick | but still, if you attempt to support widely-used syntax (SSH), you'd better make it work like everything else that supports it | 21:41 |
MTecknology | so, where should I get started building this plugin? | 21:41 |
MTecknology | I'll obviously need to start understanding python a little bit :P | 21:44 |
MTecknology | mathrick: do you know where the plugin is that handles lp:? or is that probably much more in depth than what I need? | 21:46 |
mathrick | MTecknology: lp: and colo: are the same deal | 21:47 |
mathrick | MTecknology: I think bzr plugins -v should tell you | 21:48 |
mathrick | the plugin you want is called launchpad | 21:49 |
MTecknology | I'm seeing .pyc files, do I need to compile the python before it can be run? | 21:49 |
mathrick | eh, no | 21:49 |
mathrick | that's done automatically by python whenever you invoke a .py file | 21:49 |
MTecknology | oh | 21:49 |
mathrick | running ubuntu/debian? | 21:50 |
MTecknology | ya | 21:50 |
mathrick | if so, you have them precompiled | 21:50 |
mathrick | sec | 21:50 |
MTecknology | looks like test_lp_directory.py is the file that I should look into | 21:50 |
mathrick | quite possibly | 21:50 |
MTecknology | mathrick: wow; this doesn't look friendly :P | 21:59 |
mathrick | lp is kinda huge | 22:00 |
MTecknology | yup | 22:00 |
MTecknology | I don't think my mind thinks in python | 22:01 |
mathrick | but you shouldn't be looking at test_* | 22:01 |
mathrick | that's, as the name suggests, tests | 22:01 |
mathrick | hmm, the netloc thing might not really be suitable for the kind of thing ssh foo:bar syntax needs | 22:02 |
mathrick | MTecknology: I'd wait until somebody more familiar with bzr's guts comes | 22:03 |
MTecknology | test_lp_directory.py has 'lp:' in it; which makes me want to look at lp_directory.py | 22:04 |
MTecknology | mathrick: ok, thanks for pointing me in the right direction | 22:05 |
mathrick | MTecknology: lp_directory is where it's at, but it might not be suitable a method for registering a catch-all prefix | 22:06 |
mathrick | which is why I suggested waiting | 22:06 |
mathrick | and you're welcome | 22:06 |
MTecknology | It's not really that bad because it remembers the branch push/pull locations; just be easier when we get more going on | 22:09 |
mathrick | yeah, though I could see it useful in an environment with many branches going on | 22:10 |
mathrick | if that's the case, a generic branch-reference-shortener could be useful | 22:10 |
mathrick | so you could say b:mtecknology:foo for example | 22:10 |
asabil | MTecknology, I can probably help | 22:10 |
mathrick | or b:main | 22:10 |
MTecknology | asabil: I can probably eagerly listen :D | 22:11 |
MTecknology | mathrick: how would I do that? | 22:12 |
asabil | http://pastebin.com/HHgSxp5M | 22:12 |
mathrick | MTecknology: by registering a b: URL scheme, like lp:, and then having a map from shorthands to full locations somewhere in the config file | 22:13 |
mathrick | but that only makes much sense if you really operate in a forest and need to refer to many branches often | 22:13 |
mathrick | asabil: but that's only for a fixed prefix:, no? | 22:14 |
mathrick | can you make it catch any not otherwise recognised prefix? | 22:14 |
asabil | mathrick, well you wanted something like lp: no ? | 22:15 |
MTecknology | ya | 22:15 |
mathrick | well, I wanted something like scp host:dir | 22:15 |
MTecknology | This is long: bzr+ssh://user@code.domain.com/home/user/connect/foo | 22:16 |
MTecknology | that's what I'm trying to change | 22:16 |
MTecknology | to k:~user/connect/foo | 22:16 |
praseodym | just upgraded to 2.1, but now I get the following error when pushing to a remote repository: "AssertionError: _remember_remote_is_before((2, 1)) called, but _remember_remote_is_before((1, 6)) was called previously. | 22:16 |
asabil | MTecknology, what I pasted answers your question | 22:17 |
MTecknology | asabil: what about the username@ part? | 22:18 |
asabil | MTecknology, you can do whatever you want with the url | 22:18 |
asabil | you parse it the way you want | 22:18 |
MTecknology | So I need to format this? -> return "bzr://code.kalliki.com/repo" + name | 22:19 |
asabil | yep | 22:19 |
asabil | for example | 22:19 |
MTecknology | asabil: Is there any way to decopmose the whole path into little pieces? | 22:28 |
MTecknology | So I could grab the first part of the path | 22:28 |
asabil | split ? | 22:29 |
MTecknology | ya | 22:29 |
asabil | "hello:world".split(":") | 22:29 |
asabil | for example | 22:29 |
MTecknology | oh | 22:29 |
MTecknology | that first part of the path will be the user name as well as the home directory | 22:30 |
MTecknology | so k:foo/bar -> bzr+ssh://foo@blah.com/home/foo/bar | 22:30 |
asabil | you remove the prefix | 22:31 |
asabil | and then split on th "/" | 22:31 |
MTecknology | then toss the first part into a variable | 22:31 |
asabil | user, directory = uri[2:].split("/", 1) | 22:31 |
asabil | (it is not the most beautiful python code :P) | 22:32 |
MTecknology | if url.startswith('prefix:'): | 22:32 |
MTecknology | I change that to my prefix? | 22:32 |
asabil | yes | 22:32 |
asabil | the uri[2:] it to remove the 1st 2 characters | 22:33 |
MTecknology | oh | 22:33 |
MTecknology | what's the else: for? if I matched that it start's with k: | 22:34 |
asabil | the else shouldn't happen | 22:34 |
MTecknology | if url.startswith('k:'): if url starts with k: name = url[2:] then remove the first two letters and store in name else: but if it doesn't start with k: | 22:36 |
MTecknology | OH! | 22:37 |
MTecknology | does indentation matter in python? | 22:37 |
MTecknology | I had it wrong when you copied things and I read it as the return happens in the else :P | 22:38 |
MTecknology | asabil: that's what goes in __init__.py ? | 22:44 |
asabil | yes | 22:45 |
MTecknology | cool - an error | 22:46 |
asabil | ? | 22:48 |
MTecknology | I tried return 'bzr+ssh://' + name.split("/", 1) + '@code.kalliki.com/home/' + name | 22:49 |
asabil | name.split("/", 1) returns an array | 22:50 |
asabil | whose size is maximum 2 | 22:50 |
MTecknology | oh | 22:50 |
asabil | you need to extract the element | 22:50 |
MTecknology | asabil: ok, I thought it was returning the 1th item from it :P | 22:55 |
asabil | I guessed so | 22:55 |
elpargo | hi, I'm not a bzr user but I want to check out some code from trunk/tip whatever you guys call it :) | 22:57 |
elpargo | will someone be kind enough to point me the URL to check out the 0.10 branch for https://launchpad.net/ipython | 22:58 |
asabil | elpargo, bzr branch lp:ipython | 22:58 |
asabil | or lp:ipython/0.10 | 22:59 |
asabil | if you want the 0.10 series | 22:59 |
elpargo | yea I believe that is what I want as it has the bugfix but there is no 0.10.1 | 23:00 |
elpargo | asabil: what's this lp? is that with an existing checkout? | 23:00 |
asabil | elpargo, lp is a shorthand for launchpad | 23:02 |
MTecknology | asabil: so if I want to force an error to happen, now do I do that? | 23:03 |
asabil | do the same as what is in the else: | 23:03 |
elpargo | asabil: interesting. That seems handy. | 23:04 |
asabil | elpargo, you are welcome | 23:04 |
humitos | hello | 23:11 |
humitos | I'm tryig to serve a branch downloaded from launchpad with "bzr serve" and I get this error: | 23:11 |
humitos | bzr: ERROR: Invalid http response for http://localhost:4155/.bzr/branch-format: Bad status line received | 23:11 |
MTecknology | asabil: :D absolutely perfect :D | 23:33 |
asabil | cool | 23:33 |
MTecknology | asabil: wanna see? | 23:34 |
asabil | yeah sure | 23:34 |
MTecknology | http://dpaste.com/168836/ | 23:34 |
MTecknology | asabil: team|user/project/branch :D | 23:35 |
asabil | looks good | 23:36 |
MTecknology | asabil: namesplit = name.split("/", 3) | 23:36 |
MTecknology | sorry | 23:36 |
MTecknology | asabil: thanks :D | 23:37 |
MTecknology | mathrick: ^ In case you're curious what the solution was | 23:39 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!