# HG changeset patch # User Dirkjan Ochtman # Date 1286376610 -7200 # Node ID cfefeefad199c92d91c9b14f5e77f46555b84833 # Parent e830b592917b642906cc03a140be774c542ea68b rename TagMap to Tags, to free up the TagMap name diff --git a/hgsubversion/maps.py b/hgsubversion/maps.py --- a/hgsubversion/maps.py +++ b/hgsubversion/maps.py @@ -97,7 +97,7 @@ class AuthorMap(dict): return author.rsplit('@', 1)[0] -class TagMap(dict): +class Tags(dict): """Map tags to converted node identifier. tag names are non-empty strings. diff --git a/hgsubversion/svncommands.py b/hgsubversion/svncommands.py --- a/hgsubversion/svncommands.py +++ b/hgsubversion/svncommands.py @@ -102,9 +102,9 @@ def rebuildmeta(ui, repo, args, **opts): branchinfo = {} noderevnums = {} tagfile = os.path.join(svnmetadir, 'tagmap') - if os.path.exists(maps.TagMap.filepath(repo)): - os.unlink(maps.TagMap.filepath(repo)) - tags = maps.TagMap(repo) + if os.path.exists(maps.Tags.filepath(repo)): + os.unlink(maps.Tags.filepath(repo)) + tags = maps.Tags(repo) layout = None diff --git a/hgsubversion/svnmeta.py b/hgsubversion/svnmeta.py --- a/hgsubversion/svnmeta.py +++ b/hgsubversion/svnmeta.py @@ -67,7 +67,7 @@ class SVNMeta(object): self.branches = pickle.load(f) f.close() self.prevbranches = dict(self.branches) - self.tags = maps.TagMap(repo) + self.tags = maps.Tags(repo) if os.path.exists(self.tag_locations_file): f = open(self.tag_locations_file) self.tag_locations = pickle.load(f) @@ -413,7 +413,7 @@ class SVNMeta(object): return node.hex(self.revmap[tagged]) tag = fromtag # Reference an existing tag - limitedtags = maps.TagMap(self.repo, endrev=number-1) + limitedtags = maps.Tags(self.repo, endrev=number-1) if tag in limitedtags: return limitedtags[tag] r, br = self.get_parent_svn_branch_and_rev(number - 1, branch, exact)