[PATCH 5 of 5 V3] commands.bookmarks: move hexfn to inside list block

Siddharth Agarwal sid0 at fb.com
Fri Dec 20 10:04:05 CST 2013


# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1384893809 28800
#      Tue Nov 19 12:43:29 2013 -0800
# Node ID 30d708ce5258551c3e06697b807aecf9214c291b
# Parent  e04bd1e754d2910a9b3b6051fd5f229f1c4d78d7
commands.bookmarks: move hexfn to inside list block

This isn't used outside this block, nor is it expected to be.

diff -r e04bd1e754d2910a9b3b6051fd5f229f1c4d78d7 -r 30d708ce5258551c3e06697b807aecf9214c291b mercurial/commands.py
--- a/mercurial/commands.py	Tue Nov 19 12:42:17 2013 -0800
+++ b/mercurial/commands.py	Tue Nov 19 12:43:29 2013 -0800
@@ -807,8 +807,6 @@ def bookmark(ui, repo, *names, **opts):
     rename = opts.get('rename')
     inactive = opts.get('inactive')
 
-    hexfn = ui.debugflag and hex or short
-
     def checkformat(mark):
         mark = mark.strip()
         if not mark:
@@ -920,6 +918,7 @@ def bookmark(ui, repo, *names, **opts):
         finally:
             wlock.release()
     else: # show bookmarks
+        hexfn = ui.debugflag and hex or short
         marks = repo._bookmarks
         if len(marks) == 0:
             ui.status(_("no bookmarks set\n"))


More information about the Mercurial-devel mailing list