Mercurial > public > mercurial-scm > hg-stable

diff hgext/transplant.py @ 23452:86c0d8c1484f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
transplant: don't honor whitespace and format-changing diffopts transplant uses diff purely internally.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 18 Nov 2014 21:49:05 -0800
parents 41c03b7592ed
children 49caef455912
line wrap: on
line diff
--- a/hgext/transplant.py	Tue Nov 18 21:38:19 2014 -0800
+++ b/hgext/transplant.py	Tue Nov 18 21:49:05 2014 -0800
@@ -118,7 +118,7 @@
         revs = sorted(revmap)
         p1, p2 = repo.dirstate.parents()
         pulls = []
-        diffopts = patch.diffopts(self.ui, opts)
+        diffopts = patch.difffeatureopts(self.ui, opts)
         diffopts.git = True
 
         lock = wlock = tr = None