# HG changeset patch # User Augie Fackler # Date 1269733367 18000 # Node ID eb16630bceb1fd52f8dd8bc1fcdf8499d7002c04 # Parent b4c3afc95420b0a32071447f51d84b0f19f1c556 maps: fix a % formatting bug diff --git a/hgsubversion/maps.py b/hgsubversion/maps.py --- a/hgsubversion/maps.py +++ b/hgsubversion/maps.py @@ -153,7 +153,7 @@ class TagMap(dict): self[k] = v def __contains__(self, tag): - return (tag and dict.__contains__(self, tag) + return (tag and dict.__contains__(self, tag) and dict.__getitem__(self, tag) != node.nullid) def __getitem__(self, tag): @@ -267,7 +267,7 @@ class FileMap(object): def add(self, fn, map, path): mapping = getattr(self, map) if path in mapping: - msg = 'duplicate %s entry in %s: "%d"\n' + msg = 'duplicate %s entry in %s: "%s"\n' self.ui.status(msg % (map, fn, path)) return bits = map.strip('e'), path