Rev 2109: Make finding original mapping a bit more robust. in http://people.samba.org/bzr/jelmer/bzr-svn/0.5

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 2109
revision-id: jelmer at samba.org-20081130211149-q21u67lhuk9ihggq
parent: jelmer at samba.org-20081130195648-i6l2z6pp3jnyhl5e
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Sun 2008-11-30 22:11:49 +0100
message:
  Make finding original mapping a bit more robust.
modified:
  mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
=== modified file 'mapping.py'
--- a/mapping.py	2008-11-28 22:46:49 +0000
+++ b/mapping.py	2008-11-30 21:11:49 +0000
@@ -787,7 +787,13 @@
 def find_mapping_fileprops(changed_fileprops):
     for k, v in changed_fileprops.iteritems():
         if k.startswith(SVN_PROP_BZR_REVISION_ID):
-            return mapping_registry.parse_mapping_name("svn-" + k[len(SVN_PROP_BZR_REVISION_ID):])
+            try:
+                # perhaps check if content change was valid?
+                find_new_lines(v)
+            except ValueError:
+                pass
+            else:
+                return mapping_registry.parse_mapping_name("svn-" + k[len(SVN_PROP_BZR_REVISION_ID):])
     return None