We are currently indexing your data, so search results may be incomplete until we finish.
Merge with stable
by
Changes to 4 files · Browse files at 86dbd8b68b22 Showing diff from parent 1240dcadb580 b2c4a1e27be1 Diff from another changeset...
|
@@ -190,6 +190,7 @@ self.opts['autoinc'] = repo.ui.config('tortoisehg', 'autoinc', '')
self.opts['bugtraqplugin'] = repo.ui.config('tortoisehg', 'issue.bugtraqplugin', None)
self.opts['bugtraqparameters'] = repo.ui.config('tortoisehg', 'tortoisehg.issue.bugtraqparameters', None)
+ self.stwidget.opts['ciexclude'] = repo.ui.config('tortoisehg', 'ciexclude', '')
layout = QVBoxLayout()
layout.setContentsMargins(2, 2, 2, 2)
|
||
|
@@ -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():
|
||
|
@@ -1055,6 +1055,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', '',
|
||
|
@@ -26,8 +26,6 @@ # Chunk selection, tri-state checkboxes for commit
# Maybe, Maybe Not
# Investigate folding/nesting of files
-# Toolbar
-# double-click visual diffs
COL_PATH = 0
COL_STATUS = 1
@@ -515,6 +513,7 @@ QAbstractTableModel.__init__(self, parent)
rows = []
nchecked = {}
+ excludes = [f.strip() for f in opts.get('ciexclude', '').split(',')]
def mkrow(fname, st):
ext, sizek = '', ''
try:
@@ -527,21 +526,21 @@ return [fname, st, mst, hglib.tounicode(fname), ext[1:], sizek]
if opts['modified']:
for m in wctx.modified():
- nchecked[m] = checked.get(m, True)
+ nchecked[m] = checked.get(m, m not in excludes)
rows.append(mkrow(m, 'M'))
if opts['added']:
for a in wctx.added():
- nchecked[a] = checked.get(a, True)
+ nchecked[a] = checked.get(a, a not in excludes)
rows.append(mkrow(a, 'A'))
if opts['removed']:
for r in wctx.removed():
mst = r in ms and ms[r].upper() or ""
- nchecked[r] = checked.get(r, True)
+ nchecked[r] = checked.get(r, r not in excludes)
rows.append(mkrow(r, 'R'))
if opts['deleted']:
for d in wctx.deleted():
mst = d in ms and ms[d].upper() or ""
- nchecked[d] = checked.get(d, False)
+ nchecked[d] = checked.get(d, d not in excludes)
rows.append(mkrow(d, '!'))
if opts['unknown']:
for u in wctx.unknown():
|
||
Add a tag
Loading...