Show More
@@ -63,9 +63,11 b' pretty fast (at least faster than having' | |||||
63 |
|
63 | |||
64 | from mercurial.i18n import _ |
|
64 | from mercurial.i18n import _ | |
65 | from mercurial.node import short, nullid |
|
65 | from mercurial.node import short, nullid | |
66 | from mercurial import scmutil, scmutil, util, commands, encoding |
|
66 | from mercurial import cmdutil, scmutil, scmutil, util, commands, encoding | |
67 | import os, shlex, shutil, tempfile, re |
|
67 | import os, shlex, shutil, tempfile, re | |
68 |
|
68 | |||
|
69 | cmdtable = {} | |||
|
70 | command = cmdutil.command(cmdtable) | |||
69 | testedwith = 'internal' |
|
71 | testedwith = 'internal' | |
70 |
|
72 | |||
71 | def snapshot(ui, repo, files, node, tmproot): |
|
73 | def snapshot(ui, repo, files, node, tmproot): | |
@@ -238,6 +240,15 b' def dodiff(ui, repo, diffcmd, diffopts, ' | |||||
238 | ui.note(_('cleaning up temp directory\n')) |
|
240 | ui.note(_('cleaning up temp directory\n')) | |
239 | shutil.rmtree(tmproot) |
|
241 | shutil.rmtree(tmproot) | |
240 |
|
242 | |||
|
243 | @command('extdiff', | |||
|
244 | [('p', 'program', '', | |||
|
245 | _('comparison program to run'), _('CMD')), | |||
|
246 | ('o', 'option', [], | |||
|
247 | _('pass option to comparison program'), _('OPT')), | |||
|
248 | ('r', 'rev', [], _('revision'), _('REV')), | |||
|
249 | ('c', 'change', '', _('change made by revision'), _('REV')), | |||
|
250 | ] + commands.walkopts, | |||
|
251 | _('hg extdiff [OPT]... [FILE]...')) | |||
241 | def extdiff(ui, repo, *pats, **opts): |
|
252 | def extdiff(ui, repo, *pats, **opts): | |
242 | '''use external program to diff repository (or selected files) |
|
253 | '''use external program to diff repository (or selected files) | |
243 |
|
254 | |||
@@ -262,21 +273,6 b' def extdiff(ui, repo, *pats, **opts):' | |||||
262 | option = option or ['-Npru'] |
|
273 | option = option or ['-Npru'] | |
263 | return dodiff(ui, repo, program, option, pats, opts) |
|
274 | return dodiff(ui, repo, program, option, pats, opts) | |
264 |
|
275 | |||
265 | cmdtable = { |
|
|||
266 | "extdiff": |
|
|||
267 | (extdiff, |
|
|||
268 | [('p', 'program', '', |
|
|||
269 | _('comparison program to run'), _('CMD')), |
|
|||
270 | ('o', 'option', [], |
|
|||
271 | _('pass option to comparison program'), _('OPT')), |
|
|||
272 | ('r', 'rev', [], |
|
|||
273 | _('revision'), _('REV')), |
|
|||
274 | ('c', 'change', '', |
|
|||
275 | _('change made by revision'), _('REV')), |
|
|||
276 | ] + commands.walkopts, |
|
|||
277 | _('hg extdiff [OPT]... [FILE]...')), |
|
|||
278 | } |
|
|||
279 |
|
||||
280 | def uisetup(ui): |
|
276 | def uisetup(ui): | |
281 | for cmd, path in ui.configitems('extdiff'): |
|
277 | for cmd, path in ui.configitems('extdiff'): | |
282 | if cmd.startswith('cmd.'): |
|
278 | if cmd.startswith('cmd.'): |
General Comments 0
You need to be logged in to leave comments.
Login now