Rev 2724: Merge last merged support branch back from bzr.dev, removing duplicate method definitions previously created in a merge. in http://people.ubuntu.com/~robertc/baz2.0/repository

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/repository

------------------------------------------------------------
revno: 2724
revision-id: robertc at robertcollins.net-20070822063025-cbnp2jeeshfx62mc
parent: robertc at robertcollins.net-20070822062352-0h4g14qd15odqfn0
parent: pqm at pqm.ubuntu.com-20070822052832-nxby1d1plok4syek
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Wed 2007-08-22 16:30:25 +1000
message:
  Merge last merged support branch back from bzr.dev, removing duplicate method definitions previously created in a merge.
modified:
  bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
    ------------------------------------------------------------
    revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.72
    revision-id: pqm at pqm.ubuntu.com-20070822052832-nxby1d1plok4syek
    parent: pqm at pqm.ubuntu.com-20070822044432-tfi063jpsr3vgnao
    parent: robertc at robertcollins.net-20070822000438-ytdb6rp46lnk2jlx
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-08-22 06:28:32 +0100
    message:
      (robertc) Add a private repository attribute to tell reonccile tests what the repository does to inventories during reconcile(). (Robert Collins).
    modified:
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
=== modified file 'bzrlib/fetch.py'
--- a/bzrlib/fetch.py	2007-08-22 01:02:35 +0000
+++ b/bzrlib/fetch.py	2007-08-22 06:30:25 +0000
@@ -220,7 +220,6 @@
     def _fetch_inventory_weave(self, revs, pb):
         pb.update("fetch inventory", 0, 2)
         to_weave = self.to_repository.get_inventory_weave()
-
         child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
         try:
             # just merge, this is optimisable and its means we don't

=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py	2007-08-22 06:23:52 +0000
+++ b/bzrlib/remote.py	2007-08-22 06:30:25 +0000
@@ -277,28 +277,6 @@
         self._ensure_real()
         return self._real_repository.commit_write_group()
 
-    def abort_write_group(self):
-        """Complete a write group on the decorated repository.
-        
-        Smart methods peform operations in a single step so this api
-        is not really applicable except as a compatibility thunk
-        for older plugins that don't use e.g. the CommitBuilder
-        facility.
-        """
-        self._ensure_real()
-        return self._real_repository.abort_write_group()
-
-    def commit_write_group(self):
-        """Complete a write group on the decorated repository.
-        
-        Smart methods peform operations in a single step so this api
-        is not really applicable except as a compatibility thunk
-        for older plugins that don't use e.g. the CommitBuilder
-        facility.
-        """
-        self._ensure_real()
-        return self._real_repository.commit_write_group()
-
     def _ensure_real(self):
         """Ensure that there is a _real_repository set.