Rev 1748: Use find_new_lines when finding revision ids. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/trunk

------------------------------------------------------------
revno: 1748
revision-id: jelmer at samba.org-20081109195807-mducpprmvql5gbju
parent: jelmer at samba.org-20081109195639-ei0pa55kxkfdo1h6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-11-09 20:58:07 +0100
message:
  Use find_new_lines when finding revision ids.
modified:
  revids.py                      revids.py-20070416220458-36vfa0730cchevp1-1
=== modified file 'revids.py'
--- a/revids.py	2008-11-09 05:06:06 +0000
+++ b/revids.py	2008-11-09 19:58:07 +0000
@@ -22,8 +22,10 @@
 from bzrlib.plugins.svn.cache import CacheTable
 from bzrlib.plugins.svn.core import SubversionException
 from bzrlib.plugins.svn.errors import InvalidPropertyValue, ERR_FS_NO_SUCH_REVISION, InvalidBzrSvnRevision
-from bzrlib.plugins.svn.mapping import (parse_revision_id, BzrSvnMapping, 
-                     SVN_PROP_BZR_REVISION_ID, parse_revid_property)
+from bzrlib.plugins.svn.mapping import (find_new_lines, parse_revision_id, 
+                                        BzrSvnMapping, 
+                                        SVN_PROP_BZR_REVISION_ID, 
+                                        parse_revid_property)
 from bzrlib.plugins.svn.mapping3 import BzrSvnMappingv3FileProps
 from bzrlib.plugins.svn.mapping3.scheme import BranchingScheme
 
@@ -112,8 +114,16 @@
                 if not propname.startswith(SVN_PROP_BZR_REVISION_ID):
                     continue
                 try:
+                    new_lines = find_new_lines((oldpropvalue, propvalue))
+                    if len(new_lines) != 1:
+                        continue
+                except ValueError:
+                    # Don't warn about encountering an invalid property, 
+                    # that will already have happened earlier
+                    continue
+                try:
                     (entry_revno, entry_revid) = parse_revid_property(
-                        propvalue.splitlines()[-1])
+                        new_lines[0])
                 except InvalidPropertyValue:
                     # Don't warn about encountering an invalid property, 
                     # that will already have happened earlier