Mercurial > hg
comparison hgext/mq.py @ 5432:bfbd9b954315
mq: clarify queue top message
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 09 Oct 2007 17:22:38 -0500 |
parents | 24de027551c1 |
children | 0b3f910dfd17 |
comparison
equal
deleted
inserted
replaced
5431:a7c832abd29c | 5432:bfbd9b954315 |
---|---|
585 def check_toppatch(self, repo): | 585 def check_toppatch(self, repo): |
586 if len(self.applied) > 0: | 586 if len(self.applied) > 0: |
587 top = revlog.bin(self.applied[-1].rev) | 587 top = revlog.bin(self.applied[-1].rev) |
588 pp = repo.dirstate.parents() | 588 pp = repo.dirstate.parents() |
589 if top not in pp: | 589 if top not in pp: |
590 raise util.Abort(_("queue top not at same revision as working directory")) | 590 raise util.Abort(_("working directory revision is not qtip")) |
591 return top | 591 return top |
592 return None | 592 return None |
593 def check_localchanges(self, repo, force=False, refresh=True): | 593 def check_localchanges(self, repo, force=False, refresh=True): |
594 m, a, r, d = repo.status()[:4] | 594 m, a, r, d = repo.status()[:4] |
595 if m or a or r or d: | 595 if m or a or r or d: |