Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

visdiff: add --bundle argument to visual diff

For use primarily by the changelog tool when an overlay bundle
is being viewed.

Changeset 2147a9a35226…

Parent e14521f6d3e9…

by Steve Borho

Changes to 2 files · Browse files at 2147a9a35226 Showing diff from parent e14521f6d3e9 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​hgtk.py Stacked
 
681
682
683
 
684
685
686
 
681
682
683
684
685
686
687
@@ -681,6 +681,7 @@
  "^vdiff": (vdiff,   [('c', 'change', '', _('changeset to view in diff tool')),   ('r', 'rev', [], _('revisions to view in diff tool')), + ('b', 'bundle', '', _('bundle file to preview')),   ('', 'raw', None, _('directly use raw extdiff command'))],   _('launch visual diff tool')),   "^version": (version,
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​visdiff.py Stacked
 
100
101
102
103
 
 
104
105
106
 
277
278
279
280
 
 
281
282
283
 
100
101
102
 
103
104
105
106
107
 
278
279
280
 
281
282
283
284
285
@@ -100,7 +100,8 @@
  treeview.append_column(fcol)     try: - repo = hg.repository(ui.ui(), path=paths.find_root()) + path = opts.get('bundle') or paths.find_root() + repo = hg.repository(ui.ui(), path=path)   except hglib.RepoError:   # hgtk should catch this earlier   gdialog.Prompt(_('No repository'), @@ -277,7 +278,8 @@
  'launch raw extdiff command, block until finish'   from hgext import extdiff   try: - repo = hg.repository(ui, path=paths.find_root()) + path = opts.get('bundle') or paths.find_root() + repo = hg.repository(ui, path=path)   except hglib.RepoError:   # hgtk should catch this earlier   ui.warn(_('No repository found here') + '\n')