Rev 4697: Align RevisionTextStore and SignatureTextStore keys() definitions for weave repos in http://bazaar.launchpad.net/~vila/bzr/integration

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/integration

------------------------------------------------------------
revno: 4697 [merge]
revision-id: v.ladeuil+lp at free.fr-20090917090800-mo1mspu2chgpli1z
parent: pqm at pqm.ubuntu.com-20090917080942-rhh806k1mgcmj3p1
parent: v.ladeuil+lp at free.fr-20090916171907-i5pd2mrwgg1dzmtr
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: integration
timestamp: Thu 2009-09-17 11:08:00 +0200
message:
  Align RevisionTextStore and SignatureTextStore keys() definitions for weave repos
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-09-17 07:31:22 +0000
+++ b/NEWS	2009-09-17 09:08:00 +0000
@@ -77,6 +77,10 @@
 * Registry objects should not use iteritems() when asked to use items().
   (Vincent Ladeuil, #430510)
 
+* Weave based repositories couldn't be cloned when committers were using
+  domains or user ids embedding '.sig'. Now they can.
+  (Matthew Fuller, Vincent Ladeuil, #430868)
+
 Improvements
 ************
 

=== modified file 'bzrlib/repofmt/weaverepo.py'
--- a/bzrlib/repofmt/weaverepo.py	2009-08-18 14:49:52 +0000
+++ b/bzrlib/repofmt/weaverepo.py	2009-09-16 17:19:07 +0000
@@ -688,7 +688,7 @@
             path, ext = os.path.splitext(relpath)
             if ext == '.gz':
                 relpath = path
-            if '.sig' not in relpath:
+            if not relpath.endswith('.sig'):
                 relpaths.add(relpath)
         paths = list(relpaths)
         return set([self._mapper.unmap(path) for path in paths])