=== abentley1 is now known as abentley | ||
=== jay-dinner is now known as jaypipes | ||
treeform | hey is there plans on adding some thing like a transfer rate and progress when you checkout etc... ? | 03:28 |
---|---|---|
=== jamesh_ is now known as jamesh | ||
jelmer | treeform, there has been talk about it, not sure if there are any concrete plans | 04:06 |
poolie | both vila and i would like to work on that, i for one have not got a patch yet | 04:15 |
treeform | oh ok | 04:16 |
treeform | i say this because we use bzr for our project and lots of 3d art people try to use it too | 04:16 |
treeform | and they complain about this alot because our bzr downloads are in GB's | 04:16 |
poolie | ok | 04:19 |
poolie | we'll try to do it soon | 04:19 |
ferringb | c | 04:27 |
ferringb | *cough*. damn screen :/ | 04:27 |
vila | hi all | 07:10 |
vila | spiv: ping | 07:12 |
vila | spiv: thanks for updating bug #286834 description ! Are you working on it right now ? I talked with jam about it yesterday and I know how to fix it, just checking we aren't both working on it. | 07:13 |
ubottu | Launchpad bug 286834 in bzr-gtk ""bzr gcommit" issues an exception" [Undecided,Confirmed] https://launchpad.net/bugs/286834 | 07:13 |
spiv | vila: no, I'm not working on it | 07:14 |
spiv | vila: I was just gardening :) | 07:14 |
vila | spiv: ok, thanks for that | 07:14 |
spiv | Not a problem. | 07:17 |
* spiv heads to yoga. | 07:25 | |
mwhudson | abadger1999: hello? | 09:19 |
jandem | are there any plans for developing a light-weight built-in webserver like mercurial has? | 09:27 |
jandem | i like bazaar a lot but i just miss that feature sometimes | 09:27 |
mwhudson | jandem: you've seen loggerhead | 09:28 |
mwhudson | ? | 09:28 |
jandem | mwhudson, but doesn't that need apache? | 09:29 |
mwhudson | no | 09:29 |
jandem | mwhudson, ok then i got that wrong, i will look at it again | 09:29 |
jandem | it looks nice here: http://bazaar.launchpad.net/~bzr/bzr/trunk/changes :) | 09:30 |
mwhudson | yeah, it's nice and pretty these days :) | 09:31 |
nir | How can I install bzr-1.7.1 back on Ubuntu 7? I need it for bzr-svn. Or how can I install a bzr-svn version that supports 1.8.1? | 09:49 |
mwhudson | nir: ubuntu 7 ? | 09:57 |
nir | y | 09:57 |
mwhudson | nir: no such thing | 09:57 |
mwhudson | nir: do you mean 7.10 (gutsy)? | 09:57 |
nir | correct | 09:57 |
mwhudson | the debs for 1.7.1 will still be in the librarian i guess, i don't know how to find them though | 09:58 |
mwhudson | jelmer: you here? | 10:13 |
nir | mwhudson: so the only solution is to install 1.7.1 and bzr-svn from source, in a separate location, for bzr-svn work? | 10:16 |
mwhudson | nir: i admit, i get the versioning issues confused | 10:17 |
mwhudson | nir: do bzr 1.8 and bzr-svn tip not work together? | 10:17 |
nir | apt-get won't let you install bzr-svn because it requires version < 1.8 | 10:18 |
mwhudson | nir: i was trying to suggest using the bzr 1.8 deb and bzr-svn from source | 10:20 |
nir | mwhudson: I'll try that | 10:23 |
LarstiQ | nir: http://bazaar-vcs.org/BzrForeignBranches/Subversion does not list a released version of bzr-svn that works with 1.8, but the 0.4 branch on launchpad should | 10:27 |
nir | bzr-svn 0.4.13 seems to work with bzr 1.8 | 10:40 |
=== abentley1 is now known as abentley | ||
=== abentley1 is now known as abentley | ||
jelmer | mwhudson, hi | 12:22 |
mwhudson | jelmer: i can't remember what i wanted to ask you now :) | 12:22 |
gour | does latest bzr-svn works with 1.8.. | 12:29 |
tvainika | jelmer: is it possible that bzr-svn has some race condition while committing to svn repo? my co-worker used svn merge to merge one change, and on same minute I had committed with bzr-svn my changes. co-workers commit went in first, but commit I made silently discarded his commit and applied my changes to revision before my co-workers commit. | 12:35 |
tvainika | i tried to reproduce this yesterday at home, but could reproduce it with some scripts looping commits to artificial repo | 12:35 |
jelmer | tvainika, yes, there's an open bug about this | 12:36 |
jelmer | gour, yes, 1.8 works with 0.4.13 | 12:36 |
jelmer | tvainika, requires some fixes in bzr | 12:36 |
tvainika | oh, didn't notice that bug report | 12:38 |
=== thunderstruck is now known as gnomefreak | ||
gour | jelmer: ta. i guessed that's what mwhudson wanted to ask | 12:45 |
mwhudson | it wasn't actually, but it was a good question | 12:46 |
mwhudson | ah right | 12:46 |
mwhudson | jelmer: you made some debs for loggerhead, right? | 12:46 |
jelmer | mwhudson, yep | 12:46 |
mwhudson | jelmer: can you tell barry where they are? :) | 12:47 |
mwhudson | hm, he's not in here | 12:47 |
jelmer | the two branches are here: http://bzr.debian.org/pkg-bazaar/loggerhead/ | 12:47 |
* lamont needs a bzr-svn that works with bzr 1.8, preferably in the ~bzr PPA | 12:58 | |
jelmer | there is one in Debian, not sure why it hasn't been imported into ppa yet | 13:00 |
lamont | the BzrSvn homepage doesn't even mention 1.8 | 13:16 |
lamont | jelmer: so 0.4.13-4 loves 1.8? | 13:17 |
lamont | as indicated by the changelog, *facepalm*( | 13:21 |
jelmer | lamont, 0.4.13-4 | 13:24 |
lamont | yeah | 13:24 |
lamont | grabbed and stuck where I need it, thanks | 13:24 |
jelmer | I hadn't had time to do a proper 0.4.14 release yet | 13:24 |
lamont | heh | 13:25 |
* lamont understands ENOTIME | 13:25 | |
LarstiQ | jelmer: so http://bazaar-vcs.org/BzrForeignBranches/Subversion can be updated to include 1.8? | 13:25 |
jelmer | not really, it does still warn about 1.8 | 13:26 |
jelmer | the debian package has a patch to silence that | 13:26 |
LarstiQ | aha | 13:26 |
lamont | jelmer: mind you, someone will need to upload bzr-svn to the ppa | 13:26 |
abadger1999 | mwhudson: hi | 14:53 |
fynn | what's the equivalent of `git stash` for bzr? | 17:09 |
fynn | the shelve plugin? | 17:09 |
LarstiQ | fynn: I'm afraid I don't know what `git stash` does. | 17:10 |
mwhudson | fynn: yes | 17:10 |
LarstiQ | but mwhudson does! :) | 17:10 |
fynn | LarstiQ: apparently, it does what shelve does in bzr ;) | 17:11 |
* mwhudson is a compulsive factoid acquisition machine | 17:11 | |
mwhudson | fynn: the plugin that provides 'shelve' is called 'bzrtools' though | 17:12 |
LarstiQ | until abentley has finished the shelve previewtrees rewrite, then it might go into core | 17:13 |
* LarstiQ runs off to practice | 17:13 | |
mwhudson | spiv: i seem to get your blog posts three times in my rss reader :) | 17:25 |
matkor | Hi ! Is it possible to "revert update" ? I had WT in rev A , did bzr update and WT got updated to rev B ... I want it back in state when it was in rev A ... | 17:41 |
matkor | when I do bzr revert -r A WT contains proper files but files are marked as modified ... | 17:42 |
matkor | TIA | 17:42 |
whitelynx | try 'bzr update -r A WT' | 17:43 |
whitelynx | revert would revert the _files_ to the state of A, whereas update works on the tree iirc | 17:43 |
=== thunderstruck is now known as gnomefreak | ||
clemente | I'm looking for ways to debug Bazaar (or Python in general) comfortably. For instance I'm at pdb and I wrote „p working_tree.“ and now I would like to see a list with possible completions (e.g.: methods and variables of working tree) | 17:48 |
clemente | How do you debug Bazaar? | 17:48 |
james_w | clemente: if you install ipython you can get that | 17:49 |
james_w | it takes some fiddling to make it work inside pdb, bug it can be worth it | 17:49 |
clemente | clemente: is ipython a superset of pdb? | 17:49 |
* clemente must add a filter to his IRC client to forbid doing monologues | 17:50 | |
james_w | http://libreamoi.com/index.php/starting-ipython-from-pdb/ | 17:50 |
james_w | heh :-) | 17:51 |
james_w | it's an alternative REPL, with tab completion and other goodies | 17:51 |
james_w | you can use that ^ to get those goodies when you hit a pdb prompt | 17:51 |
matkor | whitelynx: Thanks but my bzr 1.8 does not have option -r for bzr update ... | 17:51 |
whitelynx | hm -.- | 17:51 |
clemente | I didn't know that it could also debug. And what about ipdb? | 17:52 |
james_w | I think that's just an easier way to do the above | 17:52 |
james_w | I've never tried it, but I'd appreciate it knowing if it works if you do | 17:53 |
LarstiQ | clemente: I like http://pypi.python.org/pypi/ipdb/0.1dev-r1716 | 17:53 |
LarstiQ | matkor: update brings the content of the working tree to the same revision as the branch | 17:53 |
clemente | LarstiQ: that seems simple and easy | 17:53 |
LarstiQ | clemente: it is a very simple package, it imports some convenience things from ipython and then wraps pdb | 17:54 |
LarstiQ | matkor: do you want to roll the branch back? It isn't entirely clear to me what your desired outcome is. | 17:55 |
matkor | LarstiQ: I had checkout in rev_a ... I did bzr update which updated to rev_b ... I would like to revert that update - get back to state before | 17:56 |
matkor | I do not want to have rev_b in that WT now ... | 17:57 |
matkor | I just want stick with rev_a for while | 17:57 |
LarstiQ | matkor: you have a checkout, something bound to a master branch, but you specifically don't want the state to be synchronized? *boggle* | 17:58 |
matkor | yes | 17:58 |
LarstiQ | ok | 17:58 |
LarstiQ | matkor: do you intend for it to become a proper checkout again later on? | 17:59 |
matkor | yes.. I just want to delay "bzr update" I have done already | 17:59 |
=== thunderstruck is now known as gnomefreak | ||
matkor | I fact I need files being in rev_a ... so bzr revert -r rev_a would be OK, but I am courious is there way to not keep modified files .. becouse sb may comit that later by accident ... | 18:02 |
LarstiQ | matkor: I'm trying to wrap my head around the reasoning. What makes revert -r A difficult for you? | 18:02 |
LarstiQ | ah, you do commit there | 18:03 |
LarstiQ | matkor: wouldn't it make more sense to not be a checkout at all? | 18:03 |
matkor | hmm make it branch ? | 18:04 |
LarstiQ | matkor: a 'standalone branch', yes | 18:04 |
matkor | so do: bzr unbind ; bzr revert -r rev_a ? | 18:05 |
* matkor is checking term standalone branch .... | 18:05 | |
LarstiQ | matkor: bzr unbind; bzr pull . --overwrite -r rev_a | 18:06 |
LarstiQ | matkor: now whitelynx was right that an `update -r` would be useful in this case. | 18:06 |
LarstiQ | but the pull . --overwrite accomplishes the same thing | 18:06 |
matkor | yeah ! great idea .. Thats exactly what I need, thank you both very much ! | 18:07 |
LarstiQ | glad you got to where you wanted to be | 18:08 |
matkor | Yup, after rebinding I am exactly in state I wanted :) | 18:09 |
clemente | james_w: ipdb is very simple: I just installed it from the egg here: http://pypi.python.org/pypi/ipdb/0.1dev-r1716 (installing python-setuptools before and learning how to install eggs), and then you just use: from ipdb import set_trace; set_trace() . You get a prompt like pdb, but coloured code for „l“ and „w“, bash-style completion with TAB for members and Python+pdb commands, and maybe more | 18:15 |
clemente | It could also colour-code the completions, specially when there are many (ex: >300) | 18:16 |
clemente | But in general, it seems better than pdb | 18:16 |
whitelynx|work | i'm having a permissions issue on my shared repository | 18:17 |
whitelynx|work | when written to with bzr+ssh | 18:17 |
whitelynx|work | I put the whole problem description in pastebin: http://gne.pastebin.com/m23a731ad | 18:18 |
LarstiQ | whitelynx|work: umask? | 18:18 |
whitelynx|work | LarstiQ: can you set the umask just for a single bzr repository? | 18:18 |
whitelynx|work | i don't want all the files the user creates to be group-readable; just the ones in /bzr | 18:19 |
whitelynx|work | brb | 18:19 |
matkor | whitelynx: I solve that with using ACLs | 18:19 |
whitelynx|work | matkor: that would probably do it... never used ACLs before though | 18:19 |
clemente | What still confuses me about (i)pdb: if you do „l“ some times, it shows you the next and next source lines. But how can you tell it to go back to the current line again? | 18:19 |
whitelynx|work | and this server is going to be our web, bzr, svn, ftp, etc. server | 18:20 |
whitelynx|work | so i don't want to screw it up too much | 18:20 |
whitelynx|work | although it is a VPS, so it's not too difficult to redo | 18:20 |
whitelynx|work | but yeah... brb | 18:20 |
matkor | whitelynx: you have to remount filesystem with ACLs and than: setfacl -r -d --set u::rwX,g::rwX,o::- repo | 18:21 |
whitelynx|work | hmm | 18:23 |
whitelynx|work | ok | 18:23 |
clemente | Is there some way to refer to the currently debugged line in pdb? | 18:26 |
clemente | So that I can say: l $that_line | 18:27 |
clemente | to list the currently debugged source | 18:27 |
clemente | Mmmm... sorry, better would it be in #python | 18:28 |
orospakr | What does the "Gateway to LAN" option in the tray icon do? | 18:30 |
mxpxpod | I'm using bzr 1.8 with bzr-svn 0.4.13 and it's telling me that bzr-svn is not up to date with the installed bzr version... what does that mean since the plugin works? | 18:50 |
LarstiQ | orospakr: send out commit notifications to the lan | 18:50 |
LarstiQ | mxpxpod: bzr-svn is being conservative, the debian package has silenced the warning as 0.4.13 does work with 1.8 (as you noticed) | 18:51 |
mxpxpod | LarstiQ: ok, thanks | 18:53 |
orospakr | LarstiQ, using avahi? I assume that means that any other computers with bzr-notify on the LAN will pop up a libnotify toaster or something I make a commit? | 18:54 |
orospakr | s/something/something when/ | 18:54 |
LarstiQ | orospakr: that's the idea, but I don't know what the current status is | 18:55 |
whitelynx|work | grah... the only gentoo/acl howto i'm finding is on gentoo-wiki.com, which is down because their provider went under -.- | 19:02 |
whitelynx|work | thank god for the wayback machine | 19:03 |
LarstiQ | whitelynx|work: hmm, it may be coincidence, but vim.org isn't working for me either | 19:06 |
whitelynx|work | LarstiQ: that's probably a different thing... gentoo-portage.com and gentoo-wiki.com have been down since friday: http://www.gentoo-wiki.com/ | 19:07 |
LarstiQ | whitelynx|work: ouch | 19:09 |
whitelynx|work | yeah -.- | 19:09 |
whitelynx|work | that's one of the single most useful sites on the web for any Gentoo user | 19:09 |
whitelynx|work | and they can't even get at the data for it right now to put it up somewhere else -.- | 19:09 |
LarstiQ | whitelynx|work: yeah, I read a bit of that page, really sucky situation | 19:10 |
whitelynx|work | yeah | 19:10 |
whitelynx|work | i've been keeping up on it for the past few days, since i use that site all the time | 19:10 |
whitelynx|work | that's really shitty behavior on the part of skiplink though | 19:11 |
whitelynx|work | they should have notified their customers | 19:11 |
whitelynx|work | and allowed them to make backups | 19:11 |
whitelynx|work | damn... matkor quit -.- | 19:16 |
whitelynx|work | i wanted to ask him more about ACLs | 19:16 |
whitelynx|work | since i'm still not entirely convinced they'll fix the issue | 19:16 |
LarstiQ | whitelynx|work: as poolie said in that mail, it should work without acls | 19:17 |
whitelynx|work | LarstiQ: it doesn't | 19:17 |
LarstiQ | whitelynx|work: are you sure there is not an umask set somewhere that influences this? | 19:17 |
whitelynx|work | i tried following the email and the bzr docs | 19:17 |
whitelynx|work | this is using a newly-created user with no modifications to its config files | 19:17 |
whitelynx|work | completely vanilla gentoo install | 19:17 |
whitelynx|work | in a VPS | 19:18 |
LarstiQ | whitelynx|work: ok | 19:18 |
* LarstiQ tries to reproduce | 19:18 | |
whitelynx|work | thanks :-) | 19:20 |
LarstiQ | whitelynx|work: happens here too | 19:20 |
whitelynx|work | ok, so it's confirmed... | 19:21 |
whitelynx|work | hm | 19:21 |
whitelynx|work | any ideas on how to work around it? | 19:21 |
LarstiQ | let me try | 19:21 |
whitelynx|work | or musings on how ACLs might actually help? | 19:21 |
whitelynx|work | ok :-) | 19:21 |
whitelynx|work | thank you | 19:21 |
LarstiQ | whitelynx|work: https://bugs.edge.launchpad.net/bzr/+bug/50568 seems relevant | 19:25 |
ubottu | Launchpad bug 50568 in bzr "'bzr push' does not preserve sgid bit on newly created directories" [Medium,Confirmed] | 19:25 |
whitelynx|work | hmm | 19:26 |
whitelynx|work | that does sound relevant | 19:26 |
whitelynx|work | can't check it right now because firefox froze up again | 19:26 |
LarstiQ | whitelynx|work: also contains some ACL info | 19:26 |
whitelynx|work | hmm | 19:26 |
whitelynx|work | ok | 19:26 |
LarstiQ | which I really should look into sometimes | 19:26 |
=== thekorn_ is now known as thekorn | ||
whitelynx|work | i wish chrome ran under linux -e- | 19:36 |
whitelynx|work | *-.- | 19:36 |
whitelynx|work | firefox is pissing me off | 19:36 |
LarstiQ | whitelynx|work: for basics, you could try aurora | 19:36 |
LarstiQ | no, arora | 19:36 |
* LarstiQ always gets that name wrong | 19:36 | |
whitelynx|work | haven't even heard of that... i'll take a look | 19:36 |
whitelynx|work | heh | 19:37 |
whitelynx|work | ooh! | 19:37 |
whitelynx|work | webkit/qt ^_^ | 19:37 |
whitelynx|work | what's the difference between that and konqueror? | 19:37 |
LarstiQ | whitelynx|work: no kde dependencies iirc | 19:39 |
LarstiQ | whitelynx|work: and well, it's very basic | 19:39 |
whitelynx|work | hmm | 19:39 |
whitelynx|work | i'll give it a shot | 19:39 |
whitelynx|work | i already have konqueror installed though | 19:39 |
whitelynx|work | i like chrome because it's fast and stable | 19:39 |
whitelynx|work | and standards-compliant, afaict | 19:40 |
LarstiQ | whitelynx|work: but not because it has a missing GUI? :) | 19:42 |
whitelynx|work | i'm talking under windows :-P | 19:42 |
whitelynx|work | right now they just have to finish fixing the code to build in linux, and it should be pretty well ready to go | 19:43 |
whitelynx|work | i'm surprised it isn't done yet... they're accepting help from the community with it | 19:43 |
whitelynx|work | i wish i had time to work on it | 19:43 |
luks | by 'fixing the code' you mean write the GUI code for linux? | 19:43 |
whitelynx|work | ? | 19:44 |
* whitelynx|work wishes firefox would stop freezing and crashing | 19:44 | |
LarstiQ | whitelynx|work: Google chose to implement a (Windows) gui on top of GDI | 19:48 |
LarstiQ | whitelynx|work: so for Linux they have to write a gui from scratch | 19:48 |
whitelynx|work | hm | 19:48 |
* LarstiQ hasn't followed closely after the first two weeks though | 19:49 | |
LarstiQ | so no clue what the status currently is | 19:49 |
=== Verterok is now known as Verterok|out | ||
james_w | clemente: thanks, I'll look at packaging it | 21:25 |
whitelynx | LarstiQ: that bug on launchpad seems to pertain to sftp, not bzr+ssh | 21:37 |
whitelynx | although i haven't seen anything there that confirms that it shouldn't happen on bzr+ssh | 21:37 |
LarstiQ | whitelynx: right, I added a comment to revive it | 21:38 |
whitelynx | cool | 21:38 |
LarstiQ | whitelynx: did the acl info help? | 21:38 |
whitelynx | i'm still testing | 21:38 |
whitelynx | LarstiQ: someone responded | 21:40 |
whitelynx | i'm not even sure which repo format i'm using... whatever the default is, i would guess | 21:40 |
LarstiQ | whitelynx: let me respond | 21:43 |
whitelynx | ok cool | 21:43 |
whitelynx | LarstiQ: thanks for all the help with this :-) | 21:43 |
LarstiQ | whitelynx: thank me when it works as you want :) | 21:45 |
whitelynx | :-) | 21:45 |
LarstiQ | whitelynx: done, and now I need sleep | 21:58 |
LarstiQ | another day tomorrow | 21:58 |
whitelynx | :-) | 21:58 |
whitelynx | have a good night | 21:58 |
LarstiQ | thanks, you too when that is applicable :) | 21:59 |
whitelynx | :-) | 22:01 |
whitelynx | another 5-7 hours | 22:02 |
whitelynx | i am headed home from work now, though | 22:02 |
whitelynx | thanks for the help, and ttyl | 22:02 |
=== BasicPRO is now known as BasicOSX | ||
poolie | hello LarstiQ | 22:59 |
=== bob2_ is now known as bob2 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!