Mercurial > hg-stable

changeset 3129:f145d04899d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extdiff: use the default option only if the default program is used
author TK Soh <teekaysoh@yahoo.com>
date Mon, 18 Sep 2006 12:01:32 +0200
parents 70e62df12704
children 2e043c9a38a6
files hgext/extdiff.py
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/extdiff.py	Mon Sep 18 11:55:38 2006 +0200
+++ b/hgext/extdiff.py	Mon Sep 18 12:01:32 2006 +0200
@@ -137,8 +137,12 @@
     specified then that revision is compared to the working
     directory, and, when no revisions are specified, the
     working directory files are compared to its parent.'''
-    return dodiff(ui, repo, opts['program'] or 'diff',
-                  opts['option'] or ['-Npru'], pats, opts)
+    program = opts['program'] or 'diff'
+    if opts['program']:
+        option = opts['option']
+    else:
+        option = opts['option'] or ['-Npru']
+    return dodiff(ui, repo, program, option, pats, opts)
 
 cmdtable = {
     "extdiff":