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

sync: add autoresolve option

Changeset 355df1492eb5…

Parent 1824d70b3978…

by James McKay

Changes to one file · Browse files at 355df1492eb5 Showing diff from parent 1824d70b3978 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
554
555
556
 
 
557
558
 
559
560
 
561
562
563
 
709
710
711
 
 
 
 
 
 
712
713
714
 
746
747
748
 
 
749
750
751
 
554
555
556
557
558
559
 
560
561
 
562
563
564
565
 
711
712
713
714
715
716
717
718
719
720
721
722
 
754
755
756
757
758
759
760
761
@@ -554,10 +554,12 @@
  return   self.finishfunc = finished   cmdline = ['--repository', self.root, 'pull', '--verbose'] + uimerge = self.repo.ui.configbool('tortoisehg', 'autoresolve') \ + and 'ui.merge=internal:merge' or 'ui.merge=internal:fail'   if self.cachedpp == 'rebase': - cmdline += ['--rebase', '--config', 'ui.merge=internal:fail'] + cmdline += ['--rebase', '--config', uimerge]   elif self.cachedpp == 'update': - cmdline += ['--update', '--config', 'ui.merge=internal:fail'] + cmdline += ['--update', '--config', uimerge]   elif self.cachedpp == 'fetch':   cmdline[2] = 'fetch'   self.run(cmdline, ('force', 'branch', 'rev')) @@ -709,6 +711,12 @@
  cfglabel.linkActivated.connect(self.linkactivated)   layout.addWidget(cfglabel)   + self.autoresolve_chk = QCheckBox(_('Automatically resolve merge conflicts ' + 'where possible')) + self.autoresolve_chk.setChecked( + repo.ui.configbool('tortoisehg', 'autoresolve', False)) + layout.addWidget(self.autoresolve_chk) +   BB = QDialogButtonBox   bb = QDialogButtonBox(BB.Save|BB.Cancel)   bb.accepted.connect(self.accept) @@ -746,6 +754,8 @@
  self.repo.incrementBusyCount()   try:   cfg.set('tortoisehg', 'postpull', self.getValue()) + cfg.set('tortoisehg', 'autoresolve', + self.autoresolve_chk.isChecked())   wconfig.writefile(cfg, fn)   except EnvironmentError, e:   qtlib.WarningMsgBox(_('Unable to write configuration file'),