[Bug 465517] Re: 'bzr push' copies the entire repository if there is a BzrDir but not a Branch

[Launchpad Bug Tracker]

** Branch linked: lp:~ubuntu-branches/ubuntu/natty/bzr/natty-proposed

-- 
You received this bug notification because you are a member of Ubuntu
Foundations Bugs, which is subscribed to bzr in Ubuntu.
https://bugs.launchpad.net/bugs/465517

Title:
  'bzr push' copies the entire repository if there is a BzrDir but not a
  Branch

Status in Bazaar Version Control System:
  Fix Released
Status in Bazaar 2.0 series:
  Won't Fix
Status in Bazaar 2.3 series:
  Fix Released
Status in “bzr” package in Ubuntu:
  Fix Released
Status in “bzr” source package in Natty:
  Fix Committed

Bug description:
  I don't know what is specifically wrong, but I don't want to release
  the next version without getting a handle on this.

  I just did some work to set up the release branches for bzr 2.0.2 and
  bzr 2.1.0b2. I then went to push that work to a staging area on
  'babune' because I was at a coffee house and babune is closer to
  Launchpad than I am. (So a few pushes to a shared repo, and then push
  from there to launchpad.)

  However, as I tried to push it seemed to be pushing *way* too much
  content, given that the remote repository should have all of bzr.dev.

  When I instrumented it, I got:

  fetching revisions: 11086
  streaming inventories: 11086
  streaming chk, excluding: 276
  streamed 17737 chk pages
  found text keys: 33378

  So somehow my small incremental branch is trying to push 11k revisions
  up to the remote side.

  'bzr missing --include-merges --mine ../bzr.dev' claims that I only
  have 7 new revisions, which is obviously << 11k.

  Also, in the '-Dhpss' traceback I see lines like:

  12.543  Using fetch logic to copy between CHKInventoryRepository('file:///C:/Users/jameinel/dev/bzr/.bzr/repository/')(<RepositoryFormat2a>) and RemoteRepository(bzr+ssh://jam@babune.ladeuil.net:26662/home/jam/dev/bzr-test/.bzr/)(<RemoteRepositoryFormat>)
  12.552  fetch up to rev {None}
  12.553  hpss call:   'get', '/home/jam/dev/bzr-test/.bzr/branch-format'
  12.553               (to bzr+ssh://jam@babune.ladeuil.net:26662/home/jam/dev/bzr-test/lp/2.1.0b3-dev/)
  12.694     result:   ('ok',)
  12.694                35 body bytes read
  12.695  hpss call:   'get', '/home/jam/dev/bzr-test/.bzr/repository/format'
  12.695               (to bzr+ssh://jam@babune.ladeuil.net:26662/home/jam/dev/bzr-test/lp/2.1.0b3-dev/)
  12.835     result:   ('ok',)
  12.836                54 body bytes read
  12.836  hpss call:   'stat', '/home/jam/dev/bzr-test/.bzr/repository'
  12.836               (to bzr+ssh://jam@babune.ladeuil.net:26662/home/jam/dev/bzr-test/lp/2.1.0b3-dev/)
  12.976     result:   ('stat', '4096', '040755')
  12.979  hpss call:   'get', '/home/jam/dev/bzr-test/.bzr/repository/pack-names'
  12.979               (to bzr+ssh://jam@babune.ladeuil.net:26662/home/jam/dev/bzr-test/lp/2.1.0b3-dev/)
  13.132     result:   ('ok',)
  13.132                696 body bytes read
  13.139  RemoteSSHTransport.readv 3 offsets => 1 coalesced => 1 requests (1)
  13.139  hpss call w/readv: 'readv', '/home/jam/dev/bzr-test/.bzr/repository/indices/f82954caa7b2bf4e81d54c0dd172c542.rix'
  13.139                7 bytes in readv request
  13.325     result:   ('readv',)
  13.493                10520 body bytes read
  13.497  RemoteSSHTransport.readv 2 offsets => 1 coalesced => 1 requests (1)
  13.497  hpss call w/readv: 'readv', '/home/jam/dev/bzr-test/.bzr/repository/indices/f82954caa7b2bf4e81d54c0dd172c542.rix'
  13.497                9 bytes in readv request
  13.682     result:   ('readv',)
  13.704                6424 body bytes read

  Which show that it starts out using a "RemoteRepository" but then
  seems to quickly "ensure_real" determine the exact remote format, and
  then probe the remote indexes directly, rather than using the smarter
  'get_parent_map' implementations.

  I'm sure it is still using GCCHKStreamSource when it is done, because
  that is the code I instrumented to get the debug values.

  I will post more as I figure out more.

To manage notifications about this bug go to:
https://bugs.launchpad.net/bzr/+bug/465517/+subscriptions