Mercurial > hgsubversion
changeset 593:eb16630bceb1
maps: fix a % formatting bug
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Sat, 27 Mar 2010 18:42:47 -0500 |
parents | b4c3afc95420 |
children | 3dbd3af0ffaf |
files | hgsubversion/maps.py |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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