Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

resolve: use qtlib.editfiles

Changeset f5eb5cbd6a6a…

Parent 1b9f095d7ca5…

by Steve Borho

Changes to one file · Browse files at f5eb5cbd6a6a Showing diff from parent 1b9f095d7ca5 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​resolve.py Stacked
 
14
15
16
17
 
18
19
20
 
192
193
194
195
 
196
197
198
 
14
15
16
 
17
18
19
20
 
192
193
194
 
195
196
197
198
@@ -14,7 +14,7 @@
   from tortoisehg.util import hglib  from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt import qtlib, cmdui, wctxactions, visdiff, thgrepo +from tortoisehg.hgqt import qtlib, cmdui, visdiff, thgrepo    MARGINS = (8, 0, 0, 0)   @@ -192,7 +192,7 @@
  paths = self.getSelectedPaths(self.rtree)   if paths:   abspaths = [os.path.join(r,w) for r,w in paths] - wctxactions.edit(self, self.repo.ui, self.repo, abspaths) + qtlib.editfiles(self.repo, abspaths, parent=self)     def getVdiffFiles(self, tree):   paths = self.getSelectedPaths(self.rtree)