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
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mhgext/shelve.py (2 lines)

Diff 15598

hgext/shelve.py

"""subcommand that creates a new shelve""" """subcommand that creates a new shelve"""
with repo.wlock(): with repo.wlock():
statemod.checkunfinished(repo) statemod.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)'