1. Steve Test
  2. My test repo

Commits

Yuya Nishihara  committed 2f4342b

rebase: drop checkbox for deprecated --detach option

Since Mercurial 2.3, rebase --detach is always enabled. (see hg 50f434510da6)

Thanks to Katsunori FUJIWARA <flying.foozy@gmail.com>.

  • Participants
  • Parent commits d010e5a
  • Branches default

Comments (0)

Files changed (2)

File tortoisehg/hgqt/rebase.py

View file
  • Ignore whitespace
         self.keepbrancheschk.setChecked(opts.get('keepbranches', False))
         self.layout().addWidget(self.keepbrancheschk)
 
-        self.detachchk = QCheckBox(_('Force detach of rebased changesets '
-                                     'from their original branch'))
-        self.detachchk.setChecked(opts.get('detach', True))
-        self.layout().addWidget(self.detachchk)
         self.collapsechk = QCheckBox(_('Collapse the rebased changesets '))
         self.collapsechk.setChecked(opts.get('collapse', False))
         self.layout().addWidget(self.collapsechk)
         self.bbox = bbox
 
         if self.checkResolve() or not (s or d):
-            for w in (srcb, destb, sep, self.keepchk, self.detachchk, 
+            for w in (srcb, destb, sep, self.keepchk,
                       self.collapsechk, self.keepbrancheschk):
                 w.setHidden(True)
             self.cmd.setShowOutput(True)
         self.cancelbtn.setShown(False)
         self.keepchk.setEnabled(False)
         self.keepbrancheschk.setEnabled(False)
-        self.detachchk.setEnabled(False)
         self.collapsechk.setEnabled(False)
         cmdline = ['rebase', '--repository', self.repo.root]
         cmdline += ['--config', 'ui.merge=internal:' +
                 cmdline += ['--keep']
             if self.keepbrancheschk.isChecked():
                 cmdline += ['--keepbranches']
-            if self.detachchk.isChecked():
-                cmdline += ['--detach']
             if self.collapsechk.isChecked():
                 cmdline += ['--collapse']
             if self.svnchk is not None and self.svnchk.isChecked():

File tortoisehg/hgqt/run.py

View file
  • Ignore whitespace
     "^rebase": (rebase,
         [('', 'keep', False, _('keep original changesets')),
          ('', 'keepbranches', False, _('keep original branch names')),
-         ('', 'detach', False, _('force detaching of source from its original '
-                                'branch')),
+         ('', 'detach', False, _('(DEPRECATED)')),
          ('s', 'source', '',
           _('rebase from the specified changeset')),
          ('d', 'dest', '',
           _('rebase onto the specified changeset'))],
-        _('thg rebase -s REV -d REV [--keep] [--detach]')),
+        _('thg rebase -s REV -d REV [--keep]')),
     "^tag":
         (tag,
          [('f', 'force', None, _('replace existing tag')),