diff mercurial/scmutil.py @ 34459:d5c5cc767b7e

extdata: ignore ambiguous identifier as well
author Yuya Nishihara <yuya@tcha.org>
date Sun, 01 Oct 2017 11:56:41 +0100
parents 7757cc48b766
children 910adadf08e8
line wrap: on
line diff
--- a/mercurial/scmutil.py	Sun Oct 01 11:13:09 2017 +0100
+++ b/mercurial/scmutil.py	Sun Oct 01 11:56:41 2017 +0100
@@ -1059,9 +1059,10 @@
                 k, v = l.strip(), ""
 
             k = encoding.tolocal(k)
-            if k in repo:
-                # we ignore data for nodes that don't exist locally
+            try:
                 data[repo[k].rev()] = encoding.tolocal(v)
+            except (error.LookupError, error.RepoLookupError):
+                pass # we ignore data for nodes that don't exist locally
     finally:
         src.close()