Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/cmdutil.py @ 35458:786289423e97

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Augie Fackler <augie@google.com>
date Tue, 19 Dec 2017 16:27:24 -0500
parents 8a0cac20a1ad 058c725925e3
children 5bec509dc1ff
comparison
equal deleted inserted replaced
35457:44fd4cfc6c0a 35458:786289423e97
1513 if not matchroot.startswith(relroot): 1513 if not matchroot.startswith(relroot):
1514 ui.warn(_('warning: %s not inside relative root %s\n') % ( 1514 ui.warn(_('warning: %s not inside relative root %s\n') % (
1515 match.uipath(matchroot), uirelroot)) 1515 match.uipath(matchroot), uirelroot))
1516 1516
1517 if stat: 1517 if stat:
1518 diffopts = diffopts.copy(context=0) 1518 diffopts = diffopts.copy(context=0, noprefix=False)
1519 width = 80 1519 width = 80
1520 if not ui.plain(): 1520 if not ui.plain():
1521 width = ui.termwidth() 1521 width = ui.termwidth()
1522 chunks = patch.diff(repo, node1, node2, match, changes, opts=diffopts, 1522 chunks = patch.diff(repo, node1, node2, match, changes, opts=diffopts,
1523 prefix=prefix, relroot=relroot, 1523 prefix=prefix, relroot=relroot,