From patchwork Mon Dec 29 23:57:16 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [4,of,4] tests/autodiff.py: explicitly only honor feature diffopts
From: Siddharth Agarwal <sid0@fb.com>
X-Patchwork-Id: 7257
Message-Id: <500550c4f8085e52fe3a.1419897436@devbig136.prn2.facebook.com>
To: <mercurial-devel@selenic.com>
Date: Mon, 29 Dec 2014 15:57:16 -0800

# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1416614546 28800
#      Fri Nov 21 16:02:26 2014 -0800
# Node ID 500550c4f8085e52fe3a87b4c2759c3696ecd5d1
# Parent  249986d8472a676d5a86d7a9f1c370b3ad5b0743
tests/autodiff.py: explicitly only honor feature diffopts

This test extension manages the opts it cares about on its own anyway.

diff --git a/tests/autodiff.py b/tests/autodiff.py
--- a/tests/autodiff.py
+++ b/tests/autodiff.py
@@ -10,7 +10,7 @@
     [('', 'git', '', 'git upgrade mode (yes/no/auto/warn/abort)')],
     '[OPTION]... [FILE]...')
 def autodiff(ui, repo, *pats, **opts):
-    diffopts = patch.diffopts(ui, opts)
+    diffopts = patch.difffeatureopts(ui, opts)
     git = opts.get('git', 'no')
     brokenfiles = set()
     losedatafn = None