[PATCH 1 of 5] namespaces: fix name/node confusion

timeless timeless at mozdev.org
Thu Mar 17 11:46:48 EDT 2016


# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1458169963 0
#      Wed Mar 16 23:12:43 2016 +0000
# Node ID a96a4945808a3d3896e81d2204ef1ccd3a44a251
# Parent  dfd5a6830ea7cd56909b6667c78ae122cc3a5aa1
namespaces: fix name/node confusion

There was a lot of copy/paste here.

diff --git a/mercurial/namespaces.py b/mercurial/namespaces.py
--- a/mercurial/namespaces.py
+++ b/mercurial/namespaces.py
@@ -30,7 +30,7 @@
         # branches) to be initialized somewhere, so that place is here
         bmknames = lambda repo: repo._bookmarks.keys()
         bmknamemap = lambda repo, name: tolist(repo._bookmarks.get(name))
-        bmknodemap = lambda repo, name: repo.nodebookmarks(name)
+        bmknodemap = lambda repo, node: repo.nodebookmarks(node)
         n = namespace("bookmarks", templatename="bookmark",
                       # i18n: column positioning for "hg log"
                       logfmt=_("bookmark:    %s\n"),
@@ -40,7 +40,7 @@
 
         tagnames = lambda repo: [t for t, n in repo.tagslist()]
         tagnamemap = lambda repo, name: tolist(repo._tagscache.tags.get(name))
-        tagnodemap = lambda repo, name: repo.nodetags(name)
+        tagnodemap = lambda repo, node: repo.nodetags(node)
         n = namespace("tags", templatename="tag",
                       # i18n: column positioning for "hg log"
                       logfmt=_("tag:         %s\n"),
@@ -149,8 +149,8 @@
         logfmt: the format to use for (i18n-ed) log output; if not specified
                 it is composed from logname
         listnames: function to list all names
-        namemap: function that inputs a node, output name(s)
-        nodemap: function that inputs a name, output node(s)
+        namemap: function that inputs a name, output node(s)
+        nodemap: function that inputs a node, output name(s)
         deprecated: set of names to be masked for ordinary use
 
         """


More information about the Mercurial-devel mailing list