Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 43860: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
comparison
equal deleted inserted replaced
43859:fb4a6d584756 43860:7315464f0613
6891 fm.data(source=copy[f]) 6891 fm.data(source=copy[f])
6892 fm.plain( 6892 fm.plain(
6893 (b' %s' + end) % uipathfn(copy[f]), 6893 (b' %s' + end) % uipathfn(copy[f]),
6894 label=b'status.copied', 6894 label=b'status.copied',
6895 ) 6895 )
6896 if morestatus:
6897 morestatus.formatfile(f, fm)
6896 6898
6897 if morestatus: 6899 if morestatus:
6898 morestatus.formatfooter(fm) 6900 morestatus.formatfooter(fm)
6899 fm.end() 6901 fm.end()
6900 6902