Rev 4100: Weaves were reporting way too many lines altered... fix so that the fetch changes actually emit the right revisions and tests pass. in http://people.ubuntu.com/~robertc/baz2.0/fetch

Robert Collins robertc at robertcollins.net
Wed Mar 11 05:26:21 GMT 2009


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

------------------------------------------------------------
revno: 4100
revision-id: robertc at robertcollins.net-20090311052614-v57k6mz9hqcxzgf6
parent: robertc at robertcollins.net-20090310074723-jgctuly1ziw23r7e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: fetch
timestamp: Wed 2009-03-11 16:26:14 +1100
message:
  Weaves were reporting way too many lines altered... fix so that the fetch changes actually emit the right revisions and tests pass.
=== modified file 'bzrlib/tests/per_repository/test_fileid_involved.py'
--- a/bzrlib/tests/per_repository/test_fileid_involved.py	2009-01-17 01:30:58 +0000
+++ b/bzrlib/tests/per_repository/test_fileid_involved.py	2009-03-11 05:26:14 +0000
@@ -141,6 +141,7 @@
             print set(self.branch.repository.get_ancestry(new)).difference(set(self.branch.repository.get_ancestry(old)))
         self.branch.lock_read()
         self.addCleanup(self.branch.unlock)
+        self.branch.repository.fileids_altered_by_revision_ids(["rev-J","rev-K"])
         self.assertEqual(
             {'b-file-id-2006-01-01-defg':set(['rev-J']),
              'c-funky<file-id>quiji%bo':set(['rev-K'])

=== modified file 'bzrlib/weave.py'
--- a/bzrlib/weave.py	2009-02-23 15:29:35 +0000
+++ b/bzrlib/weave.py	2009-03-11 05:26:14 +0000
@@ -575,10 +575,7 @@
             version_ids = self.versions()
         version_ids = set(version_ids)
         for lineno, inserted, deletes, line in self._walk_internal(version_ids):
-            # if inserted not in version_ids then it was inserted before the
-            # versions we care about, but because weaves cannot represent ghosts
-            # properly, we do not filter down to that
-            # if inserted not in version_ids: continue
+            if inserted not in version_ids: continue
             if line[-1] != '\n':
                 yield line + '\n', inserted
             else:




More information about the bazaar-commits mailing list