##// END OF EJS Templates
log: fix the bug 'hg log --stat -p == hg log --stat'...
Alecs King -
r11950:d157e040 stable
parent child Browse files
Show More
@@ -663,7 +663,7 b' def diffordiffstat(ui, repo, diffopts, n'
663 fp.write(s)
663 fp.write(s)
664
664
665 if stat:
665 if stat:
666 diffopts.context = 0
666 diffopts = diffopts.copy(context=0)
667 width = 80
667 width = 80
668 if not ui.plain():
668 if not ui.plain():
669 width = util.termwidth()
669 width = util.termwidth()
@@ -803,10 +803,17 b' class changeset_printer(object):'
803 matchfn = self.patch
803 matchfn = self.patch
804 if matchfn:
804 if matchfn:
805 stat = self.diffopts.get('stat')
805 stat = self.diffopts.get('stat')
806 diff = self.diffopts.get('patch')
806 diffopts = patch.diffopts(self.ui, self.diffopts)
807 diffopts = patch.diffopts(self.ui, self.diffopts)
807 prev = self.repo.changelog.parents(node)[0]
808 prev = self.repo.changelog.parents(node)[0]
808 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
809 if stat:
809 match=matchfn, stat=stat)
810 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
811 match=matchfn, stat=True)
812 if diff:
813 if stat:
814 self.ui.write("\n")
815 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
816 match=matchfn, stat=False)
810 self.ui.write("\n")
817 self.ui.write("\n")
811
818
812 def _meaningful_parentrevs(self, log, rev):
819 def _meaningful_parentrevs(self, log, rev):
General Comments 0
You need to be logged in to leave comments. Login now