Commits

Yuya Nishihara  committed 02a6b88

sync: not use camel-case for updateOrRebase config option

We generally follow the Mercurial's naming convention for ui.config.

  • Participants
  • Parent commits 69d664f

Comments (0)

Files changed (3)

File tortoisehg/hgqt/settings.py

           'standard tags inserted by the Mercurial Queues Extension. '
           'Default: None (leave blank)')),
     _fi(_('After Pull Operation'), 'tortoisehg.postpull', (genDefaultCombo,
-        ['none', 'update', 'fetch', 'rebase', 'updateOrRebase']),
+        ['none', 'update', 'fetch', 'rebase', 'updateorrebase']),
         _('Operation which is performed directly after a successful pull. '
           'update equates to pull --update, fetch equates to the fetch '
           'extension, rebase equates to pull --rebase, '
-          'updateOrRebase equates to pull -u --rebase.  Default: none')),
+          'updateorrebase equates to pull -u --rebase.  Default: none')),
     _fi(_('Default Push'), 'tortoisehg.defaultpush', (genDefaultCombo,
         ['all', 'branch', 'revision']),
         _('Select the revisions that will be pushed by default, '

File tortoisehg/hgqt/sync.py

                                       % (link, ret))
             self.pullCompleted.emit()
             # handle file conflicts during rebase
-            if self.opts.get('rebase') or self.opts.get('updateOrRebase'):
+            if self.opts.get('rebase') or self.opts.get('updateorrebase'):
                 if os.path.exists(self.repo.join('rebasestate')):
                     dlg = rebase.RebaseDialog(self.repo, self)
                     dlg.finished.connect(dlg.deleteLater)
             cmdline += ['--rebase', '--config', uimerge]
         elif self.cachedpp == 'update':
             cmdline += ['--update', '--config', uimerge]
-        elif self.cachedpp == 'updateOrRebase':
+        elif self.cachedpp == 'updateorrebase':
             cmdline += ['--update', '--rebase', '--config', uimerge]
         elif self.cachedpp == 'fetch':
             cmdline[2] = 'fetch'
             layout.addWidget(self.fetch)
         else:
             self.fetch = None
-        if 'rebase' in repo.extensions() or repo.postpull == 'rebase' or repo.postpull == 'updateOrRebase':
+        if 'rebase' in repo.extensions() or repo.postpull == 'rebase' or repo.postpull == 'updateorrebase':
             if 'rebase' in repo.extensions():
                 rebasetxt = _('Rebase - rebase local commits above pulled changes')
                 updateorrebasetxt = _('UpdateOrRebase - pull, then try to update or rebase')
             self.fetch.setChecked(True)
         elif repo.postpull == 'rebase':
             self.rebase.setChecked(True)
-        elif repo.postpull == 'updateOrRebase':
+        elif repo.postpull == 'updateorrebase':
             self.updateOrRebase.setChecked(True)
 
         self.autoresolve_chk = QCheckBox(_('Automatically resolve merge conflicts '
         elif (self.rebase and self.rebase.isChecked()):
             return 'rebase'
         else:
-            return 'updateOrRebase'
+            return 'updateorrebase'
 
     def accept(self):
         path = self.repo.join('hgrc')

File tortoisehg/hgqt/thgrepo.py

         @propertycache
         def postpull(self):
             pp = self.ui.config('tortoisehg', 'postpull')
-            if pp in ('rebase', 'update', 'fetch', 'updateOrRebase'):
+            if pp in ('rebase', 'update', 'fetch', 'updateorrebase'):
                 return pp
             return 'none'