| Noldorin | jelmer, any progress? | 00:34 |
|---|---|---|
| Noldorin | zzz... | 01:10 |
| Noldorin | jelmer, well, will be around another hour or so still i think | 01:10 |
| Noldorin | just saw the update | 01:24 |
| Noldorin | awesome | 01:24 |
| smoser | is it possible to do what i want here: | 01:37 |
| smoser | bzr diff ../milestone-proposed -r 1184 | 01:37 |
| poolie | that command works | 01:37 |
| poolie | what do you want it to do? | 01:37 |
| smoser | well, yes. it exits 0 | 01:37 |
| smoser | i want to know what the differences between this dir and the branch at tip ../milestone-proposed at revision 1184 | 01:38 |
| smoser | s/tip /tip and / | 01:38 |
| smoser | err... | 01:38 |
| smoser | this dir at tip and revision 1184 of ../milestone-proposed | 01:38 |
| smoser | poolie, ^ | 01:42 |
| poolie | bzr diff -r 1184:../milestone-proposed | 01:43 |
| poolie | if by 'this dir' you mean '.' | 01:43 |
| smoser | thank you sir. | 01:44 |
| smoser | is there a way to say "tip" in the above ? | 01:45 |
| smoser | i guess '-1' works. | 01:46 |
| smoser | but that always seems so counter-intuitive to me | 01:46 |
| smoser | i like git's "HEAD" alias | 01:46 |
| spiv | smoser: do you mean rev 1184 of 'this dir' or of milestone-proposed? | 01:46 |
| smoser | milestone-proposed | 01:47 |
| smoser | poolie's answer was what i wanted. | 01:47 |
| spiv | Oh, right. | 01:47 |
| poolie | smoser, if you want to diff . to the tip of milestone proposed | 01:47 |
| poolie | bzr diff -r ../milestone-proposed | 01:48 |
| Noldorin | jelmer, catch you tomorrow probalby... | 01:52 |
| === CapnRobby is now known as robbyoconnor | ||
| idnar | under what circumstances does the submit branch get set by bzr? | 06:19 |
| AuroraBorealis_ | the waht | 06:19 |
| idnar | submit_location, :submit, I'm not sure exactly what to call it; it's used as the default target for bzr send, among other things | 06:21 |
| AuroraBorealis_ | hmm | 06:21 |
| AuroraBorealis_ | ive notused that feature so i'm not sure | 06:21 |
| AuroraBorealis_ | is it in bzr.conf or the user config file? | 06:21 |
| idnar | it's stored in .bzr/branch/branch.conf along with push_location, parent_location etc. (although the global locations.conf can override that) | 06:22 |
| idnar | I don't use it much either, but somehow my "trunk" branch keeps on getting some random local branch set as the submit branch | 06:22 |
| AuroraBorealis_ | what is it set to by default? | 06:22 |
| idnar | nothing | 06:22 |
| idnar | unfortunately every time I notice it, it's been too long since I actually did anything with the branch it's referring to, so I can never figure out what it is I'm doing that causes it to be set | 06:23 |
| idnar | oh hang on | 06:23 |
| AuroraBorealis_ | one of the other developers will probably know better | 06:23 |
| idnar | I think I just figured it out (this always happens as soon as I decide to ask on IRC about something) | 06:23 |
| AuroraBorealis_ | i know right =P | 06:24 |
| idnar | bzr merge sets the submit branch if it's not already set; that seems... weird | 06:24 |
| vila | idnar: use --no-remember | 06:27 |
| idnar | yeah, but how will I ever remember to do that? :P | 06:28 |
| idnar | I suppose it makes sense for "downstream" merges | 06:28 |
| idnar | it's just that I mostly only do "upstream" merges, so it seems backwards to me | 06:29 |
| vila | yeah, that's the problem with default values, sometimes you can't satisfy everybody :-} | 06:31 |
| idnar | is there some way to make --no-remember the default for bzr merge? | 06:31 |
| idnar | perhaps I should just not care about it, I don't think I ever run any command on my "trunk" branch that uses the submit branch, so it doesn't really matter if it gets set to something | 06:32 |
| vila | well, having a submit_branch set | 06:32 |
| spiv | idnar: "bzr alias merge='merge --no-remember'" | 06:33 |
| vila | idnar: yup, that's what I do (don't care), in rare cases I have to 'bzr config --remove submit_branch' or force a different value, but still, in most of the cases, --remember is what I want | 06:33 |
| idnar | vila: I guess we have different workflows or something | 06:34 |
| * vila nods | 06:34 | |
| idnar | 90% of the time when I run bzr merge, it's to land a branch on trunk | 06:34 |
| vila | idnar: just set a submit_branch for trunk and it will be kept | 06:35 |
| AuroraBorealis_ | how do you set a submit branch | 06:35 |
| spiv | vila: trunks typically don't have a submit branch, though? | 06:35 |
| AuroraBorealis_ | edit the config file? | 06:35 |
| idnar | yeah, but what would I set it to? I suppose I could make it the same as the push location | 06:35 |
| vila | spiv, randi: indeed, but I use the remote branch i.e. the push_location | 06:36 |
| spiv | (I mean you could set it a dummy location like /dev/null, but that's obviously a hack) | 06:36 |
| vila | using the push_location also is the Right Thing for diff -rsubmit: | 06:36 |
| spiv | vila: sure, a copy of trunk might have a semantically sensible push_location | 06:37 |
| idnar | hmm, I keep forgetting about bzr lp-submit | 06:38 |
| spiv | vila: I don't think it makes good sense to say it has a submit_branch though. It's a sink for submissions, not a source. | 06:38 |
| idnar | yeah, ideally if I run some command that uses the submit branch, it would just give me an error about there being no submit branch, instead of doing something meaningless | 06:39 |
| idnar | not that it's a big deal, more of a semantic nit | 06:39 |
| spiv | (A setting that happens to produce ok behaviour in the tool does not automatically equal a setting that makes sense to humans) | 06:40 |
| idnar | hmm, that reminds me, there's a bzr merge --preview; but is there a way to do it from "the other side", like bzr send --preview or something? | 06:41 |
| idnar | (I'm not sure if bzr send would be the right command for that, just trying to explain what I mean wrt direction) | 06:42 |
| spiv | idnar: instead of 'bzr merge --preview FOO', 'bzr merge -d FOO --preview .", perhaps | 06:45 |
| idnar | hmm, that only works with local FOO | 06:46 |
| spiv | Otherwise you could probably use -rancestor: or something like that | 06:46 |
| spiv | idnar: hmm, I thought that might be the case :/ | 06:47 |
| spiv | idnar: that's probably a relatively easy to fix limitation | 06:47 |
| spiv | (and it probably already has a bug report...) | 06:47 |
| idnar | heh | 06:47 |
| idnar | well, not really important, I was just pondering if I could actually eliminate bzr merge from my workflow almost completely ;) | 06:47 |
| idnar | Tarmac eliminates the need to actually land the branch on trunk myself; but I still need a way to preview the merge result for code reviews, when Launchpad's preview isn't sufficient | 06:49 |
| vila | spiv: I've yet to encounter a case where using such a submit_branch cause problems | 06:49 |
| idnar | (not that there's any particular need to eliminate bzr merge from my workflow, it was just an interesting thought) | 06:50 |
| vila | err | 06:50 |
| vila | s/<engrish>/I've never encounter/ | 06:50 |
| vila | and hi all ! | 06:53 |
| vila | spiv: and to be honest I have to "trunks": a mirror of upstream and an integration one. The later is where I merge various other branches before submitting to pqm. | 06:55 |
| spiv | vila: I'm not saying bzr will misbehave, I'm saying that it doesn't make sense to a human reader of that value. | 06:55 |
| vila | The later has a push_location which is *not* lp:bzr, in fact public_branch and push_location are my lp corresponding branch and the *submit_branch* is lp:bzr, all locations make perfect sense there (parent_location is lp:bzr) | 06:56 |
| spiv | vila: sure, in your workflow for working with lp:bzr (which involves PQM, etc) that's fine | 06:58 |
| spiv | vila: there are common workflows where having a submit_branch set doesn't match reality, even if it is technically harmless | 06:58 |
| * vila nods | 06:59 | |
| vila | It also works for the plugins I maintain where I have: parent_location=lp:plugin, push_location=lp:plugin and submit_branch=lp:plugin where my "trunk" branch in this case is really the authoritative branch and the integration one | 07:02 |
| vila | When I say "works" I mean: having a submit_branch is enough to avoid merge setting it to an inappropriate value | 07:02 |
| spiv | But don't you agree that ideally in that case it wouldn't be set at all? | 07:03 |
| spiv | The answer to "where are changes made on this branch submitted to by default?" is "they aren't!" | 07:05 |
| vila | well, no :) *I* use it with diff -rsubmit: to check what I will push | 07:05 |
| spiv | Wouldn't diff -rpush: would make more sense for that? | 07:06 |
| spiv | (and be shorter to type!) | 07:06 |
| spiv | Or missing :push, perhaps. | 07:06 |
| vila | could be, but diff -rsubmit: is faster because it's bound to H-z m (2 keystrokes) whereas diff -rpush: is not :-D | 07:06 |
| * spiv raises an eyebrow | 07:07 | |
| vila | spiv: but yes, I agree that for authoritative trunks, there is no places from where you want to merge, they are potentially different for every merge | 07:08 |
| poolie | hi vila, diff | 07:08 |
| poolie | s//spiv | 07:09 |
| vila | lol | 07:09 |
| vila | poolie: _o/ | 07:09 |
| * spiv waves | 07:10 | |
| poolie | Riddell, hi | 07:54 |
| poolie | jelmer, vila, riddell, jam, chat in 5m? | 07:54 |
| Riddell | hola | 07:54 |
| * vila nods | 07:54 | |
| jelmer | already doing the audio configuration dance | 07:55 |
| jelmer | :) | 07:55 |
| poolie | :) | 07:56 |
| jam | hi poolie, I'm in | 07:59 |
| jam | vila: I have to go work with my wife for a little bit, but it would be nice to hear your thoughts on the select() issue. | 08:30 |
| jelmer | Riddell: is there more work to be done on the packaging guide for UDD? | 08:31 |
| poolie | hi jam | 08:32 |
| poolie | is there any discussion about it other than the mp? | 08:32 |
| poolie | i was going to say specifically for EINTR | 08:32 |
| vila | jam: sure, roughly: let's make it simple in production (no loop), pay a bit in the test suite while filing a bug about easier ways to get servers running in their own process (there are ways to get *one* process shared between tests) | 08:32 |
| Riddell | jelmer: I don't think so (there's more work to be done on it for traditional packaging) | 08:32 |
| jam | poolie: I think it has mostly been on the mp or on the bug. Though I guess there has been a fair amount last week between vila and I on IRC | 08:32 |
| poolie | you should almost always just restart the syscall, perhaps just checking any other preconditions like "was i interrupted" or "has the timeout expired" | 08:32 |
| jam | poolie: right. which points me at vila: we need a loop to handle EINTR, we may as well keep the loop | 08:33 |
| vila | poolie: I went to the bug yesterday to mention the error handle only to find you an spiv already saying the same thing | 08:33 |
| vila | jam: only for tests no ? | 08:33 |
| jam | vila: EINTR we need to handle in production | 08:33 |
| poolie | keep the loop and use it for what? | 08:33 |
| jam | otherwise if someone resizes the terminal during 'bzr serve' it could cause weird interactions. | 08:34 |
| poolie | right | 08:34 |
| jam | poolie: to handle EINTR, we nede to catch the exception and restart select() | 08:34 |
| vila | resizing the terminal in production ? | 08:34 |
| jam | so we need a loop | 08:34 |
| jam | vila: "bzr serve" on my terminal, and then resize it | 08:34 |
| jam | triggers signals | 08:34 |
| jam | which the application might ignore | 08:34 |
| jam | we've had bugs in the past | 08:34 |
| jam | where it caused EINTR that we didn't handle, and bzr crashed | 08:34 |
| poolie | i'll reply abotu that | 08:35 |
| jam | I *think* we fixed them by no longer listening to SIGWIN* or whatever | 08:35 |
| poolie | yep, we don't want that | 08:35 |
| poolie | correct | 08:35 |
| poolie | but, eintr should still be handled | 08:35 |
| vila | sounds out of scope for the bug you're after no ? | 08:35 |
| jam | but it is something that, in general, we should have a loop to handle EINTR for cases where we get a signal | 08:35 |
| jam | which is unrelated to this select | 08:35 |
| jam | vila: getting *any* signal causes all blocking calls to return | 08:35 |
| jam | with EINTR | 08:35 |
| jam | read/select/etc | 08:35 |
| vila | yeah, not the bug you're fixing right now | 08:36 |
| jam | vila: we would be *introducing* a new bug if I don't handle EINTR | 08:36 |
| vila | ? | 08:36 |
| jam | vila: specifically, with the code I'm writing, if I don't handle EINTR, I will disconnect clients if the process gets a signal | 08:36 |
| jam | (the way the code is written today) | 08:37 |
| jam | vila: as a "for example", say we have a signal that you can use to tell bzr to do a memory dump. We don't want clients to get disconnected while trying to get a memory dump of the running server process. | 08:37 |
| vila | and you want to take care of that for every call to select/recv/send ? | 08:38 |
| jam | vila: we already should be taking care of it, and don't | 08:38 |
| jam | we do in some places | 08:38 |
| jam | which is why the osutils wrappers exist | 08:38 |
| jam | vila: "osutils.read_bytes_from_socket" has EINTR handling | 08:38 |
| jam | as does osutils.send_all | 08:39 |
| jam | And a fairly obvious "osutils.until_no_eintr" | 08:39 |
| vila | how about having the main thread takes care of signals and put the real server in its own thread so we get the same model for PipeServer and TCPServer instead of tracking every call that happens in the call stack then (but I didn't mention that to in your bug scope...) | 08:40 |
| poolie | jam, done | 08:41 |
| jam | poolie: thanks for the review. I did fix the rs/xs stuff but forgot to push the latest, though you still found a couple bugs I didn't fix | 08:44 |
| jam | poolie: actually, because you noticed I wasn't terminating the loop on 'xs', that might be why I was seeing bugs even when passing errfds. | 08:48 |
| jam | Specifically, the first call would get 'you have an error here', and return it into xs | 08:48 |
| jam | but then I wouldn't stop the loop | 08:48 |
| poolie | right | 08:48 |
| jam | and then the rest of the calls wouldn't say anything | 08:48 |
| poolie | that could very well cause it to hang if the near end of the socket closes | 08:49 |
| poolie | though... | 08:49 |
| poolie | i would have kind of expected select might just error out entirely | 08:49 |
| poolie | oh, on the other topic of running the server out of process | 08:49 |
| jam | poolie: I would think I would have kept getting xs returned, though, so even if we loop until timeout, it would still end up with xs | 08:49 |
| poolie | it does seem like it would fix some persistent kinds of bugs where tests misbehave or are not realistic | 08:49 |
| jam | The issue was that I was never seeing "xs". | 08:49 |
| jam | Anyway, I'll poke at it. | 08:49 |
| poolie | also, there is the 'testresources' library which might help with having an external server that runs across multiple tests | 08:50 |
| poolie | obviously we would not want to stop and start it on every test | 08:50 |
| vila | yup, lp:bzr-local-test-server is a variation around this idea where you explicitly start/stop real servers and inject the running ones into the test suite | 08:52 |
| poolie | i'll send out the standup notes | 09:22 |
| Riddell | do plugins in bzrlib/plugins/ have unit tests? | 10:05 |
| jelmer | Riddell: yes, usually in the tests directory in the plugin | 10:10 |
| Riddell | jelmer: oh aye, and do they get run with the normal test suite? | 10:10 |
| vila | Riddell: yes, even when you do BZR_PLUGIN_PATH=-site, they are the so-called 'core' plugins | 10:26 |
| === yofel_ is now known as yofel | ||
| === Quintasan_ is now known as Quintasan | ||
| Noldorin | jelmer, hey :-) | 12:23 |
| jelmer | hi Noldorin | 12:24 |
| jelmer | Noldorin: do you *ever* sleep? | 12:24 |
| Noldorin | haha | 12:24 |
| Noldorin | no, i'm always online to pester you ;-) | 12:24 |
| Noldorin | i often go to bed very late and wake up around midday | 12:25 |
| jelmer | you're in Europe? | 12:25 |
| Noldorin | London, yep | 12:25 |
| Noldorin | netherlands for you i presume | 12:27 |
| jelmer | yep | 12:27 |
| Noldorin | want to visit some day :-) | 12:28 |
| Noldorin | jelmer, any luck with the issue anyway? | 12:28 |
| jelmer | Noldorin: I added a test case for it yesterday | 12:28 |
| Noldorin | ok cool | 12:29 |
| jelmer | Noldorin: I'm hacking on it in my spare time though, working on other stuff at the moment. | 12:29 |
| Noldorin | yes i saw | 12:29 |
| Noldorin | okay | 12:29 |
| Noldorin | other core bzr stuff eh? | 12:29 |
| jelmer | yep | 12:31 |
| vila | james_w: ping | 12:45 |
| james_w | hi vila | 12:45 |
| Noldorin | jelmer, playing more with the script reveals that moving a directory -or- renaming a directory works fine, but doing *both* at once screws it up | 12:45 |
| Noldorin | jam, hi? | 12:45 |
| vila | james_w: hey ! That was quick :) | 12:45 |
| vila | james_w: If you know how to make tea, can you have a look at https://code.launchpad.net/~vila/udd/795321-make-tea/+merge/76058 and give feedback ? | 12:46 |
| james_w | vila, yeah, it's in my inbox | 12:46 |
| james_w | along with 100 other things :-) | 12:46 |
| james_w | I'll look today | 12:46 |
| vila | james_w: awesome ! | 12:46 |
| james_w | I read your cover letter and I think I like your approach | 12:46 |
| james_w | I certainly agree that the circuit breaker pattern isn't quite the right fit | 12:47 |
| vila | james_w: we expect more lp downtimes so probably more failure storms and I suspect the should_retry have rotten (I'm sure you added transient failures for lp in the past but sigs have probably changed since them) | 12:47 |
| vila | james_w: yeah, not a perfect fit, but it helps making the actual code smaller | 12:48 |
| vila | (and can be tested independently *today* | 12:49 |
| Noldorin | jelmer, that shoudl really narrow it down :-) hopefully you can work on the issue today? | 12:50 |
| jelmer | Noldorin: no idea, working on more things than just this... | 12:54 |
| Noldorin | okay | 12:54 |
| Noldorin | jelmer, we all have our own priorities i guess :-P this is obviously high for me | 12:55 |
| Noldorin | but much less high for the bzr time | 12:55 |
| Noldorin | jelmer, is bzr-git still the best solution for mirroring LP branches on GitHub? | 12:58 |
| jelmer | Noldorin: yep | 13:10 |
| mssever | How can I check that a copy of a branch is correct without overwriting the existing branch? I'm trying to recover from serious file corruption caused by Dropbox, and I want to check that they restored things correctly. But when I run bzr in the restored directory, I get this error: No working tree exists for <path to restored dir, which is different from the original>. When I symlink it to the original location, I get the same error, showing the target path, | 13:17 |
| mssever | not the symlink path. | 13:17 |
| jam | mwhudson: did any of your anonymous ssh stuff land? I'm running into problems with "bzr branch lp:bzr-rewrite" giving me a "bzr+ssh://" URL, even though the build machine has not called "launchpad-login" | 13:21 |
| jam | (I don't have an ssh key there, etc.) | 13:21 |
| jam | jelmer: Help? It looks like 'bzr-rewrite' lost its development focus branch. | 13:28 |
| jam | https://launchpad.net/bzr-rewrite/trunk | 13:28 |
| jam | doesn't have a branch link. | 13:29 |
| mssever | How can I check that a copy of a branch is correct without overwriting the existing branch? I'm trying to recover from serious file corruption caused by Dropbox, and I want to check that they restored things correctly. But when I run bzr in the restored directory, I get this error: No working tree exists for <path to restored dir, which is different from the original>. When I symlink it to the original location, I get the same error, showing the target path, | 13:29 |
| mssever | not the symlink path. | 13:29 |
| jam | mssever: if you are running "bzr status" that doesn't apply to a repository/branch that doesn't have a working tree. | 13:30 |
| jam | You could try "bzr log" or some other command. | 13:30 |
| mssever | bzr log says Not a branch <path> location is a repository | 13:32 |
| mssever | jam: See ^^ | 13:32 |
| mssever | jam: And, it is supposed to be an exact copy of a working tree. Does this mean that it isn't an exact copy? | 13:32 |
| jam | mssever: ls .bzr ? | 13:33 |
| mssever | jam: The .bzr directory is there, but I don't know if it has the right contents. | 13:34 |
| mssever | Dropbox Updated part of the tree with an old version, and deleted some files | 13:34 |
| jam | mssever: sure, I'm asking for the output to help discovering what is going on. | 13:35 |
| jam | for example, if there is a ".bzr/branch" or ".bzr/checkout" directories. | 13:35 |
| mssever | Oh, OK. Here goes: | 13:35 |
| mssever | ls .bzr: | 13:35 |
| mssever | branch/ branch-format branch-lock/ checkout/ README repository/ | 13:35 |
| jelmer | jam: I'll set one, thanks for the hint | 13:38 |
| jam | jelmer: well, I failed to build the windows installers | 13:38 |
| jam | Not sure what changed | 13:38 |
| jelmer | jam: fixed | 13:38 |
| jelmer | jam: I converted my branch mirrors to code imports | 13:38 |
| jam | ok | 13:39 |
| jam | are there any others that would be affected? | 13:39 |
| jam | jelmer: and, of course, you've now broken my test case for fixing the related mis-communication in bzr :) | 13:40 |
| mssever | jam: Did you notice my last reply? I forgot to mention your nick... | 13:43 |
| jelmer | jam: I'm checking the other branches now | 13:44 |
| jelmer | jam: sorry! I can re-unlink it if necessary :) | 13:45 |
| Noldorin_ | jam, any idea when the Windows build of 2.5b1 will be available? :-) | 13:54 |
| iorec | helos. new to bazaar. looking for a solution to this situation: we have a software project that has public and private source parts. we want both in one repo with user access control to allow some people whole r/w access and others only write access to the public parts. is such a setup feasible with bzr? | 14:14 |
| Noldorin_ | jam is ignoring me :-( | 14:17 |
| vila | Noldorin_: he is probably building them, that doesn't count as ignoring you :) | 14:33 |
| Noldorin_ | vila, i was mainly teasing...but yes, i hope so anyway! :-) | 14:34 |
| vila | iorec: bzr doesn't support different access patterns inside a given branch, you need to define separate branches | 14:34 |
| vila | jelmer: by the way, should you upload 2.5b1 to debian ? | 14:34 |
| iorec | vila: so i could have a single repository with public and private branches? | 14:37 |
| vila | iorec: see http://wiki.bazaar.canonical.com/MatthewFuller/SpotDocs/PiecesInBrief so use the same meanings for the same words :) | 14:38 |
| vila | iorec: a repository is just a bag of revisions, a branch is a pointer to an entry point in a graph of revisions (directed and acyclic, so-called DAG) | 14:39 |
| vila | you can use the same repository for unrelated branches, but in your case that will make it harder to separate who can write from who cannot | 14:40 |
| Noldorin_ | jelmer, i see a comment in the bzr-git code saying "renames not supported:...? | 14:42 |
| vila | if you keep unrelated branches separate, it will be easier to define the access with scripts like contrib/bzr_access and the like | 14:42 |
| cerf | hello all | 14:43 |
| cerf | I've just installed bzr v2.4.1 from PPA | 14:44 |
| cerf | I'm wondering how to use branch.fetch_tags | 14:44 |
| jelmer | Noldorin_: that's for roundtripping | 14:44 |
| cerf | should it be set in .bzr/branch/branch.conf or ? | 14:44 |
| Noldorin_ | jelmer, how do you mean? | 14:44 |
| cerf | bazaar.conf ? | 14:44 |
| jelmer | cerf: it should be set for the source branch, so either in the source branches' branch.conf, bazaar.conf or an entry in locations.conf | 14:45 |
| jelmer | Noldorin_: "regular" push | 14:45 |
| jelmer | Noldorin_: not dpush | 14:45 |
| Noldorin_ | jelmer, oh ok | 14:45 |
| Noldorin_ | so i can ignore that huh? | 14:45 |
| jelmer | Noldorin_: git doesn't do renames | 14:45 |
| Noldorin_ | got it | 14:45 |
| Noldorin_ | ooh. another reason not to like git ha! | 14:45 |
| iorec | vila: the thing is that we want people with full access to be able to checkout one revision of the main branch and have everything they need (public and private parts) and others with public access only checkout the same revision but only get the public parts. | 14:46 |
| Noldorin_ | jelmer, i thought bzr cannot do "push" at all to git though? | 14:46 |
| Riddell | jelmer: I'm looking at https://code.launchpad.net/~jelmer/bzrtools/unused-imports/+merge/73265 what's the best way to run the test suite of bzrtools? | 14:47 |
| jelmer | Noldorin_: it can | 14:47 |
| jelmer | Riddell: BZR_PLUGINS_AT=bzrtools@`pwd` bzr selftest -s bp.bzrtools | 14:47 |
| Noldorin_ | jelmer, but dpush is preferable for some reasons.../ | 14:47 |
| Noldorin_ | ? | 14:47 |
| jelmer | Noldorin_: it's experimental, not enabled by default | 14:48 |
| Noldorin_ | okay sure | 14:48 |
| Noldorin_ | makes sense | 14:48 |
| jelmer | vila: yeah, I should upload to experimental I guess.. | 14:48 |
| Noldorin_ | jelmer, since i am so eager with this, maybe you could point me to the bit of code that handles bzr moves/renames in dpush? :-) | 14:48 |
| vila | iorec: bzr tracks whole trees so having people use different trees won't work out of the box, there are some parts of your needs that can be addressed with views, others may work with nested trees (not implemented yet), but overall, there is no way to get what describe directly | 14:49 |
| cerf | jelmer: thanks I'll try it | 14:49 |
| vila | iorec: s/what describe/what you describe/ | 14:49 |
| cerf | hope this can help for bug https://bugs.launchpad.net/bzr/+bug/843684 | 14:49 |
| ubot5 | Ubuntu bug 806348 in Launchpad itself "duplicate for #843684 BzrCheckError: Internal check failed: Cannot add revision(s) to repository: missing chk node(s) for id_to_entry maps" [Critical,Triaged] | 14:50 |
| iorec | vila: thanks. it seems so strange that ours is obviously a special case setup since none of the popular revision control systems seem to support such a setup. so it seems to me we'll have to manually handle 2 repos and always say rev XY of repo A is the one that fits rev ZW of repo B. | 14:57 |
| vila | iorec: well, once you start using distributed VCS, access rights... are less relevant, to start, either you publish or you don't, if you publish, you don't blindly accept submissions, they are generally checked before being accepted and at that point, the checkers generally have write access | 14:59 |
| cerf | so bad, that didn't help | 15:00 |
| cerf | still get 'missing chk node(s) for id_to_entry maps ' | 15:01 |
| vila | iorec: keeping two related projects in sync is what nested trees are about, but the progress is slow on that front as we focus on other subjects (with our limited resources ;) | 15:01 |
| cerf | in bug report https://bugs.launchpad.net/udd/+bug/806348 | 15:01 |
| ubot5 | Ubuntu bug 806348 in Launchpad itself "BzrCheckError: Internal check failed: Cannot add revision(s) to repository: missing chk node(s) for id_to_entry maps" [Critical,Triaged] | 15:01 |
| cerf | jameinel talked about a quick regression avoidance with https://bugs.launchpad.net/bzr/+bug/771184 | 15:02 |
| ubot5 | Ubuntu bug 771184 in Bazaar "option to disable/enable fetching of all tags" [Critical,Fix released] | 15:02 |
| cerf | how to use it ? | 15:02 |
| cerf | I've put 'fetch_tags = True' in the bazaar.conf file of my source branch, but still got a crash | 15:03 |
| cerf | I've also tried 'branch.fetch_tags = True" with no luck | 15:04 |
| jelmer | Noldorin_: there is no such thing, as git doesn't store renames | 15:04 |
| jelmer | cerf: are you sure you're actually hitting *that* bug? | 15:05 |
| iorec | vila: yes, i am still new to distributed vcs and hoping i haven't fully understood its potentials yet.. | 15:07 |
| cerf | I'm not sure, my original bug report (843684) was considered as a duplicate of 806348 | 15:07 |
| cerf | is it really a duplicate ? | 15:07 |
| Noldorin_ | jelmer, well, put it this way...where in the code do you "handle" bzr renames...translate them to git? | 15:08 |
| cerf | For bug 806384, John A Meinel suggested a "quick regression avoidance" actually bug 771184 | 15:09 |
| ubot5 | Launchpad bug 806384 in Nikki and the Robots "Allow dynamic block coloring" [Undecided,New] https://launchpad.net/bugs/806384 | 15:09 |
| ubot5 | Launchpad bug 771184 in Bazaar "option to disable/enable fetching of all tags" [Critical,Fix released] https://launchpad.net/bugs/771184 | 15:09 |
| vila | iorec: there is a bunch to read at http://doc.bazaar.canonical.com/ not sure what is the most relevant for you, but asking questions here or on the mailing list is welcome (answers depend on available time though ;) | 15:09 |
| jam | mssever: Sorry, I had to step away for a sec. If you have ".bzr/branch" but it says "not a branch", then something is particularly broken. | 15:10 |
| cerf | so this where I am, I'm stuck at trying to do do simple merge between two branches | 15:10 |
| jam | I don't really have the time to debug it at this point. You can try to create another branch in a different location, and see how they differ. | 15:10 |
| iorec | vila: ya thanks i'm already reading... | 15:10 |
| jam | Noldorin_: I don't specifically know when 2.5b1-1 will be available. I started working on it this afternoon, but ran into problems with plugins no longer being available. (jelmer changed some things, and accidentally broke the linking). | 15:11 |
| jam | That looks to be fixed, but as I'm past the end-of-day here, it won't be worked on until tomorrow at the earliest. | 15:11 |
| jelmer | Noldorin_: renames aren't "handled", but _revision_to_objects (IIRC) is where generating the git objects happens. | 15:12 |
| Noldorin_ | jelmer, okay got it | 15:12 |
| Noldorin_ | ta | 15:12 |
| jam | vila, jelmer, Riddell: Have a good night. I'll see you guys around tomorrow | 15:14 |
| vila | jam: _o/ | 15:14 |
| Riddell | ciao | 15:14 |
| Noldorin_ | jelmer, i see no such function...which file might you know | 15:14 |
| Noldorin_ | ? | 15:14 |
| Noldorin_ | jelmer, never mind i see | 15:21 |
| Noldorin_ | jelmer, oh interesting...i just noticed the tracelog suggests bzr-git is doing a *pull* when i run dpush :O | 15:24 |
| jelmer | Noldorin_: it is, it pulls the changes pushed into git back into your local branch | 15:26 |
| Noldorin_ | jelmer, that's interesting, didn't know. why does it need to do that? | 15:26 |
| jelmer | Noldorin_: as you're aware, dpush changes the source branch | 15:27 |
| Noldorin_ | indeed | 15:27 |
| jelmer | Noldorin_: this is how | 15:27 |
| Noldorin_ | right | 15:27 |
| Noldorin_ | it's just *why* it needs to pull back into local branch that i'm wondering :-) | 15:27 |
| jelmer | Noldorin_: otherwise you have a diverging source and target branch | 15:28 |
| Noldorin_ | okay.. | 15:28 |
| Noldorin_ | jelmer, does the pull-back actually affect a) the content of the branch b) the revision data c) some other metadata? | 15:28 |
| jelmer | Noldorin_: it discard the existing branch | 15:29 |
| Noldorin_ | obh | 15:29 |
| jelmer | Noldorin_: but you've used dpush, so you should've seen what it does? | 15:29 |
| Noldorin_ | jelmer, so i lose all bzr metadata in the local branch too? | 15:30 |
| jelmer | Noldorin_: yes, unless you use --no-rebase (which prevents that pull) | 15:30 |
| jelmer | Noldorin_: if you don't rebase you can't pull from the git repository | 15:30 |
| Noldorin_ | ahh | 15:30 |
| Noldorin_ | got it | 15:30 |
| Noldorin_ | jelmer, well no-rebase is fine for me for now :-) | 15:31 |
| Noldorin_ | jelmer, eventually when you get proper push support working i can change over...i guess you are gradually working on that | 15:31 |
| abentley | Riddell: why are you reviewing bzrtools merges? | 15:35 |
| Riddell | abentley: because I'm patch pilot and I've run out of bzr patches to review so I'm doing all bazaar | 15:36 |
| Riddell | and these patches have been sitting around for over three weeks, clearly the bzrtools maintainer is slacking :) | 15:37 |
| abentley | Riddell: bzrtools isn't a Canonical project, and I'm not asking for the patch pilot's reviews. | 15:37 |
| abentley | Riddell: I'm slacking, sure. But I already know how I feel about those patches. | 15:38 |
| mgz | abentley: could you set a state on those kinds of mps so people know not to be helpful? | 15:41 |
| abentley | mgz: That wouldn't be slacking. | 15:42 |
| mgz | :) | 15:42 |
| Noldorin_ | jelmer, what's interropostiroy? | 15:55 |
| === beuno is now known as beuno-lunch | ||
| === deryck is now known as deryck[lunch] | ||
| Noldorin_ | jelmer, even closer in finding what it is, if you're curious :-) | 16:12 |
| Noldorin_ | when you try to access non-existent items, the error messags are not very informative btw | 16:14 |
| Noldorin_ | non-existent files/dirs that is | 16:14 |
| Noldorin_ | jelmer, okay, so i have identified exactly what the problem is :-) | 16:51 |
| === zyga is now known as zyga-afk | ||
| === deryck[lunch] is now known as deryck | ||
| === beuno-lunch is now known as beuno | ||
| jam | Noldorin_: apparently I lied, bzr 2.5b1-1 has been uploaded. :) | 17:33 |
| === zyga-afk is now known as zyga | ||
| Noldorin_ | jam, just saw it, that's excellent. thank you :-) | 17:45 |
| Noldorin_ | jam, any indications how stable it's proving btw? | 17:45 |
| jam | Noldorin_: I don't know about the installer, but I use bzr.dev daily | 17:49 |
| Noldorin_ | jam, ok that's reassuring | 17:49 |
| Noldorin_ | jam, i understand it supports collocated branches. but does that mean individual local branches can be pushed to a remote collocated branch? | 17:53 |
| Noldorin_ | using some special URL syntax | 17:53 |
| jam | Noldorin_: you'll need to check with Jelmer, but I think you still need the 'bzr-colo' plugin to enable collocated branches. | 17:54 |
| Noldorin_ | ah right | 17:54 |
| jam | It does have the new syntax (http://url/to/repo/path,branch=X) | 17:54 |
| Noldorin_ | jam, awesome. i hope that works with git branches too! | 17:54 |
| jam | Noldorin_: i'm pretty sure that was the inspiration. I don't think bzr-git is bundled yet. | 17:57 |
| jam | I think Jelmer has a patch, that I'll bring in for the next beta | 17:57 |
| jam | so bzr-2.5b2-1 will probably have bzr-git support | 17:57 |
| Noldorin_ | jam, yeah so i heard. but i have no prob installing it as a plugin for now | 18:13 |
| Noldorin_ | jam, just pestering jelmer to fix this bug now that i've very narrowly identified it :-) | 18:14 |
| Noldorin_ | with dpush to git | 18:14 |
| === Ursinha is now known as Ursinha-lunch | ||
| === med_out is now known as medberry | ||
| Noldorin_ | jelmer, ping? | 19:10 |
| jelmer | Noldorin_: hi | 19:50 |
| Noldorin_ | hi jelmer | 19:59 |
| Noldorin_ | get my updates? | 19:59 |
| Noldorin_ | jelmer, i left some comments on LP | 20:05 |
| mwhudson | jam: no, i wanted to put it under a feature flag and that required a bit of infrastructure (which has now landed) | 20:10 |
| jam | mwhudson: yeah, it turned out that the lp:bzr-rewrite just wasn't connected to an actual branch | 20:10 |
| mwhudson | jam: :-) | 20:12 |
| * Noldorin_ waits for jelmer to return | 20:21 | |
| === Ursinha-lunch is now known as Ursinha | ||
| jelmer | Noldorin_: your comment doesn't really make sense, bzr-git with dpush doesn't create entries for empty directories one way or another | 20:54 |
| jam | mwhudson: we just had a bug with the error reporting. It would say "bzr+ssh://..." no service available | 20:54 |
| jelmer | it skips empty directories | 20:54 |
| mwhudson | jam: ah | 20:54 |
| Noldorin_ | jelmer, it does create some sort of sha hash :-P | 20:54 |
| jelmer | Noldorin_: for empty directories? it really shouldn't | 20:58 |
| Noldorin_ | jelmer, if for example you do a 'bzr st' on an empty directory in the git repo that shouldn't have been pushed... | 20:59 |
| Noldorin_ | then it returns a key for it | 20:59 |
| Noldorin_ | which it can't find | 20:59 |
| Noldorin_ | jelmer, it shouldn't but it does ;-) | 20:59 |
| Noldorin_ | jelmer, it would explain the error, i think.. | 21:01 |
| Noldorin_ | jelmer, well? | 21:23 |
| jelmer | Noldorin_: I really don't understand what you mean, the sha for an empty tree (if it were valid) would be 4b825dc642... | 21:41 |
| Noldorin_ | jelmer, i will test it now with you if you have some time | 21:41 |
| Noldorin_ | and demonstrate | 21:42 |
| cody-somerville | If I do a Branch.open() on something over ssh, how can I close the transport down properly to avoid the disconnection from host (e.g. bazaar.launchpad.net) message? I currently use 'remote_branch.control_transport.disconnect()' but that doesn't seem to work for bzr 2.1.4. | 21:43 |
| poolie | hi all | 21:43 |
| jelmer | g'morning poolie | 21:43 |
| jelmer | Noldorin_: I'm looking at the problematic code now for the first time | 21:43 |
| Noldorin_ | jelmer, okay :-) | 21:44 |
| jelmer | cody-somerville: we haven't really had a need for a way to disconnect transports, I think that's the closest thing | 21:44 |
| cody-somerville | jelmer, control_transport isn't a property on Branch in 2.1.4. | 21:44 |
| Noldorin_ | jelmer, here is what i'm seeing. run the test script (i forgot to replace IrcDotNet with 'baz' in it btw), then do: | 21:44 |
| Noldorin_ | ./git-branch//foo/ | 21:44 |
| Noldorin_ | err | 21:45 |
| Noldorin_ | bzr ls ./git-branch/ -r 1 | 21:45 |
| Noldorin_ | you should get back: | 21:45 |
| Noldorin_ | ./git-branch//foo/ | 21:45 |
| Noldorin_ | jelmer, my tinkering indicates the problem probably lies in either _tree_to_objects or import_git_tree (objectstore.py and fetch.py) | 21:47 |
| jelmer | Noldorin_: that's kindof obvious, as those are the functions that actually do the conversion :) | 21:49 |
| Noldorin_ | jelmer, sorry, of course. but they weren't to me...as i didn't write the code ;-) | 21:49 |
| Noldorin_ | jelmer, the problem is in the push side, i'm convinced | 21:57 |
| Noldorin_ | jelmer, e.g. do a dpush --no-rebase (it should succeed), and then run "bzr ls .\git-branch\baz -r 2" | 21:57 |
| Noldorin_ | should give you an error | 21:57 |
| === medberry is now known as med_out | ||
| Noldorin_ | jelmer, well good luck! :-) | 22:16 |
| jelmer | Noldorin_: located the error, rewriting revision_to_objects | 22:33 |
| AuroraBorealis | soooo | 22:34 |
| AuroraBorealis | what exactly does this error mean: | 22:34 |
| Noldorin_ | jelmer, that's great. what was it (briefly)? | 22:36 |
| AuroraBorealis | https://gist.github.com/e4d86236e79bbc009bd3 | 22:36 |
| jelmer | AuroraBorealis: when are you getting that? | 22:38 |
| AuroraBorealis | well | 22:38 |
| jelmer | Noldorin_: order in which directories are processed | 22:38 |
| AuroraBorealis | tried to commit a new revision | 22:38 |
| AuroraBorealis | and then it was out of date | 22:38 |
| Noldorin_ | jelmer, hah okay. as we both thoughts some days ago ;-) | 22:38 |
| AuroraBorealis | i tried to update and now i got that xD | 22:38 |
| jelmer | AuroraBorealis: that's really odd - any plugins used, other special things? | 22:38 |
| AuroraBorealis | nope | 22:39 |
| AuroraBorealis | could it just be corruption on the server side? | 22:39 |
| jelmer | I'd doubt it; can you file a bug? | 22:39 |
| AuroraBorealis | yeah, branching it from the server normally works fine | 22:40 |
| AuroraBorealis | i shall attempt to file a bug! | 22:40 |
| Noldorin_ | jelmer, btw jam said 2.5b1 still requires the bzr-colo plugin -- is this correct? | 22:40 |
| AuroraBorealis | so...what should be the name of the bug? | 22:42 |
| jelmer | AuroraBorealis: thanks | 22:42 |
| AuroraBorealis | not exactly sure what is going on here haha | 22:42 |
| jelmer | AuroraBorealis: I guess just something like "InconsistentDelta error during 'bzr up'" ? | 22:42 |
| AuroraBorealis | i have however archived the repository in case someone wants to look at it | 22:42 |
| jelmer | Noldorin_: I'm not sure I follow, requires the bzr-colo plugin for what? | 22:43 |
| Noldorin_ | jelmer, colocated branches in bzr | 22:43 |
| jelmer | Noldorin_: yes, they haven't landed yet | 22:43 |
| Noldorin_ | okay sure | 22:43 |
| jelmer | Noldorin_: I thought you were asking about being able to address git branches though? | 22:43 |
| Noldorin_ | jelmer, yes, just curious about that too :-) | 22:44 |
| jelmer | that's possible with bzr 2.5b1 and bzr-git trunk | 22:44 |
| Noldorin_ | jelmer, i can address git branches with git-url,branch=foo right? | 22:44 |
| Noldorin_ | yep | 22:44 |
| jelmer | Noldorin_: yes | 22:45 |
| Noldorin_ | ta | 22:45 |
| Noldorin_ | jelmer, just let me know when ready and i can test on my case with launchpad/github. | 22:50 |
| AuroraBorealis | stupid launchpad didn't report my bug :< | 23:00 |
| AuroraBorealis | jelmer: https://bugs.launchpad.net/bzr/+bug/855155 | 23:03 |
| ubot5 | Ubuntu bug 855155 in Bazaar "InconsistentDelta error when using bzr update" [Undecided,New] | 23:03 |
| briandealwis | is there an equivalent to git's reflog? I.e., to find out what was the previous tip? | 23:21 |
| jelmer | briandealwis: no, though there is "bzr heads" which can display old heads | 23:22 |
| briandealwis | jelmer: the cause himself :) I was actually askig as I'd like to revert to my last head of bzr-git, since the new one requires dulwich 0.8.1 | 23:23 |
| briandealwis | I never understood the purpose of the reflog previously | 23:26 |
| poolie | lifeless, jelmer, iirc upgrading should (must?) be done on the stacked branch and then the stacked-on branch? | 23:29 |
| poolie | or vice versa? | 23:29 |
| jelmer | that's a good question, I'm not sure either | 23:34 |
| mwhudson | upgrading stacked first will work | 23:35 |
| mwhudson | i don't know if upgrading stacked-on first will work, it depends how upgrade opens the thing being upgraded | 23:35 |
| mwhudson | of course both approaches leave the stacked branch a bit broken until both are upgraded | 23:36 |
| poolie | ah, i think that's it | 23:46 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!