Patchwork [4,of,4] commands.bookmarks: move hexfn to inside list block

login
register
mail settings
Submitter Siddharth Agarwal
Date Nov. 19, 2013, 8:45 p.m.
Message ID <1317f3a74ba55d05bb4e.1384893945@dev1091.prn1.facebook.com>
Download mbox | patch
Permalink /patch/3069/
State Superseded, archived
Headers show

Comments

Siddharth Agarwal - Nov. 19, 2013, 8:45 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1384893809 28800
#      Tue Nov 19 12:43:29 2013 -0800
# Node ID 1317f3a74ba55d05bb4eb308d27cacdb5de37afc
# Parent  5efde1fac081f2271fc2d97189506aa61cd908be
commands.bookmarks: move hexfn to inside list block

This isn't used outside this block, nor is it expected to be.
David Soria Parra - Nov. 21, 2013, 10:08 p.m.
On 11/19/13, 12:45 PM, "Siddharth Agarwal" <sid0@fb.com> wrote:

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

Besides the comment on patch 3 this series looks good to me.

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -807,8 +807,6 @@ 
     rename = opts.get('rename')
     inactive = opts.get('inactive')
 
-    hexfn = ui.debugflag and hex or short
-
     def checkformat(mark):
         mark = mark.strip()
         if not mark:
@@ -918,6 +916,7 @@ 
         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"))