/srv/irclogs.ubuntu.com/2009/07/28/#bzr.txt

ronnylifeless: im going to build the api's of the filesystem draft pep on top of hg, svn, bzr and git for viewing revisions/building commits00:00
lifelessto build a commit, use tree.commit()00:01
ronnythats what i use now00:01
lifelessor if you like, you can use branch.get_commit_builder, which is a lower level API; under some specific circumstances it would be easier (e.g.. if you have a delta to apply)00:02
lifelessI'm not sure what you mean when you say 'building commits' though00:02
lifelessgenerally, if you have a tree on disk, its just 'tree.commit("foo")' and you're done00:03
lifelessI don't really get why that requires /any/ bookkeeping00:03
ronnyopen a revision as a 'filesystem', do highlevel operations, commit the results00:03
ronnythis is a repo op that doesnt involve workingtrees00:03
ronnyfor normal commits all i do is wt.commit00:04
ronnythe workdir apis work quite well00:04
ronnynow im dealing with creating and viewing history00:04
lifelessok00:05
lifelessso for viewing history, the same readonly api as wt's have should work00:05
lifelessunless you're doing remote operations nearly any api will be plenty fast00:06
ronnyi plan to keep a larger distinction betwen network ops and local ops00:07
ronnyand i need to figure what the heck to do with bzr repos, they actually do matter in some situations00:08
lifelessif you want to be able to do arbitrary operations to create commits, MemoryTree should be fine - but it may be incomplete. Its a test helper, which, while correct, is not complete. It only does what we have needed it to do so far.00:09
lifelessTreeTransform - I am not extremely familiar with it, but it is the core workhorse for merge/revert/checkout style operations.00:09
=== verterok_ is now known as verterok
ronnytransform seemed pretty painfull to use00:10
lifelessUsing a TreeTransform on top of a revisiontree has a commit method these days, and as long as you use bzr 1.18 there are good checks that the deltas it commits will be consistent00:10
ronnyit seems to make absolutely no sense, and the implementation is quite scarry00:11
lifelessAs I say I'm not extremely familiar with it. Its model is to assign a unique id for every operation in the transform, accumulate your changes, then check everything is consistent.00:11
lifelessThere is some confusion between fileids (inodes) and transform ids (temporary to the operation)00:12
lifelessMy tendancy, if I wanted to present a tree like interface, would be to improve MemoryTree00:12
ronnyyeah, it seems more workable00:15
jamspiv: are you around?00:42
=== kiko is now known as kiko-afk
spivjam: I am.01:00
pooliehullo spiv01:00
jamhey spiv01:00
spivpoolie: good morning01:00
jamJust wanted to let you know that I'm interested in reviewing whatever you have for the inventory delta code01:01
jam(as I finally got the bundle stuff  finished)01:01
jamI can review your last patch more thoroughly01:01
jamor you can resubmit something if you've had a chance to look at why it wasn't actually being active01:01
lifelessjam: I had a question01:02
spivjam: review what I have, please.01:02
lifelessthe serializer that you use, what format does it actually output? xml?01:02
lifeless[and if so, /which/ xml?]01:02
jamspiv: ok. I still know that it doesn't actually work, but I can look over the code assuming it does :)01:02
spivjam: I'm digging into why it doesn't seem to be used today, but it shouldn't make a large difference to the patch...01:02
jamlifeless: xml v701:02
jamIIRC01:02
lifelessjam: Are you using CHKrepo._serializer.write_to_string ?01:03
jamit is fairly obvious in the patch, because I had to change away from being v501:03
jamlifeless: write_inventory_to_string, yes01:03
lifelessI have a proposal01:03
lifelessmake that not work01:03
lifelessand instead make CHKRepository.get_inventory_xml work01:03
lifelessor at least, change the method to say that it gives xml01:04
jamas in documentation or as in changing it to01:04
jamwrite_inventory_to_xml_string01:05
lifelessCHKRepository wasn't meant to output xml ever01:05
lifelessso this is kindof a backdoor01:05
lifelessOne I understand the need for, at least until we get a semantic delta based bundle01:05
jamright01:06
lifelessI think it would be good to make it more explicit about whats going on01:06
jamWith spiv's code close to landing, I'd like to make a bundle which is a "GenericStream"01:06
lifelessand the method that seems clearest to me is the repo.*inventory_xml* set of functions01:06
jamwhich then knows how to stack on another repo, etc.01:06
lifelessjam: I think that would be lovely; I've wanted to do that for ages too :)01:06
jamlifeless: i suppose. Though the bundle code was already dealing with "target_format.serializer.write_inventory(source_format._serializer.read_inventory(bytes))"01:07
jamwe need a reasonably efficient generic stream implementation, which I think Andrew is getting close to01:07
lifelessjam: its not clear that xml is involved there; I'd like it to be clear that it is xml.01:07
jamso I'm a bit concerned about the deprecation dance of introducing a different name for the same function01:08
lifelessIts up to you.01:08
lifelessI realise its not immediately-in-scope.01:08
lifelessthat said, other folk who use this API will be surprised when huge amounts of IO are done to satisfy 'write_inventory_to_string'01:09
jamwell, given that it is inherently a whole-tree operation01:11
jamregardless of whether it is XML or not...01:11
lifelessjam: well, its a thought01:15
lifelessust trying to deter people from using  it01:15
jamlifeless: so what we need is a code level "did you really mean to do this check". :)01:16
jamIssue a warning when vim saves the file01:16
lifelessthat would be lovely01:18
lifelessperhaps a code test for uses of that function01:18
spivWe should rename get_bytes_as, I think.01:29
lifelessto?01:30
spivSomething else ;)01:31
spivit returns more than bytes...01:31
lifelessit shouldn't01:32
lifelessit should always be returning a bytestring01:32
spivIt already returns lists of bytes ('chunked')01:32
lifelessmm01:32
spivMy inventory-delta patch further (ab)uses it to return inv deltas.01:32
lifelessoh01:32
lifelessI'd rather you didn't do that01:32
lifelessdoing that doesn't fit with the layering01:33
lifelessIf you'd like more bandwidth to discuss, we could have a call; I'd be extremely happy to help find a good home for the deserialisation call that is needed01:35
spivWell, it wouldn't be a big deal to add a new method to just InventoryDeltaContentFactory.01:39
lifelessspiv: so CF are meant to be just about byte storage and transport01:39
lifelessyou should pass the bytes they transfer to something that knows how to handle them01:39
lifelessIDCF sounds like a layering mistake in the first place01:40
spivBut for in-process streams I don't want to serialise down to bytes and back.01:40
lifelessright, so don't!01:41
spivI'm not ;)01:41
lifelessit sounds like you'e using a byte transport mechanism though01:41
lifelesswhich is where the layers are confused.01:41
spivWell, I'm using "record streams", which appear to actually be "content factory streams".01:42
spivWhat mechanism would you expect?01:43
lifelessmay I call?01:45
spivlifeless: sure, but give me a minute01:46
lifelessrecord streams are for transfer of bytes01:46
lifelessinventory deltas have a in memory representation (though I was thinking we should make an object for them, just recently)01:47
lifelesswhen we stream inventory components using content factories, we are streaming ytes01:48
lifelessand we [de]serialise on both sides01:49
spivlifeless: you can call now01:50
EricInBNEhihi....so what is the status of bzreclipse?02:39
EricInBNEeg - what doesnt it support02:39
EricInBNE(coming from a svn POV)02:40
lifelessEricInBNE: I'm not sure02:46
lifelesswhat does svn support ? :)02:46
EricInBNEcommit, merge, show history, revgraph, revert, etc02:49
EricInBNElifeless, BzrEclipse says: update supported (very basic)02:50
EricInBNEwhat does that mean02:50
lifelessI'm not sure - I don't use eclipse often02:51
lifelessfolk do use it - you could drop guilherme an email if you need more detail than the wiki page has02:51
EricInBNEah - it doesnt support authentication02:51
EricInBNEcheers02:53
JemsquashDoes anyone know when there is going to be an update for the bzr eclipse plugin so that it will work with the Galileo release?03:05
lifelessJemsquash: I don't - could you file a bug on it?03:05
JemsquashYes I can.03:06
poolieit looks like the nightlies still don't have all the right extension libraries03:14
pooliei wonder if the releases are missing them too - that could cause some performance problems03:14
poolieanyhow putting head down now03:14
lifelesstime for your nap?03:16
poolienice idea03:16
pooliei'm going to dream of long release cycles03:16
poolieand drool a bit onto an editor03:16
=== timchen1` is now known as nasloc__
=== TDJACR is now known as NotTheDJ
=== NotTheDJ is now known as NotADJ
lifeless\o/ very close now04:27
lifelessdirstate children-of-removed-dirs + dirstate-C version to go, and we're golden04:27
RenatoSilvaI've downloaded bzr 1.17-1 windows installer, but bzr version is reporting 1.17 (msising the "-1")04:32
lifelessthats correct04:32
lifelessthe installer suffix is the installer suffix04:32
lifeless1.17.1 would be 1.17.1-104:32
RenatoSilvaah ok04:33
RenatoSilvaI'd never grok that04:33
lifelessif the installer has a bug you get 1.17-204:35
lifelessif bzr has a bug you get 1.17.1-104:35
RenatoSilvaok04:35
RenatoSilvahow to list saved locations? I know I asked this before, but I can't recall04:36
lifelessbzr info?04:37
RenatoSilvathanks04:39
RenatoSilvanow, I have a problem on applying a patch built with bzr send04:39
RenatoSilvaok solved04:41
RenatoSilvaHow to merge with a patch without having to commit?04:42
RenatoSilvaI mean, imagine you commit 2 new revisions, then bzr send -o patch.diff, then in the target branch, you bzr merge patch.diff, but you get uncommitted changes. You have to commit something like "merge with xyz"04:44
lifelessthats right04:44
RenatoSilvaBut actually you just want to put the 2 new revisions in the top of the tree04:44
lifelessif you want that, do bzr pull04:44
RenatoSilvalifeless: thanks!04:53
lifelessEODing07:30
crisbhi, i'm getting a hang running bzr selftest on AIX at bzrlib.tests.blackbox.test_check.ChrootedCheckTests.test_check_missing_branch08:22
crisbcan anyone give me some pointers in order to figure out whats happening?08:22
crisbfrom the bzr.log i can see its running bzr check --branch http://localhost:47422 and returning "ERROR no branch found at specified location" - which seems to be the point of the test?08:26
crisbi can see from netstat that it seems to still be listening on that port but when i try bzr check myself i get "Unable to handle http code 504: Gateway Time-out"08:32
crisbshould it still be listening at this point?08:32
spivlifeless: btw, that mysql branch with the slow get_parent_map HPSS requests is 1.9: https://code.edge.launchpad.net/~mysql/mysql-server/mysql-next08:49
AfCDid the dotted revno numbering scheme change recently? I know jam and others have talked about it.08:52
spivAfC: I don't think so.08:52
AfCThen I think that loggerhead thing on your launchpad site is buggy.08:53
AfCSomeone [else] mentioned this URL when closing a bug http://bazaar.launchpad.net/~afcowie/java-gnome/mainline/revision/654.1.308:53
AfCthat web page says "This revision was merged to the branch mainline in revision 654."08:54
spivHmm, odd.08:54
AfCbut that's not true; this revision was merged to 'mainline' later, in 655 as it happens.08:54
AfChttp://bazaar.launchpad.net/%7Eafcowie/java-gnome/mainline/revision/65508:54
AfCnote appropriate commit message.08:54
spivRight, that does sound like a loggerhead bug.08:55
spivCare to file it?  Or I can do it if you like, I'm at the bug tracker atm anyway.08:55
AfC[I was hoping it was a case of "Bazaar upstream has changed numbering, but my bzr / bzr viz hasn't" but the commit messages give it away (even without comparing revids]08:55
AfCspiv: if you would08:55
AfCI'm about to step out08:55
spivAfC: sure.08:55
* AfC admits that he doesn't use loggerhead08:56
AfC(or launchpad, for that matter) so I appreciate you confirming that this was a glitch.08:56
spivNot a problem.08:57
AfCspiv: incidentally, now that those URLs are out there (apparently), should bzr change its dotted revno scheme, then you might want to consider changing the URL scheme in use above, perhaps to http://bazaar.launchpad.net/~afcowie/java-gnome/mainline/revno/655.1.3 or something08:58
AfCjust something to mull over08:59
AfC(or put in a wizard mod_rewrite rule, or...)08:59
spivlifeless: ah, the slow get_parent_map is probably the C extension regression bialix just reported!09:00
spivYeah, that's true.  We'll definitely need to tread carefully if we do change the scheme to avoid too many disruptions.09:00
spivSilently giving different pages would probably be worse than 404ing, too.09:01
AfCspiv: at the end of the day, this is what HTTP 301 Moved Permanently is for; if you had some code that understood both schemes then you could use a redirect like that (ie 301 from .../revision/654.1.3 to .../revno/655.1.3/ in this contrived example)09:05
AfCspiv: [we just went through that when we moved our blog]09:06
=== AfC is now known as AfC|out
spivThe revision/... scheme also allows revids, so just changing "revision" to "revno" in the URL might not be quite right.  Just "rev" might do, though.09:08
spivAfC|out: https://bugs.edge.launchpad.net/loggerhead/+bug/405686, btw09:09
ubottuLaunchpad bug 405686 in loggerhead "Revision page for a dotted revno has incorrect "was merged into" revision" [Undecided,New]09:09
spivAfC|out: thanks for the report.09:09
AfC|outspiv: sure. Glad I noticed. Just a little glitch.09:11
ronnylifeless: aware of any bts for subvertpy? i have it crashing my unittests here and jelmer is missing09:36
lukshttps://bugs.launchpad.net/subvertpy ?09:37
ronnyok, im blind and need coffee09:37
crisbi'm getting a hang running bzr selftest on AIX at bzrlib.tests.blackbox.test_check.ChrootedCheckTests.test_check_missing_branch can anyone give me some pointers in order to figure out whats happening?09:42
spivcrisb: I'd love to but I'm about to log off for the day :(09:43
spivcrisb: hopefully someone else will turn up soon, otherwise you can file a bug or post to the list.09:43
crisbspiv: cheers :)09:49
KinnisonIs there an easy way to alter my whoami information based on which directory I'm in?09:52
Kinnisone.g. to have ~/work say "Daniel Silverstone <dsilvers@simtec.co.uk>" but ~/personal be "Daniel Silverstone <dsilvers@digital-scurf.org>" ?09:52
spivKinnison: yes09:53
Kinnisonspiv: can I ask for a pointer to the right bit of docs, or else an example?09:53
spivKinnison: put an "email = Daniel Silverstone <dsilvers@simtec.co.uk>" line in a [/home/dsilvers/work] section of ~/.bazaar/locations.conf09:53
spivAnd similarly for ~/personal, of course :)09:54
Kinnisonthanks09:54
spivI do exactly that myself.  Well, with slightly different directories and identities ;)09:54
Kinnisonoddly09:54
Kinnison:-)09:55
pooliespiv, nice catch there10:40
poolie:) hello kinni10:40
crisbi'm getting a hang running bzr selftest on AIX at bzrlib.tests.blackbox.test_check.ChrootedCheckTests.test_check_missing_branch can anyone give me some pointers in order to figure out whats happening?10:59
jelmerabentley, hi11:42
jelmerabentley: "bzr shell" currently repeats the previous command on empty commands, that's intentional I presume?11:42
spivpoolie: bialix caught it, originally.11:55
spiv(assuming you mean the broken C extension import)11:55
bialixaccidentally11:57
Kinnisonpoolie: hihi11:57
ronnyjelmer: found the issue11:57
jelmerronny, cool, what was it?11:58
ronnyjelmer: appearantlz svn does an abort if the path in get_file starts with a /11:58
bialixjelmer: IIUC it's default behavior of std python cmd lib11:58
jelmerronny: subvertpy should be taking care of that11:58
jelmerronny, perhaps we don't yet in that particular situation11:58
ronnywell, now you know, so it will get fixed11:58
jelmerronny: What version of subvertpy are you using?11:58
ronnyjelmer: im tracking your bzr version11:59
jelmerronny, we're already canonicalizing12:00
jelmerronny, hence my question about what version you are running12:00
jelmerronny, actually, I can reproduce it now - thanks12:01
SiDiHello. I'm trying to push to a lp bzr repo from behind a proxy using corkscrew, and i'm getting this error : bzr: ERROR: Connection closed: please check connectivity and permissions. Any idea what this means ? :/12:11
amanica1SiDi: its trying to go through ssh12:12
amanica1which is probably blocked by your proxy12:12
amanica1I mean it doesn't try to go through the proxy, and is blocked by your firewall12:13
spivSiDi: the TCP connection is being closed (or failing to connect?) on bzr12:13
SiDiAlright12:13
SiDiSo i'm doing something wrong, i guess :/12:14
spivPush to lp is via ssh, as amanica1 says.12:14
amanica1I'm not sure if lp supports pushing over bzr+https12:14
awilkinsSiDi: You need to ask your network admin to open port 22 for you12:14
spivSo if you can ssh bazaar.launchpad.net, bzr should work.12:14
spivamanica1: not yet, unfortunately12:14
spivif "ssh bazaar.launchpad.net" doesn't work (even with your lp username added), then bzr can't work either.12:15
SiDiawilkins: my network admin is a guy who thinks a QoS allowing 3KB/Sec when there are 6MB available and 100 people on the network (and its a residence, not an office) is a good idea :p12:16
SiDiok thanks for the infos12:17
SiDiIm gonna stab my network admin >_>12:17
ronnyjelmer: you got twitter by any chance?12:30
jelmerronny, yeah, http://twitter.com/ctrlsoft12:30
ronnyk12:35
luksjelmer: wow, I've just seen the svn send format. thanks a lot for finishing that!12:40
abentleyjelmer: Actually, I think it's the default behaviour.  But I'm okay with changing it to do nothing, like bash.12:48
jelmerluks: No problem, thanks for starting that.12:57
jelmerluks, I've also done a "bzr send --format=git" based on the svn send format12:57
jelmerluks, Which creates "git am"-compatible patches, although as one concatenated file at the moment rather than individual attachments.12:58
jelmerabentley: Thanks - I'll file forward the Debian bug then.12:58
lifelessjelmer: what does the svn send format do?13:03
jelmerlifeless, send svn-like diffs without bzr-specific metadata13:04
jelmerlifeless: Including mentioning the svn revision numbers that the delta's of individual files are against13:05
lifelesscute13:05
=== mrevell is now known as mrevell-lunch
=== abentley1 is now known as abentley
thekornhi, is there a release of bzr-gtk somewhere for jaunty (ideally in a PPA) which works with bzr 1.17?14:16
thekornI get a lot of messages like """Unable to load plugin 'gtk'. It requested API version (1, 13, 0) of module <module 'bzrlib' from '/usr/lib/python2.6/dist-packages/bzrlib/__init__.pyc'> but the minimum exported version is (1, 17, 0), and the maximum is (1, 17, 0)""" when using bzr from the ~bzr team ppa14:17
=== mrevell-lunch is now known as mrevell
=== abentley1 is now known as abentley
jelmerLarstiQ, ^14:38
=== abentley1 is now known as abentley
=== abentley1 is now known as abentley
=== nevans1 is now known as nevans
OllieRIs it normal for bzr to be uploading 3000kb to commit a one character text change?15:35
=== hal_away is now known as hal
* dobey pleas for help16:10
bialixOllieR: perhaps your commit triggers repack16:10
OllieRbialix: what on earth does that mean?16:11
bialixare you aware of `bzr pack`?16:11
bialixcurrent repository formats store committed data in the form of "packs"16:13
bialixevery new commit add new "pack"16:13
bialixwhen there is many pack files in repository it should be repacked otherwise things become slower than needed16:13
bialixcommit or push or pull can trigger automatic repack of repository16:14
=== kiko-afk is now known as kiko
bialixunfortunately in remote repo case bzr do repack on client side, i.e. it has to download big amount of data, repack it into single file and upload it back16:15
bialixOllieR: hth16:15
bialixrepacking on server side should be implemented in recent bzr versions, but I don;t know for sure16:16
bialixdobey: if you want to ask it's better to just ask in IRC. somebody will answer or not16:17
awilkinsIt repacks server side as long as you're using a smart protocol16:19
bialixI suppose it was fixed recently16:20
awilkinsDumb protocols... I think it still repacks over the wire. Which is a bummer when your dumb protocol is a windows fileshare over VON16:20
awilkinsVPN16:20
bialixwhy it's bummer?16:21
awilkinsBecause VPN is slow16:21
awilkins(well, over my 512Kbit/s upload, repacking a 70MB repo is16:21
awilkinsI usually get someone in the office to do a repack locally before I touch it if I see the packing start16:21
fullermdNEWS says the server-side autopack was in 1.9, so it's been around a while (doesn't help on dumb transports of course, but not much does)16:22
dobeybialix: yeah. i'm just trying to understand what to ask, because i'm not sure if it's a bzr issue or a lp issue16:22
bialixmay be some sort of server-side daemon that repack onsite will help with VPN?16:22
awilkinsbialix: That would be a reasonable idea. I call it "users".16:23
bialixhaha16:23
dobeybut basically, i can't seem to push a branch to launchpad successfully that is stacked on a 2a branch16:23
fullermd"bio-cron"   :p16:23
awilkinsIt would be nice.... we serve some of the branches out of an IIS box and sometimes I think it would have been nice to just have that since it has a smart server.16:23
bialixNeo: the Matrix has you...16:24
eydaimonbzr plugins lists blow 1.1116:25
eydaimon    Loggerhead web viewer for Bazaar branches.16:26
eydaimonbut when I do bzr serve --htt[16:26
eydaimonhttp evenI get errors16:26
awilkinsI'm currently racking my brains thinking about porting Mercurial pbranch to Bazaar.... there must be an easier way than reading the pbranch.py file and trying to trans-code it to bzrlib16:26
eydaimonbzr help blow does say This provides a new option "--http" to the "bzr serve" command, that ...16:26
bialixpbranch instead of loom?16:29
bialixawilkins: is not bzr-pipeline is another alternative to loom?16:32
ronnyjelmer: what are the plans for doing all lower level workdir operations of git in dulwich?16:34
eydaimonwhat's the easiest way to track one particular file and see revisions only for that file?16:36
eydaimonI don't want to have to do bzr log on it, check revision, and keep doing diffs by hand. it's tedious16:37
bialixbzr log FILE?16:43
eydaimonas I said, bzr log only tells me that the file has changed16:44
eydaimonI'd easily like to be able to navigat the revisions and see what has changed16:45
eydaimonwhich means bzr log FILE ... look... bzr diff revno... bzr log FILE ... look ... bzr diff other_revno... etc16:45
abentleyeydaimon: log can also show diffs, if you want.16:45
=== abentley is now known as abentley-lunch
awilkinsbialix: bzr-pipeline is stacked branches, like loom16:46
eydaimonok, thanks16:46
bialixbzr log -p FILE16:46
awilkinsbialix: I have two ways to what I want ; add parallel featues to pipeine or port pbranch16:46
bialixor bzr qlog FILE ;-)16:46
bialixI have not tried pipeline yet, but from abentley announce I was under impression it's more than stacked branches16:47
eydaimonthe annoying thing is I have to keep track of all the revisions since I only want to look at what's changed between them16:47
* awilkins pulls the latest version of bzr-pipline16:48
dobeyguess it's a lp issue mostly16:49
lllamaHello everyone. I've started making some changes to a program that I'd now like to work on as a branch. I've yet to commit the stuff I've changed, so was wondering what the best way would be to go about doing this.16:49
awilkinslllama: Are you working in a free standing branch or a checkout?16:50
lllamaawilkins: checkout16:52
lllamaawilkins: but I can unbind if required.16:53
awilkinslllama: If you unbind, you are now working in a branch - you might want to do `bzr nick project.fix-my-bug` or another sensible name before you commit.16:54
awilkinslllama: I tend to work with a local no-trees repository containing all the related branches I'm working on, and use lightweight checkouts and `bzr switch` to move between them.16:56
awilkinslllama: Other people make their parent folder a shared repository, and keep a "trunk" checkout for merging, and branch from that for work packages.16:57
lllamaawilkins: Interesting. I've got a remote no-trees repo, so I could look into something similar.16:57
lllamaawilkins: If I unbind though can I copy the dir (keeping the uncommited changes as a result) and then revert the existing branch to back them out?16:58
awilkinsYou should be able to do that, yes16:59
awilkinsOr branch your existing folder to your new "trunk" branch16:59
awilkinse.g. cd .. ; bzr branch work trunk ; cd work ; bzr commit -m "My Changes"16:59
awilkins(presuming "work" is the existing folder with changes in it"17:00
=== hal is now known as hal_away
lllamaI tried that but I don't get the uncommited changes in the new branch (natch). Just wondering whether there's a better procedure. I could do with a little rethink of my repo layout methinks. It's a little flat ATM..17:02
awilkinslllama: You keep the old folder as your work branch, and the new one is your "trunk" branch17:02
awilkinslllama: The not-getting-the-changes is intentional in this case :-)17:03
lllamaawilkins: of course. Thanks for the help. I'll look into 'switch' as well.17:06
awilkinslllama: You're welcome17:07
=== JamalFanaian is now known as JamalFanaian|afk
ronnylifeless, awilkins: btw, if bzr is basically inode based, shoudn't there be a rather simple way to expose commit building/tree changing as if it was a posix fs17:37
awilkinsronny: Not sure about that, I think Subversion is sort of like that but I have the impression that the undergarments of Bazaar are rather different17:39
LarstiQjelmer: hmm? the context of that '^' was a bit scarce17:40
ronnywell, i'll gradually put complete in-memory filesystems on top of hg, bzr, svn and git based on the api"s of the fraft spec for the new filesystem apis17:40
ronny*draft17:40
jelmerLarstiQ, sorry17:40
jelmerLarstiQ, somebody was asking about bzr-gtk in the PPA's17:40
jelmerLarstiQ, are you doing those or johnf?17:40
LarstiQjelmer: I haven't been doing them17:41
LarstiQjelmer: it seems you and jam have, I can pick those up17:42
LarstiQjelmer: although I'm not really a user of bzr-gtk nowadays17:42
jamLarstiQ: bzr-gtk hadn't done a release in long enough, that I don't think anyone was doing them :)17:43
franck_hello there, does anybody know how to use the --nested options ???17:43
franck_i can't find the option with 1.3 and 1.17 release (ubuntu jaunty)17:43
* LarstiQ heads out17:48
=== abentley-lunch is now known as abentley
=== kiko is now known as kiko-fud
abentleyfranck_: I think you're talking about features that are still in the planning phase.18:14
abentleyawilkins: I'm open to supporting parallel pipes, I just haven't really needed it.18:23
awilkinsabentley: I'm scratching my head ans starting at a pipe called "parallel" ATM :-18:24
awilkinsstaring18:24
awilkinsI don't think the Mercurial lot are 100% decided on what to do either, it's clear that people want features like this but they've notarrived at the mbest way to do it yet.18:25
awilkinsI found a page where they compare 4 ways of doing it. And pbranch credits loom for inspiration!18:26
awilkinshttp://mercurial.selenic.com/wiki/PatchHandlingUnificationRFC18:27
awilkinsI think the worst thing is that "get_(next|prev)_pipe" becomes a bit awkward instantly18:28
awilkinsThey just resort to moving around on names only18:28
franck_abentley: ok it's that i've seen with more search on mailing list, by the way do you know a good method in order to merge already versionned branches within a new versioned project, i need that cause i got some libraries wich are managed via bzr, but i can't add them only if i delete .bzr folder within module...18:39
awilkinsfranck_: `bzr help join`  ?18:40
franck_awilkins: many thanks i haven't seen that, i'm gonna try it !18:41
=== hal_away is now known as hal
macinjoshI'm new bazaar can i ask a question?19:04
macinjoshI've read a lot of documentation and cannot find an answer19:05
macinjoshI have a repository on a web server with a checkout that are the files actually being served as as a website, if another developer changes those files being served  is there a way to commit those changes?19:06
LarstiQmacinjosh: `bzr commit`? I'm not sure what you're asking19:07
macinjoshwell i only have FTP access19:07
macinjoshI do not have shell access to this server19:08
awilkinsmacinjosh: you can commit via FTP but it's not the ultimate in effciency19:08
LarstiQmacinjosh: preferably, imo, you would not edit at the website, but only deploy to it19:09
awilkinsmacinjosh: And note that this does not necessarily change the working tree on the server to match your commit19:09
macinjoshyeah I realize that, we're working with a web designer who doesn't use or want to user version control :-(19:09
macinjoshI've tried this: bzr commit ftp://josh@mywebserver.com19:10
macinjoshand i get this error bzr: ERROR: Path(s) are not versioned: "ftp:/josh@mywebserver.com"19:10
awilkinsmacinjosh: Does the tree correspond to the root of the FTP home on the server?19:11
macinjoshyes the .bzr folder is at the root of the FTP home19:12
awilkinsmacinjosh: Oh, hang on, you're trying to commit that file19:12
awilkinsmacinjosh: You want to commit the changes to the folder, remotely, via FTP?19:12
awilkinsmacinjosh: Which OS are you using as your client?19:13
macinjoshyes, but not changes to the .bzr folder if thats what you are thinking. The changes would be in versioned folders like public_html19:13
macinjoshim on mac os x, the server runs redhat19:13
macinjoshthese are the files/directories in the FTP home .bzr .bzrignore public_html views www models19:16
macinjoshchanges will be made in public_html views www and models19:16
LarstiQmacinjosh: can you ssh into the server, and run bzr there?19:16
LarstiQmacinjosh: the checkout needs to be updated anyway19:17
macinjoshin need to commit those from my machine into the repository in .bzr19:17
macinjoshno i don't have shell access (its a shared server)19:17
awilkinsmacinjosh: The only other way to do it I can think of is ... i) run a smart server on the server ii) mount the folder into your local filesystem19:17
macinjoshok, thanks19:18
macinjoshyou've been helpful. bye19:18
=== ja1 is now known as jam
=== kiko-fud is now known as kiko
=== hal is now known as hal_away
reggiehey bzr devs19:53
reggiei just branched 4 svn branches into bzr and uploaded them to lp.  now I need to inform bzr that they are fully merged19:53
reggieis null-merge the only way to do that?19:53
jelmerreggie, full merged in what sense?19:54
jelmerreggie, and what do you mean by null-merge?19:54
reggiewell, since svn doesn't support true merging, in the sense that newer branches have the changes I want them to have from older branches19:54
reggienull merge meaning do the merge and then revert the changes19:55
reggieand since the merge from one branch to another will likely find all sorts of conflicts and I'm going to revert them anyway, I can just tell bzr to merge it "any way it can" right?19:56
* LarstiQ blinks19:57
=== JamalFanaian|afk is now known as JamalFanaian
beunopoolie, let me know when you're around20:17
LarstiQreggie: if the branches share ancestry, then merge will know about merged changes, and not bork on lines already being added20:21
=== CardinalFang is now known as Guest3645
=== hal_away is now known as hal
lifelessmoin21:16
agrippaany idea when https://bugs.launchpad.net/bzr/+bug/98836 will be fixed?21:27
ubottuLaunchpad bug 98836 in bzr "[MASTER] "OS locks must die" - dirstate file write locks exclude readers and limit portability" [High,Confirmed]21:27
=== hal is now known as hal_away
lifelessagrippa: likely after 2.0; it is very important to us to fix21:35
lifelessbut the core devs have a full plate already21:35
agrippalifeless:  When will 2.0 be?21:35
lifelessvery soon :)21:36
agrippalifeless: Can't use bzr on any of our Windows shares, and all we have are Windows file servers :(21:36
lifelessagrippa: :(21:36
lifelessagrippa: bzr only uses OSLocks on the working tree copy21:36
agrippalifeless: And git is good and all, but our designers here will not like it21:36
agrippalifeless: And I like bzr's compatibility with opendiff21:37
agrippaand comparing revisions is easy since I don't have to type in a stupid hash21:37
lifelessagrippa: you should be able to use bzr by using either checkouts from a central branch, or local branches on each machine21:37
agrippalifeless: Well, I've had no such luck on this version on OS X 10.5.721:41
agrippalifeless: bzr co, bzr status, bzr init, bzr branch won't work21:43
lifelessagrippa: is the location you're checking out to on the server, or on the local disk?21:44
agrippaagrippa: local disk21:44
lifelessagrippa: then its not bug 98836 :)21:44
ubottuLaunchpad bug 98836 in bzr "[MASTER] "OS locks must die" - dirstate file write locks exclude readers and limit portability" [High,Confirmed] https://launchpad.net/bugs/9883621:44
agrippalifeless:  Hmm, could be something else?  I found a similar bug that was marked a duplicate of 98836 that matched my issue21:45
agrippalifeless: I am also getting the Errno 4521:45
lifelesswhich dup were you looking at?21:46
agrippalifeless:  This is the one I originally found: https://bugs.launchpad.net/bzr/+bug/3100621:48
ubottuLaunchpad bug 31006 in bzr "dirstate file locking doesn't work on smb mount on osx - bzr add, bzr status, and bzr commit fail over a SMB share (dup-of: 98836)" [High,Confirmed]21:48
ubottuLaunchpad bug 98836 in bzr "[MASTER] "OS locks must die" - dirstate file write locks exclude readers and limit portability" [High,Confirmed]21:48
lifelessso, that is on an smb mount21:48
lifelessbut you just said you were checking out onto local disk21:48
agrippaYeah21:48
agrippaWell, onto local disk, from an smb mount21:49
lifelessdoes the source have a working tree itself?21:49
lifeless(If you just created it by doing bzr init, or bzr branch, then it probably does)21:50
agrippaI believe so, I originally created a repo from a Windows machine with bzr init and then tried checking out from OS X21:51
lifelesso21:51
lifelessok21:51
agrippathen I added all the files in there and committed21:51
lifelessso, here's whats happening21:51
lifeless[I think]21:52
lifelessa backtrace would help diagnose to be sure.21:52
lifelessI think bzr is trying to read lock the source tree, to read its files from disk21:52
reggiethanks everyone who responded.  I got my merge all fixed up21:52
lifelessthis isn't particularly helpful in your case21:52
agrippaHow do I do a backtrace?21:53
lifelessso, if you don't need the working copy on that central branch, running (from the machine that created it), 'bzr remove-tree', will get rid of the source tree and files, and then bzr won't try to lock it21:53
lifelessrun with -Derror21:53
=== JamalFanaian is now known as JamalFanaian|afk
lifelesskfogel: bug 405595 - you might like to weigh in with your opinion21:55
ubottuLaunchpad bug 405595 in bzr "bzr-svn on Windows does not support Subversion 1.6 format" [Undecided,New] https://launchpad.net/bugs/40559521:55
agrippalifeless: Do you want me to run that on the repo located on the Samba share?21:56
lifelessagrippa: yes21:56
agrippaAlright21:56
kfogellifeless: I have no strong opinion; either solution seems fine for now, though eventually the auto-upgrade seems like the right thing to do.22:03
agrippalifeless: Want me to paste the output into here?22:06
lifelessagrippa: sure, or a pastebin22:18
agrippahttp://pastebin.com/m718a691f22:19
lifelessagrippa: you need to run this from a machine that is working :)22:20
lifelessagrippa: or are none of them working?22:21
agrippaOh, I can do that too22:21
beunolifeless, re: bug 40597222:21
ubottuLaunchpad bug 405972 in bzr "Pushing a new stacked branch to the Launchpad project does 18 VFS calls" [Undecided,New] https://launchpad.net/bugs/40597222:21
lifelessbeuno: yes22:21
beunoI see 2 VFS calls for branches with tags22:21
beunonot 1822:21
beunowhich is why I filed that bug22:21
lifelessbeuno: yes, and no22:22
lifelessbeuno: do to any vfs calls takes about 16 calls in setup22:22
beuno:)22:22
lifelessits why doing any vfs based operations is so expensive22:22
lifelesswe have to read .bzr/branch-format, .bzr/branch/format, .bzr/repository/format, .bzr/branch/branch.conf, .bzr/repository/pack-names, etc etc22:22
beunoI see22:23
beunowhy do I only see 1 or 2 VFS calls sometimes then?22:23
lifelessbeuno: if you enable the back-trace-on-vfs stuff, which we had enabled previous22:23
lifelessyou'd see that the backtrace for the earlier vfs calls comes from tags.set_tags_dict, or something like tat22:24
beunolifeless, sure, what knob do I have to twirl to do that?22:24
lifelessbeuno: -Dhpssvfs22:24
lifelessor set that in your config22:24
beunothanks22:25
beunoI already have hpss22:25
lifelessit was on by default, but folk felt it was too noisy22:25
beunoI'll add vfs22:25
beunolet's try this again then with that enabled22:26
lifelessthis will produce a backtrace at the point vfs access is triggered22:26
beunoyeah, I remember those22:27
beunothey sure where noisy, but if it helps pin point the issues and someone is working on it, it's good noise  :)22:27
beunohrm, with hpssvfs, it doesn't give me the counts22:28
beunolifeless, http://paste.ubuntu.com/235454/22:29
beunoit does seem to go through tags22:29
agrippadon't know if I got anything useful for you lifeless22:31
lifelessagrippa: well if the command worked, your mac checkout should work now22:32
agrippahttp://pastebin.com/m6d29d96d22:32
lifelessagrippa: try checking out on your mac machine again now22:33
lifelessbeuno: thus, its tags :)22:33
agrippawith branch or co?22:33
lifelessagrippa: either22:33
lifelessbeuno: hpssvfs and hpss are separate flags; they don't imply each other22:34
agrippalifeless: Wow, that worked.22:35
lifelessagrippa: you just need to make sure your branches on the mount don't have trees, and it should keep working22:35
beunoah22:36
beunothanks lifeless22:36
beunodo you know when spiv's branch is landing?22:36
lifelessyes, but it doesn't matter22:36
lifelessthe right question is 'when will launchpad be running with spiv's branch'22:37
agrippalifeless: So is this a bug or just the way bzr works?22:37
lifelessagrippa: needing OS Locks is a design defect we'll be fixing. Using them at the moment is situation-normal.22:37
lifelessagrippa: we made the [wrong] assumption that OS locks were in fact a reasonable and reliable tool to use.22:37
agrippalifeless: So in the future, it should be possible to have trees on the mount?22:39
lifelessagrippa: yes, once we fix the bug about OS Locks22:41
agrippalifeless: Thanks a bunch, man.  I think I might be able to get my coworkers to start with Bazaar soon enough then.  I'm tired of flashFile1000000.flah22:42
pooliebeuno, hi, i'm here now22:44
beunopoolie, hi22:44
lifelessagrippa: cool. Please do drop in with any more questions, there is usually someone around.22:44
beunopoolie, want to talk about the website today?22:45
poolieyes, very much22:45
pooliei was hoping to catch kiko first...22:45
beunopoolie, sure, I'm on the hpone now anyway22:45
lifelessthe hpone eh22:50
poolielike an iphone but better22:51
poolielifeless/spiv, are these "%d byte part read" things really necessary?22:52
pooliethey use a lot of space...22:52
lifelesspoolie: turn off -Dhpss :P22:57
lifeless(yes, I think they are. We want to gather detailed data when people are gathering data)22:58
awilkinslifeless: Are OS locks going to be removed for 1.18 ?22:58
awilkinslifeless: Or 2.0 ?22:59
lifelessawilkins: no22:59
lifelessprobably no22:59
poolieawilkins: only if you send a patch :)22:59
awilkinsWaah22:59
awilkinsShelve just doesn't work on Windows until you kill them off22:59
poolielifeless: making things so verbose that people turn them off is missing the point22:59
pooliemy question really is, what kind of thing do they help you debug?23:00
awilkinsWhich means no pipeline or anything else that needs shelf to work23:00
pooliejohn had some kind of patch towards addressing that particular problem23:00
pooliei think it was hard to refactor transform(?) to fix it23:01
awilkinspoolie: Yes, last commit to the lp mirror of that was in February AFAIR23:01
poolietherefore he stopped23:01
lifelesspoolie: the command line output is very minimal23:02
pooliei think that is an improvement to the code but it's arguably better to change the locking model to avoid the whole thing23:02
pooliethe .bzr.log output is definitely not23:02
lifelesspoolie: how many people are really looking in .bzr.log all the time?23:02
awilkinsOS locks have never been a good idea, they are just to inconsistent23:02
awilkinsI remember maintaining code that used semaphores specifically for that reason23:03
lifelesspoolie: I want to be able to say to someone who files *any* bug based on the command line output of -Dhpss: 'please attach the log from that run', and get enough detail to identify and fix it23:03
awilkinsAnyway, sleepytime23:03
poolieawilkins: that's great, i thought the same thing, but...23:03
poolielifeless: right therefore my question about what kind of bug that helps with23:04
lifelesspoolie: I don't think I saw that question23:04
awilkinsMaybe I'll look at it on the train tomorrow (not that it'll do much good :-) )23:04
poolie08:00 poolie: my question really is, what kind of thing do they help you debug?23:08
poolielifeless: ^^23:08
lifelesspoolie: They have helped in the past find interactions between buffer layers23:09
lifelesslike the TCP ack/psh issue23:09
poolieby, say, showing that it starts reading tiny little buffers?23:09
lifelessyes23:09
lifelessdo we need them every time? no23:09
lifelessunfortunately, I can't say when we will need them in advance :(. It may be that spiv who has done much more networking over the last few months will say 'I haven't looked at these for ages, we can dump them'23:10
pooliek thanks23:10
lifelesshowever, in terms of bug round trips, I really prefer a single large debug hammer to repeated incrementally larger requests23:11
lifelessif what you really want is to know when bzr does lots of round trips, perhaps we could give you [and other folk that want a feel] a dedicated ui-only reporting flag23:12
lifeless-Dnosy :P23:12
pooliepossibly for bug reports we want -Deverything23:13
lifeless(which could show a range of different summary numbers)23:13
poolieoh i see we do already have -Dhpssdetail23:17
pooliei thought we might23:17
=== nevans1 is now known as nevans

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