Mercurial > hg-stable

changeset 9957:ad44e1f8b3f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Sune Foldager <cryo@cyanite.org>
date Mon, 30 Nov 2009 19:52:03 +0100
parents 7bcbdefcd93a (current diff) 6045a8c4dbbc (diff)
children 777c1df76ef4 0aa1a632262b
files hgext/extdiff.py
diffstat 3 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/extdiff.py	Mon Nov 30 16:53:05 2009 +0100
+++ b/hgext/extdiff.py	Mon Nov 30 19:52:03 2009 +0100
@@ -254,7 +254,8 @@
         def save(cmd, path, diffopts):
             '''use closure to save diff command to use'''
             def mydiff(ui, repo, *pats, **opts):
-                return dodiff(ui, repo, path, diffopts, pats, opts)
+                return dodiff(ui, repo, path, diffopts + opts['option'],
+                              pats, opts)
             doc = _('''\
 use %(path)s to diff repository (or selected files)
 
--- a/tests/test-extdiff	Mon Nov 30 16:53:05 2009 +0100
+++ b/tests/test-extdiff	Mon Nov 30 19:52:03 2009 +0100
@@ -65,3 +65,9 @@
 hg extdiff -p `pwd`/differ.py # will change to /tmp/extdiff.TMP and populate directories a.TMP and a and start tool
 echo '% diff in working directory, after'
 hg diff --git
+
+echo
+echo % test extdiff with --option
+hg extdiff -p echo -o this -c 1
+hg falabala -o this -c 1
+echo
--- a/tests/test-extdiff.out	Mon Nov 30 16:53:05 2009 +0100
+++ b/tests/test-extdiff.out	Mon Nov 30 19:52:03 2009 +0100
@@ -68,3 +68,8 @@
 -b
 +changed
 +edited
+
+% test extdiff with --option
+this a.8a5febb7f867/a a.34eed99112ab/a
+diffing this a.8a5febb7f867/a a.34eed99112ab/a
+