Patchwork [3,of,4] cmdutil.changeset_printer: explicitly honor all diffopts

login
register
mail settings
Submitter Siddharth Agarwal
Date Dec. 29, 2014, 11:57 p.m.
Message ID <249986d8472a676d5a86.1419897435@devbig136.prn2.facebook.com>
Download mbox | patch
Permalink /patch/7255/
State Accepted
Commit e41bcb0196334c5da39638e93fffbae2ecba4e76
Headers show

Comments

Siddharth Agarwal - Dec. 29, 2014, 11:57 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1416614515 28800
#      Fri Nov 21 16:01:55 2014 -0800
# Node ID 249986d8472a676d5a86d7a9f1c370b3ad5b0743
# Parent  d6c626f1b24ef6bcdd7fa5fc081ca87b488449df
cmdutil.changeset_printer: explicitly honor all diffopts

This is used in hg log -p so the output is expected to be the same as that of
hg diff.

Patch

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -991,7 +991,7 @@ 
         if matchfn:
             stat = self.diffopts.get('stat')
             diff = self.diffopts.get('patch')
-            diffopts = patch.diffopts(self.ui, self.diffopts)
+            diffopts = patch.diffallopts(self.ui, self.diffopts)
             prev = self.repo.changelog.parents(node)[0]
             if stat:
                 diffordiffstat(self.ui, self.repo, diffopts, prev, node,