This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6558

cmdutil: updated description for bailifchanged()
AbandonedPublic

Authored by taapas1128 on Jun 20 2019, 3:11 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

This is added to establish a connection between statemod.checkunfinished()
and bailifchanged().

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (3 lines)

Diff 15622

mercurial/cmdutil.py

def bailifchanged(repo, merge=True, hint=None): def bailifchanged(repo, merge=True, hint=None):
""" enforce the precondition that working directory must be clean. """ enforce the precondition that working directory must be clean.
'merge' can be set to false if a pending uncommitted merge should be 'merge' can be set to false if a pending uncommitted merge should be
ignored (such as when 'update --check' runs). ignored (such as when 'update --check' runs).
'hint' is the usual hint given to Abort exception. 'hint' is the usual hint given to Abort exception.
It's probably good to check statemod.checkunfinished() right before
this.
""" """
if merge and repo.dirstate.p2() != nullid: if merge and repo.dirstate.p2() != nullid:
raise error.Abort(_('outstanding uncommitted merge'), hint=hint) raise error.Abort(_('outstanding uncommitted merge'), hint=hint)
modified, added, removed, deleted = repo.status()[:4] modified, added, removed, deleted = repo.status()[:4]
if modified or added or removed or deleted: if modified or added or removed or deleted:
raise error.Abort(_('uncommitted changes'), hint=hint) raise error.Abort(_('uncommitted changes'), hint=hint)
ctx = repo[None] ctx = repo[None]