fetching looms does not work properly with bzr+ssh

Did r82 fix this?

I've tried to push a loomified branch to LP and branching from LP doesn't seem to produce a working loomified branch. The branch I've pushed is lp:~mathiaz/openldap/pkg-ubuntu.

bzr-loom version:

(i)mathiaz@mathiaz-srv:~/src/openldap/bzr/ubuntu$ bzr up ~/.bazaar/plugins/loom/
Tree is up to date at revision 84.

In my loomified directory:

(i)mathiaz@mathiaz-srv:~/src/openldap/bzr/ubuntu$ bzr info
Repository tree (format: unnamed)
Location:
  shared repository: /home/mathiaz/src/openldap/bzr
  repository branch: .

Related branches:
    push branch: bzr+ssh://<email address hidden>/%7Emathiaz/openldap/pkg-ubuntu/
  parent branch: /home/mathiaz/src/openldap/bzr/debian
(i)mathiaz@mathiaz-srv:~/src/openldap/bzr/ubuntu$ bzr show-loom
=>changelog
  apparmor
  po-files
  ubuntu-maintainer
  slapddir-rules
  gnutls-dep
  drop-smbk5pwd-overlay
  SECURITY_CVE-2008-0658
  fix-dnpretty-assertion
  fix-ucred-libc
  fix-assertion-io
  debian
(i)mathiaz@mathiaz-srv:~/src/openldap/bzr/ubuntu$ bzr push
(i)mathiaz@mathiaz-srv:~/src/openldap/bzr/ubuntu$

In a temporary directory:

(i)mathiaz@mathiaz-srv:~/tmp$ bzr branch lp:~mathiaz/openldap/pkg-ubuntu
(i)mathiaz@mathiaz-srv:~/tmp$ cd pkg-ubuntu/
(i)mathiaz@mathiaz-srv:~/tmp/pkg-ubuntu$ bzr show-loom
(i)mathiaz@mathiaz-srv:~/tmp/pkg-ubuntu$

robertc@lifeless-64:/tmp/foo$ bzr st
Current thread: trunk
robertc@lifeless-64:/tmp/foo$ bzr push ../foo1
r Created new branch.
robertc@lifeless-64:/tmp/foo$ bzr info ../foo1
Standalone tree (format: unnamed)
Location:
  branch root: /tmp/foo1
robertc@lifeless-64:/tmp/foo$ bzr st ../foo1
Current thread: trunk
robertc@lifeless-64:/tmp/foo$ bzr log ../foo1
------------------------------------------------------------
revno: 1
committer: Robert Collins <email address hidden>
branch nick: trunk
timestamp: Wed 2010-06-02 12:26:26 +1200
message:
  1
robertc@lifeless-64:/tmp/foo$ bzr create-thread
bzr: ERROR: command 'create-thread' requires argument THREAD
robertc@lifeless-64:/tmp/foo$ bzr create-thread thread
robertc@lifeless-64:/tmp/foo$ bzr record
bzr: ERROR: command 'record' requires argument MESSAGE
robertc@lifeless-64:/tmp/foo$ bzr record 3
Loom recorded.
robertc@lifeless-64:/tmp/foo$ bzr push ../foo1
No new revisions to push.
robertc@lifeless-64:/tmp/foo$ bzr st ../foo1
Current thread: thread
robertc@lifeless-64:/tmp/foo$ less ../foo1/
.bzr/ foo
robertc@lifeless-64:/tmp/foo$ less ../foo1/.bzr/branch/l
last-loom last-revision lock/
robertc@lifeless-64:/tmp/foo$ less ../foo1/.bzr/branch/last-loom
Loom current 1
<email address hidden>
 <email address hidden> : <email address hidden> trunk
 <email address hidden> : <email address hidden> thread
robertc@lifeless-64:/tmp/foo$ cd ..
robertc@lifeless-64:/tmp$ bzr branch foo1 foo2
Branched 1 revision(s).
robertc@lifeless-64:/tmp$ bzr info foo2
Standalone tree (format: unnamed)
bLocation:
  branch root: foo2

Related branches:
  parent branch: foo1
robertc@lifeless-64:/tmp$ bzr st foo2
Current thread: thread
robertc@lifeless-64:/tmp$ cat foo2/.bzr/branch/last-loom
Loom current 1
<email address hidden>
 <email address hidden> : <email address hidden> trunk
 <email address hidden> : <email address hidden> thread

So it seems to work to me, locally.

Trying with a +junk on launchpad now.

Ok, reproduced with +junk. So its a smart server interaction of some sort.

Locally happens too (so not bzr-loom version, per-se)

robertc@lifeless-64:/tmp/foo2$ bzr push bzr+ssh://localhost/tmp/foo4
Created new branch.
robertc@lifeless-64:/tmp/foo2$ cd ..
robertc@lifeless-64:/tmp$ bzr branch bzr+ssh://localhost/tmp/foo4 foo5
Branched 1 revision(s).
robertc@lifeless-64:/tmp$ cat foo4/.bzr/branch/last-loom
Loom current 1
<email address hidden>
 <email address hidden> : <email address hidden> trunk
 <email address hidden> : <email address hidden> thread
robertc@lifeless-64:/tmp$ cat foo4/.bzr/branch/last-revision
1 <email address hidden>
robertc@lifeless-64:/tmp$ cat foo5/.bzr/branch/last-loom
Loom current 1

ok, so what happens with branch, (and pull will be similar) is this:
RemoteBranch.sprout is called, not LoomBranch7.sprout
so the custom copy_content_into is not called
and the loom stays unaltered.

There is a further bug too, which is that 'bzr pull' doesn't correctly update looms when the source is behind a bzr+ssh server - with a similar cause. I'm going to wrap this into the same bug.

I tried a few different layouts, using the existing InterBranch works best; there is still a really scratchy feeling here - we can't put sprout or clone on InterBranch, and I think that the right layout would also encompass InterBranch, but scope creep doesn't help get things done ;)

I've landed the loom side of the fix which spiv eyeballed an earlier version of (and it looks ~ the same); the bzr side is up for review now.