Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 43842:7315464f0613

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
status: add template/json data about whether a file has unresolved conflicts Differential Revision: https://phab.mercurial-scm.org/D7594
author Rodrigo Damazio Bovendorp <rdamazio@google.com>
date Mon, 09 Dec 2019 22:06:55 -0800
parents fb4a6d584756
children aac921f54554
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Dec 09 18:15:38 2019 -0800
+++ b/mercurial/commands.py	Mon Dec 09 22:06:55 2019 -0800
@@ -6893,6 +6893,8 @@
                         (b'  %s' + end) % uipathfn(copy[f]),
                         label=b'status.copied',
                     )
+                if morestatus:
+                    morestatus.formatfile(f, fm)
 
     if morestatus:
         morestatus.formatfooter(fm)