This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6608

graft: moved abortgraft and readgraft to cmdutil
ClosedPublic

Authored by taapas1128 on Jul 6 2019, 2:48 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGf9da9d5f3f5a: graft: moved abortgraft and readgraft to cmdutil
Summary

This patch moves abortgraft and readgraft to
cmdutil. Various callers are updated accordingly.

This is done because these serve as ulitlity functions
for command graft and so that new functions regarding
graft can be built from them.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

taapas1128 created this revision.Jul 6 2019, 2:48 PM
pulkit added a subscriber: pulkit.Jul 8 2019, 11:51 AM

It will be nice to mention about our motivation to move code in the commit message.

mercurial/cmdutil.py
3350

We should drop _ perfix from names, both here and below.

3413

Unrequired newline at the end of file.

taapas1128 edited the summary of this revision. (Show Details)Jul 8 2019, 2:17 PM
taapas1128 updated this revision to Diff 15803.
taapas1128 marked 2 inline comments as done.Jul 8 2019, 2:21 PM
pulkit accepted this revision.Jul 8 2019, 5:09 PM
This revision is now accepted and ready to land.Jul 8 2019, 5:09 PM
taapas1128 added a commit: rHGf9da9d5f3f5a: graft: moved abortgraft and readgraft to cmdutil.Jul 8 2019, 6:03 PM
Closed by commit rHGf9da9d5f3f5a: graft: moved abortgraft and readgraft to cmdutil (authored by taapas1128). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (66 lines)
Mmercurial/commands.py (68 lines)

Diff 15778

mercurial/cmdutil.py

match as matchmod, match as matchmod,
merge as mergemod, merge as mergemod,
mergeutil, mergeutil,
obsolete, obsolete,
patch, patch,
pathutil, pathutil,
phases, phases,
pycompat, pycompat,
repair,
revlog, revlog,
rewriteutil, rewriteutil,
scmutil, scmutil,
smartset, smartset,
state as statemod, state as statemod,
subrepoutil, subrepoutil,
templatekw, templatekw,
templater, templater,
If there's no task (repo.ui.note for 'hg commit'), it does not offer If there's no task (repo.ui.note for 'hg commit'), it does not offer
a hint. a hint.
''' '''
after = howtocontinue(repo) after = howtocontinue(repo)
hint = None hint = None
if after[1]: if after[1]:
hint = after[0] hint = after[0]
raise error.Abort(_('no %s in progress') % task, hint=hint) raise error.Abort(_('no %s in progress') % task, hint=hint)
def _abortgraft(ui, repo, graftstate):
pulkitUnsubmitted
Done

We should drop _ perfix from names, both here and below.

pulkit: We should drop `_` perfix from names, both here and below.
"""abort the interrupted graft and rollbacks to the state before interrupted
graft"""
if not graftstate.exists():
raise error.Abort(_("no interrupted graft to abort"))
statedata = _readgraftstate(repo, graftstate)
newnodes = statedata.get('newnodes')
if newnodes is None:
# and old graft state which does not have all the data required to abort
# the graft
raise error.Abort(_("cannot abort using an old graftstate"))
# changeset from which graft operation was started
if len(newnodes) > 0:
startctx = repo[newnodes[0]].p1()
else:
startctx = repo['.']
# whether to strip or not
cleanup = False
from . import hg
if newnodes:
newnodes = [repo[r].rev() for r in newnodes]
cleanup = True
# checking that none of the newnodes turned public or is public
immutable = [c for c in newnodes if not repo[c].mutable()]
if immutable:
repo.ui.warn(_("cannot clean up public changesets %s\n")
% ', '.join(bytes(repo[r]) for r in immutable),
hint=_("see 'hg help phases' for details"))
cleanup = False
# checking that no new nodes are created on top of grafted revs
desc = set(repo.changelog.descendants(newnodes))
if desc - set(newnodes):
repo.ui.warn(_("new changesets detected on destination "
"branch, can't strip\n"))
cleanup = False
if cleanup:
with repo.wlock(), repo.lock():
hg.updaterepo(repo, startctx.node(), overwrite=True)
# stripping the new nodes created
strippoints = [c.node() for c in repo.set("roots(%ld)",
newnodes)]
repair.strip(repo.ui, repo, strippoints, backup=False)
if not cleanup:
# we don't update to the startnode if we can't strip
startctx = repo['.']
hg.updaterepo(repo, startctx.node(), overwrite=True)
ui.status(_("graft aborted\n"))
ui.status(_("working directory is now at %s\n") % startctx.hex()[:12])
graftstate.delete()
return 0
def _readgraftstate(repo, graftstate):
"""read the graft state file and return a dict of the data stored in it"""
try:
return graftstate.read()
except error.CorruptedState:
nodes = repo.vfs.read('graftstate').splitlines()
return {'nodes': nodes}
pulkitUnsubmitted
Done

Unrequired newline at the end of file.

pulkit: Unrequired newline at the end of file.

mercurial/commands.py

