This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4055

rebase: move "backup" flag to rbsrt
ClosedPublic

Authored by khanchi97 on Aug 2 2018, 2:42 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG2b728789edfd: rebase: move "backup" flag to rebaseruntime
Summary

It was getting messy to populate "backup" flag to calls
of _finishrebase() and _prepareabortorcontinue, so
made some changes to move "backup" flag to rbsrt.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

khanchi97 created this revision.Aug 2 2018, 2:42 PM
pulkit added a subscriber: pulkit.Aug 2 2018, 6:22 PM
pulkit added inline comments.
hgext/rebase.py
349

not A or not B = not (A and B)
not(not A or not B) = A and B

khanchi97 added inline comments.Aug 3 2018, 3:33 AM
hgext/rebase.py
349

Ah, right.

khanchi97 updated this revision to Diff 9815.Aug 3 2018, 3:35 AM
Closed by commit rHG2b728789edfd: rebase: move "backup" flag to rebaseruntime (authored by khanchi97). · Explain WhyAug 3 2018, 9:44 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (21 lines)

Diff 9817

hgext/rebase.py

self.collapsemsg = cmdutil.logmessage(ui, opts) self.collapsemsg = cmdutil.logmessage(ui, opts)
self.date = opts.get('date', None) self.date = opts.get('date', None)
e = opts.get('extrafn') # internal, used by e.g. hgsubversion e = opts.get('extrafn') # internal, used by e.g. hgsubversion
self.extrafns = [_savegraft] self.extrafns = [_savegraft]
if e: if e:
self.extrafns = [e] self.extrafns = [e]
self.backupf = ui.configbool('ui', 'history-editing-backup')
self.keepf = opts.get('keep', False) self.keepf = opts.get('keep', False)
self.keepbranchesf = opts.get('keepbranches', False) self.keepbranchesf = opts.get('keepbranches', False)
self.obsoletenotrebased = {} self.obsoletenotrebased = {}
self.obsoletewithoutsuccessorindestination = set() self.obsoletewithoutsuccessorindestination = set()
self.inmemory = inmemory self.inmemory = inmemory
self.stateobj = statemod.cmdstate(repo, 'rebasestate') self.stateobj = statemod.cmdstate(repo, 'rebasestate')
@property @property
clearcollapsemsg(self.repo) clearcollapsemsg(self.repo)
self.repo.ui.warn(_('rebase aborted (no revision is removed,' self.repo.ui.warn(_('rebase aborted (no revision is removed,'
' only broken state is cleared)\n')) ' only broken state is cleared)\n'))
return 0 return 0
else: else:
msg = _('cannot continue inconsistent rebase') msg = _('cannot continue inconsistent rebase')
hint = _('use "hg rebase --abort" to clear broken state') hint = _('use "hg rebase --abort" to clear broken state')
raise error.Abort(msg, hint=hint) raise error.Abort(msg, hint=hint)
if isabort: if isabort:
backup = backup and self.backupf
pulkitUnsubmitted
Not Done

not A or not B = not (A and B)
not(not A or not B) = A and B

pulkit: not A or not B = not (A and B) not(not A or not B) = A and B
khanchi97AuthorUnsubmitted
Not Done

Ah, right.

