mercurial/cmdutil.py
changeset 19804 061ce98c888d
parent 19730 d184bae667e4
child 19867 edce20ebe1f3
equal deleted inserted replaced
19803:0f64af33fb63 19804:061ce98c888d
    82 def bailifchanged(repo):
    82 def bailifchanged(repo):
    83     if repo.dirstate.p2() != nullid:
    83     if repo.dirstate.p2() != nullid:
    84         raise util.Abort(_('outstanding uncommitted merge'))
    84         raise util.Abort(_('outstanding uncommitted merge'))
    85     modified, added, removed, deleted = repo.status()[:4]
    85     modified, added, removed, deleted = repo.status()[:4]
    86     if modified or added or removed or deleted:
    86     if modified or added or removed or deleted:
    87         raise util.Abort(_("outstanding uncommitted changes"))
    87         raise util.Abort(_('uncommitted changes'))
    88     ctx = repo[None]
    88     ctx = repo[None]
    89     for s in sorted(ctx.substate):
    89     for s in sorted(ctx.substate):
    90         if ctx.sub(s).dirty():
    90         if ctx.sub(s).dirty():
    91             raise util.Abort(_("uncommitted changes in subrepo %s") % s)
    91             raise util.Abort(_("uncommitted changes in subrepo %s") % s)
    92 
    92