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

merge: add action to 'View changes...' link

Changeset 65f8054d4508…

Parent c71cea49a9a4…

by Yuki KODAMA

Changes to one file · Browse files at 65f8054d4508 Showing diff from parent c71cea49a9a4 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
12
13
14
15
 
16
17
18
 
439
440
441
442
443
 
 
444
445
446
 
12
13
14
 
15
16
17
18
 
439
440
441
 
 
442
443
444
445
446
@@ -12,7 +12,7 @@
   from tortoisehg.util import hglib, paths  from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt import qtlib, csinfo, i18n, cmdui +from tortoisehg.hgqt import qtlib, csinfo, i18n, cmdui, status    keep = i18n.keepgettext()   @@ -439,8 +439,8 @@
  self.runner.commandFinished.connect(finished)   self.runner.run(['qrename', oldpatch, newpatch])   elif cmd == 'view': - # TODO: show Status dialog to show local changes - print 'Not implemented: view' + dlg = status.StatusDialog([], {}, self) + dlg.exec_()   elif cmd == 'skip':   self.done = True   self.wizard().next()