This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6547

shelve: removed redundant merge detection method
ClosedPublic

Authored by taapas1128 on Jun 19 2019, 3:30 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5c64d0b4c037: shelve: removed redundant merge detection method
rHGe9f2252e218e: shelve: removed redundant merge detection method

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.

Revision Contents
Changeset List

PathPackages
Mhgext/shelve.py (8 lines)

Diff 15697

hgext/shelve.py

"""subcommand that creates a new shelve""" """subcommand that creates a new shelve"""
with repo.wlock(): with repo.wlock():
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
return _docreatecmd(ui, repo, pats, opts) return _docreatecmd(ui, repo, pats, opts)
def _docreatecmd(ui, repo, pats, opts): def _docreatecmd(ui, repo, pats, opts):
wctx = repo[None] wctx = repo[None]
parents = wctx.parents() parents = wctx.parents()
if len(parents) > 1:
raise error.Abort(_('cannot shelve while merging'))
parent = parents[0] parent = parents[0]
origbranch = wctx.branch() origbranch = wctx.branch()
if parent.node() != nodemod.nullid: if parent.node() != nodemod.nullid:
desc = "changes to: %s" % parent.description().split('\n', 1)[0] desc = "changes to: %s" % parent.description().split('\n', 1)[0]
else: else:
desc = '(changes in empty repository)' desc = '(changes in empty repository)'
return return
if abortf: if abortf:
return unshelveabort(ui, repo, state, opts) return unshelveabort(ui, repo, state, opts)
elif continuef: elif continuef:
return unshelvecontinue(ui, repo, state, opts) return unshelvecontinue(ui, repo, state, opts)
elif len(shelved) > 1: elif len(shelved) > 1:
raise error.Abort(_('can only unshelve one change at a time')) raise error.Abort(_('can only unshelve one change at a time'))
# abort unshelve while merging (issue5123)
parents = repo[None].parents()
if len(parents) > 1:
raise error.Abort(_('cannot unshelve while merging'))
elif not shelved: elif not shelved:
shelved = listshelves(repo) shelved = listshelves(repo)
if not shelved: if not shelved:
raise error.Abort(_('no shelved changes to apply!')) raise error.Abort(_('no shelved changes to apply!'))
basename = util.split(shelved[0][1])[1] basename = util.split(shelved[0][1])[1]
ui.status(_("unshelving change '%s'\n") % basename) ui.status(_("unshelving change '%s'\n") % basename)
else: else:
basename = shelved[0] basename = shelved[0]