Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

run: add vdiff command

Changeset 966043d60b7c…

Parent 6a5495197a79…

by Steve Borho

Changes to one file · Browse files at 966043d60b7c Showing diff from parent 6a5495197a79 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​run.py Stacked
 
239
240
241
 
242
243
244
 
373
374
375
 
 
 
 
 
376
377
378
 
613
614
615
 
 
 
 
 
616
617
618
 
239
240
241
242
243
244
245
 
374
375
376
377
378
379
380
381
382
383
384
 
619
620
621
622
623
624
625
626
627
628
629
@@ -239,6 +239,7 @@
  raise error.RepoError(_("There is no Mercurial repository here"   " (.hg not found)"))   + cmdoptions['mainapp'] = True   d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)   return _runcommand(lui, options, cmd, d)   @@ -373,6 +374,11 @@
  from tortoisehg.hgqt.workbench import run   qtrun(run, ui, *pats, **opts)   +def vdiff(ui, *pats, **opts): + """launch configured visual diff tool""" + from tortoisehg.hgqt.visdiff import run + qtrun(run, ui, *pats, **opts) +  ### help management, adapted from mercurial.commands.help_()  def help_(ui, name=None, with_version=False, **opts):   """show help for a command, extension, or list of commands @@ -613,6 +619,11 @@
  [('C', 'clean', None, _('discard uncommitted changes (no backup)')),   ('r', 'rev', '', _('revision to update')),],   _('thg update [-C] [[-r] REV]')), + "^vdiff": (vdiff, + [('c', 'change', '', _('changeset to view in diff tool')), + ('r', 'rev', [], _('revisions to view in diff tool')), + ('b', 'bundle', '', _('bundle file to preview'))], + _('launch visual diff tool')),  }    if os.name == 'nt':