khanchi97: Ah, right.
return abort(self.repo, self.originalwd, self.destmap, self.state, return abort(self.repo, self.originalwd, self.destmap, self.state,
activebookmark=self.activebookmark, backup=backup, activebookmark=self.activebookmark, backup=backup,
suppwarns=suppwarns) suppwarns=suppwarns)
def _preparenewrebase(self, destmap): def _preparenewrebase(self, destmap):
if not destmap: if not destmap:
return _nothingtorebase() return _nothingtorebase()
(desc, repo[self.state[rev]])) (desc, repo[self.state[rev]]))
if not tr: if not tr:
# When not using single transaction, store state after each # When not using single transaction, store state after each
# commit is completely done. On InterventionRequired, we thus # commit is completely done. On InterventionRequired, we thus
# won't store the status. Instead, we'll hit the "len(parents) == 2" # won't store the status. Instead, we'll hit the "len(parents) == 2"
# case and realize that the commit was in progress. # case and realize that the commit was in progress.
self.storestatus() self.storestatus()
def _finishrebase(self, backup=True): def _finishrebase(self):
"""
backup: if False, no backup will be stored when stripping rebased
revisions
"""
repo, ui, opts = self.repo, self.ui, self.opts repo, ui, opts = self.repo, self.ui, self.opts
fm = ui.formatter('rebase', opts) fm = ui.formatter('rebase', opts)
fm.startitem() fm.startitem()
if self.collapsef: if self.collapsef:
p1, p2, _base = defineparents(repo, min(self.state), self.destmap, p1, p2, _base = defineparents(repo, min(self.state), self.destmap,
self.state, self.skipped, self.state, self.skipped,
self.obsoletenotrebased) self.obsoletenotrebased)
editopt = opts.get('edit') editopt = opts.get('edit')
if newwd not in [c.rev() for c in repo[None].parents()]: if newwd not in [c.rev() for c in repo[None].parents()]:
ui.note(_("update back to initial working directory parent\n")) ui.note(_("update back to initial working directory parent\n"))
hg.updaterepo(repo, newwd, overwrite=False) hg.updaterepo(repo, newwd, overwrite=False)
collapsedas = None collapsedas = None
if self.collapsef and not self.keepf: if self.collapsef and not self.keepf:
collapsedas = newnode collapsedas = newnode
clearrebased(ui, repo, self.destmap, self.state, self.skipped, clearrebased(ui, repo, self.destmap, self.state, self.skipped,
collapsedas, self.keepf, fm=fm, backup=backup) collapsedas, self.keepf, fm=fm, backup=self.backupf)
clearstatus(repo) clearstatus(repo)
clearcollapsemsg(repo) clearcollapsemsg(repo)
ui.note(_("rebase completed\n")) ui.note(_("rebase completed\n"))
util.unlinkpath(repo.sjoin('undo'), ignoremissing=True) util.unlinkpath(repo.sjoin('undo'), ignoremissing=True)
if self.skipped: if self.skipped:
skippedlen = len(self.skipped) skippedlen = len(self.skipped)
if opts.get('auto_orphans'): if opts.get('auto_orphans'):
for key in opts: for key in opts:
if key != 'auto_orphans' and opts.get(key): if key != 'auto_orphans' and opts.get(key):
raise error.Abort(_('--auto-orphans is incompatible with %s') % raise error.Abort(_('--auto-orphans is incompatible with %s') %
('--' + key)) ('--' + key))
userrevs = list(repo.revs(opts.get('auto_orphans'))) userrevs = list(repo.revs(opts.get('auto_orphans')))
opts['rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)] opts['rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)]
opts['dest'] = '_destautoorphanrebase(SRC)' opts['dest'] = '_destautoorphanrebase(SRC)'
backup = ui.configbool('ui', 'history-editing-backup')
opts['backup'] = backup
if dryrun: if dryrun:
return _dryrunrebase(ui, repo, opts) return _dryrunrebase(ui, repo, opts)
elif inmemory: elif inmemory:
try: try:
# in-memory merge doesn't support conflicts, so if we hit any, abort # in-memory merge doesn't support conflicts, so if we hit any, abort
# and re-run as an on-disk merge. # and re-run as an on-disk merge.
overrides = {('rebase', 'singletransaction'): True} overrides = {('rebase', 'singletransaction'): True}
with ui.configoverride(overrides, 'rebase'): with ui.configoverride(overrides, 'rebase'):
return _dorebase(ui, repo, opts, inmemory=inmemory) return _dorebase(ui, repo, opts, inmemory=inmemory)
except error.InMemoryMergeConflictsError: except error.InMemoryMergeConflictsError:
ui.warn(_('hit merge conflicts; re-running rebase without in-memory' ui.warn(_('hit merge conflicts; re-running rebase without in-memory'
' merge\n')) ' merge\n'))
_dorebase(ui, repo, {'abort': True}) _dorebase(ui, repo, {'abort': True})
return _dorebase(ui, repo, opts, inmemory=False) return _dorebase(ui, repo, opts, inmemory=False)
else: else:
return _dorebase(ui, repo, opts) return _dorebase(ui, repo, opts)
def _dryrunrebase(ui, repo, opts): def _dryrunrebase(ui, repo, opts):
rbsrt = rebaseruntime(repo, ui, inmemory=True, opts=opts) rbsrt = rebaseruntime(repo, ui, inmemory=True, opts=opts)
confirm = opts.get('confirm') confirm = opts.get('confirm')
backup = opts.get('backup')
if confirm: if confirm:
ui.status(_('starting in-memory rebase\n')) ui.status(_('starting in-memory rebase\n'))
else: else:
ui.status(_('starting dry-run rebase; repository will not be ' ui.status(_('starting dry-run rebase; repository will not be '
'changed\n')) 'changed\n'))
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
needsabort = True needsabort = True
try: try:
overrides = {('rebase', 'singletransaction'): True} overrides = {('rebase', 'singletransaction'): True}
with ui.configoverride(overrides, 'rebase'): with ui.configoverride(overrides, 'rebase'):
_origrebase(ui, repo, opts, rbsrt, inmemory=True, _origrebase(ui, repo, opts, rbsrt, inmemory=True,
leaveunfinished=True) leaveunfinished=True)
except error.InMemoryMergeConflictsError: except error.InMemoryMergeConflictsError:
ui.status(_('hit a merge conflict\n')) ui.status(_('hit a merge conflict\n'))
return 1 return 1
else: else:
if confirm: if confirm:
ui.status(_('rebase completed successfully\n')) ui.status(_('rebase completed successfully\n'))
if not ui.promptchoice(_(b'apply changes (yn)?' if not ui.promptchoice(_(b'apply changes (yn)?'
b'$$ &Yes $$ &No')): b'$$ &Yes $$ &No')):
# finish unfinished rebase # finish unfinished rebase
rbsrt._finishrebase(backup=backup) rbsrt._finishrebase()
else: else:
rbsrt._prepareabortorcontinue(isabort=True, backup=False, rbsrt._prepareabortorcontinue(isabort=True, backup=False,
suppwarns=True) suppwarns=True)
needsabort = False needsabort = False
else: else:
ui.status(_('dry-run rebase completed successfully; run without' ui.status(_('dry-run rebase completed successfully; run without'
' -n/--dry-run to perform this rebase\n')) ' -n/--dry-run to perform this rebase\n'))
return 0 return 0
srcf = opts.get('source', None) srcf = opts.get('source', None)
basef = opts.get('base', None) basef = opts.get('base', None)
revf = opts.get('rev', []) revf = opts.get('rev', [])
# search default destination in this space # search default destination in this space
# used in the 'hg pull --rebase' case, see issue 5214. # used in the 'hg pull --rebase' case, see issue 5214.
destspace = opts.get('_destspace') destspace = opts.get('_destspace')
contf = opts.get('continue') contf = opts.get('continue')
abortf = opts.get('abort') abortf = opts.get('abort')
backup = opts.get('backup')
if opts.get('interactive'): if opts.get('interactive'):
try: try:
if extensions.find('histedit'): if extensions.find('histedit'):
enablehistedit = '' enablehistedit = ''
except KeyError: except KeyError:
enablehistedit = " --config extensions.histedit=" enablehistedit = " --config extensions.histedit="
help = "hg%s help -e histedit" % enablehistedit help = "hg%s help -e histedit" % enablehistedit
msg = _("interactive history editing is supported by the " msg = _("interactive history editing is supported by the "
raise error.Abort( raise error.Abort(
_('abort and continue do not allow specifying revisions')) _('abort and continue do not allow specifying revisions'))
if abortf and opts.get('tool', False): if abortf and opts.get('tool', False):
ui.warn(_('tool option will be ignored\n')) ui.warn(_('tool option will be ignored\n'))
if contf: if contf:
ms = mergemod.mergestate.read(repo) ms = mergemod.mergestate.read(repo)
mergeutil.checkunresolved(ms) mergeutil.checkunresolved(ms)
retcode = rbsrt._prepareabortorcontinue(abortf, backup=backup) retcode = rbsrt._prepareabortorcontinue(abortf)
if retcode is not None: if retcode is not None:
return retcode return retcode
else: else:
destmap = _definedestmap(ui, repo, inmemory, destf, srcf, basef, destmap = _definedestmap(ui, repo, inmemory, destf, srcf, basef,
revf, destspace=destspace) revf, destspace=destspace)
retcode = rbsrt._preparenewrebase(destmap) retcode = rbsrt._preparenewrebase(destmap)
if retcode is not None: if retcode is not None:
return retcode return retcode
# Same logic for the dirstate guard, except we don't create one when # Same logic for the dirstate guard, except we don't create one when
# rebasing in-memory (it's not needed). # rebasing in-memory (it's not needed).
dsguard = None dsguard = None
if singletr and not inmemory: if singletr and not inmemory:
dsguard = dirstateguard.dirstateguard(repo, 'rebase') dsguard = dirstateguard.dirstateguard(repo, 'rebase')
with util.acceptintervention(dsguard): with util.acceptintervention(dsguard):
rbsrt._performrebase(tr) rbsrt._performrebase(tr)
if not leaveunfinished: if not leaveunfinished:
rbsrt._finishrebase(backup=backup) rbsrt._finishrebase()
def _definedestmap(ui, repo, inmemory, destf=None, srcf=None, basef=None, def _definedestmap(ui, repo, inmemory, destf=None, srcf=None, basef=None,
revf=None, destspace=None): revf=None, destspace=None):
"""use revisions argument to define destmap {srcrev: destrev}""" """use revisions argument to define destmap {srcrev: destrev}"""
if revf is None: if revf is None:
revf = [] revf = []
# destspace is here to work around issues with `hg pull --rebase` see # destspace is here to work around issues with `hg pull --rebase` see