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

sync: use resolve and rebase dialogs to handle post-pull conflicts

Changeset 674ac1570591…

Parent 97b60b127516…

by Steve Borho

Changes to one file · Browse files at 674ac1570591 Showing diff from parent 97b60b127516 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
14
15
16
 
17
18
19
 
501
502
503
 
 
 
 
 
 
 
 
 
 
 
 
 
504
505
506
507
 
508
509
 
510
511
512
 
14
15
16
17
18
19
20
 
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
 
521
522
 
523
524
525
526
@@ -14,6 +14,7 @@
 from PyQt4.QtGui import *    from mercurial import hg, ui, url, util, error +from mercurial import merge as mergemod    from tortoisehg.util import hglib, wconfig  from tortoisehg.hgqt.i18n import _ @@ -501,12 +502,25 @@
  self.showMessage.emit(_('Pull completed successfully'))   else:   self.showMessage.emit(_('Pull aborted, ret %d') % ret) + # handle file conflicts during rebase + if os.path.exists(self.repo.join('rebasestate')): + dlg = rebase.RebaseDialog(self.repo, self, **opts) + dlg.finished.connect(dlg.deleteLater) + dlg.exec_() + return + # handle file conflicts during update + ms = mergemod.mergestate(self.repo) + for path in ms: + if ms[path] == 'u': + dlg = resolve.ResolveDialog(self.repo, self) + dlg.exec_() + return   self.finishfunc = finished   cmdline = ['--repository', self.root, 'pull', '--verbose']   if self.cachedpp == 'rebase': - cmdline.append('--rebase') + cmdline += ['--rebase', '--config', 'ui.merge=internal:fail']   elif self.cachedpp == 'update': - cmdline.append('--update') + cmdline += ['--update', '--config', 'ui.merge=internal:fail']   elif self.cachedpp == 'fetch':   cmdline[2] = 'fetch'   self.run(cmdline, ('force', 'branch', 'rev'))