[Pkg-bazaar-commits] ./bzr/unstable r941: - allow for parents specified to Weave.add to be a set

[Martin Pool]

------------------------------------------------------------
revno: 941
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-07-18 08:41:06 -0300
message:
  - allow for parents specified to Weave.add to be a set
modified:
  bzrlib/weave.py
-------------- next part --------------
=== modified file 'bzrlib/weave.py'
--- a/bzrlib/weave.py	2005-07-18 11:36:41 +0000
+++ b/bzrlib/weave.py	2005-07-18 11:41:06 +0000
@@ -226,9 +226,11 @@
         
             return new_version
 
-        if len(parents) == 1 and sha1 == self._sha1s[parents[0]]:
-            # special case: same as the single parent
-            return new_version
+        if len(parents) == 1:
+            pv = list(parents)[0]
+            if sha1 == self._sha1s[pv]:
+                # special case: same as the single parent
+                return new_version
             
 
         ancestors = self.inclusions(parents)
@@ -274,7 +276,6 @@
             i1 = basis_lineno[i1]
             i2 = basis_lineno[i2]
 
-            assert 0 <= i1 <= i2 <= len(old_l)
             assert 0 <= j1 <= j2 <= len(text)
 
             #print tag, i1, i2, j1, j2