facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

log: fix the bug 'hg log --stat -p == hg log --stat'

Browse Source 
Before:
    hg log --stat -p -r tip # only show stat

After:
    hg log --stat -p -r tip # show stat _and_ diff
This commit is contained in:
Alecs King 2010-08-13 14:29:30 +08:00
parent 5f4b538b5a
commit 057134ed97
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mercurial/cmdutil.py
View File

@ -663,7 +663,7 @@ def diffordiffstat(ui, repo, diffopts, node1, node2, match,
fp.write(s)
if stat:
diffopts.context = 0
diffopts = diffopts.copy(context=0)
width = 80
if not ui.plain():
width = util.termwidth()
@ -803,10 +803,17 @@ class changeset_printer(object):
matchfn = self.patch
if matchfn:
stat = self.diffopts.get('stat')
diff = self.diffopts.get('patch')
diffopts = patch.diffopts(self.ui, self.diffopts)
prev = self.repo.changelog.parents(node)[0]
diffordiffstat(self.ui, self.repo, diffopts, prev, node,
match=matchfn, stat=stat)
if stat:
diffordiffstat(self.ui, self.repo, diffopts, prev, node,
match=matchfn, stat=True)
if diff:
if stat:
self.ui.write("\n")
diffordiffstat(self.ui, self.repo, diffopts, prev, node,
match=matchfn, stat=False)
self.ui.write("\n")
def _meaningful_parentrevs(self, log, rev):