mercurial/scmutil.py

--- a/mercurial/scmutil.py	Wed Apr 04 15:13:32 2018 -0700
+++ b/mercurial/scmutil.py	Wed Apr 04 22:36:21 2018 -0700
@@ -1134,7 +1134,7 @@
 
             k = encoding.tolocal(k)
             try:
-                data[repo[k].rev()] = encoding.tolocal(v)
+                data[revsingle(repo, k).rev()] = encoding.tolocal(v)
             except (error.LookupError, error.RepoLookupError):
                 pass # we ignore data for nodes that don't exist locally
     finally: