/srv/irclogs.ubuntu.com/2010/03/22/#bzr.txt

* igc back in a few hours01:42
=== davidstrauss_ is now known as davidstrauss
spm*** FYI. Launchpad Codehost will be going down shortly for a code update. ~ 5-10 mins before I'll be doing so; ETA of outage < 30 secs, all going well. ***03:55
spm*** About to restart Launchpad codehost for a code update ***04:05
spm*** all done ***04:07
=== mwhudson_ is now known as mwhudson
TimMiaohello, I'm a newbie on bzr, I have an issue when I'm going to bzr launchpad-login with my id, it always tells me:05:40
TimMiaobzr: ERROR: Connection error: curl connection error (error setting certificate verify locations:05:40
TimMiao  CAfile: /etc/curl/curlCA05:40
TimMiao  CApath: none05:40
TimMiao)05:40
TimMiaoon https://launchpad.net/~tim-miao/%2Bsshkeys05:40
TimMiaoI'm sure I've uploaded my public rsa key, what's the problem?05:40
bob2heh curl05:40
TimMiaoI'm using the bzr on OpenSolaris 2010.03 release05:40
TimMiaobob2: excuse me?05:43
TimMiaobob2: would you please give me some clue in detail? thanks! :)05:43
bob2no, sorry05:43
igcback05:52
pooliebob2, that was kind of harsh05:58
bob2sorry :| I misread it as being from get, so was going to suggest http+urllib05:58
bob2but then realised I had no idea05:58
bob2s/get/branch/06:00
pooliei would guess he was trying to lp-login and it's trying to send xmlrpc over ssl06:01
poolieand that's failing06:01
pooliek, sprint stuff sent06:04
=== davidstrauss_ is now known as davidstrauss
vilahi all !06:56
=== vila changed the topic of #bzr to: Bazaar version control | try https://answers.launchpad.net/bzr for more help | http://irclogs.ubuntu.com/ | Patch pilot: vila | bzr 2.1.0 is out
pooliehi vila07:21
vilahey poolie !07:21
vilapoolie: I'll submit a fix shortly for bug #474807 and I did apply for patch piloting this week07:24
ubottuLaunchpad bug 474807 in bzr "MYSQL/BZR P3: Incomprehensible results of "bzr log -rX..Y"" [High,In progress] https://launchpad.net/bugs/47480707:24
vilapoolie: since the active review list is mainly from core, I plan to dig the wip queue and maybe have  a look at the bugs with patches07:27
pooliehey, that's pretty good07:28
pooliei barely saw you last week, being away and then having some activities in the evening07:28
vilaI paused a bit on the merge stuff, concentrating on some plugin paths and log bugs, thanks for the past reviews and even more thanks for the coming ones ;-)07:29
pooliethat's ok07:29
pooliei spent today mostly doing some clerical things, including getting organized for Belgium07:30
pooliei'm planning to take a holiday in the week after easter07:30
vilathere are two merges (well conflicts really) submissions waiting for review anyway07:30
vilacoll07:30
vilacool07:30
dcolesAnyone got an idea why `bzr serve --git` is currently hard coded to localhost?07:35
pooliein what sense?07:35
dcolespoolie: The serve_git function in server.py (of the bzr-git plugin) calls "server = TCPGitServer(backend, 'localhost')"07:37
dcoles(At the very bottom of the file)07:37
dcolesI'm just checking if trunk is the same07:37
dcolesYup. In trunk too07:39
* dcoles opens a bug07:39
vilagah, there are days....07:45
vilaI read the above 'In trunk too' as '"I'm drunk too" and then 'opens a bug' as 'opens a mug'....07:45
* vila get more coffeee07:45
dcolesHahaha07:46
=== mthaddon` is now known as mthaddon
dcolesbug 54399807:57
ubottuLaunchpad bug 543998 in bzr-git "bzr serve --git is hardcoded to localhost" [Undecided,New] https://launchpad.net/bugs/54399807:57
dcolesLooks pretty simple. I might try and write up a patch on the train home.07:58
* igc dinner08:07
bialixHeya GaryvdM09:35
GaryvdMHi bialix09:36
bialixI'm thinking about starting packaging 0.18.409:36
GaryvdMI've just committed some tests for treewidget select all.09:36
GaryvdMbialix: Cool. Let me know If I can help at all.09:37
GaryvdMbialix: I'll do 0.19b1 on Wednesday (24th) evening.09:38
bialixGaryvdM: you can help, yes. Can you confirm I can start 0.18.4 or you have some plans?09:39
GaryvdMbialix: Yes you can start on 0.18.4.09:40
bialixGaryvdM: ok, I've let the 0.19b1 for you then09:40
GaryvdMbialix: I'm working on some stuff for trunk. So I want to leave 0.19b1 for the last minute.09:41
bialixok09:41
bialixin the end it's b109:41
GaryvdMYes :-)09:41
bialixGaryvdM: I have last revno 1227 in 0.18 branch. (Restore test removed by rev 1225.) That's correct?09:43
* GaryvdM looks09:43
bialixGaryvdM: can you skim through NEWS?09:43
bialixGaryvdM: and one more thing: do you have a tree name for this release ;-) ?09:44
dcolesjelmer: Have you seen bug 54399809:44
ubottuLaunchpad bug 543998 in bzr-git "bzr serve --git is hardcoded to localhost" [Undecided,New] https://launchpad.net/bugs/54399809:44
bialixGaryvdM: what about bug #533837?09:44
ubottuLaunchpad bug 533837 in qbzr "Trying to show the log of a file causes a crash" [High,Confirmed] https://launchpad.net/bugs/53383709:44
GaryvdMbialix: The revision is correct. NEWS has every thing. (Except test improvements, which I don't think should be in NEWS)09:47
bialixGaryvdM: do you have objections for codename "pussy-willow"?09:48
GaryvdMSounds good: http://en.wikipedia.org/wiki/Pussy_willow09:49
bialixyes, it is09:50
GaryvdMbialix: I'm looking at bug 533837.09:51
ubottuLaunchpad bug 533837 in qbzr "Trying to show the log of a file causes a crash" [High,Confirmed] https://launchpad.net/bugs/53383709:51
GaryvdMI did not target that bug btw.09:51
bialixGaryvdM: it seems igc has assigned it to you and to 0.18.4. I've removed milestone assignment09:52
GaryvdMbialix: Ok - I'm not going to look at it now. I'm going to stay focused on what I'm doing (treewidget stuff)09:53
bialixGaryvdM: that's great09:53
=== radoe_ is now known as radoe
vilabialix, GaryvdM : Hi guys !09:58
bialixbonjour vila!09:58
vilaGaryvdM: Test improvements in NEWS give *me* a warm feeling of confidence ;-)09:59
GaryvdMHi vila09:59
bialixqbzr 0.18.4 released. w00t!10:04
jelmerdcoles: yep10:04
jelmerdcoles: I'd consider that a low-priority bug, we need more testing of the server first10:05
dcolesAh. OK.10:05
dcolesWasn't quite sure of it's status, though it's been mighty handy of late :)10:06
bialixit seems vila enjoyed piloting :-)10:06
jelmerdcoles: so it's working ok for you?10:07
dcolesjelmer: For a very trivial repository, yes. I might just try something more complex10:08
dcolesjelmer: Though it appears to be serving the wrong branch...10:10
* bialix finishes the qbzr release10:11
dcolesjelmer: It seems to be a tad confused in a shared repository. Regardless of how I try and clone, it grabs the first branch I pulled10:14
dcoles(I have 2 branches in this directory)10:15
jelmerbialix: \o/10:16
bialixhi jelmer, thank you!10:16
jelmerdcoles: how are you cloning from it, git clone ?10:16
dcolesYup10:16
jelmerIIRC it should just grab all branches in that case10:18
dcolesI tried git clone git://localhost/nonexistantfoo and I still get the same branch10:19
dcolesThis is even if I try and serve from the other branch (rather than the shared repo)10:19
dcolesThough I notice that `bzr serve --proto=bzr` refuses to branch when it's not run from the shared repo10:22
mobbyHi, I wonder if anyone would be able to help me please? I'm doing a lightweight checkout of an svn repo and it is failing with an "Unable to find old fileid for..." for a file in the svn repo. Any ideas what would cause this?10:23
vilafullermd: quick check on FreeBSD8, is /var/crash the right and only place to search for left over dumps after a hard crash ? (One that required running fsck and then some)10:24
* vila shudders, rats, crashing again :(10:25
jelmerdcoles: hmm, that's probably a bug :-(10:26
dcolesjelmer: Ok. I'll see if I can reproduce the circumstances and file it10:27
=== elmo_ is now known as elmo
gioelehello11:15
gioeleis there a public installation of the current trac-bzr?11:16
bialixgioele: do you mean: to see it in action?11:19
gioelebialix: yes11:20
bialixI'm not sure about "current"11:21
bialixbut there was some open-source project using it11:21
bialixwhat exactly you want to see?11:22
bialixjelmer: do you know any existing public server with trac-bzr?11:23
gioelebialix: I would like to see how it looks like: how branches are managed, whether relationships between branches are shows, how the timeline looks like, etc.11:26
bialixbranches are not managed11:27
bialixrelations between branches is not shown11:27
bialixI'm using it at my work11:27
bialixtimeline shows revisions on;y for the mainline11:27
bialix*only11:27
gioelebialix: "how branches are managed" as in "how multiple branches in the same shared repo are shown"11:28
bialixgioele: as directories11:28
bialixlemme show you some images11:28
gioelebialix: so basically it still looks like http://bugs.bitlbee.org/bitlbee/browser11:29
bialixgioele: here http://imagebin.ca/view/ZrY9m2.html11:30
bialixgioele: yes11:30
bialixgioele: do you know do they're using trac-bzr or ?11:31
gioelebialix: they = bitlbee? Yes, I think so: that page is linked from the old wiki page of TracBzr11:32
bialixyes, bitlbee11:33
tenchihello11:37
tenchiI'm using bzr in ubuntu with Bazaar Explorer. is there any way to export my projects log history (in html format)?11:38
bialixgioele: there is also [[Branches]] macro to use in wiki pages11:39
bialixtenchi: no, we don't have such feature yet11:39
bialixtenchi: but there is special plugin to do so11:39
bialixcheck htmllog11:39
bialixalso there is xmloutput plugin do support xml output of some commands11:40
tenchithx, will google it11:40
tenchialso: using hungarian characters in the commit text provided some errors11:41
tenchiare you working on utf8-ing it?11:41
gioeletenchi: is should be unicode/utf8 clean11:42
gioeletenchi: what did you use to read the commit log?11:42
bialixtenchi: I'm working with Russian and it's fine (on Windows)11:42
tenchihmmm11:42
bialixtenchi: make sure you have correct LANG settings11:42
tenchijust checked it and it works11:42
tenchistrange11:42
tenchiwill tray again at next commit11:43
tenchityped all texts in english because of this11:43
gioeletenchi: I have been using Italian accents and German vowels for quite a long time and everything seems fine11:44
bialixtenchi: http://michael.ellerman.id.au/bzr/plugins/htmllog11:45
tenchiok, will not whine if it works :-D11:45
tenchiWhen I first tried there was some error but I can't remamber what...11:45
bialixtenchi: ghosts11:45
tenchiI just tried the gnulog plugin and it works fine for me :-D11:52
bialixomg11:54
LeoNerdhttp://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572109  <== anyone know if this bzr-svn bug is going to be fixed any time soon?12:05
ubottuDebian bug 572109 in bzr-svn "AttributeError during 'bzr shelve'" [Normal,Open]12:05
LeoNerdI'm sure it can't be that hard, and I'd really appreciate being able to 'bzr shelve' in my svn checkouts again12:05
jelmerLeoNerd: it's already fixed upstream12:05
LeoNerdAh excellent12:05
LeoNerdHmm.. if I bzr co a later copy of bzr-svn would that do it?12:06
jelmerLeoNerd: yeah12:06
LeoNerdOK thanks12:06
aburchIs it possible to use "bzr send" (or something else) to send only specific changes?12:11
jelmeraburch: you can give it a revision range12:11
aburchjelmer: "bzr send -r 1961..1962" still bundles two revisions (the same with -r 1962..1962, -r 1962) when the remote has rev 196012:13
LeoNerdjelmer: Thanks; that fixes it. Have commented on the debian bug to this effect too; hopefully they'll pull it12:15
jelmerLeoNerd: they == me :-)12:15
LeoNerdAh. :)12:15
jelmeraburch: What are you trying to do exactly ? Sending a bundle without those revisions seems pointless since the remote side won't be able to apply it.12:15
jelmers/side/site/12:15
aburchjelmer: I fixed a bug and used "bzr send" to send the patch, now I fixed something else and wanted to send only the second commit upstream.12:18
aburchjelmer: Git could do this with "git format-patch -1".  As long as the patches do not depend on each other, upstream should be able to apply them seperately.12:20
jelmeraburch: bzr bundles in their current form are intended to keep history (e.g. revision ids stay the same), that's not necessarily the case for "git format-patch"12:21
jelmeraburch: I guess to answer your question: it's not possible at the moment, but please file a bug report about it.12:22
aburchjelmer: Hmm, ok.  Then I will either look into how Bzr handles branches or just use "bzr diff". (And file the report.)12:23
=== mrevell is now known as mrevell-lunch
=== mrevell-lunch is now known as mrevell
=== Meths_ is now known as Meths
=== aburch_ is now known as aburch
=== deryck is now known as deryck[lunch]
=== salgado is now known as salgado-lunch
=== deryck[lunch] is now known as deryck
dvheumenhey lifeless, got time for a question about the high(er) level lock hooks?16:50
=== zini1 is now known as zini
jelmerdvheumen: I think he's asleep, being in .au17:14
dvheumenah right okay17:14
dvheumenare you up for a (simple) question by any chance?17:15
jelmerFor certain values of "simple", sure :-)17:15
dvheumenjelmer, maybe you already caught on to that, the idea was that I'd implement a slightly "higher" level of lock hooks. I've been browsing around the code for a good location (or locations) and I think that, for the working trees, I could best implement it in the MutableTree class. But the MutableTree class only "implements" lock_write and lock_tree_write but no lock_read.17:17
dvheumenSo I was wondering, was lock_read just forgotten, or should I take the implementation up to MemoryTree and WorkingTree classes17:18
dvheumenbecause lock_write and lock_tree_write only raise NotImplementedException and nothing more17:18
dvheumenI personally think I could best implement it in MutableTree, but I wanted to wait for some confirmation :)17:23
dvheumenow w8, not it's not, it's stupid, because the actual locking implementation isn't there17:23
dvheumennevermind17:23
jelmerdvheumen: MutableTree seems like the best place to me17:24
jelmerWorkingTree could be thought of as OnDiskMutableTree17:24
dvheumenjelmer, but then I could only do the implementation partially, right17:25
jelmerdvheumen: yes, but the interface would be on MutableTree17:25
jelmerdvheumen: how the subclasses of MutableTree call the hook is up to them17:25
dvheumenokay, that's exactly what I was thinking. okay tnx17:25
dvheumenin that case I also know what (approximate) level to choose for the branch and repository hooks :)17:26
=== salgado-lunch is now known as salgado
dark_soulhow can i use bzr to delete a branch?17:52
mgedminis it difficult to define a custom location scheme a la lp:projectname?17:54
mgedminit gets tiring to type bzr+ssh://servername/prefix/for/all/my/bzr/repos/ all the time17:54
maxbNo, it's pretty simple, I suggest looking at how the launchpad plugin defines lp:17:58
maxb(which is slightly complicated only because it goes and hits an xml-rpc server to resolve the name)17:59
jpdsmgedmin: http://pastebin.ubuntu.com/399436/18:00
mgedminjpds, thanks, but it's a bit cryptic18:00
mgedminis it ~/.bazaar/config?18:00
jpdsmgedmin: ~/.bazaar/locations.conf18:01
mgedminand what does it do?  lets be do cd ~/someproject/devell && bzr branch X  where X gets translated to prefix/X ?18:02
=== beuno is now known as beuno-lunch
jpdsmgedmin: You'll then be able to do: bzr push - from a branch and it will automatically go to lp~you/someproject/branchname18:02
* mgedmin googles for locations.conf18:03
mgedminthanks for the pointer18:03
mgedminfrom what I see I'm not sure it's what I want, but I'll read18:03
mgedminhttp://wiki.bazaar-vcs.org/ConfiguringBzr was not useful18:06
mgedminno useful matches in wiki search18:07
mgedminno matches at all in http://doc.bazaar.canonical.com/latest18:08
* mgedmin searches for appendpath18:08
mgedminthat works better18:09
=== beuno-lunch is now known as beuno
=== radoe_ is now known as radoe
beunogar20:00
beunoI have a newbie question  :)20:00
beunoI have a revno that removed stuff20:00
beunoI want to revert only those changes20:00
beunorevert seems to not be what I want20:01
beunoand merging in that revision, or 111..112 (assuming 112 is the revno I that I want to revert) doesn't work either20:01
james_wmerge -r 156..155 will undo the changes that you see with diff -c 15620:02
beunoof course, the other way around20:03
beuno*sigh*20:03
beunothank you james_w   :)20:03
NfNitLoophehe.20:17
codygmanIf I create a branch, then merge the changes, would I be able to revert back to that at any time?20:49
codygmanor should I say... could I create a branch, commit, then revert back to what it was before that, while keeping the branch20:50
GaryvdMcodygman: Yes.20:51
codygmanalright cool20:51
GaryvdMcodygman: You can do bzr uncommit20:51
codygmanwell here's what i'm trying to do20:52
codygmani'm experimenting with different facebook connect solutions on my django site.. and i'd like to keep note of each one20:52
codygmanand be able to revert to the one i like20:52
GaryvdMcodygman: for that, I would make a branch for each solution.20:53
GaryvdMcodygman: And merge the one you want.20:53
codygmanthe branches stay until i delete them right?20:53
GaryvdMcodygman: Yes20:53
GaryvdMcodygman: or pull the one you want if you have no other commits in your main branch.20:54
codygmanThanks!20:54
codygmanI have quite a few other commits lol20:54
pooliehi jam?20:58
codygmanbzr branch "name of my branch" isn't the right syntax huh21:00
codygmanis their anything similiar to that?21:00
codygmansimilar*21:00
pooliecodygman: it's "branch FROM TO"21:00
pooliewhat do you want to do?21:00
codygmanI just want to test out different facebook connect solutions on my django website21:00
codygmanthen be able to revert to the one I like most21:00
poolieok, and they're already in different bzr branches? or you're going to write things in different branches?21:01
codygmanthere is currently only the master branch21:01
codygmanbasically.. I want to be able to revert to my website without the facebook connect plugins.. code the solution.. then do it for the other 2 possible solutions21:02
codygmanand be able to revert to the one I like best21:02
GaryvdMcodygman: (in the dir above master) bzr branch master solution121:03
GaryvdMHi poolie21:03
codygmanthen when I want to test.. I just merge right?21:05
codygmanbzr merge solution1 master ?21:05
GaryvdMcodygman: Run mange.py runserver in the branch21:07
codygmanwell.. this is actually on an apache server.. that's why i'm trying to get everything working in that directory21:07
GaryvdMOk, 2 options:21:08
GaryvdM1. use the bzr-colo plugin21:09
GaryvdMthat allows you to have more than one branch in the same dir.21:09
GaryvdM2. step 1: branch apache-dir ~/proj/master21:11
pooliehi gary21:11
GaryvdMstep 2: edit  apache-dir, commit, push ~/proj/solution121:12
GaryvdMstep 3: (in apache-dir) bzr pull ~/proj/master21:13
GaryvdMgo back to step 2 repeat21:13
GaryvdMwhen you chose, pull master, then merge concision solution.21:14
GaryvdMcodygman: ^21:14
codygmanI'm reading! Thanks for that. I think i'm going to try the bzr-colo plugin21:15
codygmanif i can't do it with that, i'll use option 221:15
GaryvdMcodygman: I would recomend trying: branch into your home dir, and run with ./manage.py runserver21:16
fullermdvila: Yes, that's where crashdumps get copied to on boot, unless you change it.21:16
GaryvdMcodygman: I had good mileage with that when I was working with django.21:17
codygmanyou mean runserver?21:21
GaryvdMcodygman: Yes, runserver, and working with branches in my home dir.21:24
GaryvdMnight all21:28
humphreybchi22:00
humphreybcwe have a pretty big problem22:00
humphreybcour branch has randomly jumped back about 30 revisions and we're not sure why22:00
humphreybcwe may have lost a crapload of work but not sure22:00
humphreybchttp://bazaar.launchpad.net/~ubuntu-manual/ubuntu-manual/main/changes22:00
humphreybcit was on 565, but then we think it got screwed when Sayantan pushed something and merged22:01
=== salgado is now known as salgado-afk
humphreybcno we have people sitting on 554 testing it all over the palce22:01
bob2pushing can do that22:01
humphreybcso we've got a tonne of people (hundreds) who are testing an older version, but on a newer revision number22:02
humphreybcwhat happens now?22:02
bob2bzr log -n022:02
humphreybcthat command gives me 0 - 6522:02
humphreybcwe've got 500+ revisions22:02
bob2it should give you a long and complicated nested log22:03
humphreybci might need to turn up my line count in terminal22:03
bob2run it through less22:04
humphreybcit looks like we've lost about 30 revisions, 2 days worth of work22:04
bob2really?22:04
humphreybcyes22:04
humphreybcwhich isn't particularly cool22:05
humphreybcdo you mind jumping in to #ubuntu-manual ?22:05
bob2ok, two thinsg: push can change rev order, so look carefully at the output of bzr log -n022:05
bob2also, those revs still exist on the computers of whoever committed them, so even if someone broke launchpad, you can recover them22:05
bob2(msot likely)22:05
bob2http://bazaar.launchpad.net/~ubuntu-manual/ubuntu-manual/main/changes/525.1.17 < -s that the work you think is gone?22:06
humphreybchttp://paste.ubuntu.com/399564/22:07
humphreybcand there is more, under rev 529.xx22:08
humphreybcbut i'm presuming that stuff has been preserved?22:08
humphreybchttp://bazaar.launchpad.net/~ubuntu-manual/ubuntu-manual/main/changes/525.4.2522:10
humphreybcthat's more stuff that we had22:10
humphreybcis that stuff preserved, or is it gone?22:10
mrooneyhey all! I've been searching around, is there something like a rebase, but that collapses your commits into just one?22:55
mrooneysuch as, I've made a bunch of commits , now I want to push it somewhere else as one22:55
lifelessbzr merge; bzr revert --forget-merges; bzr commit - that will discard the history of where the changes came from22:56
lifelessor if you just merge and commit, bzr log will, by default, show it as one change, and keeps the little details available if desired via log -n022:56
mrooneylifeless: doesn't a simple merge squash the remote history, not the local history?22:58
mrooneyor do I rebase and then merge, or something interesting22:59
maxbmrooney: You realize you could just uncommit multiple commits, then commit once?23:03
mrooneyyeah certainly23:03
mrooneybut as a workflow item, that's tedious and annoying23:03
maxbThat's probably because squashing commits isn't a common workflow :-)23:04
maxbWhy do you want to do it anyway?23:04
lifelessmultiple uncommits + commit == merge ; revert --forget-merges, commit23:05
maxbyes, just depends whether you're already in a branch with the commits to be squashed23:07
mwhudsonjelmer: ayt?23:14
jelmermwhudson: otp23:14
mrooneymaxb: I don't really, some people want to wrap our svn workflow and don't want all their local commits to end up as individual commits on the svn end23:15
mwhudsonmkanat: https://bugs.edge.launchpad.net/loggerhead/+bug/513044/comments/623:18
ubottuUbuntu bug 513044 in loggerhead "loggerhead (codebrowse) hangs occasionally on launchpad" [Critical,Triaged]23:18
jelmermwhudson: hello23:18
mwhudsonjelmer: well, i have to admit i'm otp now too :)23:18
mrooneyI'm hoping to convince them to just rebase and enjoy all the history being in svn23:18
mwhudsonjelmer: but did you have time/brain energy to talk about incremental bzr-hg imports?23:18
jelmermwhudson: I'm always excited to talk about bzr-hg imports!23:19
mwhudsonjelmer: heh heh23:20
mrooneyokay so if I can do a bzr branch of an svn repos23:20
mrooneyand then someone else branches my branch, can they bzr push $SVN_REPOS without issue23:21
mwhudsonjelmer: last time we talked, i think we decided that limiting in findmissing() would be too hard?23:21
jelmermrooney: yes.23:21
jelmermwhudson: yep23:22
lifelessyay, my new machine has shipped23:22
mrooneyokay great23:22
mrooneyand a silly question I think but one I've had a hard time googling an answer for23:23
mrooneyif I've got a branch on my machine, what do I need to set up to have someone else be able to branch from it23:23
mwhudsonjelmer: so where can you limit?23:24
mwhudsoni guess i need to figure out what23:24
mwhudson        cg = self.source._hgrepo.changegroup(missing, 'pull')23:24
mwhudsonis doing23:24
mrooneywe're all on a LAN here, I've never figured out how to push and pull from another LAN machine23:24
jelmermwhudson: you can't really limit what the server will send you, but you can limit how much you process23:24
jelmermwhudson: cg is a unpacked hg bundle23:25
mwhudsonoh ok, so addchangegroup needs to change?23:25
jelmermwhudson: it contains three chunks of data in order - from memory: revisions, inventories and texts. We basically loop over all three and you'd need to limit how much processing you do in the first then skip irrelevant stuff in the second two loops.23:25
mwhudsonjelmer: that sounds about right23:27
mwhudsoni don't know what "skip irrelevant stuff" means in concrete terms23:27
jelmermwhudson: inventories (manifests in mercurial jargon) that aren't referenced by any revisions that you're importing should be skipped as well as texts that aren't referenced by any of those manifests.23:29
mwhudsonjelmer: sorry :-p23:29
mwhudsonjelmer: i understood that much23:29
jelmermwhudson: the revisions have references to the manifest ids23:29
jelmerand the manifests have references to the text ids23:30
mwhudsonjelmer: ahh23:30
mwhudsonso i'll need to keep track of some set()s i guess23:30
jelmeryou might be able to leverage the existing datastructures23:30
mwhudson"referenced manifest ids" and so on23:30
jelmersince they try to keep track of what manifest is for what revision23:30
RAOFmrooney: SSH access should be sufficient for people to push/pull to/from you.23:31
jelmerand what mercurial file rev is for what bzr fileid/revid23:31
mwhudsonjelmer: ok, that should be enough to keep me going until i have some more questions i guess23:32
igcmorning23:32
mrooneyRAOF: but would every user that wants to pull from me need a user on my machine?23:34
jelmermwhudson: awesome23:34
mrooneyis there any documentation I can read for this? I'm reading through http://doc.bazaar.canonical.com/latest/en/user-guide/organizing_branches.html and such, but I can't find anything that tells you how to actually set up the sharing23:34
jelmerhi Ian23:34
=== iBasic_ is now known as iBasic
mrooneyjelmer: okay one more question for you, I can't create a --stacked branch of an svn branch, correct?23:52
mrooneybut what happens if someone branches --stacked my branch, and then tries to push to svn?23:52
jelmermrooney: no23:52
jelmermrooney: If they --stacked your branch, that would work and they would be able to push23:53
jelmeryou just can't stack on a svn branch23:53
mrooneyokay so I can branch an svn branch, serve it with bzr serve, and people can branch --stacked and push back to svn all they like? that seems good!23:53
mwhudsonjelmer: grar23:54
mwhudsonjelmer: the unpack_chunk_iter makes live a little awkward to do this, maybe23:55
mwhudson^ interface23:55

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