135 When two revision arguments are given, then changes are |
135 When two revision arguments are given, then changes are |
136 shown between those revisions. If only one revision is |
136 shown between those revisions. If only one revision is |
137 specified then that revision is compared to the working |
137 specified then that revision is compared to the working |
138 directory, and, when no revisions are specified, the |
138 directory, and, when no revisions are specified, the |
139 working directory files are compared to its parent.''' |
139 working directory files are compared to its parent.''' |
140 return dodiff(ui, repo, opts['program'] or 'diff', |
140 program = opts['program'] or 'diff' |
141 opts['option'] or ['-Npru'], pats, opts) |
141 if opts['program']: |
|
142 option = opts['option'] |
|
143 else: |
|
144 option = opts['option'] or ['-Npru'] |
|
145 return dodiff(ui, repo, program, option, pats, opts) |
142 |
146 |
143 cmdtable = { |
147 cmdtable = { |
144 "extdiff": |
148 "extdiff": |
145 (extdiff, |
149 (extdiff, |
146 [('p', 'program', '', _('comparison program to run')), |
150 [('p', 'program', '', _('comparison program to run')), |