[PATCH 4 of 4] annotate: remove dead code to not convert path to relative path

Yuya Nishihara yuya at tcha.org
Sat Nov 24 07:34:18 EST 2018


# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1543057555 -32400
#      Sat Nov 24 20:05:55 2018 +0900
# Node ID 1aac31914fee54803cd5c206f0dddcc18f6120e2
# Parent  3ba66c3809b43da8216aea05b0cef15bf3a53109
annotate: remove dead code to not convert path to relative path

It's annotate. There should be at least one file path specified.

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -412,8 +412,7 @@ def annotate(ui, repo, *pats, **opts):
         rootfm.startitem()
         rootfm.data(path=abs)
         if not opts.get('text') and fctx.isbinary():
-            rootfm.plain(_("%s: binary file\n")
-                         % ((pats and m.rel(abs)) or abs))
+            rootfm.plain(_("%s: binary file\n") % m.rel(abs))
             continue
 
         fm = rootfm.nested('lines', tmpl='{rev}: {line}')


More information about the Mercurial-devel mailing list