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

workbench: add resolve to repository menu

Changeset 772e32adcefe…

Parent 344eed191f83…

by Steve Borho

Changes to 2 files · Browse files at 772e32adcefe Showing diff from parent 344eed191f83 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
21
22
23
24
 
25
26
27
 
329
330
331
 
 
 
 
 
 
332
333
334
 
21
22
23
 
24
25
26
27
 
329
330
331
332
333
334
335
336
337
338
339
340
@@ -21,7 +21,7 @@
 from tortoisehg.hgqt.repomodel import HgRepoListModel  from tortoisehg.hgqt import cmdui, update, tag, backout, merge, visdiff  from tortoisehg.hgqt import archive, thgimport, thgstrip, run, thgrepo, purge -from tortoisehg.hgqt import bisect +from tortoisehg.hgqt import bisect, resolve    from tortoisehg.hgqt.repofilter import RepoFilterBar  from tortoisehg.hgqt.repoview import HgRepoView @@ -329,6 +329,12 @@
    def bisect(self, paths=None):   dlg = bisect.BisectDialog(self.repo, {}, self) + dlg.finished.connect(dlg.deleteLater) + dlg.exec_() + + def resolve(self, paths=None): + dlg = resolve.ResolveDialog(self.repo, self) + dlg.finished.connect(dlg.deleteLater)   dlg.exec_()     def thgimport(self, paths=None):
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​workbench.py Stacked
 
255
256
257
 
 
258
259
260
 
255
256
257
258
259
260
261
262
@@ -255,6 +255,8 @@
  newaction(_("Recover"), self._repofwd('recover'), enabled='repoopen',   menu='repository')   newseparator(menu='repository') + newaction(_("Resolve"), self._repofwd('resolve'), + enabled='repoopen', menu='repository')   newaction(_("Rollback/Undo"), self._repofwd('rollback'),   enabled='repoopen', menu='repository')   newaction(_("Purge"), self._repofwd('purge'), enabled='repoopen',