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

stable merge: check merge status recursively

Changeset 8290afe6e1ca…

Parent dd43e9bae451…

by Steve Borho

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

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
14
15
16
17
 
18
19
20
 
501
502
503
504
505
506
507
 
 
508
 
509
510
511
 
666
667
668
669
670
671
 
 
 
672
673
674
 
738
739
740
741
742
743
744
 
14
15
16
 
17
18
19
20
 
501
502
503
 
504
 
 
505
506
507
508
509
510
511
 
666
667
668
 
 
 
669
670
671
672
673
674
 
738
739
740
 
741
742
743
@@ -14,7 +14,7 @@
 from tortoisehg.util import hglib  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib, csinfo, i18n, cmdui, status, commit, resolve -from tortoisehg.hgqt import qscilib +from tortoisehg.hgqt import qscilib, thgrepo    keep = i18n.keepgettext()   @@ -501,11 +501,11 @@
  self.results = (False, 1)     def run(self): - ms = mergemod.mergestate(repo)   unresolved = False - for path in ms: - if ms[path] == 'u': + for root, path, status in thgrepo.recursiveMergeStatus(repo): + if status == 'u':   unresolved = True + break   wctx = repo[None]   dirty = bool(wctx.dirty()) or unresolved   self.results = (dirty, len(wctx.parents())) @@ -666,9 +666,9 @@
  self.cmd.run(cmdline)     def isComplete(self): - ms = mergemod.mergestate(self.wizard().repo) - for path in ms: - if ms[path] == 'u': + repo = self.wizard().repo + for root, path, status in thgrepo.recursiveMergeStatus(repo): + if status == 'u':   self.reslabel.setText(_('There were <b>merge conflicts</b> '   'that must be <a href="resolve">'   '<b>resolved</b></a>')) @@ -738,7 +738,6 @@
   def run(ui, *pats, **opts):   from tortoisehg.util import paths - from tortoisehg.hgqt import thgrepo   rev = opts.get('rev') or None   if not rev and len(pats):   rev = pats[0]