--- 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 = {