narrowspec, narrowspec,
obsolete, obsolete,
obsutil, obsutil,
patch, patch,
phases, phases,
pycompat, pycompat,
rcutil, rcutil,
registrar, registrar,
repair,
revsetlang, revsetlang,
rewriteutil, rewriteutil,
scmutil, scmutil,
server, server,
shelve as shelvemod, shelve as shelvemod,
state as statemod, state as statemod,
streamclone, streamclone,
tags as tagsmod, tags as tagsmod,
if opts.get('continue'): if opts.get('continue'):
raise error.Abort(_("cannot use '--continue' and " raise error.Abort(_("cannot use '--continue' and "
"'--abort' together")) "'--abort' together"))
if any((opts.get('edit'), opts.get('log'), opts.get('user'), if any((opts.get('edit'), opts.get('log'), opts.get('user'),
opts.get('date'), opts.get('currentdate'), opts.get('date'), opts.get('currentdate'),
opts.get('currentuser'), opts.get('rev'))): opts.get('currentuser'), opts.get('rev'))):
raise error.Abort(_("cannot specify any other flag with '--abort'")) raise error.Abort(_("cannot specify any other flag with '--abort'"))
return _abortgraft(ui, repo, graftstate) return cmdutil._abortgraft(ui, repo, graftstate)
elif opts.get('continue'): elif opts.get('continue'):
cont = True cont = True
if revs: if revs:
raise error.Abort(_("can't specify --continue and revisions")) raise error.Abort(_("can't specify --continue and revisions"))
# read in unfinished revisions # read in unfinished revisions
if graftstate.exists(): if graftstate.exists():
statedata = _readgraftstate(repo, graftstate) statedata = cmdutil._readgraftstate(repo, graftstate)
if statedata.get('date'): if statedata.get('date'):
opts['date'] = statedata['date'] opts['date'] = statedata['date']
if statedata.get('user'): if statedata.get('user'):
opts['user'] = statedata['user'] opts['user'] = statedata['user']
if statedata.get('log'): if statedata.get('log'):
opts['log'] = True opts['log'] = True
if statedata.get('no_commit'): if statedata.get('no_commit'):
opts['no_commit'] = statedata.get('no_commit') opts['no_commit'] = statedata.get('no_commit')
statedata['newnodes'].append(node) statedata['newnodes'].append(node)
# remove state when we complete successfully # remove state when we complete successfully
if not opts.get('dry_run'): if not opts.get('dry_run'):
graftstate.delete() graftstate.delete()
return 0 return 0
def _abortgraft(ui, repo, graftstate):
"""abort the interrupted graft and rollbacks to the state before interrupted
graft"""
if not graftstate.exists():
raise error.Abort(_("no interrupted graft to abort"))
statedata = _readgraftstate(repo, graftstate)
newnodes = statedata.get('newnodes')
if newnodes is None:
# and old graft state which does not have all the data required to abort
# the graft
raise error.Abort(_("cannot abort using an old graftstate"))
# changeset from which graft operation was started
if len(newnodes) > 0:
startctx = repo[newnodes[0]].p1()
else:
startctx = repo['.']
# whether to strip or not
cleanup = False
if newnodes:
newnodes = [repo[r].rev() for r in newnodes]
cleanup = True
# checking that none of the newnodes turned public or is public
immutable = [c for c in newnodes if not repo[c].mutable()]
if immutable:
repo.ui.warn(_("cannot clean up public changesets %s\n")
% ', '.join(bytes(repo[r]) for r in immutable),
hint=_("see 'hg help phases' for details"))
cleanup = False
# checking that no new nodes are created on top of grafted revs
desc = set(repo.changelog.descendants(newnodes))
if desc - set(newnodes):
repo.ui.warn(_("new changesets detected on destination "
"branch, can't strip\n"))
cleanup = False
if cleanup:
with repo.wlock(), repo.lock():
hg.updaterepo(repo, startctx.node(), overwrite=True)
# stripping the new nodes created
strippoints = [c.node() for c in repo.set("roots(%ld)",
newnodes)]
repair.strip(repo.ui, repo, strippoints, backup=False)
if not cleanup:
# we don't update to the startnode if we can't strip
startctx = repo['.']
hg.updaterepo(repo, startctx.node(), overwrite=True)
ui.status(_("graft aborted\n"))
ui.status(_("working directory is now at %s\n") % startctx.hex()[:12])
graftstate.delete()
return 0
def _readgraftstate(repo, graftstate):
"""read the graft state file and return a dict of the data stored in it"""
try:
return graftstate.read()
except error.CorruptedState:
nodes = repo.vfs.read('graftstate').splitlines()
return {'nodes': nodes}
def _stopgraft(ui, repo, graftstate): def _stopgraft(ui, repo, graftstate):
"""stop the interrupted graft""" """stop the interrupted graft"""
if not graftstate.exists(): if not graftstate.exists():
raise error.Abort(_("no interrupted graft found")) raise error.Abort(_("no interrupted graft found"))
pctx = repo['.'] pctx = repo['.']
hg.updaterepo(repo, pctx.node(), overwrite=True) hg.updaterepo(repo, pctx.node(), overwrite=True)
graftstate.delete() graftstate.delete()
ui.status(_("stopped the interrupted graft\n")) ui.status(_("stopped the interrupted graft\n"))