/srv/irclogs.ubuntu.com/2011/09/19/#bzr.txt

pooliehi all00:30
nigelbMorning poolie!01:00
pooliehi nigel01:07
=== robbyoconnor is now known as CapnRobby
=== CapnRobby is now known as robbyoconnor
=== wallyworld___ is now known as wallyworld
=== wallyworld is now known as Guest73189
=== robbyoconnor is now known as CapnRobby
vilahi all !06:34
pooliehi vila06:36
=== Quintasan_ is now known as Quintasan
jammorning all07:25
pooliehi there jam07:25
poolievila, istm wrt packaging plugins, the most scalable thing is to get babune jobs going for bzr+plugins07:37
vilapoolie: right07:38
vilapoolie: the issue is to install the right plugins for the right bzr versions and decide what kind of test run we want07:40
vilapoolie: all selected plugin tips against bzr.dev is probably the first step07:40
pooliesounds good to me07:41
poolieas a first step, doing that just for one plugin would be good07:41
pooliewe can get that green then iterate07:41
vilapoolie: but it should be done in a way tht doesn't break running bzr.dev itself (i.e. without plugins)07:41
pooliethat could be either one that's really unlikely to break, or that's very actively maintained07:41
pooliewhat do you mean?07:41
pooliei think we need a separate job from the tests for bzr itself07:42
vilayes, separate run isolated from the plugins07:42
vilabut the plugins still need to installed on the slaves, jenkins tracks a single branch for a given run07:43
vilas/to/to be/07:43
poolieoh, i see07:45
poolieit has no capability to test combinations of branches?07:45
pooliei'm surprised07:45
vilapoolie: it's somewhat related to testtools/subunit deployment on all slaves and also with bug #83946107:48
ubot5Launchpad bug 839461 in Bazaar "can't run selftest for 2.2 with recent subunit/testtools" [High,Confirmed] https://launchpad.net/bugs/83946107:48
pooliesurely other people use jenkins to test combinations of one project running on another?07:49
vilapoolie: nothing in the GUI hints at that (imbw)07:50
vilaor if they do they use other tricks, maven ?07:51
pooliehm07:52
pooliehttp://stackoverflow.com/questions/7189874/how-can-i-automatically-build-multiple-eclipse-plug-in-projects-as-one-jenkins-pr suggests it is "make everything look like one big branch"07:52
pooliedoes it really need to know about all the branches?07:53
pooliehow about having just one job that runs every day and just does a 'pull' on every branch, then runs the tests?07:53
pooliei know that's not quite elegant07:53
lifelesssorry, I'm missing a subtlety07:54
lifelesswhats the problem ?07:54
pooliei would like to test bzr tip against the tip of various plugins07:54
poolievila says this is hard because jenkins does not have a concept of one job depending on multiple branches07:54
lifelessits pretty straight forward07:54
lifelesssetup one job that as you say branches LP then uses a script to branch in the dependencies / plugins.07:55
lifelesssetup one job per thing you want to trigger that job, and have that jobs test be a no-op (or even run just the tests for that plugin, if you like)07:55
lifelesset voila07:55
lifelesss/branches LP/branches bzr/07:56
lifelessthe script is the 'pre actions' in jenkins, doesn't need to be formal; just a few lines of bash in the config pag.e07:56
poolieso the second job is "when lp:bzr-svn changes: do nothing; then run job 1"07:56
lifelessfor instance, yes.07:56
lifelessit could be 'package and build bzr-svn; if that works run job 1'07:57
vilamultiply by supported platform07:57
lifelesswhich is what dx's hudson does/did - it would ppa build take the package then use it as a dep in all the things that use it.07:57
lifelessvila: the platform multiplier should be straight forward with matrix07:57
lifelessvila: but even a single platform would be a big win on its own, no?07:58
poolie+107:59
vilapatches welcome ? :D08:00
poolieseriously, just ignoring multiplication for now would still give us something really useful08:00
pooliethen if it turns out that it is useful, but we're missing things that only occur on other platforms, we can work out how to add it08:01
pooliedoing just a single version does not seem like it would make that any harder to do later on08:01
lifelessvila: I'll trade, you can bootstrap SOA on Launchpad and change nappies in alternating hours, I'll drive your point-n-click CI tool :P08:01
poolieow08:01
vilaI can put that on top of my babune TODO list but I'd like to clean up my plate a bit before switching to it08:02
vilachanging nappies....08:02
vilacute memories :)08:02
vilaanyway, babune's backup is under way and therefore it's off-line right now08:05
MvGHi! I'm trying to deprecate an argument to a builtin command (wrt. lp:~gagern/bzr/log-omit-merges). Added code using symbol_versioning.deprecated_passed and so on as other parts of bzrlib do. selftest does see the deprecation warning in its captured command output, but I myself don't. And I'm not running a final version of bzrlib either. Does anyone know whether deprecation warnings might be configured off somewhere?08:05
lifelessMvG: running a recent python ?08:05
lifelessMvG: upstream turned deprecations off globally. Because they were ugly or something.08:06
MvGlifeless: Yes, very recent python.08:07
MvGSo if I want to warn the user about something, I'll have to drop the warning category?08:08
lifelessI don't know what we should do here.08:08
poolieMvG, DeprecationWarning is only for developer-oriented deprecations08:08
pooliethere is a separate ui_factory.user_warning08:08
poolie(sp?)08:09
pooliewhich is more appropriate08:09
lifelesstheory is that devs will turn deprecations on so that they know.08:09
lifelesshowever, your experience demonstrates the obvious flaw there, that I was worried about :)08:09
pooliewe use a separate mechanism for a bunch of reasons, one being that the python deprecations tend to error out or to print lines of code that are not appropriate for users08:09
pooliealso to vary across platforms08:09
poolielifeless, i think one of the best things is to set the equivalent of -Werror from the test suite08:15
poolieat least optionally08:15
pooliewhich bzr does08:15
vilalifeless: there are various ways to make this work with jenkins, none are trivial and I'm already focusing on other stuff for today (bug #795321 and some config stuff for/with jelmer)08:17
ubot5Launchpad bug 795321 in Ubuntu Distributed Development "udd importer should make tea while launchpad is down" [High,In progress] https://launchpad.net/bugs/79532108:17
lifelessvila: thats fine, we've moved on haven't we ?08:19
vilalifeless: yeah ;)08:19
vilaok, let's have tea08:26
MvGjelmer, vila, jam: Will you re-review https://code.launchpad.net/~gagern/bzr/log-omit-merges/+merge/74821 or should I file a new merge request?08:55
poolieMvG, you don't need to file a new request but asking for review (as you did now) is useful08:55
jamMvG: arr, matey, I be slackin' on givin' ya feedback08:58
jamMvG: did ye just push some changes? It be claimin that the diff be updatin soon08:58
MvGjam: Pushed some a moment ago, yes, and to me lp talked about updating the diff. Done so now.08:59
jamhttp://www.talklikeapirate.com/ in case ye be wondrin08:59
MvGARG! the diff has a merge conflict, although I just merged bzr.dev into my treee. Probably hadn't pulled bzr.dev before that...09:00
poolieo/ jelmer09:12
MvGvila: thx 4 the review!09:20
vilaMvG: be my guest ;) Wait for some more opinions though ;)09:20
MvGIt's not as if I could send this to pqm mysel before that, is it?09:21
vilahehe :)09:21
vilatouche09:21
MvGbtw: added one release notes item after your review. is that going to confuse pqm?09:22
vilaMvG: nope, pqm uses the lp branch when it receives the submissions and nobody sent the submission so far09:23
MvGSo I could slip an arbitrary change into a branch after sane stuff has been approved? Sounds frightening.09:24
MvGbtw: I'm (mostly) around in case someone wants to talk about the really evil bug #842695.09:24
ubot5Launchpad bug 842695 in Bazaar "log --include-merges apparently prints unrelated commits" [Undecided,New] https://launchpad.net/bugs/84269509:24
viladid anybody ever witness rsync "pausing" for a long time ? (the file it's trying to sync is ~30GB if that's relevant)09:24
vila"pausing" in this case includes a case where the tmp file on the receiving side wasn't updated for ~1h and both client or server rsync processes were sleeping (AFAICS)09:26
MvGnope, but does sound bad.09:27
MvGstrace those processes'?09:27
vilacan I do that for an already running process ?09:28
MvGyepp09:28
MvGat least on linux09:28
MvGprobably won't tell you mich if the process is really asleep, but otherwise you should see some i/o09:29
MvGcan even gdb the running process, see what it's waiting for, but that will probably require debug symbols.09:29
MvGThe "Unmerged revisions" list in https://code.launchpad.net/~gagern/bzr/log-omit-merges/+merge/74821 is incomplete, and doesn't indicate so. I'd consider this a bug in LP, do you agree?09:35
poolieyes, very much09:36
poolienot one i remember seeing before either; please file it09:37
vilaMvG: only the 10 most recent ones but none of the previous ones ?09:39
jelmerhi poolie, MvG, vila09:45
jelmersorry, had to go out for some emergency coffee beans09:45
poolie:) tut tut, insufficient preparation :)09:45
vilajelmer: _o/09:45
pooliei see Riddell's pilot this week09:46
poolieok i'm off to squash09:46
pooliepossibly but probably not back later09:46
RiddellI shall steer the ship of patches with precision!09:46
=== Riddell changed the topic of #bzr to: Bazaar version control <http://bazaar.canonical.com> | try https://answers.launchpad.net/bzr for more help | http://irclogs.ubuntu.com/ | Patch pilot: Riddell
pooliepilot like a pirate09:48
poolieriddell did you see my blog post draft?09:48
poolieif you can't get at it, ask in #is09:48
Riddellpoolie: no I don't thinkso09:49
Riddellon the bazaar blog?09:49
jelmerpoolie: have fun :)09:49
pooliecan you click login on blog.bazaar.canonical.com?09:49
jelmervila: Have you seen issues with http redirects to the root of the server rather than the actual location?09:49
jelmerhttp://varnish-cache.org/svn/trunk/ is permanently redirected to https+urllib://www.varnish-cache.org/09:50
Riddellpoolie: i don't see a login option09:51
vilathe only bell ringing is one about some path lost inside bzrlib or a plugin, I forgot the root cause09:51
Riddelloh "log in"09:51
Riddellpoolie: ok I see "bzr starts speaking your language"09:52
poolieyep, edit to taste and post09:52
poolieor not09:52
RiddellI had a blog post on my own blog last week09:52
Riddellbut my blog seems to have falled off planet bazaar :(09:52
Riddellprobably because of the move to a new kde.org domain09:53
poolieoh right, i saw that09:53
pooliesorry i forgot09:53
pooliefile an rt i guess09:53
RiddellI'll just post this one then do the rt thing09:53
jelmervila: HttpTransport._redirected_to seems to strip it, I'll have a closer look09:58
vilathat rings another bell... unclear, but I seem to recall some servers not sending back the proper url to redirect to under... some circumstances ? Sorry for the vagueness :-/09:59
jelmervila: if we redirect to something non-http/https then we drop the path component10:12
vilaurgh, including http+urllib ?10:12
vilaoh, httpS+urllib ?10:12
jelmeryep10:13
vilahmm, I thought this was taken care of, I'm pretty sure there are even tests for that... regression ?10:13
jelmerit might be a regression, but at least there are no tests for this10:14
vilatest_redirected_to_same_host_sibling_protocol10:15
vilatest_redirected_to_same_host_different_protocol10:15
jelmervila: that second test doesn't check the r.base10:15
vilathat's the hole :)10:15
vilahmm, well, the base may change for a redirect so the test is... incomplete ?10:18
jelmeryeah, I'll add some tests for r.base too10:19
* vila nods10:23
jelmervila: hmm11:10
jelmervila: it looks like the issue is that self._path has a trailing / whereas the source URL that is being passed in does not11:10
vilastupid Apache ? They are the same damn thing but Apache insists that a dir must have a trailing /, is this the case here ? Or is there more than the final / that differs ?11:11
jelmerthis is actually in our tests, we seem to assume that the server will send a trailing slash11:12
jelmerI'm hitting this trying to test _redirected_to directly11:12
vilahmm11:14
vilaI think our test servers follow apache and *will* send a trailing slash, not a good reason to assume they will always do though11:14
vilajelmer: yeah, see http_server.py ~line 19811:15
vilahow do the tests assume that ?11:16
jelmerTransport adds a trailing slash11:17
jelmer>11:18
vilatransport as in our own bzrlib.transport ? I know there was a very old bug about *not* stripping the final slash when we know we're talking about a dir, I'm pretty sure this has never been fixed though11:19
jelmervila: see bzrlib/transport/__init__.py:132611:20
vilajelmer: yeah, bzrlib.transport.Transport.relpath line 513 blindly strip11:20
vilajelmer: but who talks last ? :)11:21
jelmervila: Transport.relpath isn't broken, but _redirected_to has its own relpath implementation11:21
jelmerand that relpath implementation breaks with a trailing slash11:21
vilastrip() triggers only if there is one to strip, what is breaking exactly ?11:24
jelmervila: it returns an empty string11:28
jelmervila: and that causes parsed_url.path[:-len(relpath)] to break11:28
jelmeras parsed_url.path[:0] == ""11:28
vilaI miss some context here, what is the abspath that leads an empty relpath() ?11:31
vilas/leads/returns/11:31
jelmere.g. http://www.example.com/foo, for transport with base http://www.example.com/foo/11:32
vilaright, so that's 'base_path = parsed_url.path[:-len(relpath)]' which is bogus, the base_path should just be relpath right ?11:39
vilaerrr,should just be parsed_url.path11:40
jelmerthat was my thinking too, that would also simplify a bit of the other code11:41
vilajelmer: so, in your case, the server redirected from 'xxx/' to 'xxx' ?11:43
jelmervila: the server redirects from http://foo/bar to https://foo/bar11:43
jelmer(note the missing trailing slashes)11:43
jelmerand what _redirected_to sees is a call with "http://foo/bar" and "https+urllib://foo/bar"11:43
vilaooooh, no slash nowhere and *we* injected a slash11:44
vilaand probably never encountered it before because we received redirected urls with trailing slashes ?11:44
jelmeryeah11:44
vila(including our test servers....)11:45
vilawow11:45
jelmerthis might be a regression when I introduced the URL classes11:46
viladoesn't seem to be the case, the relpath handling there is... unclear, the comment says why we do it, but an example may have been clearer11:49
vilajelmer: do you know what kind of server is involved there ?11:50
jelmerno idea11:50
jelmervila: it seems to break with our existing _redirected_to tests too11:50
jelmersee the tests added in r-2 in lp:~jelmer/bzr/853765-http-redirects-broken11:51
vilawhat ? the fix we just ... let me look11:51
vilajelmer: meh, I've got failures from test_http.SmartHTTPTunnellingTest.test_open_bzrdir ???11:54
jelmervila: try the second to last revision, that just changes tests11:55
vilaeeerk, tests failing on trunk !11:58
jelmerwhich ones, and how?11:58
vilaat revno 6144, the ones I mentioned above, no pycurl on pqm nor babune ?11:58
vilaInvalidURL: Invalid url supplied to transport: ""11:59
vilabzrlib.tests.test_http.SmartHTTPTunnellingTest.test_open_bzrdir(pycurl,HTTP/1.1)11:59
vilabzrlib.tests.test_http.SmartHTTPTunnellingTest.test_open_bzrdir(pycurl,HTTP/1.0)11:59
jelmerseems fine here12:00
jelmerwhat's the backtrace like?12:00
vilahttp://paste.ubuntu.com/692972/12:01
vilajelmer: ha, some plugin is involved, using BZR_PLUGIN_PATH=-site, the test succeed12:09
jelmervila: ah, ok12:10
jelmervila: I'm looking into the redirected_to issue further, thanks for the hints12:10
vilaok, thanks12:11
jelmervila: fixed, https://code.launchpad.net/~jelmer/bzr/853765-http-redirects-broken/+merge/7601412:21
vilajelmer: looking12:36
vilajelmer: BB:tweak12:43
Noldorinhi jelmer13:21
=== Ursinha is now known as Ursinha-brb
jelmerhi Noldorin13:44
Noldorinjelmer, hey. i updated the bug comments if you saw it :-)13:53
jelmerNoldorin: yep! did you post the actual script to reproduce it ?13:58
Noldorinjelmer, no but i can give it to you now13:59
Noldorinit's a powershell script13:59
Noldorinor just push the test repo somewhere if you like13:59
jelmerNoldorin: the test repo won't be of much use, but it'd be great if you can attach the powershell script14:07
Noldorinjelmer, will do14:08
Noldorindid you see my previous note about the rename error btw?14:08
Noldorinthat may be the cause14:08
Noldorinthat bzr-git isn't handly it properly...14:08
jelmerNoldorin: how do you mean?14:09
Noldorinjelmer, the error in my penultimate comment14:12
jelmerNoldorin: doesn't that happen before you call dpush?14:15
Noldorinjelmer, yes but i think it could still be a hint as to whjat's 'upsetting' dpush14:15
jelmerhmm, that's an interesting thought14:16
jelmeralthough that's definitely a different issue from the original bug14:16
Noldorinokay14:19
RiddellMvG: log-omit-merges seems to be approved, I don't think you have permission to send it to PQM, would you like me to do so?14:49
MvGRiddell: Yes, please.14:49
MvGShould I enter a comit msg in lp first, or will you take care of that as well?14:49
RiddellMvG: yes do, you'll know better than me a good message14:51
Riddelljam: don't forget the question for you on https://code.launchpad.net/~spiv/bzr/faster-stacked-tree-build/+merge/7038114:52
=== Ursinha-brb is now known as Ursinha
MvGRiddell: Should I include my name in the commit msg, or will pqm add that automatically?14:53
RiddellMvG: no need, your name will be in the merge changelog and more importantly in doc/en/release-notes/bzr-2.5.txt14:54
MvGRiddell: OK, commit message updated (was already entered but out of date). Ready for pqm as far as I am concerned. Thx for submitting it!14:55
Noldorin  jelmer back14:57
Noldorinjelmer, will upload shortly14:57
MvGTrying to figure out what behaviour people expect, I've got a question for everybode around here, related to bug #842695.15:14
ubot5Launchpad bug 842695 in Bazaar "log --include-merges apparently prints unrelated commits" [Undecided,New] https://launchpad.net/bugs/84269515:14
MvGSuppose a feature branch branches off trunk at revision 10, at some point merges r 30 of trunk, and gets itself merged into trunk at r 40. Suppose furthermore that some other branch gets merged at trunk r 20, and that that branch modifies files in a given directory foo, not modified by any other branch since trunk r 10.15:14
MvGNow if you do "bzr log -n0 foo" on the trunk, would you expect to see the commit where trunk was merged into the feature branch?15:14
MvGPersonally, I would not, because the feature branch was not dealing with directory foo at all, except for merging from trunk things which the log will already report in other places. But current log implementation does (mostly) report that, based on the fact that the merge modified that directory relative to the leftmost parent inside the feature branch. Which is unserstandable, once you think of it in those terms, and really makes me wonder whether15:14
RiddellMvG: whether...   I think you got cut off15:27
MvGI did? Pidgin doesn't reflect that fact... :-(15:27
MvG[...] and really makes me wonder whether other people would expect the same behaviour that I expect. So please let me know what you think!15:28
jelmerMvG: I think the current behaviour makes sense, but I don't feel strongly either way.15:32
MvGCurrent behaviour can lead to a single file being reported as "added" multiple times in the verbose log. Which I consider one of themost confusing aspects about this interpretation, and which is also the root of the bug described above.15:35
Noldorinhi jam15:36
Noldorinjelmer, just added a new comment with the script attachment15:53
jelmerNoldorin: thanks15:54
Noldorinjelmer, you can probably write a bash script to do the same thing15:55
Noldorinjelmer, then have a very simple example to debug. i bet you will see immediately :-)15:56
=== deryck is now known as deryck[lunch]
=== beuno is now known as beuno-lunch
=== deryck[lunch] is now known as deryck
=== beuno-lunch is now known as beuno
Noldorinjelmer, hey, back20:11
jelmerNoldorin: hey :)20:11
Noldorinjelmer, okay so i guess you're actually wanting me to write the unit test for this ;-) still, we are very very close now20:13
Noldorinin that...20:13
Noldorinwe have it reproduced in a *new* branch20:13
jelmerNoldorin: well, close to that but yeah :)20:15
jelmerNoldorin: it's still a branch with a lot of extra data that makes it hard to see what the actual issue is20:15
jelmerand something that's indeed hard to turn into a unit test20:15
Noldorinjelmer, no, it's precisely a new branch. it doesn't import any metadata, just file data20:16
jelmerNoldorin: that's still a lot of extra data20:16
Noldorintrue20:16
Noldorinlet me see what i can do...20:16
Noldorinjelmer, i also am curious when the 2.5b1 windows setup will be out...i guess jam builds it20:16
jelmerNoldorin: related to that, I just proposed adding bzr-git to the installer: https://code.launchpad.net/~jelmer/bzr-windows-installers/bzr-git/+merge/7610020:20
Noldorinjelmer, awesome :-D20:20
Noldorinjelmer, site we got site-packages though, it's pretty easy to add manually anyway though20:20
Noldorinonly that annoyingly python doesn't recognise symlinks on windows :-S20:20
jelmerNoldorin: presumably it shouldn't matter what the contents of the files are that change, just whether they changed20:21
Noldorinso i can't link it to the repository20:21
Noldorinjelmer, indeed20:21
Noldorinjelmer, okay, got a script that reproduces it from scratch :-D20:31
Noldorinwill post now20:31
Noldorinjelmer, done! check the comment log20:43
marsHi, has anyone noticed that the Ubuntu Software Center in Oneiric has two packages named Bazaar?20:52
marsOne is Bazaar itself (titled Bazaar Version Control System), the other is bzr-gtk20:52
wizhello everyone :)21:02
jelmerhi mars21:02
jelmermars: no, I hadn't seen that. Can you file a bug?21:03
marsjelmer, certainly21:03
marsfwiw, here is what I see when I search: http://people.canonical.com/~mars/USC%20Bazaar%20search%20-%20Screenshot%20at%202011-09-19%2016:54:02.png21:04
wizit would be great if someone can provide a bit of light for me regarding the bazaar :) I'm currently considering to begin to use it... but there is one thing that bothers me and I didn't find it within documentation yet :(21:04
Noldorinjelmer, so?21:14
pooliehi all21:31
mgzhey poolie.21:33
pooliehi mgz21:33
jelmerhi poolie, mgz21:36
jelmerNoldorin: I'll have a look in a second21:36
pooliehi jelmer21:36
jelmermgz: did you see my follow question to the bug you filed about cache files opened by bzr-git on windows?21:36
jelmer*follow-up21:36
mgzah, not yet, I'll look at it.21:39
pooliehi jelmer21:40
jelmerhey poolie21:43
jelmerhmm, glitch in the matrix?21:45
mgz:)21:45
Noldorinjelmer, ok cool21:46
jelmerpoolie: do you have anymore thoughts on landing the colocated format changes?21:52
jelmerI'd like to move it forward but am not entirely sure how to do so.21:52
jelmermars: thanks for filing that bug22:00
AfCpoolie wins coolest unicode glyph of the day award with '⪆'22:02
poolie:)22:02
pooliei hope it means what i think it means22:02
jelmera tent falling in the sea?22:03
sorenThere are some delightfully confusing glyphs in that section. ⪐ is particularly spectacular. "Can you use it in a sentence?"22:06
Noldorinjelmer, that other rename error can be dealed with separately you think eh?22:10
Noldorinjelmer, i guess the first thing with your testing is to convert that into a bash script (pretty easy i think) and then check what's going on in bzr-git!22:20
Noldorinthe problem boils down to moving a subdir into a newly created dir it seems22:54
Noldorinhmm22:54
jelmerNoldorin: looking now23:07
Noldoringreat23:11
Noldorinjelmer, just poke me if you need help with the script/other stuff, i'm not going anywhere. :-)23:31

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