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

stable rebase: check for unresolved conflicts recursively

Changeset f7efbb18f909…

Parent 8290afe6e1ca…

by Steve Borho

Changes to one file · Browse files at f7efbb18f909 Showing diff from parent 8290afe6e1ca Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​rebase.py Stacked
 
14
15
16
17
 
18
19
20
 
123
124
125
126
127
128
129
 
 
130
131
132
 
181
182
183
184
185
186
 
 
187
188
189
 
243
244
245
246
247
248
249
 
14
15
16
 
17
18
19
20
 
123
124
125
 
 
 
 
126
127
128
129
130
 
179
180
181
 
 
 
182
183
184
185
186
 
240
241
242
 
243
244
245
@@ -14,7 +14,7 @@
   from tortoisehg.util import hglib  from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt import qtlib, csinfo, cmdui, resolve, commit +from tortoisehg.hgqt import qtlib, csinfo, cmdui, resolve, commit, thgrepo    BB = QDialogButtonBox   @@ -123,10 +123,8 @@
  elif wctx.dirty():   self.dirty = True   else: - ms = mergemod.mergestate(repo) - unresolved = False - for path in ms: - if ms[path] == 'u': + for r, p, status in thgrepo.recursiveMergeStatus(repo): + if status == 'u':   self.dirty = True   break   def completed(): @@ -181,9 +179,8 @@
  self.rebasebtn.clicked.connect(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 = _('Rebase generated merge <b>conflicts</b> that must '   'be <a href="resolve"><b>resolved</b></a>')   self.rebasebtn.setEnabled(False) @@ -243,7 +240,6 @@
   def run(ui, *pats, **opts):   from tortoisehg.util import paths - from tortoisehg.hgqt import thgrepo   repo = thgrepo.repository(ui, path=paths.find_root())   if os.path.exists(repo.join('rebasestate')):   qtlib.InfoMsgBox(_('Rebase already in progress'),