Patchwork [1,of,7] context: remove unneeded alias of diffopts

login
register
mail settings
Submitter Yuya Nishihara
Date July 6, 2018, 1:03 p.m.
Message ID <36567c3231fe2a7c26a0.1530882226@mimosa>
Download mbox | patch
Permalink /patch/32663/
State New
Headers show

Comments

Yuya Nishihara - July 6, 2018, 1:03 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1530880082 -32400
#      Fri Jul 06 21:28:02 2018 +0900
# Node ID 36567c3231fe2a7c26a01f7981e6795514bc5aaa
# Parent  050fbd9d103ad4f4b2085e721e4d175791fc8b4c
context: remove unneeded alias of diffopts

Patch

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -302,10 +302,8 @@  class basectx(object):
             ctx2 = self.p1()
         if ctx2 is not None:
             ctx2 = self._repo[ctx2]
-
-        diffopts = opts
         return patch.diff(self._repo, ctx2, self, match=match, changes=changes,
-                          opts=diffopts, losedatafn=losedatafn, prefix=prefix,
+                          opts=opts, losedatafn=losedatafn, prefix=prefix,
                           relroot=relroot, copy=copy,
                           hunksfilterfn=hunksfilterfn)