| Thommas | hello. can someone answer my question. I need different perspective on this issue. | 01:45 |
|---|---|---|
| Thommas | hello | 01:46 |
| Thommas | hi | 01:48 |
| LeoNerd | Ask your question, don't wait for someone to reply | 01:48 |
| Thommas | Should we subsidize child rearing? | 01:49 |
| LeoNerd | There's 117 of us in here, we're not all going to say "go ahead" | 01:49 |
| Thommas | sorry :/ | 01:49 |
| fullermd | Sure, but not child fronting. Child siding is great for property values though. | 01:51 |
| Thommas | what about my question. child rearing | 01:52 |
| fullermd | I'm not sure. Is there a bzr plugin for that? | 01:52 |
| fullermd | (mind you, I'll bet version control would be handy for that...) | 01:53 |
| poolie | !? | 01:58 |
| poolie | Thommas: no, i don't think we should | 01:58 |
| poolie | or are you talking about children in a vcs tree? | 01:58 |
| Thommas | can you tell me y | 01:59 |
| poolie | uh, do you have the wrong channel perhaps? | 02:04 |
| poolie | lifeless: "ker-lick...." | 02:13 |
| maxb | jelmer: Hi. Apparently we still have a narrow window open to slot 2.2.1 into maverick-release. I guess it will be one of us who does the packaging. | 02:15 |
| lifeless | poolie: wasn't needed :) | 02:17 |
| fullermd | Shucks. I was looking forward to his plugin :( | 02:19 |
| poolie | maxb, maybe pitti can do it? | 02:55 |
| maxb | Does pitti do bzr stuff? I assume he was commenting on the bug in an ubuntu-sru / ubuntu-release approver capacity | 02:57 |
| maxb | Anyway, I've already done 2.2.1 in the PPA | 02:57 |
| maxb | So really what we need now is some aggressive verification of the PPA build as specified by the microreleasexception | 02:58 |
| poolie | ok | 03:17 |
| poolie | we should also check the diff by hand there | 03:17 |
| * maxb wonders what to call this package | 03:30 | |
| maxb | 2.2.1-0ubuntu1 I suppose | 03:30 |
| === FryGuy_ is now known as FryGuy- | ||
| poolie | maxb, i'm running 2.2.1 from the ppa on maverick and it looks ok so far | 04:53 |
| poolie | and i read the diff, and posted on bug 636930 that it looks ok to me | 04:53 |
| ubot5` | Launchpad bug 636930 in Launchpad Bazaar Integration "Upgrading a repository fails with 'Inter1and2Helper' object has no attribute 'source_repo' (affected: 5, heat: 48)" [High,Triaged] https://launchpad.net/bugs/636930 | 04:53 |
| GungaDin | is it possible to change the message of a commit? | 05:43 |
| sidnei | GungaDin, bzr uncommit then bzr commit again? | 05:56 |
| stub | So being a Launchpad developer I run with the beta PPA. I just got a crash, and it attempted to go via apport, but apport blocks it as I don't have a genuine Ubuntu package. This workflow might need tweaking. | 05:56 |
| sidnei | stub, +1 for fixing that! | 05:57 |
| poolie | stub, that's interesting, i thought that was fixed | 05:58 |
| poolie | please file a but explaining just what happened | 05:59 |
| stub | Bug #391015 is inprogress , which seems to be the apport issue | 06:00 |
| ubot5` | Launchpad bug 391015 in Bazaar "apport package hook for Bazaar (affected: 1, heat: 7)" [Medium,In progress] https://launchpad.net/bugs/391015 | 06:00 |
| stub | Oh - I'm running lucid on my main machine so apport changes might not be backported from maverick | 06:00 |
| GaryvdM | jam: Don't know if you are still awake? The ec2 instance is still up. | 06:05 |
| poolie | hello GaryvdM | 06:16 |
| poolie | GaryvdM: do you want me to shut it down? | 06:16 |
| GaryvdM | Hi poolie | 06:16 |
| GaryvdM | poolie: Yes please | 06:17 |
| poolie | GaryvdM: done | 06:27 |
| poolie | do you have a gpg key? | 06:27 |
| GaryvdM | poolie: Yes: 018A3A1D | 06:29 |
| GaryvdM | poolie: The one you signed previously. | 06:29 |
| vila | hi all ! | 08:07 |
| GaryvdM | Hi vila | 08:09 |
| vila | GaryvdM: hey ! You're up early or late ? :) | 08:10 |
| GaryvdM | During work. :-) Having a lull after the storm. | 08:11 |
| vila | GaryvdM: hehe, thanks for your hard work there ! | 08:12 |
| poolie | hi there vila | 08:20 |
| GaryvdM | poolie: Got the mail - thanks | 08:25 |
| poolie | np, thanks for your help | 08:26 |
| poolie | hi vila, i might ask pitti about the SRU, if you haven't today | 08:57 |
| vila | poolie: ok. Thanks for adding the diff, I should have thought about that... | 08:58 |
| vila | poolie: and about the 323111-orphans* reviews ? | 08:59 |
| lifeless | poolie: do it asap, RC freeze hit about 5 hours back | 09:00 |
| === spike_ is now known as spikeWRK | ||
| vila | poolie: I'm not sure I understand: "i might ask pitti about the SRU, if you haven't today", can you ping me when you have talked to pitti ? | 09:34 |
| poolie | vila i did talk to him | 09:35 |
| poolie | apparently it froze a few days ago and it's too late for the release but it can go in as an SRU soon afterwards | 09:35 |
| poolie | we should have asked for it sooner | 09:35 |
| poolie | vila, we should get maxb or jelmer to upload the package | 09:38 |
| vila | poolie: ok, so what should we do then ? ha.ok | 09:38 |
| vila | maxb: is it what you were referring to earlier when you said: | 09:40 |
| vila | * maxb wonders what to call this package | 09:40 |
| vila | <maxb> 2.2.1-0ubuntu1 I suppose | 09:40 |
| poolie | right | 09:41 |
| === beaumonta is now known as abeaumont_ | ||
| maxb | vila, poolie oh, asked I asked ScottK last night and he seemed to think a post-RC release pocket upload was still an option | 09:45 |
| poolie | oh, ok | 09:45 |
| poolie | well, can you do whatever seems best and legal? | 09:45 |
| maxb | Well, I have no upload perms, so I'll have to loiter on IRC and beg a sponsor | 09:46 |
| vila | ...and update bug #636930 ? | 09:46 |
| ubot5` | Launchpad bug 636930 in Launchpad Bazaar Integration "Upgrading a repository fails with 'Inter1and2Helper' object has no attribute 'source_repo' (affected: 5, heat: 48)" [High,Triaged] https://launchpad.net/bugs/636930 | 09:46 |
| maxb | Also, anyone know how we decide what bugs to list in debian/changelog? | 09:46 |
| maxb | jelmer: around? ^^^ | 09:47 |
| jelmer | maxb: otp | 09:47 |
| maxb | k | 09:47 |
| jelmer | maxb: hi | 09:52 |
| poolie | hi jelmer, maxb | 09:52 |
| maxb | jelmer: Hi. So I started to prepare 2.2.1-0ubuntu1 last night, and of all the minor points, got stuck on wondering how we usually decide what bugs to reference in the debian/changelog | 09:53 |
| jelmer | 'morning poolie | 09:53 |
| jelmer | maxb: we mention the ones that were closed by this particular release | 09:54 |
| jelmer | or more specifically, the ones fixed by this upload since the previous upload. | 09:54 |
| maxb | so... everything with a LP id in NEWS? | 09:55 |
| maxb | jelmer: ok, my hesitation was that there don't seem to be enough entries under 2.2.0-1 to account for that policy | 09:58 |
| maxb | for example, | 10:00 |
| maxb | * Recursive binding for checkouts is now detected by bzr. A clear error | 10:00 |
| maxb | message is shown to the user. (Parth Malwankar, #405192) | 10:00 |
| maxb | in NEWS but not debian/changelog | 10:00 |
| jelmer | maxb: Those bug ids are debian bugs, not launchpad bugs | 10:00 |
| jelmer | maxb: where I close bugs with launchpad ids it would only be for bugs that have a ubuntu bug task | 10:00 |
| maxb | Ah!, so only list in debian/changelog open ubuntu bugtasks to be closed? | 10:01 |
| maxb | rather than the entire contents of NEWS | 10:02 |
| stewart | jelmer, hi! i'm having some issues with rebase. I'm basically wanting to rewrite history before a certain revision in the repository so that revision 3 (and all after it) are the same, but that the history from another repository is inserted before revision 3. i can't seem to get it to recognise that the directories named the same in each repo are actually the same (i just get foo.moved) | 10:02 |
| stewart | jelmer, any ideas/suggestions? | 10:02 |
| jelmer | maxb: yep | 10:02 |
| maxb | jelmer: great. Well then, I need to go to work now, but I could put together a package at lunchtime and hunt for a sponsor | 10:04 |
| jelmer | stewart: bzr-rebase doesn't really help with different file ids | 10:06 |
| stewart | jelmer, i had feared that :) | 10:06 |
| maxb | stewart: Maybe you could use bzr-fastexport/import, plus some manual hackery on the streams? | 10:09 |
| stewart | maxb, that's my next thought | 10:10 |
| mgz | morning all. | 10:19 |
| vila | mgz: morning marting ;) | 10:23 |
| mgz | ;_; | 10:23 |
| vila | mgz: I still have a few minutes to joke about this typo, your fix is playing on pqm ;) | 10:24 |
| jelmer | maxb: thanks for taking care of that, btw! | 10:31 |
| vila | mgz: wow, I couldn't believe there are *no* thread leaks in bzr.dev (at least in the last runs I did) and just create one to be sure... and it was detected :) | 10:35 |
| vila | for the record, when I prepared 2.0.6 there was ~2500 leaks | 10:36 |
| mgz | nix had that many? there's still work to do on window, though. | 10:38 |
| mgz | and urk, I need to leave already, wanted to review the ~mgordan branch before I went | 10:39 |
| vila | mgz: yup, but they tend to be stealth... :-/ | 10:39 |
| jml | jam: I'm really really sorry I haven't got to your patches yet. | 12:29 |
| jml | jam: I haven't forgotten them though. | 12:29 |
| zyga | my friend is having problems using bzr send | 12:36 |
| zyga | he is behind a firewall | 12:36 |
| zyga | and cannot push using regular methods | 12:36 |
| zyga | gsc, please pastebin the command you executed and the output of that command | 12:36 |
| zyga | it seems that bzr thinks there are no changes between his tree and the public tree | 12:37 |
| zyga | gsc, could you do bzr missing and tell us if it shows anything? | 12:37 |
| gsc | zyga: Using saved parent location: http://bazaar.launchpad.net/~linaro-maintainers/linaro-image-tools/linaro-image-tools/ You have 1 extra revision(s): ------------------------------------------------------------ revno: 121 committer: r65073 <r65073@r65073-imx51> branch nick: linaro-image-tools timestamp: Wed 2010-09-29 17:09:31 -0400 message: Add imx51 for --dev option support. | 12:37 |
| gsc | zyga: sorry, how to use pastebin, i'm new to irc | 12:38 |
| zyga | gsc, go to pastebin.ubuntu.com and paste long output there | 12:38 |
| gsc | zyga: and then? | 12:40 |
| zyga | gsc, paste the url of the result ehre | 12:40 |
| gsc | zyga: how can you guys see that? | 12:40 |
| gsc | http://pastebin.ubuntu.com/502582/ | 12:40 |
| zyga | gsc, could you try a shorter version, bzr send -o foo.bundle | 12:41 |
| gsc | http://pastebin.ubuntu.com/502587/ | 12:42 |
| * zyga has no idea what's wrong | 12:44 | |
| zyga | vila, ping | 12:44 |
| maxb | Please pastebin the output of 'bzr info' in the local branch | 12:45 |
| gsc | http://pastebin.ubuntu.com/502588/ | 12:46 |
| maxb | Ah, you are being caught out by that bogus definition of submit branch | 12:47 |
| * zyga never understood what submit branch was | 12:47 | |
| maxb | It is the default location for 'bzr send'ing against | 12:47 |
| gsc | how should I state the submit branch? | 12:48 |
| maxb | Just manually edit the .bzr/branch/branch.conf and delete the line defining the submit branch | 12:48 |
| gsc | maxb: done. what's the correct one? | 12:49 |
| maxb | Or, bzr send --remember actual-submit-branch | 12:49 |
| gsc | maxb: i am new to bzr, what's the "actual-submit-branch" in my case? | 12:50 |
| maxb | uh, lp:linaro-image-tools, I suppose | 12:50 |
| maxb | So, try bzr send -o foo.bundle --remember lp:linaro-image-tools | 12:50 |
| gsc | maxb: bzr: ERROR: Connection error: Couldn't resolve host 'xmlrpc.edge.launchpad.net' [Errno -2] Name or service not known | 12:51 |
| gsc | maxb: fyi, i am beind a firewall | 12:51 |
| zyga | maxb, he's behind a firewall of some kind | 12:51 |
| maxb | oh, ok, I guess you'll need to use the long form http://bazaar.launchpad.net/~linaro-maintainers/linaro-image-tools/linaro-image-tools/ then | 12:52 |
| gsc | Bundling 1 revision(s). | 12:52 |
| gsc | succeded? | 12:52 |
| maxb | Sounds like it | 12:53 |
| zyga | maxb, thanks :) | 12:54 |
| gsc | maxb: then what's the url for my branch? | 12:54 |
| maxb | gsc: I don't quite understand your question? | 12:54 |
| zyga | gsc, there is none | 12:54 |
| zyga | gsc, you did not publish your branch | 12:54 |
| zyga | gsc, you made something that you can email | 12:55 |
| zyga | gsc, without ssh access you cannot publish a branch on lp | 12:55 |
| gsc | understood. Thanks a lot, zyga and maxb. | 12:55 |
| zyga | gsc, well actually you can but it's complex | 12:55 |
| zyga | gsc, if you can make your branch visible via http | 12:56 |
| zyga | gsc, you could ask launchpad to mirror your branch | 12:56 |
| gsc | zyga: sound complicated, forget about it. thanks zyga. | 12:56 |
| gsc | quick question: how can I change my name and email output by bzr whoami? | 12:57 |
| zyga | gsc, just pass them as arguments | 12:58 |
| zyga | gsc 'bzr whoami zygmunt krynicki <my@email> | 12:58 |
| gsc | zyga: cool, thanks | 12:59 |
| maxb | Don't forget to quote the entire string | 12:59 |
| gsc | maxb: yeah, I'm seeing the example in help. Thanks. | 13:00 |
| vila | gsc: 'bzr send' uses your 'public' branch to reduce the size of the bundle, so you can use any branch that is in the ancestry of your branch, or even the submit branch itself | 13:24 |
| gsc | vila: Thanks for the info | 13:25 |
| mgedmin | oh woe is me: I used bzr commit in a svn checkout by accident, now the working dir is all fscked up :( | 13:42 |
| mgedmin | oh, look removing $Id$ lines and bzr committing seems to have fixed it | 13:46 |
| mgedmin | no it hasn't | 13:47 |
| mgedmin | grr! | 13:47 |
| mgedmin | in case anybody cares: the error is that on svn commit, I get svn: Checksum mismatch for '/home/mg/src/.../.svn/text-base/filename.svn-base'; expected: '2fa79c790b164142e92763cbafd898b7', actual: '01f96e4634bb165ec8d95c4e6ade8e9e' and it aborts the commit | 13:50 |
| jml | vila: do you use an emacs frontend to bzr? | 14:05 |
| vila | jml: dvc | 14:06 |
| vila | but only slightly, the plan is to move to vc itself | 14:07 |
| jml | vila: your plan or someone else's? | 14:07 |
| vila | mine :) | 14:07 |
| dash | dvc is pretty good | 14:07 |
| vila | dvc targets *all* dvcs and progress is kind of slow and I can't... easily parse the weird lisp macros they use (which more or less forbids debugging) | 14:08 |
| dash | heh heh | 14:08 |
| dash | well it's better than eclipse support for bzr | 14:08 |
| jml | dash, vila: know anyone who's actually using vc for bzr? | 14:09 |
| vila | it serves me well and did so for the last 4 years but I use only a tiny part of: dvc-status and dvc-diff | 14:09 |
| vila | jml: emacs hackers ? | 14:09 |
| dash | jml: i have, briefly, but it just didn't do as much | 14:09 |
| * jml nods sagely | 14:09 | |
| dash | the diff support is definitely the dvc feature i use the most | 14:10 |
| jml | dash, vila: btw, have I shown you lp:difftodo before? | 14:10 |
| vila | jml: ideally vc.el should use direct access to bzrlib instead of bzr | 14:10 |
| dash | jml: hm! no | 14:10 |
| vila | jml: shown no, mentioned, yes, several times, did I install it ? stupidly no :( | 14:10 |
| jml | dash: it's a thing that parses Python diffs, extracts new/modified XXX comments and formats them in a compile-mode friendly way | 14:10 |
| dash | Fun. | 14:11 |
| jml | there's a bzr plugin in it, and it's pretty easy to hook up to emacs. | 14:11 |
| jml | M-x bzr-todo RET | 14:11 |
| vila | jml: spawning an external bzr or using python from emacs ? | 14:11 |
| jml | vila: spawning. | 14:12 |
| vila | :-} | 14:12 |
| * vila should stop hoping too much :-/ | 14:12 | |
| vila | jml: sorry, that was totally unrelated to difftodo | 14:12 |
| jml | vila: np :) | 14:12 |
| vila | jml: anyway, as far as emacs and bzr are concerned, the swiss army knive is still diff-mode IMHO when I'm not editing a file, I'm more or less always in a diff-mode buffer (dvc itself only slightly specialize it by adding a list of files at the top and some navigation) | 14:14 |
| vila | jml: which is why I still haven't installed difftodo, 'alt-z m' brings me a 'diff -rsubmit:' buffer where my TODO/FIXME *are* | 14:16 |
| jml | vila: ahh, I see. | 14:16 |
| jml | vila: sometimes having the list can be useful. it's generated from 'di -r submit:' | 14:17 |
| * vila nods | 14:17 | |
| vila | I still plan to try it | 14:17 |
| * vila puts it on its TODO now that it's a wikkid instance | 14:18 | |
| jml | heh heh | 14:18 |
| === zyga is now known as zyga-cold | ||
| d1b | hi | 14:40 |
| d1b | question what file handles https connections | 14:40 |
| d1b | and can you link me to it ? | 14:40 |
| d1b | please ;) | 14:40 |
| GaryvdM | d1b: I think there are more than one implementations in bzr. one is the std python library urllib2 | 14:42 |
| GaryvdM | d1b: What for? | 14:43 |
| d1b | GaryvdM: i might have a vul to report | 14:43 |
| d1b | but first i need to see the code | 14:43 |
| d1b | im on a bug reporting spree atm | 14:43 |
| GaryvdM | Let me look for you | 14:43 |
| mgz | it's known that urllib2 doesn't check certs, it's the main reason it's not the only module used | 14:44 |
| GaryvdM | d1b: Hint: bzrlib/transports | 14:44 |
| d1b | GaryvdM: thank you - just the file in a http location to your bzr thing | 14:44 |
| d1b | GaryvdM: im not looking ;) | 14:44 |
| d1b | im just reporting it if exists | 14:44 |
| d1b | and i need to see code to do that | 14:44 |
| d1b | mgz: please link me | 14:45 |
| mgz | pycurl however does check. | 14:45 |
| d1b | mgz: but you aren't using pycurl anymore i thought | 14:45 |
| d1b | bzr doesn't dep on it | 14:45 |
| d1b | iirc | 14:45 |
| Glenjamin | it uses it if its there | 14:46 |
| d1b | Glenjamin: and if it isn't ? | 14:46 |
| d1b | because by default it won't be | 14:46 |
| d1b | on ubuntu | 14:46 |
| GaryvdM | d1b: it's a suggested dep. Maybe we should bump it to a recommended dep. | 14:48 |
| GaryvdM | d1b: A bug report would be good. | 14:48 |
| d1b | GaryvdM: dude | 14:49 |
| d1b | first link me to the file | 14:49 |
| d1b | i might have a real vul to report | 14:49 |
| d1b | if you can't do that | 14:49 |
| d1b | then fail | 14:49 |
| GaryvdM | bzrlib/transports/http/(_pycurl.py|_urllib.py) | 14:49 |
| GaryvdM | sorry transport not transports | 14:50 |
| d1b | um... http://launchpad | 14:51 |
| d1b | link | 14:51 |
| d1b | http://bazaar.launchpad.net/ ... | 14:51 |
| mgz | http://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev/files/head%3A/bzrlib/transport/http/ | 14:51 |
| d1b | thanks | 14:51 |
| d1b | and urllib is used if pycurl isn't available right | 14:51 |
| mgz | yup. | 14:52 |
| d1b | i have a vul to report | 14:53 |
| d1b | 50% sure atm | 14:53 |
| d1b | confirming now | 14:53 |
| d1b | ok 85% sure | 14:53 |
| d1b | by default on ubuntu with bzr installed (as pycurl won't be) you are vulnerable to a mitm attack | 14:53 |
| d1b | as per python bug http://bugs.python.org/issue1589 | 14:54 |
| dash | d1b: but bzr supports signed revisions, so it doesn't matter. :) | 14:54 |
| d1b | as you do not check against hte common name | 14:54 |
| d1b | dash: supports != use | 14:54 |
| vila | mgz: meh, see my last comment on https://code.edge.launchpad.net/~gz/bzr/use_testtools_timings_625594/+merge/36784 | 14:54 |
| mgz | yeah vila, I just this second read it. | 14:54 |
| vila | mgz: wth ? | 14:54 |
| d1b | so by default i can mitm your bzr clients | 14:54 |
| d1b | gg | 14:54 |
| mgz | d1b, go ahead and file a report, it'll get to the right people. | 14:55 |
| d1b | mgz: it shall be done :) | 14:55 |
| d1b | ill file it against bzr in ubuntu | 14:56 |
| d1b | but it probably applies to debian / every other project who won't have pycurl isntalled | 14:56 |
| mgz | vila: I don't quite understand, but I'll try to. this code makes me cry. | 14:56 |
| d1b | wait | 14:57 |
| d1b | i think you are now deping on it | 14:57 |
| d1b | not sure | 14:57 |
| d1b | weird | 14:57 |
| d1b | im still going to report it, it exists against any client without pycurl installed | 14:58 |
| d1b | which is a possability | 14:58 |
| vila | d1b: people who care about cert verification should use pycurl | 14:58 |
| vila | d1b: this is known | 14:58 |
| d1b | vila: yes but aren't told this | 14:58 |
| d1b | vila: where is it filed? | 14:58 |
| d1b | in bzr? | 14:58 |
| d1b | or told to people | 14:58 |
| d1b | where do i report the bug to? | 14:59 |
| d1b | nm found it | 14:59 |
| vila | https://answers.edge.launchpad.net/bzr/+faq/590 | 15:00 |
| d1b | vila: that has nothing to do with this bug | 15:00 |
| d1b | read what it says | 15:00 |
| vila | d1b: I read it long ago | 15:00 |
| d1b | Once certificate validation is implemented | 15:00 |
| d1b | for urllib (easy for 2.6), we can get rid of pycurl. For python | 15:00 |
| d1b | 2.4 and 2.5 though, that will mean replacing the pycurl | 15:00 |
| d1b | dependency by a python-https[1] dependency. | 15:00 |
| d1b | that means | 15:00 |
| d1b | that the vul im reporting right now | 15:00 |
| d1b | is kind of there ;) | 15:01 |
| d1b | vila: because | 15:01 |
| d1b | ssl was implemented using socket for python 2.6 > | 15:01 |
| d1b | in bzr | 15:01 |
| vila | d1b: I wrote this faq, I know what is said there :) | 15:01 |
| d1b | vila: ok | 15:01 |
| d1b | so the comment states that when ssl is done using socket and you aren't supporting 2.5 / 2.4 python -> use that | 15:01 |
| d1b | and drop pycurl | 15:01 |
| d1b | and your comment here is not really true. | 15:02 |
| d1b | because now there is an attempt to validate the ssl | 15:02 |
| d1b | that's why socket is used | 15:02 |
| d1b | erh ssl() | 15:02 |
| d1b | but that implemenation is wrong | 15:02 |
| vila | yes, and the plan is to implement the cert verification *on top* of what the ssl module provides | 15:02 |
| d1b | vila: at the present time you are vul :) | 15:03 |
| d1b | get back to me when that is done | 15:03 |
| vila | hehe, patches welcome | 15:03 |
| vila | if you want cert verification *now* install pycurl | 15:03 |
| d1b | patch is remove urllib | 15:03 |
| d1b | only suport pycurl | 15:03 |
| d1b | from me ;) | 15:03 |
| vila | d1b: sure, as long as you had support for ctrl-c pycurl and prompting for passwords and all niceties provided by urllib ;) | 15:04 |
| vila | s/had/add/ | 15:04 |
| d1b | security > | 15:04 |
| vila | d1b: use ssh | 15:05 |
| d1b | vila: this is true :) | 15:06 |
| d1b | except then you need ssh ;) | 15:06 |
| vila | d1b: now you're talking about convenience :) | 15:06 |
| d1b | confirmed | 15:07 |
| d1b | vila: bzr does not dep on pycurl | 15:07 |
| vila | d1b: but more importantly, what will a mitm attack will gives ? | 15:07 |
| d1b | a copy of the repo | 15:07 |
| d1b | and this is bad for private repos | 15:07 |
| d1b | aka your corporate users | 15:07 |
| === Ursinha-afk is now known as Ursinha | ||
| d1b | and also commit access ;) | 15:08 |
| vila | which can 1) use pycurl (which is still the default for https if installed) 2) use ssh 3) use private networks | 15:08 |
| d1b | vila: if installed | 15:08 |
| d1b | but it isn't a dep! | 15:08 |
| d1b | it suggests pycurl | 15:08 |
| d1b | it doesn't dep pycurl | 15:08 |
| d1b | woops! | 15:09 |
| vila | no, it was a deliberate decision | 15:09 |
| d1b | i should state that this is not true i just remembered | 15:09 |
| d1b | i have recommends disabled | 15:09 |
| d1b | don't nkow if the default bzr will do that .. | 15:09 |
| d1b | suggests will be installed right? | 15:09 |
| vila | I advocate keeping it but the consensus was that the vast majority of users just don't verify certs anyway | 15:09 |
| d1b | so it should be a dep in anycase | 15:10 |
| d1b | and not a suggests | 15:10 |
| d1b | ok via synaptic | 15:12 |
| d1b | it isn't pulling in pycurl.. | 15:12 |
| d1b | nor via apt-get | 15:12 |
| d1b | http://pastebin.com/Ec0cJ0eA | 15:12 |
| d1b | so recommends is not the same as suggests | 15:13 |
| d1b | vila: yeah? | 15:13 |
| * d1b reports | 15:14 | |
| vila | d1b: you'd better add your comments to the existing one so your new bug doesn't get marked as duplicated | 15:15 |
| d1b | vila: yeah dude how do i make a new bug? | 15:15 |
| d1b | launchpad is confusing | 15:15 |
| d1b | nm gotit | 15:15 |
| d1b | had to put the url in manually can't find a link | 15:15 |
| vila | let me introduce you to our lovely bot: bug #82086 | 15:17 |
| ubot5` | Launchpad bug 82086 in Bazaar "pycurl transport causes tracebacks if the server's SSL cert cannot be verified. (affected: 3, heat: 43)" [Medium,Confirmed] https://launchpad.net/bugs/82086 | 15:17 |
| vila | thanks ubot5` | 15:17 |
| d1b | vila: ;) | 15:17 |
| d1b | vila: reported | 15:20 |
| d1b | https://bugs.edge.launchpad.net/bzr/+bug/651161 | 15:20 |
| ubot5` | 'Error: Could not parse data returned by Launchpad: HTTP Error 401: Unauthorized\nResponse headers:\n---\ncontent-length: 21\ncontent-type: text/plain\ndate: Wed, 29 Sep 2010 14:20:55 GMT\nserver: zope.server.http (HTTP)\nstatus: 401\nvary: Accept-Encoding\nvia: 1.1 wildcard.edge.launchpad.net\nx-powered-by: Zope (www.zope.org), Python (www.python.org)\n---\nResponse body:\n---\nBug 651161 is private\n---\n (https://launchpad.net/bugs/651161)' | 15:20 |
| d1b | private? | 15:21 |
| d1b | what no | 15:21 |
| d1b | this is already public via irc | 15:21 |
| d1b | fixed | 15:21 |
| mgz | ha, ubot fail. you ticked the 'security' box I take it? | 15:21 |
| d1b | mgz: yeah ;) | 15:22 |
| d1b | https://bugs.edge.launchpad.net/bzr/+bug/651161 | 15:22 |
| ubot5` | Launchpad bug 651161 in Bazaar "bzr fails to verify ssl validity in https connections - by default --> as pycurl isn't a dep only a suggestion (affected: 1, heat: 260)" [Undecided,New] | 15:22 |
| mgz | right, can just edit private off via web interface. | 15:22 |
| d1b | there we go | 15:22 |
| === Meths_ is now known as Meths | ||
| === frakturfreak is now known as a234567890123456 | ||
| === a234567890123456 is now known as frakturfreak | ||
| MTecknology | I pulled a branch, then had to overwrite the latest change to the branch, now I get an error when I try to pull the branch from another location - how can I tell it to ignore this last change? | 15:51 |
| MTecknology | It says the branches diverged.. I want them back together.. | 15:52 |
| vila | MTecknology: pull --overwrite | 15:52 |
| MTecknology | :D | 15:53 |
| MTecknology | vila: awesome- thanks | 15:53 |
| CardinalFang | Hi all, jelmer. I'm trying to use the bzr-svn plugin for the first time, (with versions in Ubuntu Maverick,) and I can't figure out what I'm doing wrong, if anything. | 16:02 |
| CardinalFang | https://android-client.forge.funambol.org/source/browse/android-client/ | 16:02 |
| CardinalFang | Branching "https://guest@androi" gets me 'unknown bzrdir format ""' | 16:03 |
| CardinalFang | No http-basic "guest@" and I get 'No route to host' error (perhaps some SSL problem?). | 16:04 |
| CardinalFang | Er, no , that gets me 'Unable to handle http code 401', even though I (think) I set "user = guest" in my locations.conf . | 16:05 |
| CardinalFang | Finally, "svn://" gets me the no-route-to-host. | 16:05 |
| CardinalFang | Hmm, the doc says the plugin can do several things, but none of them is "branch". I don't think "pull" counts. | 16:07 |
| Glenjamin | CardinalFang: whatever location you'd pass to svn checkout, bzr branch/pull/checkout should accept | 16:12 |
| Glenjamin | oh, i see you've got some pycurl problems, try using https+urllib:// | 16:13 |
| * CardinalFang tries. | 16:13 | |
| CardinalFang | Hell yeah. Glenjamin, she goes! | 16:14 |
| === Ursinha is now known as Ursinha-lunch | ||
| === deryck is now known as deryck[lunch] | ||
| jeremyw | I see in bzrlib.builtins.cmd_ls.run(), there is a cleanup like this: self.add_cleanup(tree.lock_read().unlock) | 17:40 |
| jeremyw | What's that for? | 17:40 |
| mgz | jeremyw: it's a slightly confusing spelling of "this operation needs a read lock for the duration, that then gets unlocked" | 17:42 |
| mgz | roryy: was hoping to catch you, one of the things we need before your branch can land is for you to do this: <http://www.canonical.com/contributors> | 17:44 |
| roryy | mgz: hi. was wondering about that, assumed the patch was too small | 17:45 |
| roryy | mgz: will get on it | 17:45 |
| mgz | great, shout if you have any questions. | 17:46 |
| jeremyw | mgz: Thanks. | 17:47 |
| roryy | mgz: send it to contributor-agreement@canonical.com and Martin Pool? | 17:57 |
| mgz | yup. | 17:57 |
| === Ursinha-lunch is now known as Ursinha | ||
| roryy | ok, done | 17:58 |
| mgz | cool. when australia wakes up you'll get added to the right team. | 18:04 |
| fullermd | Australia's so lazy. Sleeping all day, every day... | 18:04 |
| jeremyw | Anyone got a minute to help me better understand locking? I see this stuff is abstracted in the command logic and I just need to better understand it. | 18:07 |
| jeremyw | I think I figured it out and was actually confused by my test repository lacking content. ;) | 18:09 |
| jeremyw | So...let's say I have an Inventory[Directory|File], how might one go about getting the last revision the item was changed in? | 18:16 |
| jeremyw | I'm looking into the API but if someone beats me to it... | 18:19 |
| ovnicraft | hi folks i was searching for alias for location i want to use for push,pull, etc i search in man but nothing result | 18:20 |
| fullermd | jeremyw: BTW, did those docs help you back a week or so? | 18:20 |
| jeremyw | fullermd: Yeah. I am figuring out how to get deeper and deeper. Now, I've got a working tree and I'm listing the files. In doing so, I'd also like to get more information like the revision at which the files were last modified. | 18:22 |
| jeremyw | Of course your docs don't cover that so I'm tracing the API as I go. | 18:22 |
| fullermd | Yeah. I don't really go below the UI :) | 18:22 |
| jeremyw | fullermd: It helped a lot actually. I know the difference between the higher level objects and can go between them easily. | 18:22 |
| ovnicraft | how i can do this? | 18:24 |
| fullermd | ovnicraft: I'm not sure I understand the question... | 18:25 |
| jeremyw | fullermd: I need to go below the UI. It's not difficult. :) It just takes some deeper learning and it's coming along nicely, I'm just missing something that takes an Inventory[Directory/File] and gives me revision information. | 18:25 |
| roryy | ovnicraft: does "bzr help location-alias" help? | 18:25 |
| ovnicraft | roryy, yes i found this http://doc.bazaar.canonical.com/bzr.2.1/en/user-reference/location-alias-help.html | 18:26 |
| ovnicraft | roryy, but i have 2 locations for pull | 18:30 |
| ovnicraft | i want to bzr pull location1 and bzr pull location2 | 18:30 |
| roryy | ovnicraft: i'm no expert, i'm afraid. perhaps you can use a command alias for that ('bzr pl1' and 'bzr pl2') or write two shell scripts or cmd files? | 18:31 |
| ovnicraft | bzr must do this hg do it XD | 18:32 |
| ovnicraft | btw thx | 18:32 |
| roryy | does what? user-specifiable location aliases? | 18:32 |
| mgz | got OOPS-1733N1768 commenting on an mp, but comment seems to have gone through anyway | 18:37 |
| ubot5` | https://lp-oops.canonical.com/oops.py/?oopsid=1733N1768 | 18:37 |
| === deryck[lunch] is now known as deryck | ||
| === BasicPRO is now known as BasicOSX | ||
| mgz | hm, don't think I quite worded that properly. ah well, lifeless will understand. | 19:03 |
| === Meths_ is now known as Meths | ||
| jeremyw | Does anyone know of a better way to get a revision object, or just the revision id, that a file was last changed based on the file's id? | 19:19 |
| === sidnei_ is now known as sidnei | ||
| jam | jeremw: better than what way? | 20:28 |
| jam | tree.inventory[file_id].revision ? | 20:28 |
| jeremyw | jam: That might be what I need. :) Basically, I've looked at how the log module does it and it's very slow. | 20:29 |
| jeremyw | jam: Basically, my intent is to get the last modified revision of a path. | 20:29 |
| jeremyw | The quickest way. | 20:29 |
| bfrog | is there a large repo that has bzr git and hg versions? | 20:37 |
| bfrog | linux? | 20:37 |
| bfrog | like there's a hg mirror of the kernel which is useful to compare git and hg with | 20:38 |
| fullermd | I presume you could translate one with bzr-git or fast-{im,ex}port if nothing else. | 20:41 |
| fullermd | https://code.launchpad.net/~vcs-imports/linux/trunk looks like an import of the Linux kernel. | 20:43 |
| bfrog | launchpad, joy, so that'll only take like 10 hours to clone | 20:45 |
| bfrog | launchpad has to be the slowest site on the internet to host a project, I never get anymore than about 15kbps from there, meanwhile kernel.org is like 1.5mb ... | 20:46 |
| * fullermd shrugs. | 20:47 | |
| fullermd | I didn't say it was better than a chocolate chip cookie. Just a good first guess to look for a pile of imports of projects in $OTHER_VCS. | 20:47 |
| bfrog | yeah I hear you | 20:48 |
| bfrog | its more a complaint towards launchpad than anything else | 20:48 |
| bfrog | thanks | 20:50 |
| roryy | wow - 3000 branches in vcs-imports | 21:17 |
| vila | roryy: you mean https://code.edge.launchpad.net/~vcs-imports ? | 21:20 |
| vila | hmpf | 21:20 |
| vila | talk about ruining jokes... I was about to propose him to have a look at https://code.edge.launchpad.net/ubuntu | 21:21 |
| maxb | oooookay | 21:22 |
| thumper | hey | 21:35 |
| thumper | anyone have definitive knowledge if bzr reconfigure --unstacked works on LP? | 21:35 |
| fullermd | I was told the other day that it does. | 21:36 |
| maxb | thumper: yes, it does, provided the old stacking location is valid | 21:37 |
| thumper | cool | 21:37 |
| thumper | yay | 21:37 |
| thumper | now I don't have to write an annoying script | 21:38 |
| thumper | does it do it server side or client side? | 21:38 |
| thumper | over bzr+ssh? | 21:38 |
| maxb | Um. Are stacking changes *ever* clever enough to be server-side? | 21:40 |
| === Ursinha is now known as Ursinha-bbl | ||
| jam | maxb, thumper: actually the design is explicit that smart process can't see the stacked-upon repository, so it *can't* be done via bzr+ssh smart rpc | 22:17 |
| jam | and thumper, we never had our conversation about Branch Revision | 22:18 |
| thumper | jam: ok | 22:18 |
| thumper | jam: no, we didn't | 22:18 |
| thumper | jam: just in the standup now | 22:18 |
| jam | thumper: the joys of daylight savings changes | 22:18 |
| tsmith | is it possible to get bzr-svn to remember my svn username and password? | 22:35 |
| thumper | tsmith: you can add the username and password in the url | 22:40 |
| tsmith | i'm not about to save the password in bash_history :O | 22:40 |
| tsmith | but thanks for the tip | 22:40 |
| jam | tsmith: I think you can look at "bzr help authentication" | 22:41 |
| jam | also, I thought there was something about setting username via svn, which we would then remember | 22:41 |
| tsmith | jam: omg that worked (remembering the pass via svn) | 22:41 |
| tsmith | thanks | 22:41 |
| tsmith | ! | 22:41 |
| === Meths_ is now known as Meths | ||
| jbowtie | Hello all. | 23:07 |
| thumper | jam: are you still around? | 23:10 |
| jam | thumper: I actually need to go pick up my son now. if you want to talk via phone, we could talk in about 20 min | 23:11 |
| thumper | jam: yeah, that could work | 23:13 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!