Mercurial > hg-stable

changeset 9519:0d3c1aa9d5de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extdiff: fix defaulting to "diff" if no --program is given
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
date Thu, 01 Oct 2009 08:50:10 +0200
parents 5987183d6e59
children bcc27ee3a37b
files hgext/extdiff.py
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/extdiff.py	Wed Sep 30 18:47:33 2009 -0500
+++ b/hgext/extdiff.py	Thu Oct 01 08:50:10 2009 +0200
@@ -173,11 +173,11 @@
     that revision is compared to the working directory, and, when no
     revisions are specified, the working directory files are compared
     to its parent.'''
-    program = opts['program'] or 'diff'
-    if opts['program']:
-        option = opts['option']
-    else:
-        option = opts['option'] or ['-Npru']
+    program = opts.get('program')
+    option = opts.get('option')
+    if not program:
+        program = 'diff'
+        option = option or ['-Npru']
     return dodiff(ui, repo, program, option, pats, opts)
 
 cmdtable = {