hgext/extdiff.py
changeset 9523 d932dc655881
parent 9512 e7bde4680eec
parent 9519 0d3c1aa9d5de
child 9941 11d7ee94b56a
equal deleted inserted replaced
9522:47f1d44d3fa3 9523:d932dc655881
   214     When two revision arguments are given, then changes are shown
   214     When two revision arguments are given, then changes are shown
   215     between those revisions. If only one revision is specified then
   215     between those revisions. If only one revision is specified then
   216     that revision is compared to the working directory, and, when no
   216     that revision is compared to the working directory, and, when no
   217     revisions are specified, the working directory files are compared
   217     revisions are specified, the working directory files are compared
   218     to its parent.'''
   218     to its parent.'''
   219     program = opts['program'] or 'diff'
   219     program = opts.get('program')
   220     if opts['program']:
   220     option = opts.get('option')
   221         option = opts['option']
   221     if not program:
   222     else:
   222         program = 'diff'
   223         option = opts['option'] or ['-Npru']
   223         option = option or ['-Npru']
   224     return dodiff(ui, repo, program, option, pats, opts)
   224     return dodiff(ui, repo, program, option, pats, opts)
   225 
   225 
   226 cmdtable = {
   226 cmdtable = {
   227     "extdiff":
   227     "extdiff":
   228     (extdiff,
   228     (extdiff,