/srv/irclogs.ubuntu.com/2010/07/05/#bzr.txt

lifelessmtaylor: btw00:09
lifelessmtaylor: please tell me if my fix works for you in builddeb00:09
mtaylorlifeless: I will check it00:10
lifelessmgz: yes, interbranch multimethod was extracted from previously plan branch methods00:10
lifelessmgz: most of the tests are just copies of the old branch ones00:10
mgzthanks.00:13
mgzlp:launchpad still hasn't finished branching...00:13
lifelessharh00:14
lifelessits a tad big00:14
mgzha! ran out of disk space00:16
lifeless><00:17
lifelessare you hoping to patch launchpad ?00:17
lifelessmgz: ^00:18
mgzI thought I'd see if the problem with group membership being seen as more important than direct subscription was something as simple as a badly-ordered if chain00:19
lifelessah cool00:20
lifelessyou'll want about 1.5GB00:20
mgzI think I'll check via the web interface before finding a big enough drive :)00:20
lifeless+ a bit of slack00:20
lifelessI have a 4G VM00:21
lifelesswith 550M free in it, to do LP development00:21
lifelessI documented that on the dev.launchpad.net wiki under running/vm, or something like htat00:21
lifelessI'm off to do various things; shall be back online periodically.00:22
exarkunI'm having difficulties merging some changes from one branch into another.00:26
exarkunhttp://pastebin.com/PQ2hFcCd00:27
exarkunIs something wrong with that?00:27
mgzbranching rev 0 isn't something I've every tried personally.00:30
spivGood morning.01:02
spivexarkun: there's a bug about that01:03
spivexarkun: are you aware that branching rev 0 is essentially the same as doing "bzr init"?01:03
spivexarkun: IIRC there's a bug that rev 1 cannot be a merge commit.01:04
spivexarkun: See https://bugs.edge.launchpad.net/bzr/+bug/242175, and the bug it links to (and the bugs linked to from its comments...)01:07
ubot5Launchpad bug 242175 in Bazaar "Better error message when merging into empty branch (affected: 1, heat: 0)" [Wishlist,Confirmed]01:07
exarkunHow about this one, http://pastebin.com/h1Z2U7Qk02:25
exarkunIt seems odd to get conflicts when merging like that.02:25
spivexarkun: that seems odd to me too02:27
spivexarkun: file a bug :/02:27
exarkunwill do02:42
exarkunI don't know if I'll file all the bugs I ran into tonight :/02:42
exarkunit's five so far, that seems excessive02:42
exarkunI can't seem to bring myself to try isolating the most recent02:43
spivOh, hmm.03:00
spivexarkun: oh!03:01
spivexarkun: I'm silly; it would be because "bzr merge -r 2..16" doesn't include the changes from 1->2.03:02
exarkun:(03:02
exarkunThat explains some issues, I guess03:02
spivexarkun: Usually the way you'd express "merge up to point X" is by simply "bzr merge -r X"03:03
spivI think we could give better feedback in this case, perhaps.03:04
exarkunThis whole thing I'm doing has problems.  But on the other hand, I'm done now, so I hopefully I don't have to care.03:04
spivLike explicitly announcing if the merge is a cherrypick.03:04
lifelessmmm sadness03:11
lifelessbzr-builddeb has no direct merge-upstream tests03:11
spivHmm, I think I may have stumbled upon a reason why 'get_stream_for_missing_keys' is needed even for initial fetches which.07:07
spiv...which should be able to easily enough send a complete stream.07:07
lifelessghosts?07:08
spivlifeless: overly aggressive calculation of "uninteresting" chk root nodes.  The logic doesn't seem to allow for the possibility that two different inventories might refer to the same chk_maps.07:20
spivStill digging into the details.07:20
vilahi all07:59
aidalgolI'm using the development version of a project that uses Bazaar.  Instead of pulling updates from the repository on the Internet onto both my laptop and desktop, I want to pull them from the Internet to only my dekstop and then push them to my laptop.  How do I do this?08:19
aidalgol(Without using shared directories.)08:19
lifelesson your desktop run bzr pull08:19
aidalgolRight, figured that much out. :)08:19
lifelessthen bzr push bzr+ssh://laptop/path/to/branch08:19
aidalgolIs there a way to not use SSH?08:20
lifelessfinally on the laptop run 'bzr update' if there is a tree where the branch is (if there is the push will alert you to that fact)08:20
lifelessbtw, shared repositories are totaly unrelated to your request; can I ask why you said you didn't want to use them?08:20
aidalgolShared?08:20
aidalgolI haven't heard of that.08:20
lifelessah sorry08:21
lifelessI misread, you said 'shared directories'. My bad - ignore my question.08:21
lifelessuhm yes, you can use any protocol bzr supports.08:21
aidalgollol OK :)08:21
lifelessBut ssh is best. Is it a problem for you?08:21
aidalgolI don't want to set up ssh on my system.08:21
aidalgolI only do this kind of thing at home on a fairly secure LAN.08:22
aidalgolSo, for syncing my files, I've been using Unison's unsecure protocol.08:22
aidalgolBecause I have good physical security.08:22
lifelessits not about security08:23
lifelessssh runs the bzr server at the far end so its very very effiicent08:23
aidalgolI'll take a look at the list of protocols bzr supports.08:23
maxbIn this case, the recommendation to use ssh is not about security, but because it's an excellent way of making two machines talk to each other08:24
maxbUnless you're stuck running Windows?08:24
aidalgolConvenience is more important than efficiency for me.08:25
aidalgolmaxb: No, thank heavens.08:25
maxbSetting up ssh on Linux *is* convenient08:27
maxbBecause every distro provides it packaged08:27
aidalgolbzr serve looks like a good option.08:27
aidalgolI agree it's convenient, but I'd rather not run a system daemon if I don't have to.08:28
aidalgolWhat's the LOCATION syntax?08:41
aidalgolI ran bzr serve --port=X on my desktop.08:41
aidalgolNot I need to run bzr pull [something] on my laptop, right?08:42
mwhudsonhmm09:13
mwhudsoni seem to be getting bzr bugmail now09:13
lifeless\o/ ?09:13
mwhudsonYou received this bug notification because you are a member of bzr-qa, which is subscribed to Bazaar.09:13
lifelessoh right09:13
lifelessthats unexpected ;)09:13
lifelessit might be because you're in bazaar-canonical.09:13
lifelessI think the group layout isn't quite right.09:13
mwhudsonerr09:14
lifelessare you in bazaar-canonical ?09:14
mwhudsoni'm in ~bzr, indirectly, which owns ~bzr-qa, but i'm not _in_ ~bzr-qa09:14
lifelessoh09:14
mwhudsonlifeless: yeah09:14
mwhudsonso i don't know why i'm getting these emails09:14
lifelessright, so poolie rearranged things this morning09:14
* mwhudson looks at some headers09:15
lifeless~bzr is meant to give you that bugmail anyway09:15
mwhudsoni guess i'll see how much mail this results in before complaining further :)09:18
lifelessI'll try to look tomorrow09:19
lifelessfeel free to drop me a mail your midday if its driving you batty ;)09:20
* lifeless changes a few things, just because09:23
hayalciHi, I can't use recorded passwords with bzr-svn09:27
hayalciI tried authentication.conf09:27
hayalciand tried some settings, but bzr either asks for password, or gives the error message :09:28
vilahayalci: svn handles its own cache which bzr-svn is able to use09:28
hayalcibzr: ERROR: Permission denied: ".": OPTIONS of 'http://...." : authorization failed: Could not authenticate to server: rejected Basic challenge09:28
vilahayalci: do one successful auth with svn and things should be fine09:29
hayalcivila: thanks for the info09:31
hayalcithat worked with a tweak. I am using KDE, and kwallet for password storage. While svn can store and access passwords in kwallet, bzr-svn couldn't09:32
hayalciafter forcing svn to not use kwallet, and storing password in a file, bzr-svn could access the svn repo09:33
hayalciActually, that's ok with me. That password is not important.09:33
vilahayalci: may be worth filing a wishlist bug against bzr-svn for the record09:38
poolie_spiv, hi?09:57
poolie_does https://bugs.edge.launchpad.net/bzr/+bug/601798 ring any bells for you?09:59
ubot5Launchpad bug 601798 in Bazaar "'NoneType' object has no attribute 'get_config' in filename_matches_config executing bzr switch (dup-of: 559436)" [Undecided,New]09:59
ubot5Launchpad bug 559436 in Bazaar 2.1 "AttributeError: 'NoneType' object has no attribute 'get_config' (affected: 7, heat: 31)" [High,Fix released]09:59
* spiv looks10:00
spivpoolie_: that's weird, it looks like 559436, but that was fixed in exactly 2.1.1, which is what they are running10:02
spivOr at least, that's when NEWS claims it was fixed...10:03
spivThe NEWS file in -rtag:bzr-2.1.1 agrees, though.10:04
poolie_sorry i was offline, more maverick/hardware problems :-(10:05
lifelesspoolie_: what did they say ?10:06
spivpoolie_: ouch :(10:09
spivpoolie_: I left a comment on the bug with my thoughts10:09
poolie_thanks10:11
poolie_lifeless, it's working now10:11
lifelesspoolie_: \o/10:11
poolie_burned a cd at low speed, booted from that, reset bios back to ahci10:11
poolie_despite appearances it can boot from cds in ahci mode, they just appear as a different device10:11
lifelessglub10:11
lifelessah10:12
lifelessvila: tell me about this config lock patch10:14
lifelessvila: where do you think its up to, is it ready, are you happy with it?10:14
vilalifeless: given the discussions I'm more inclined to wait for the sprint to discuss it, there so many things to do with configs that I didn't even mention in the patch that I think we need to talk about10:15
vilalifeless: the patch itself...10:15
vilawell, it needs at least to be split (once or several times) to make my intents and constraints clearer10:16
vilausing a transport for example was required to use lockdir but also a good thing in itself if we want all IOs to go thru a transport object10:17
vila_get_parser() is currently abused by tests as a way to create a config file and we need something better10:17
lifelesswhats wrong with that ?10:18
lifelessby which I mean10:18
lifelesswhat problems does that cause10:18
vilaoverall, far too many things stuffed in this patch were not related to the bugfix itself10:18
vila_get_parser() ? Well, in some cases if the config is not empty, supposing that it came from a file make things simpler10:19
vilaI don't remember the exact context/failing test, but at one point it was obvious/knee-jerk that this wasn't worth maintaining (I tried to nevertheless)10:20
vilaI think it was related to the ability to use _parser.reload() which itself requires a file name rather than rebuilding a configobj object10:21
vilarebuilding the configobj object helped with failures with the intrumented one (hence the addition of reload() there)10:22
vilaand this last addition was a bit silly since its implementation is a no-op10:22
vilakind of: ok this bug fix is simple: oh wait, I need a small refactoring here, oh wait, unrelated tests are failing, one more bit of refactoring, oh wait, etc10:23
poolie_hi there vila11:16
poolie_and good night11:16
poolie_vila, would it make any sense to send an rfc email about config locking just to summarize the progress at a higher level than an mp?11:16
vilapoolie_: it would, I have a list of other points I haven't mentioned so far regarding config11:18
lifelessthe python-ideas thread on their use of hg makes me sad11:23
lifelessconsensus emerging seems to be to not accept branches from non-committers.11:23
lifeless!11:23
poolie_really11:25
lifelessreally11:25
lifelessbai11:25
mwhudsonlifeless: !11:27
lifelessyeah11:28
mwhudsondoesn't that almost completely miss the point?11:28
lifeless'pulling all the patches generates too much noise people won't review, so people should make a single patch and put that in the bug tracker'.11:28
lifelessmwhudson: you'd think so.11:28
mwhudsonerr11:28
mwhudsondoes hg not have merge --preview?11:28
mwhudsonor some moral equivalent11:28
jameshI think there are lots of people who still want linear histories11:40
jamesheven though they're using DVCS11:40
jameshthey consider the extra non-linear history to be noise rather than valuable information11:40
lifelessyes11:42
lifelessadd to that11:42
lifelesshg doesn't do nonlinear history - it logs all left-aligned, all patches show.11:42
jameshthey should fix that11:45
lifelessgnight12:53
knielsenHi, I'm looking for docs on bzr formats (bzr 2.1.1), `bzr info` says format: rich-root-pack and `bzr checkout` says "on-the-fly conversion from RepositoryFormat2a() to RepositoryFormatKnitPack4()". But I didn't find info about those formats in docs (http://doc.bazaar.canonical.com/bzr.2.1/en/user-reference/formats-help.html)14:33
knielsenanywhere I can find info on that/those formats?14:33
spivknielsen: 'RepositoryFormat2a()' is the internal name for the '2a' format14:36
spivknielsen: and 'RepositoryFormat2a()' is the internal name for the 'rich-root-pack' format14:36
knielsenspiv: right, so RepositoryFormatKnitPack4 and rich-root-pack are two different names for the same format?14:37
spivOops, copy-and-paste screwup14:37
spivRight, 'RepositoryFormatKnitPack4' is the same format as 'rich-root-pack'14:38
spiv'rich-root-pack' is quite old, it dates back to bzr 1.014:38
knielsenspiv: right, so the question is, where can I read about that rick-root-pack format?14:38
knielsenok, yes I suspected that it was old, that's the main info I need, thanks14:38
spivBasically you should be using '2a' for everything.14:38
spivPlease file a bug about the documentation being a bit lacking there.14:39
knielsenok, will do14:40
spivThanks!14:40
* spiv goes to bed14:40
parthmknielsen: there is bug #567064 about improving the message.14:42
ubot5Launchpad bug 567064 in Bazaar "message about on-the-fly conversion is unclear (affected: 2, heat: 6)" [Medium,Confirmed] https://launchpad.net/bugs/56706414:42
spivparthm: that's a related but different bug, I think14:45
parthmspiv: yes. i suppose it could avoid using internal names + give a suggestion of upgrading to 2a.14:47
GaryvdMHi mgz15:08
knielsenfiled as https://bugs.launchpad.net/bzr/+bug/60191215:14
ubot5Launchpad bug 601912 in Bazaar "Missing documentation about repo format rich-root-pack (internal nameRepositoryFormatKnitPack4) (affected: 1, heat: 6)" [Undecided,New]15:14
riochI've written an app which I now want to use bazaar to do version control. If I do bzr init <project> will it pick up everything that is already there, or should I create it blank and then add the files and commit them?16:26
GaryvdMrioch: You can do bzr init in you existing dir. You will then need to do bzr add and bzr commit.16:29
riochGaryvdM: thanks :)16:31
riochI created a branch with bzr init, then decided to start again and deleted the project, copied the files across from a backup, and now when I do bzr init I get this error: bzr: ERROR: Already a branch: ".".16:52
maxbSounds like you deleted all the visible contents of a directory, but kept the .bzr subdir16:55
riochmaxb: I thought that too, but that's gone as well.16:56
maxbThat error message is a clear indication there is a .bzr in the location you are trying to init16:57
riochmaxb: well, I emptied my trash and now it works, so maybe it was aware I deleted it?16:58
=== abentley is now known as abentley-lunch
=== abentley-lunch is now known as abentley-
=== abentley- is now known as abentley
lifelessmorning20:17
GaryvdMHi lifeless20:25
mgzhey all.20:27
GaryvdMHi mgz20:27
GaryvdMmgz: re py2exe extraction - It work for just bzr, but not with plugins. I've not debug much...20:28
mgzyou also have a slight problem with both me and you changing the bzr setup.py and those new bits not being copied across yet20:29
mgzeasy to fix though.20:29
GaryvdMI'm working on been able to specify revision specs.20:29
lifeless\o/20:29
GaryvdMmgz: Yes - I'll fix that when I get it to work. :-)20:29
mgzI've just been tracking down the double-auth thing from the other day, it's a mess of abstractions.20:34
mgzbasic issue is the http connection creation is deeper than the try-smart-protocol-then-dumb, so if the first bit fails it throws away everything it has set up so far including the auth information20:35
mgzalso it doesn't store the credentials unless it actually gets a 200, so 401-404 will raise without recording that it actually got past the auth correctly.20:36
lifeless\o/20:36
mgzso, it's what I expected, which I might be able to fix, plus a bigger issue in bzrdir that I have no idea for.20:37
lifelesswhats the bigger issue?20:38
mgzwell, when it's probing for formats, it has no concept of an http connection20:43
lifelessyes20:43
mgzso I don't see any clear way of preserving the auth credentials, that are stored on the connection, across two seperate probes20:44
mgzexcept some global store, which is sort of what the text file on disk is.20:44
lifelessthe probes don't make a new transport object20:44
iocorhow do I find out what changed between bzr version 1.18.1 and 2.1.120:45
mgzbut the auth stuff is on the request, not the transport20:45
lifelessiocor: read the NEWS file for 2.1.120:46
iocorlifeless: is that online anywhere?20:46
GaryvdMiocor: http://doc.bazaar.canonical.com/latest/en/release-notes/index.html20:47
lifelesssure20:48
mgzah, or is it...20:48
lifelessor http://bazaar.launchpad.net/~bzr-pqm/bzr/2.1/head:/annotate/NEWS20:48
lifelessI think thats the url anyway, :)20:48
GaryvdMhttp://bazaar.launchpad.net/~bzr-pqm/bzr/2.1/annotate/head:/NEWS20:50
GaryvdMBut it breaks because annotate takes to long.20:50
mgz's on ConnectedTransport._shared_connection which I guess I'll poke and see if it survives20:50
mgz...does seem to have the same id20:53
lifelessmgz: thats a feature20:54
lifelesstcp is slow.20:54
lifelessreuse is good.20:54
mgzgoodie, so, it's cleverer than I feared20:54
lifelessI like to think of it as simpler.20:55
lifeless:P20:55
mgzif it was simple, wouldn't have taken this long to find out ;)20:55
mgz...now I have to look into writing http tests that don't leak horribly21:12
lifeless\o/21:12
mgzsemi-related, if you get the username or password wrong is it expected to get:21:14
mgzbzr: ERROR: Invalid http response for http://float.endofinternet.org/bazaar/testauth/.bzr/branch-format: Unable to handle http code 401: Authorization Required21:14
mgzit seems... unhelpful.21:15
lifelessmmm, I wouldn't say expected.21:15
lifelessif its a single line then its just the regular exception-printout21:15
iocori've got some pythoncode that uses bzrlib, and we're attempting to make commits, and for some reason we're unable to make updates to files21:26
iocoranyone got any ideas why?21:26
lifelesspaste the code21:26
lifelessI have a few minutes, I'll have a peek for you21:26
iocorthanks man21:26
iocorhttp://dpaste.com/214900/21:27
iocorthis is the commit function21:27
iocorhttp://dpaste.com/214902/ class initialiser21:28
iocorhttp://dpaste.com/214903/21:28
iocorfunction to update files21:28
lifelessok, so you don't have a tree on disk ?21:29
iocorcalling commit is meant to write the tree out to disk21:30
lifelessuhm21:30
lifelesssome terms21:30
GaryvdMiocor: small nit pick: line 16 of http://dpaste.com/214900/ should not be necessary.21:30
GaryvdM"self.b = bzrlib.branch.Branch.open(self.b.base)"21:31
lifelessiocor: a branch is a line of development21:31
lifelessiocor: a Tree is a single collection of the users files, either editable (a WorkingTree) or immutable (a RevisionTree)21:31
lifelessiocor: a 'commit' takes a Tree and puts it into the branch's Repository, and updates the branch last_revision.21:32
lifelessiocor: so if you have a WorkingTree, to commit you just do 'tree.commit()'21:32
iocorlifeless: ok, so I'm looking to take in some changes, apply them to the current branch to get a new branch21:32
iocoror21:33
iocoran update to the branch21:33
iocorit's very simple linear style committing21:33
lifelessiocor: your code won't work properly prior to 1.18 anyway, I would just not support it.21:34
iocoralso, I'm using bzr 2.1.1 but the branch isn't getting updated21:34
lifelessnot your fault, just bzrlib internals.21:34
lifelesswhat is in _update_tree ?21:34
iocorand the #as of 1.18 thing isn't executed21:34
iocor        self.PrevTree = self.TransPrev.get_preview_tree()21:34
iocorone line21:34
iocoralso, I inherited this system and it isn't particularly well documented or functional on anything other than bzr 1.18.121:35
iocorat all21:35
lifelessuhm21:35
lifelessso that one line21:35
lifelessis discarding all the data you've got21:35
lifelessto work with PreviewTree there is a strict sequence you have to follow21:36
lifeless1) make a Transformpreview21:36
iocor(happens at class init)21:36
lifeless2) call methods on it to create/move/delete files21:36
iocorlifeless: I note that creating files and deleting files works just fine21:36
lifeless3) call get_preview_tree()21:36
iocormodifying their contents doesn't21:36
iocorohic21:37
lifeless4) call that-tree.commit()21:37
iocorso in fact, this is pretty broken?21:37
iocoraaaaaaaaaaaaaaaaaaaaah21:37
lifelessI may be wrong21:37
lifelessbut looking at _PreviewTree.__init__21:37
iocorlifeless: is this going to be massively painful to fix?21:37
lifelessI don't see why21:37
lifelessjust don't call _update_tree where you are21:38
iocorok21:38
lifelessand don't call self.PrevTree = self.TransPrev.get_preview_tree() in init21:38
lifelessinstead, do that line in your commit21:38
iocorI have a merge function also21:39
iocorshould I call it there?21:39
lifelessactually21:40
lifelessI may be wrong about risk of making new trees21:40
lifelessjus tshove a self.PrevTree = self.TransPrev.get_preview_tree() call into your commit function21:40
iocorand don't remove the updatetree calls elsewhere?21:42
lifelessyeah21:42
lifelesssee how that works21:42
lifelesscan I ask, what this is for?21:42
iocorto cut a long story short, an online ide for python that controls robots and has to be deployed in an environment where we can't install software, so it's web-based21:42
* lifeless whistles21:43
lifelessthats pretty cool21:43
iocor:D21:43
iocorlifeless: http://studentrobotics.org21:44
iocor:O21:44
iocor:OI21:44
iocor:O21:44
iocorI think21:44
iocoryou just fixed it21:44
* iocor waits for the tests to finish21:45
iocoroh my god21:45
iocorlifeless: I owe you all my internets for a wek21:45
lifelessglad I could help21:45
iocor:D:D:D:D21:49
GaryvdMBla - just realised, the feature I've been planing for the last hour, was already implement by Ian, just not in use :21:56
GaryvdM:-)21:56
lifeless:P21:56
fullermdSuperrelativistic implementation FTW.22:00
lifelessnah22:03
lifelessguido's time machine22:03
lifelessdude just can't seem to keep it locked up22:04
fullermdWell, it's a time machine.  If you forget to lock it up ONCE, it's the same as never locking it up.22:05
GaryvdMBla - SEACOM down for 6-8 days: http://www.seacom.mu/news/news_details.asp?iID=14322:11
GaryvdMI nice reminder of how slow SAT3 is.22:12
=== jfroy_ is now known as jfroy
GaryvdMFor Ian's new window installer build script, he added the ability to define more than one series.22:45
GaryvdMSee http://bazaar.launchpad.net/~bzr/bzr-windows-installers/trunk/annotate/head:/bazaar_releases.py22:45
GaryvdMFor 2.2 I need to specify defined revisions.22:46
GaryvdMBut for .dev, I want it to use the latest version for each plugin.22:46
GaryvdMYou can specify a revision spec per Project/Plugin object.22:47
GaryvdMBut the way that is currently defined, you can only define the 2 series to have the same plugin versions, as they are shared.22:49
GaryvdMI'm not sure how to change this so that I can have different plugin versions, but not have to repeat plugin details, and be syntactical clean.22:50
GaryvdMMaybe add a copy_write method, define the plugins globally, and copy_write with the specific revision for the series.22:52
GaryvdMAny better ideas?22:53
pooliehi GaryvdM23:13
pooliehi jam23:13
GaryvdMHi poolie23:13
mgzhm, got another mail with team membership overriding direct subscription for X-Launchpad-Message-Rationale and bottom note23:14
lifelessheh23:14
lifelesshi poolie23:14
mgzas I completely failed to branch launchpad, guess I better just file a bug23:15
lifelesspoolie: I was out by 2 hours on my thing this morning :O23:15
pooliein which direction23:19
lifelessjust finished23:19

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