| igc | morning all | 01:39 |
|---|---|---|
| * fullermd waves at igc. | 01:39 | |
| Peng_ | Good morning. | 01:39 |
| igc | hi fullermd! | 01:39 |
| fullermd | It's so peaceful 'round here while everyone else is off summitting ;) | 01:40 |
| jbowtie | What does an uncommit actually do? I had a pull get aborted last night and repository is in inconsistent state. | 02:10 |
| jbowtie | Returns true for has_revision(X) but doesn't actually contain that revision. | 02:11 |
| jbowtie | I'm wondering if I should try and salvage the repository or not. | 02:11 |
| Peng_ | uncommit doesn't do anything to the repo, just the branch. | 02:12 |
| jbowtie | Peng_: Unfortunate for me. Maybe I can cheat and try to add the revision again, it's not in a consistent state so it might work. | 02:15 |
| Tim-7967 | hi, can somebody help me figure out whats wrong with my copy of Bazaar? | 02:29 |
| thumper | Tim-7967: what's up? | 02:29 |
| Tim-7967 | when I type bzr init I get this: http://pastebin.com/HVtDw2aZ | 02:29 |
| Tim-7967 | obviously its a problem with Python on OSX | 02:29 |
| Tim-7967 | but I've tried installing Bazaar through the DMG and MacPorts... and neither seem to work and produce the same error | 02:30 |
| thumper | ok, so you are using OSX? | 02:30 |
| Tim-7967 | yes, 10.6 Snow Leopard | 02:30 |
| thumper | and how did you install bzr? | 02:30 |
| Tim-7967 | originally through the Disk Image available at the website | 02:31 |
| Tim-7967 | then I tried it through MacPorts after that error showed up and had the same results | 02:31 |
| * thumper knows nothing about OSX | 02:31 | |
| thumper | ok | 02:31 |
| thumper | those errors are saying that some plugins aren't working | 02:31 |
| Tim-7967 | think of screwed up BSD, and then you have something to reference too :P | 02:31 |
| thumper | but that won't stop bzr working | 02:31 |
| thumper | I'll just be noisy | 02:32 |
| thumper | the plugins should be installed in ~/.bazaar/plugins | 02:32 |
| thumper | if they are local | 02:32 |
| thumper | are they local or system plugins? | 02:32 |
| Tim-7967 | lemme check | 02:32 |
| Peng_ | jbowtie: What format repo is this? It should not be possible for it to become inconsistent. | 02:32 |
| thumper | bzr plugins -v | 02:32 |
| Peng_ | jbowtie: Hey, could you take a backup before you do anything to it, in case someone wants to debug it? | 02:33 |
| Tim-7967 | I would think it would be system as its refering to the Library folder | 02:33 |
| Tim-7967 | Yes, they are system plugins | 02:33 |
| thumper | which version of bzr are you using? | 02:34 |
| Tim-7967 | bzr 2.1.1 | 02:34 |
| thumper | hmm... | 02:35 |
| thumper | did you install the pipeline and rebase plugins separately? | 02:35 |
| Tim-7967 | no | 02:35 |
| Tim-7967 | they *should* have been installed automatically | 02:36 |
| Tim-7967 | I selected install all when i was installing Bazaar | 02:36 |
| jbowtie | Peng_: Will see, might have too much internal data in it to pass around though. | 02:36 |
| thumper | it looks then like there is a bug in the installer as the versions it is installing aren't compatable | 02:37 |
| thumper | an email to the bazaar mailing list may be in order | 02:37 |
| thumper | I don't know who looks after the OSX bits | 02:37 |
| thumper | or a bug in Launchpad | 02:37 |
| jbowtie | Peng_: It's a 2a repo, but it was converting from a TFS repo; probably a bug in my TFS code caused the abort. But would have thought revision would not have committed in that case. | 02:37 |
| Tim-7967 | ok, trying out the beta one and seeing if it makes any differance | 02:39 |
| thumper | ok | 02:40 |
| Tim-7967 | "*** Bazaar has encountered an internal error. This probably indicates a | 02:40 |
| Tim-7967 | bug in Bazaar. You can help us fix it by filing a bug report at | 02:40 |
| Tim-7967 | https://bugs.launchpad.net/bzr/+filebug | 02:40 |
| Tim-7967 | including this traceback and a description of the problem." | 02:40 |
| Tim-7967 | maybe not :P | 02:40 |
| * Tim-7967 casually ignores the additional warnings and downgrades to stable release branch | 02:42 | |
| Tim-7967 | -_- | 02:53 |
| Tim-7967 | I've had more problems with bzr then git, cvs, svn and several other package managers combined :P | 02:53 |
| Peng_ | jbowtie: OK, import bugs could create a wildly invalid repo, so that could be it.. | 02:53 |
| Tim-7967 | I'll wait a little while for some bugs with bzr and OSX 10.6 to be fixed before using it | 02:54 |
| Tim-7967 | :/ | 02:58 |
| Tim-7967 | did somebody just bring the launchpad site offline? | 02:59 |
| Tim-7967 | "Firefox can't find the server at launchpad.net." | 02:59 |
| Peng_ | Tim-7967: WFM | 03:01 |
| Tim-7967 | WFM? | 03:01 |
| Peng_ | Works For Me | 03:01 |
| Tim-7967 | it must have been my DNS | 03:02 |
| Tim-7967 | I just flushed it and it was fine :P | 03:02 |
| * Tim-7967 curses OpenNIC and its tendancy to screw up DNS every 3 hours | 03:02 | |
| Peng_ | Then why use it? | 03:02 |
| Tim-7967 | because its awesome | 03:03 |
| * Tim-7967 also points to cloak | 03:03 | |
| Peng_ | Heh. | 03:03 |
| * Tim-7967 exclaims! | 03:04 | |
| Tim-7967 | I've had my project for ~1day... working on uploading stuffs | 03:04 |
| Tim-7967 | and somebody already forked it 0_o | 03:04 |
| Tim-7967 | https://launchpad.net/nyx | 03:04 |
| thumper | what do you mean someone forked it? | 03:06 |
| thumper | Tim-7967: oh you have startcommander-x? | 03:07 |
| Tim-7967 | *StarCommanderX :P | 03:07 |
| Tim-7967 | I need a new name for it anyways | 03:07 |
| Tim-7967 | I used to call it starbot | 03:07 |
| Tim-7967 | and did it in PHP | 03:07 |
| Tim-7967 | it always screwed up though | 03:07 |
| === dabomb69 is now known as Chazz | ||
| rockstar | Holy crap. The user experience for bazaar in Windows is terrible... | 05:10 |
| jbowtie | rockstar: Really? I've had excellent experiences with it. | 05:15 |
| jbowtie | rockstar: Anything specifically bothering you? | 05:16 |
| fullermd | Well, it IS on Windows... | 05:16 |
| rockstar | jbowtie, lots of things. I'll file bugs and whinge to jam in the morning. | 05:19 |
| parthm | jam: http://pastebin.com/CZBzX4Lq | 07:25 |
| jam | parthm: http://pastebin.com/eLuhbYR2 | 07:28 |
| Peng_ | "bzr info nosmart+lp:bzr" is shorter | 07:29 |
| Peng_ | parthm: 2a MySQL? :D | 07:29 |
| parthm | Peng_: Yeah :) ... I wanted one for testing | 07:32 |
| parthm | Peng_: I couldn't upgrade it locally so I push it into +junk and launchpad did it nicely. | 07:33 |
| Peng_ | Pah, kids these days. I did it locally before LP supported that. | 07:39 |
| Peng_ | Not literally locally. I got a VPS with 8 gigs of RAM... | 07:42 |
| parthm | Peng_: Nice :) | 07:49 |
| Peng_ | branch/pull themselves weren't that bad, but "bzr check" used like 5 gigs. | 08:03 |
| Peng_ | Fun times. | 08:03 |
| jelmer | Peng_: yeah, check definitely needs some work.. | 08:38 |
| jelmer | lifeless: let me know when you have time to look at foreign stuff :-) | 08:38 |
| lifeless | jelmer: come on by, the waters warm | 08:40 |
| Peng_ | Version control slash fics? | 08:41 |
| jelmer | lifeless: *nod* | 08:45 |
| fullermd | Peng_: Isn't that what rebase is for? :p | 08:46 |
| spiv | lifeless: https://code.edge.launchpad.net/~spiv/ubuntu/lucid/paramiko/address-families-579530-lucid/+merge/25297 :P | 08:53 |
| lifeless | spiv: your next step is to ping james_w or another main committer | 09:06 |
| spiv | lifeless: ta | 09:10 |
| mwhudson | jam: ooh, we can delete loggerhead.apps.config now i think | 09:21 |
| mwhudson | this makes me happy, because that is _horrible_ code | 09:21 |
| === nlisgo_ is now known as nlisgo | ||
| jam | mwhudson: because it was used only in start-loggerhead? | 09:36 |
| mwhudson | jam: right | 09:36 |
| jam | It is still in the test suite, but we can fix that :) | 09:36 |
| mwhudson | oh | 09:36 |
| mwhudson | well yeah | 09:36 |
| jam | I'm trying to clean it up now, because there were a lot of places that weren't passing 'cachepath' which is no longer optional | 09:36 |
| jam | and its being a little bit tricky | 09:36 |
| jam | but I'll get there | 09:36 |
| jam | (we have a temp dir to put the work in, just having some difficulty cleaning up after each test) | 09:37 |
| jam | mwhudson: but yes, only one reference to Root is in the test suite that I can find | 09:37 |
| jam | mwhudson: oh, and that ref actually isn't ... referenced :) | 09:38 |
| jam | 'loggerhead.tests.test_simple.test_config_root" doesn't seem connected to anything | 09:38 |
| jam | \o/ for delete paths | 09:38 |
| Peng_ | jam: BTW, I haven't looked into this much at all, but I occasionally see a KeyError in get_revno. | 09:41 |
| Peng_ | Haven't pulled the latest code -- maybe it changes things. | 09:41 |
| jam | the *latest* code is currently broken, but I'm finishing up some edges | 09:42 |
| Peng_ | Heh. | 09:42 |
| jam | I've been working on it with mwhudson this week | 09:42 |
| jam | I just merged history-db code into loggerhead so it isn't an external dependency | 09:42 |
| jam | and some other stuff like that | 09:42 |
| Peng_ | I'm without email at the moment, which makes it hard to keep up with things, but ping me on IRC when you have something. | 09:42 |
| jam | k | 09:43 |
| Peng_ | Thanks. :) | 09:43 |
| Peng_ | Haha, I just noticed this on the line above the KeyError: # TODO: Should probably handle KeyError? | 09:44 |
| lifeless | jelmer: https://lists.canonical.com/archives/bazaar/2009q2/059263.html | 09:53 |
| fstxx | imported from CVS, how to add more changes? We use cvs2svn to import a project from CVS. Unfortunately, som people continued in CVS, and others used bazaar. | 09:55 |
| === nlisgo_ is now known as nlisgo | ||
| amanica | abently I get the following when running `bzr help commands` today : ValueError: No help message set for <bzrlib.plugins.pipeline.commands.cmd_store object at | 10:09 |
| lifeless | amanica: interesting; it means a proactive code check is catching a plugin without help on a command | 10:15 |
| lifeless | please file a bug on bzr-pipeline | 10:15 |
| lifeless | preferrably with a patch :) | 10:15 |
| * fullermd filed that on -keywords last night. | 10:15 | |
| === vila is now known as mgz | ||
| hopeseekr | Hi. I have a post-commit.sh designed for svn. It uses svnlook (e.g. svnlook log -r2 only returns the commit message). Is there a plugin for BZR that provides the same functionality? | 11:26 |
| mkanat | hopeseekr: What is your post-commit script actually doing? | 11:27 |
| hopeseekr | it's only 3 lines | 11:27 |
| hopeseekr | http://pastie.org/960073 | 11:28 |
| hopeseekr | i guess the format i want it in is Author RevNo "Commit Message" "changed files" | 11:29 |
| hopeseekr | actually, i have no idea how to make a bzr post-commit hook, so this may all be moot | 11:32 |
| lifeless | its done via python | 11:32 |
| lifeless | you write it as a small script in ~/.bazaar/plugins | 11:32 |
| lifeless | there are some examples | 11:33 |
| hopeseekr | o great; i absolutely suck @ python | 11:33 |
| hopeseekr | i remember tyring to fix a *simple* bug in bzrweb; no go | 11:33 |
| jam | Peng_: so lp:~jameinel/loggerhead/history_db should be usable, and no longer depend on having bzr-history-db installed. I still have some more cleanup, and I know at least one view is broken. But I'm getting there. | 11:40 |
| hopeseekr | OK! | 11:53 |
| parthm | jam: https://code.edge.launchpad.net/~parthm/bzr/538868-message-for-heavy-checkout/+merge/24483 | 11:59 |
| fstxx | imported from CVS, how to add more changes? We use cvs2svn to import a project from CVS. Unfortunately, som people continued in CVS, and others used bazaar. | 12:30 |
| fullermd | cvs2svn doesn't support incremental conversion. | 12:34 |
| fullermd | I s'pose it's possible that it will output stuff similar enough that bzr fast-import can do incremental updates; I think it has some level of support for that. | 12:35 |
| fullermd | But I wouldn't count on it. | 12:35 |
| fstxx | fullermd: I was thinking I could do another import to new branch in bzr, and then copy changesets from the old one | 12:37 |
| fullermd | Well, the new branch would be unrelated. Maybe rewrite could do something with that; I don't know. | 12:37 |
| James7 | Hi does anyone use Bazaar on Mac Snow Leopard? | 12:40 |
| James7 | and if so, how can I uninstall it if the uninstaller doesn't work on Snow Leopard? | 12:41 |
| fstxx | fullermd: yes, metadata-wise it would be unrelated. I thought I could generate patches in one branch, and then apply them in the other | 12:48 |
| fstxx | something like what a gatekeeper would do | 12:53 |
| fullermd | Yeah. It's possible something in the rewrite plugin can help automate that. | 12:54 |
| James7 | Erm, no one? | 13:04 |
| === nlisgo_ is now known as nlisgo | ||
| === Chex- is now known as Chex | ||
| bialix | abentley: re problem with encoding of diff header again. from DiffText.diff_text method can launch either internal_diff or external_diff function. but external one has no path_encoding argument, so new code to pass the encoding down the layer is failing with external differ. will it be ok to just add path_encoding argument to external_diff function, although not really use it? | 14:47 |
| poolie | lifeless: re your blog post | 15:20 |
| lifeless | poolie: yes ? | 15:26 |
| poolie | hi | 15:26 |
| poolie | just thinking about your useFixture thing | 15:26 |
| poolie | to me 'fixture' is the whole environment where a test runs | 15:27 |
| poolie | so it's a bit strange if you can assemble some of them | 15:27 |
| poolie | i don't know if this is the orthodox meaning | 15:27 |
| bialix | poolie: where are you right now? | 15:37 |
| poolie | bialix: cocobolo 3 on the ground floor | 15:38 |
| bialix | k | 15:38 |
| poolie | will be back abotu 5pm | 15:40 |
| poolie | lifeless: you should +1 my blog comments | 15:40 |
| === nlisgo_ is now known as nlisgo | ||
| === IslandUsurper is now known as IslandUsurperAFK | ||
| === IslandUsurperAFK is now known as IslandUsurper | ||
| === IslandUsurper is now known as IslandUsurperAFK | ||
| === beuno is now known as beuno-lunch | ||
| === nlisgo_ is now known as nlisgo | ||
| === nlisgo_ is now known as nlisgo | ||
| === radoe_ is now known as radoe | ||
| === IslandUsurperAFK is now known as IslandUsurper | ||
| === Pilky_ is now known as Pilky | ||
| === beuno-lunch is now known as beuno | ||
| === nlisgo_ is now known as nlisgo | ||
| dwt | Hi, I'm trying to see what changes a remote repository has | 18:18 |
| dwt | I seem to remember that 'bzr incomming location' was it | 18:19 |
| dwt | but that seems not to work | 18:19 |
| dwt | and searching the docs doesn't seem to give enything? | 18:19 |
| fullermd | missing | 18:19 |
| dwt | ha | 18:19 |
| fullermd | 'incoming' is hg I think. | 18:19 |
| dwt | confused by differences again | 18:19 |
| dwt | thanks fullermd | 18:19 |
| dwt | on a related question, is there a fast way to find the bzr branch root? | 18:25 |
| dwt | I'm currently using bzr info and then parse out the branch root: | 18:25 |
| dwt | but that is way too _slow_ to be in my prompt | 18:25 |
| fullermd | Well, there's 'bzr root'. | 18:27 |
| fullermd | But I suspect pretty much anything will be too slow to be in a prompt. | 18:27 |
| fullermd | Well, unless you load bzrlib into your shell so there's no startup overhead ;) | 18:27 |
| dwt | fullermd: yeah, pretty much | 18:28 |
| dwt | and on osx I don't have bzr-service which loads it in the ram for me. | 18:28 |
| dwt | Or I'm missing something | 18:28 |
| * dwt thinks I could try storing the bzr source on a ramdisk | 18:35 | |
| fullermd | Well, I'd think that after running it once or twice, it would all be in cache anyway. | 18:35 |
| fullermd | It's the python startup overhead that gets you. | 18:35 |
| dwt | yeah, I pretty much think so | 18:37 |
| dwt | I wonder how the mercurial guys get this | 18:37 |
| dwt | they must be bitten by the python startup overhead too | 18:37 |
| dwt | but somehow it's much less of an issue there | 18:37 |
| dwt | my prompt pretty much takes a second to build (bzr) and about one order of magnitude less time in mercurial | 18:38 |
| fullermd | Well... a quick bit of find'ing and wc'ing says that my installed hg has around 17k lines of .py files, and bzrlib is 101k. | 18:38 |
| fullermd | bzr's all in cache here, and 'bzr rocks' consistently takes ~110ms (and I don't exactly have a pokey box) | 18:39 |
| fullermd | bzr help is about the same; 110-120. hg help is 30. | 18:39 |
| idnar | fullermd: they both take around 300ms here | 20:07 |
| idnar | (hg help and bzr help, that is) | 20:07 |
| idnar | Python startup pretty much sucks | 20:08 |
| idnar | I'm guessing my local python configuration is adding some overhead that you don't have, dwarfing the actual differences between bzr and hg | 20:09 |
| === nlisgo_ is now known as nlisgo | ||
| chx_ | hi. i would like to do bzr merge -c 15525,15526,15528,15532,15535 ../feature_pref_edition_block/ but it does not like me doing that :) | 23:42 |
| chx_ | or is there an interactive merge tool where i pick hunk by hunk maybe? | 23:57 |
| dash | chx_: you can only do one rev or range of revs at a time | 23:58 |
| TresEquis | chx_: use a bash for loop? | 23:59 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!