Mercurial > hg
comparison hgext/mq.py @ 8433:9a398dd53bcc
mq: qpush shouldn't complain if working dir is at a non-tip head
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Fri, 15 May 2009 15:21:17 +0200 |
| parents | 0bf0045000b5 |
| children | 15573b5dc78f |
comparison
equal
deleted
inserted
replaced
| 8432:94ef2c8ce683 | 8433:9a398dd53bcc |
|---|---|
| 883 raise util.Abort(_("patch %s not in series") % patch) | 883 raise util.Abort(_("patch %s not in series") % patch) |
| 884 | 884 |
| 885 def push(self, repo, patch=None, force=False, list=False, | 885 def push(self, repo, patch=None, force=False, list=False, |
| 886 mergeq=None, all=False): | 886 mergeq=None, all=False): |
| 887 wlock = repo.wlock() | 887 wlock = repo.wlock() |
| 888 if repo.dirstate.parents()[0] != repo.changelog.tip(): | 888 if repo.dirstate.parents()[0] not in repo.heads(): |
| 889 self.ui.status(_("(working directory not at tip)\n")) | 889 self.ui.status(_("(working directory not at a head)\n")) |
| 890 | 890 |
| 891 if not self.series: | 891 if not self.series: |
| 892 self.ui.warn(_('no patches in series\n')) | 892 self.ui.warn(_('no patches in series\n')) |
| 893 return 0 | 893 return 0 |
| 894 | 894 |