##// END OF EJS Templates
cmdutil: simplify the dirty check in howtocontinue()...
Matt Harbison -
r33362:e48fb90f default
parent child Browse files
Show More
@@ -3547,10 +3547,7 b' def howtocontinue(repo):'
3547 for f, msg in afterresolvedstates:
3547 for f, msg in afterresolvedstates:
3548 if repo.vfs.exists(f):
3548 if repo.vfs.exists(f):
3549 return contmsg % msg, True
3549 return contmsg % msg, True
3550 workingctx = repo[None]
3550 if repo[None].dirty(missing=True, merge=False, branch=False):
3551 dirty = any(repo.status()) or any(workingctx.sub(s).dirty()
3552 for s in workingctx.substate)
3553 if dirty:
3554 return contmsg % _("hg commit"), False
3551 return contmsg % _("hg commit"), False
3555 return None, None
3552 return None, None
3556
3553
General Comments 0
You need to be logged in to leave comments. Login now