Skip to content
Snippets Groups Projects
Commit 6045a8c4 authored by Sune Foldager's avatar Sune Foldager
Browse files

extdiff: respect --option in command aliases (issue949)

parent d6a30771
No related branches found
No related tags found
No related merge requests found
......@@ -253,7 +253,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)
......
......@@ -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
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment