Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.4, 2.0.5, and 2.1

stable rebase: add support for --keepbranches (closes #601)

Changeset 99cb620f3732…

Parent c8060a9b71b5…

by Steve Borho

Changes to 2 files · Browse files at 99cb620f3732 Showing diff from parent c8060a9b71b5 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​rebase.py Stacked
 
61
62
63
 
 
 
 
64
65
66
 
98
99
100
101
 
 
102
103
104
 
147
148
149
 
150
151
152
 
156
157
158
 
 
159
160
161
 
61
62
63
64
65
66
67
68
69
70
 
102
103
104
 
105
106
107
108
109
 
152
153
154
155
156
157
158
 
162
163
164
165
166
167
168
169
@@ -61,6 +61,10 @@
  self.keepchk.setChecked(opts.get('keep', False))   self.layout().addWidget(self.keepchk)   + self.keepbrancheschk = QCheckBox(_('Keep original branch names')) + 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)) @@ -98,7 +102,8 @@
  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.detachchk, + self.keepbrancheschk):   w.setHidden(True)   self.cmd.setShowOutput(True)   else: @@ -147,6 +152,7 @@
  self.rebasebtn.setEnabled(False)   self.cancelbtn.setShown(False)   self.keepchk.setEnabled(False) + self.keepbrancheschk.setEnabled(False)   self.detachchk.setEnabled(False)   cmdline = ['rebase', '--repository', self.repo.root]   cmdline += ['--config', 'ui.merge=internal:' + @@ -156,6 +162,8 @@
  else:   if self.keepchk.isChecked():   cmdline += ['--keep'] + if self.keepbrancheschk.isChecked(): + cmdline += ['--keepbranches']   if self.detachchk.isChecked():   cmdline += ['--detach']   if self.svnchk is not None and self.svnchk.isChecked():
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​run.py Stacked
 
1036
1037
1038
 
1039
1040
1041
 
1036
1037
1038
1039
1040
1041
1042
@@ -1036,6 +1036,7 @@
  _('thg strip [-f] [-n] [[-r] REV]')),   "^rebase": (rebase,   [('', 'keep', False, _('keep original changesets')), + ('', 'keepbranches', False, _('keep original branch names')),   ('', 'detach', False, _('force detaching of source from its original '   'branch')),   ('s', 'source', '',