/srv/irclogs.ubuntu.com/2009/04/10/#bzr.txt

fbondWhen I do bzr combine-thread, I lose a reference to a head revision.01:00
fbondHow can I get it back?01:00
=== lamont` is now known as lamont
lifelessfbond: bzr heads --dead01:41
lifelessand then branch with -r revid:<revid>01:41
lifelessfbond: but why are you deleting threads that are heads?01:41
jfroyjelmer: ping+01:54
fbondlifeless: Maybe I'm using the wrong words.01:57
fbondI guess that's my problem.01:57
fbondIt *wasn't* a head.01:57
fbondI tried bzr heads, but only found a single revision that I didn't really care about.01:58
fbondlifeless: For some reason, I can't help but think of threads as branches with a tip.  But that's wrong, huh?02:07
SKArfaceGCgeneral usage question: when would I use pull instead of merge?02:08
SKArfaceGCi.e. what does pull do that merge doesnt?02:08
Peng_SKArfaceGC: When you have a mirror of a branch.02:08
SKArfaceGCPeng_: ok, so it's mainly for copying a branch and be able to keep it updated.  i.e. pull a branch into a public_html directory to publish a website?02:09
SKArfaceGCis it different than running update on a checkout?02:10
Peng_SKArfaceGC: It's basically equivalent, but branches and checkouts are different things.02:13
Peng_Omg, brisbane-core got merged to bzr.dev! Awesome! :D02:13
Peng_A few revisions got left out, though.02:13
SKArfaceGCone more... is a branch that I've bound to it's parent any different than a checkout?  conversly, is a checkout that I've unbound different than a branch?02:14
Peng_SKArfaceGC: Bound branches are another name for checkouts. Unbound branches are regular old branches.02:15
SKArfaceGCperfect.  Than I actually do understand what I think I understand.  Thanks   :)02:15
Peng_:)02:18
=== ja1 is now known as jam
lifelessfbond: well its right to the extent that each thread has a tip; but in a normal loom all the threads are merged upwards most of the time, so there is still usually only one head05:44
lifelessfbond: bzr log in the top thread will all the heads05:45
lifelessjelmer_: so why do you want to drop sqlite?05:52
vilahi all07:59
vilajelmer_: putting webdav into core has been proposed by poolie and is considered but not done yet ;)08:00
=== Toksyury1l is now known as Toksyuryel
jelmerjfroy: hi11:46
jelmervila: thanks11:46
jelmerlifeless: bug 18520011:47
ubottuLaunchpad bug 185200 in bzr-svn ""database is locked" bzr internal error" [High,Triaged] https://launchpad.net/bugs/18520011:47
lifelessjelmer: do you know, how friendly is the new gnome vfs thingy11:49
lifelessthe old one was rather ugly11:50
jelmerlifeless: I haven't looked at it closely yet11:52
lifelessoh god11:52
lifelessI just started to look closely11:52
lifelessit depends on out of process, dbus rpcs to use the file system11:53
lifelesshttp://library.gnome.org/devel/gio/stable/ch01.html11:53
jelmerlifeless: it wants to be able to use GPL'ed libraries in LGPL'ed libs11:54
lifelesshmm, I really need to sit down and do the rejiggering of your liballocevent or whatever you called it and libevent11:54
jelmerah, libtevent :-)11:54
lifelessjelmer: thats not the reason they give, and if so, thats trying to do an end run around the GPL, which I *do not* approve of11:54
lifelessif someone doesn't want their code used in non GPL apps, it shouldn't be used in non GPL apps.11:55
jelmerlifeless: it seems to me like that's at least one of the reasons11:55
jelmer(libsmbclient is GPL, and libgvfs is LGPL)11:55
lifelessso11:55
lifelessI think its time I wrote a C VFS11:56
lifelessan async C VFS11:56
lifelessbecause I like pain11:56
lifelesswhere is the libtevent source? I'm going to compare/prod it and libevent11:56
jelmerSamba's git repository, in lib/tevent11:56
Peng_libev?11:57
lifelessurl please11:57
jelmergit://git.samba.org/samba.git11:57
lifelessjelmer: no http viewer?11:57
jelmeroh, probably11:57
jelmerhttp://gitweb.samba.org/11:57
lifelessPeng_: hmm, better than libevent?11:57
Peng_lifeless: I've never used either one, but libev was designed to be faster and have a better API. Plus it has a libevent-like API for lazy people.11:58
lifelessjelmer: ok, still lost. can you give me the url to view the source please11:58
lifelessPeng_: ok; IME when people claim that its 50-50 whether they are right or wrong :)11:59
jelmerlifeless: try "apt-get source tevent"12:00
jelmer:-)12:00
Peng_lifeless: Right. I just wanted to put it on your radar. :)12:00
lifelessjelmer: heh; so you can't find it in the web ui either12:00
lifelessPeng_: I'd almost use ACE, except its hugely overcomplicated12:00
lifelessjelmer: what did you think of my rewrite of the subunit README?12:02
lifelessjelmer: is there a tevent man page?12:02
jelmerlifeless: haven't seen it yet, not done my mail readin for the day yet12:03
lifelessjelmer: kk12:03
jelmerlifeless: no, most of the documentation is in the main header file12:03
lifelessk12:03
lifelessso what I want to exist is a good clean minimal extendable nonblocking [as opposed to async] C VFS12:04
Peng_jelmer: BTW, um. Did you know you left a couple pdb bits in bzr-svn's test_repository.py (in both 0.5 and 0.6)?12:04
lifelesswith that in existence, people can write async or sync on top12:05
jelmerPeng_: Are you sure you're looking at current sources?12:05
lifelessjelmer: don't suppose you happen to know if such a beast exists?12:05
jelmerPeng_: ganieda:~/bzr-svn/0.6% grep pdb tests/*.py | wc -l12:05
jelmer012:05
* Peng_ pulls12:05
Peng_jelmer: grep pdb tests/*/*.py12:06
jelmerlifeless: I'm not aware of one12:07
lifelessprobably cause its hard.12:07
lifelessright, time for a bit by bit hobby project12:07
jelmerlifeless: :-)12:07
lifelessinterested?12:07
lifelessoh, and fortunately, noone seems to have taken libvfs, at least not according to apt-cache search12:08
jelmerI'm not sure, I try to stay away from the file system bits in Samba generally :-)12:09
Peng_jelmer: Err, sorry. I didn't know there was a tests/test_repository.py. I meant tests/mapping_implementations/test_repository.py.12:09
lifelessjelmer: :>12:09
lifelessjelmer: my feeling is the reason that there are a bazillion different bad vfs' out there is because everyone is building them half-baked, so they play bad with threads, or with async, or with networks12:10
lifelessI don't mean bad code, I mean their design principles are such that the product isn't reusable in many contexts12:10
jelmerlifeless: You might want to talk to tridge about this, he's done quite some async work in Samba12:11
lifelessI would but he's not online :)12:12
lifelessI'll get my basic interest and notes together, then we can see12:12
jelmerlifeless: IIRC there were also still problems with the kernel support12:15
jelmerlifeless: (there is no way to make "open" non-blocking, ?)12:15
lifelessits hard to argue that the kernel should be fixed when there is no userland that can represent it12:16
lifelessfrom a VFS perspective you need: an interface that balances easy to use with getting the most out of good underlying facilities12:17
jelmerchicken-egg :-)12:17
lifelessthen you can use threads or even helper processes over e.g. dbus, to get a non-blocking open12:17
jelmerlifeless: yeah, that's one of the things that's been talked about for Samba IIRC (helper processes)12:18
lifelessas long as client code can go 'for path in paths: pending_open = vfs_open(ctx, path)'12:18
lifelesssquid uses a helper to do IO on BSD systems12:18
jelmerlifeless: anyway, my memory is all a big vague about this, you should really talk to tridge :-)12:18
lifeless('diskd')12:18
lifelesson windows you can use completion ports to get nonblocking open12:19
lifelessthe os calls back in on the next event loop cycle12:19
jelmerlifeless: any chance you can re-review my InterBranch.pull patch?12:21
lifelessremind me tuesday12:21
lifeless(its easter :P)12:21
jelmerok12:21
jelmerlifeless: ah, ok12:22
* jelmer is looking at git -> git pull today12:26
lifelessjelmer: having looked at tevent, I still think you'd be better off wrapping libev12:32
lifelessor libevent12:32
jelmerlifeless: Oh, I've never said we weren't12:32
jelmerlifeless: My day only has 24 hours though12:33
lifelesswell thats true12:33
lifelessbut you were rather dismissive of potential benefits when I raised this12:33
jelmerlifeless: the benefits are minimal12:33
lifelessI rather suspect they are more than you think12:33
jelmerlifeless: compared to the required investment12:33
lifelessperhaps12:33
jelmerlifeless: what would the benefit be, other than the fact that we have less code to maintain and fix bugs in?12:34
lifelessthats rather a big win in itself; but you would get the features from the library you wrap (both support quite a bit more), and they are likely more scalable FWICT12:35
jelmerlifeless: what sort of features does libtevent not have? last time I looked libevent lacked a couple of things that libtevent needed12:38
lifelesslibevent may have nothing; libev is much more featureful12:40
lifelesschild process watching, inotify support, that sort of thing12:40
lifelesssignal reflection12:40
jelmerwhy do you need special inotify support, isn't that just waiting for a fd to become readable?12:43
lifelessshrug12:43
lifelessI'm not saying you should go change tomorrow12:43
lifelessI'd need to do a whole bunch more reading to make a strong case; and as the samba team clearly have more pressing concerns its not exactly a wise use of time to do that12:44
lifelessthe key thing for me was looking at it now, and deciding that even if I use talloc internally in libvfs, I feel happier binding to libev, at least for now.12:44
jelmermakes sense12:47
jelmerlifeless: readme looks good13:09
jelmerlooking forward to seeing that check patch land13:09
lifelessjelmer: me too13:10
jelmerwoot, "bzr pull" from git into git works \o/13:22
lifelessgrats13:23
lifelessoh bugger13:24
lifelessI think I just pushed a development6-rich-root repo to LP :P13:25
fbondlifeless: bzr log in the top thread will show all tip revisions, but how can I tell which revisions they are?13:26
lifelessby their branch nick13:26
lifelessthey get the nick from the thread13:27
lifelessdon't you hate it when you end up recursing to solve a problem14:15
vila:-) As in: 'I want to do X, but first I need to fix Y, but to fix Y I need to fix Z' ?14:16
lifelessyes14:24
lifelessfind a URL library that isn't part of an http client14:24
lifelessfor C14:24
lifelesskgo14:24
vilamay be in an xml library ? :-}14:26
* lifeless spanks vila14:27
lifelesstime to register another launchpad project14:27
=== thekorn_ is now known as thekorn
jelmerhmm14:45
* jelmer wonders if he could finish colocated branches in time for 1.15..14:45
jelmerare there any plans to have loom support in core (even if just the infrastructure so we could have a common format) ?14:47
lifelessI'm not at all sure colocated branches _could_ have a common format with loom14:48
lifelessas loom threads cannot have different push locations etc etc14:48
lifelessnor do you [want or need I imagine] pending-merges on multiple branches stored at once14:48
jelmerI'm not saying they should necessarily have a common format14:49
jelmerbut each of those changes will mean format changes14:49
jelmerand it seems reasonable to bundle those to avoid users from having too many upgrades14:49
lifelessI'm not currently convinced that colocated branches are the answer to the issues we have14:50
jelmersorry, I should've specified common better14:50
lifelessthey are *an* answer to be sure14:50
lifelessI encourage you to discuss the problem more on the list - that would be good14:50
jelmerI prefer colocated branches to the alternatives I've seen14:50
jelmerpersonally14:50
lifelessI think its a neither-fish-nor-fowl situation14:51
lifelessI'd rather we choose14:51
lifelessif branches are colocated, repositories are hard to justify, so we should look at ripping the separated-repo facilities out or evaluating why we can't do that, and so on14:52
lifelessif repositories are still useful, then we'll have non-colocated branches in repositories, and we aren't we making them as easy to work with14:52
jelmers/repositories/shared repositories/ ?14:53
lifelessyes14:53
lifelessanyhow14:53
lifelessmidnightis14:53
lifeless-> sleep14:53
lifelessalso, launchpad.net/liburl and libvfs :P14:54
lifelessbecause the world needs more skeleton projects14:54
jelmerlifeless: that doesn14:54
jelmer't help me in the near future though, nor does it help with foreign git repositories14:55
jelmerlifeless: 'night14:55
=== AfC1 is now known as AfC
=== abentley1 is now known as abentley
vdson my jaunty bzr hangs when I do pqm-submit to launchpad, if I stop it after a while with ^C I don't get any useful info16:12
joschanHi. I am just having a little accident - I said "bzr revert" in the root folder if a live website. It seems all changes after the last commit are gone. Is this what revert normally does?16:17
joschanAnd is it somehow possible to get the latest version in the live fodlers (that was never commited) back?16:18
joschanit seems the old versions of changed files were copied as oldname.~1~16:20
joschanand new files were not deleted16:22
joschani will re-rename manually and commit again16:23
jelmerjoschan: yes, that's the intended behaviour of bzr revert16:47
jelmervila: thanks!16:48
vilajelmer: np, are you going to do fallback credential store ?16:53
SamBhmm16:54
vilajelmer: I just tought about it and I think we need a way to desactivate it without uninstalling bzr-svn for example (if only for debug purposes)16:56
joschanjelmer thank you16:59
* SamB wonders what is with the link: * http://starship.python.net/crew/mwh/bzrlibapi-oe/ (editable version)16:59
jelmerSamB: editable ?17:01
jelmervila: yeah17:01
vilaSamB: I get a 503, but mwh sounds a lot like mwhudson to me17:04
SamBwell, I guess I'm wondering whether I should delete it from the BzrLib node ...17:06
jelmerSamB: I think it should be without -oe17:07
SamBjelmer: there's a link like that too17:07
SamBwhich actually works17:07
SamBwhat configuration does mwh use to generate this ?17:08
jkakarIs there a reason 'added', 'modified' and 'unknowns' are hidden commands?  I use them all the time and only just noticed that they're hidden commands (as a result, they don't tab complete).18:21
jfroyjelmer: If you pinged me back, I couldn't see your message as it went past the scrollback buffer. But I just wanted to let you know your bzr branch has been working pretty well, even though push still seems to not work quite right for new branches.18:25
* SamB wonders why the files in doc/developers don't seem to be set up to activate rst-mode in emacs ...18:47
jelmerjfroy: hi18:48
jelmerjfroy: Ah, cool18:48
jelmerjfroy: Can you elaborate on "seems to not work quite right" ?18:48
jfroybzr was unable to create a new branch, even with --create-prefix. I had to use svn mkdir to create the destination directory, then push --overwrite18:49
jelmerjfroy: hmm, odd18:50
jfroycreating a new branch -> push a bzr branch to svn18:50
jelmerjfroy: --create-prefix would only help if one of the parent directories of the target branch didn't exist yet18:50
jelmerjfroy: e.g. if you push to /branches/foo and /branches doesn't exist yet18:50
jfroyright, which was the case18:51
jfroy(new project, pushing its initial trunk basically)18:51
jfroycommit.py:593 raised MissingPrefix18:52
jfroy(even with --create-prefix, that is)18:52
jelmerjfroy: and did creating just /branches and then pushing /branches/foo work?18:54
jfroyI didn't try that18:54
jfroyI was pushing to <host>/<prefix>/<project name (does not exists)>/trunk18:55
jelmerjfroy: please file a bug18:55
jfroyWill do, as always :)18:56
jelmerjfroy: It looks like this requires a change from bzr as well as from bzr-svn18:56
BUGabundohey19:03
BUGabundoneed your help again19:03
BUGabundohow do I restore the content of an entire folder?19:03
BUGabundosystem crashed and I last all files in that dir, so need to restore from last bzr commit19:04
jelmerBUGabundo: bzr revert <foldername> should create it again if it existed in the last commit19:24
jelmervila: still there?19:27
vilajelmer: not for long but yes :)19:28
* SamB wonders why the heck he still has Python 1.5 installed ... probably Red Hat's fault somehow ...19:30
BUGabundo1sorry.. I'm back... second system crash19:36
jelmervila: So, I'm trying to decide whether to add a new object for the fallback credentials19:43
jelmervila: or whether to reuse (and extend) CredentialStore19:44
vilaI think adding a fallback parameter to the register funcs should be enough19:44
jelmerok, so just "fallback=True" during registration19:44
jelmerand requiring the object to provide a "get_credentials()" method if fallback=True?19:44
vilasounds reasonable19:46
vilanow, do we want to allow more than one ?19:46
vilaif yes in which order are they tried ?19:46
vilalet's start by allowing only one :)19:46
jelmervila: can't we just allow multiple in the order they are registered?19:47
vilaand the first returning a credential wins ?19:47
jelmerthat seems easiest, since we could just walk the registry rather than remember which one was special19:47
jelmervila: yeah19:47
BUGabundo1how do I restore the content of an entire folder?19:48
BUGabundo1system crashed and I last all files in that dir, so need to restore from last bzr commit19:48
vilaagain, sounds reasonable19:48
* BUGabundo1 I know repeating is bad :\19:48
vilasorry BUGabundo1, I was replying to to jelemer :-/19:48
BUGabundo1I know vila19:49
jelmerBUGabundo1: bzr revert <foldername> should do that19:49
jelmervila: ok, I guess I should get to work then :-)19:49
BUGabundo1jelmer thanks19:50
BUGabundo1jelmer it worked. thanks so much!19:52
* BUGabundo1 is happy to store all ~/ ,conf in bzr19:52
BUGabundo1now to file a bug on kdepim19:52
mdkehi there. I'd like to branch something and place the .bzr folder and working tree in an existing folder. Is that possible?20:27
jelmermdke: afaik 'bzr init .' will happily do that20:44
jelmeralternatively you could create a .bzr directory somewhere else and then move it into the folder20:45
jelmerbut please file a wishlist bug if you have to do that20:45
mdkejelmer: what I'd like to do is to download an existing branch into an existing folder containing unversioned files20:45
mdkejelmer: to give you the details, say I download "desktop moin", which is an installation of Moin which I extract into my home directory. I then want to grab a Launchpad branch with some theme files, which are in the same folder structure as the Moin installation, and put them into the Moin installation under version control20:47
mdke(without putting other files under version control)20:47
mdkedunno if that explanation is clear or not :(20:47
jelmermdke: so have you tried running20:50
jelmerbzr init in that directory?20:50
mdkejelmer: ok, and after that?20:53
* SamB wonders why pydoctor takes so long to generate the bzrlib docs ...20:57
newz2000what's the best way to handle two projects that are both managed by bzr and you want one to be a subdirectory inside the other?20:58
newz2000(the subdir is a library used managed by someone else that my proj uses)20:58
* SamB supposes it might help if it didn't look at all those tests ...20:59
mdkenewz2000: I don't know anything about it, but in the absence of another response, I think this is the answer: http://bazaar-vcs.org/NestedTreeProgress21:01
mdkenewz2000: no doubt someone else will know more though21:02
LarstiQnewz2000: lp:bzr-scmproj or config-manager are other options21:02
newz2000thanks mdke, looks like what I want when it comes. LarstiQ: I will check it out, thanks21:03
DawnLight1hello. would anyone want to help to develop a configure script for a small project?21:03
LarstiQnewz2000: ideally, yes, nested trees21:04
LarstiQnewz2000: for now, you can of course have a branch as a subdir of another branch, but can't version it at the moment21:04
newz2000yeah, my problem is that I use bzr to publish my code for review and deployment21:05
newz2000so I do the nested subdir but I have to do multiple pushes (there are actually four different sub-projects managed separately from mine)21:06
LarstiQnewz2000: right21:06
=== DawnLight1 is now known as DawnLight
distaticaIs there by chance a bzr version that runs on Python2.3? running redmine on shared host, and they do not have bzr installed. Unfortunately they also only have python2.3 (which is horrible).21:19
distaticaI can run git which is setup and working nicely, and this is the only thing stopping me from going bzr vs git.21:19
Odd_BlokeSo I have two bzr branches, a and b.  I would like b to become part of a at a/b.  Is there any good way to do this (I don't care about the time data, and all the revisions in b were committed by me)?21:23
Odd_BlokeRebase?21:23
jelmermdke: just "bzr pull" from the location21:26
mdkejelmer: oh!21:27
jelmerdistatica: I don't think there is one21:27
jelmerOdd_Bloke: bzr join?21:28
distaticajelmer: I'm trying to compile python2.6 on the server now, I'm hoping that works out.21:28
distaticaIt's really unfair that they don't have a half up to date python distro, but call themselves a host with python.21:29
jelmerdistatica: yeah, 2.3 is really old21:29
mdkejelmer: that's not bad, although it's moved some of the existing folders as conflicts rather than coexisting with them21:29
Odd_Blokejelmer: Will joining a bzr branch into a bzr-svn branch Just Work?21:29
jelmermdke: yeah, that's intentional; if you resolve the conflicts it should deal with that happily21:31
jelmerOdd_Bloke: that's the idea21:31
jelmerOdd_Bloke: be sure to use a recent enough bzr-svn, other than that it should work fine21:32
mdkejelmer: I'll move the non-versioned files back21:32
mdkejelmer: thanks for the help21:33
distaticadoes anyone know, if I do all my local commits and then push that to a server, does it keep a record of all my local commits on the server? Or does it just keep the last one before I pushed?21:34
NfNitLoopdistatica: it keeps everything.21:40
NfNitLoopdistatica: even if you do merges, every commit to each separate branch gets maintained throughout history and can always be retrieved.21:41
distaticanice21:41
NfNitLoopwhich is quite refreshing coming from SVN. :)21:41
distaticaI got python 2.6 on the server running fine, I hope bzr installs.21:41
distaticaPerfect, I have bzr :)21:41
LarstiQjelmer: quite the dos on pk-bazaar-commits22:08
jelmerLarstiQ: hmm, not sure where that came from22:19
jelmerLarstiQ: somebody restarted somethign :-)22:19
LarstiQjelmer: I need to find a way to limit how many messages exim accepts in one connection.22:23
LarstiQjelmer: oom-killer kept visiting exim, until the entire server was unusable22:24
* LarstiQ babysits it with iptables and atop in the mean time22:24
LarstiQjelmer: woo, smtp_accept_max_per_connection helps22:55
jelmer\o/22:56
lifelessmoin23:22
lifelessI just found out that libgetopt++ is packaged :P I wrote that ages ago!23:36

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!