Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable backout: check for unresolved conflicts recursively

Changeset a479c0ded724…

Parent 7416d9740fdc…

by Steve Borho

Changes to one file · Browse files at a479c0ded724 Showing diff from parent 7416d9740fdc Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​backout.py Stacked
 
13
14
15
16
 
17
18
19
 
218
219
220
221
222
223
 
 
224
225
226
 
250
251
252
253
254
255
256
 
13
14
15
 
16
17
18
19
 
218
219
220
 
 
 
221
222
223
224
225
 
249
250
251
 
252
253
254
@@ -13,7 +13,7 @@
 from tortoisehg.util import hglib  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib, csinfo, i18n, cmdui, status, resolve -from tortoisehg.hgqt import commit, qscilib +from tortoisehg.hgqt import commit, qscilib, thgrepo    keep = i18n.keepgettext()   @@ -218,9 +218,8 @@
  self.accept()     def checkResolve(self): - ms = mergemod.mergestate(self.repo) - for path in ms: - if ms[path] == 'u': + for root, path, status in thgrepo.recursiveMergeStatus(self.repo): + if status == 'u':   txt = _('Backout generated merge <b>conflicts</b> that must '   'be <a href="resolve"><b>resolved</b></a>')   self.backoutBtn.setEnabled(False) @@ -250,7 +249,6 @@
   def run(ui, *pats, **opts):   from tortoisehg.util import paths - from tortoisehg.hgqt import thgrepo   repo = thgrepo.repository(ui, path=paths.find_root())   kargs = {'opts': opts}   if opts.get('rev'):