[merge] make sure to get all text revisions during merge (aaron)

bzrlib/builtins.py

@@ -41,7 +41,6 @@ def branch_files(file_list, default_branch='.'):
     try:
         return inner_branch_files(file_list, default_branch)
     except FileInWrongBranch, e:
-        print file_list
         raise BzrCommandError("%s is not in the same branch as %s" %
                              (e.path, file_list[0]))
 

bzrlib/check.py

@@ -42,6 +42,7 @@ class Check(object):
 
     def __init__(self, branch):
         self.branch = branch
+        self.inventory_weave = branch._get_inventory_weave()
         self.checked_text_cnt = 0
         self.checked_rev_cnt = 0
         self.ghosts = []
@@ -54,24 +55,27 @@ def __init__(self, branch):
 
     def check(self):
         self.branch.lock_read()
+        self.progress = bzrlib.ui.ui_factory.progress_bar()
         try:
             self.history = self.branch.revision_history()
             if not len(self.history):
                 # nothing to see here
                 return
-            self.planned_revisions = self.branch.get_ancestry(self.history[-1])
-            self.planned_revisions.remove(None)
-            revno = 0
+            if not self.branch.revision_store.listable():
+                raise BzrCheckError("Branch must be local")
+            self.planned_revisions = set(self.branch.revision_store)
+            inventoried = set(self.inventory_weave.names())
+            awol = self.planned_revisions - inventoried
+            if len(awol) > 0:
+                raise BzrCheckError('Stored revisions missing from inventory'
+                    '{%s}' % ','.join([f for f in awol]))
 
-            self.progress = bzrlib.ui.ui_factory.progress_bar()
-            while revno < len(self.planned_revisions):
-                rev_id = self.planned_revisions[revno]
-                self.progress.update('checking revision', revno,
+            for revno, rev_id in enumerate(self.planned_revisions):
+                self.progress.update('checking revision', revno+1,
                                      len(self.planned_revisions))
-                revno += 1
                 self.check_one_rev(rev_id)
-            self.progress.clear()
         finally:
+            self.progress.clear()
             self.branch.unlock()
 
     def report_results(self, verbose):

bzrlib/errors.py

@@ -458,3 +458,10 @@ class MustUseDecorated(Exception):
     This should never escape bzr, so does not need to be printable.
     """
 
+class MissingText(BzrNewError):
+    """Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"""
+    def __init__(self, branch, text_revision, file_id):
+        self.branch = branch
+        self.base = branch.base
+        self.text_revision = text_revision
+        self.file_id = file_id

bzrlib/fetch.py

@@ -20,7 +20,8 @@
 
 import bzrlib
 import bzrlib.errors as errors
-from bzrlib.errors import InstallFailed, NoSuchRevision, WeaveError
+from bzrlib.errors import (InstallFailed, NoSuchRevision, WeaveError,
+                           MissingText)
 from bzrlib.trace import mutter, note, warning
 from bzrlib.branch import Branch
 from bzrlib.progress import ProgressBar
@@ -212,22 +213,19 @@ def _copy_new_texts(self, rev_id, inv):
         # in memory until everything's done?  But this way is nicer
         # if it's interrupted.
         for path, ie in inv.iter_entries():
-            if ie.revision != rev_id:
-                continue
-            mutter('%s {%s} is changed in this revision',
-                   path, ie.file_id)
-            self._copy_one_weave(rev_id, ie.file_id)
+            self._copy_one_weave(rev_id, ie.file_id, ie.revision)
 
-    def _copy_one_weave(self, rev_id, file_id):
-        """Copy one file weave."""
-        mutter('copy file {%s} modified in {%s}', file_id, rev_id)
-        if file_id in self.copied_file_ids:
-            mutter('file {%s} already copied', file_id)
+    def _copy_one_weave(self, rev_id, file_id, text_revision):
+        """Copy one file weave, esuring the result contains text_revision."""
+        to_weave = self.to_weaves.get_weave_or_empty(file_id,
+            self.to_branch.get_transaction())
+        if text_revision in to_weave:
             return
         from_weave = self.from_weaves.get_weave(file_id,
             self.from_branch.get_transaction())
-        to_weave = self.to_weaves.get_weave_or_empty(file_id,
-            self.to_branch.get_transaction())
+        if text_revision not in from_weave:
+            raise MissingText(self.from_branch, text_revision, file_id)
+        mutter('copy file {%s} modified in {%s}', file_id, rev_id)
         try:
             to_weave.join(from_weave)
         except errors.WeaveParentMismatch:

bzrlib/weave.py

@@ -176,6 +176,9 @@ def __init__(self, weave_name=None):
         self._name_map = {}
         self._weave_name = weave_name
 
+    def __repr__(self):
+        return "Weave(%r)" % self._weave_name
+
 
     def copy(self):
         """Return a deep copy of self.