Mercurial > hg
comparison hgext/mq.py @ 13520:9510ddf87c43 stable
mq: forbid commit of merge involving mq patches
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Wed, 02 Mar 2011 14:09:06 +0100 |
| parents | 0396ca8015be |
| children | 73bf872a91d8 33a33f19aad2 |
comparison
equal
deleted
inserted
replaced
| 13517:da192c62f89e | 13520:9510ddf87c43 |
|---|---|
| 2919 def mq(self): | 2919 def mq(self): |
| 2920 return queue(self.ui, self.join("")) | 2920 return queue(self.ui, self.join("")) |
| 2921 | 2921 |
| 2922 def abort_if_wdir_patched(self, errmsg, force=False): | 2922 def abort_if_wdir_patched(self, errmsg, force=False): |
| 2923 if self.mq.applied and not force: | 2923 if self.mq.applied and not force: |
| 2924 parent = self.dirstate.parents()[0] | 2924 parents = self.dirstate.parents() |
| 2925 if parent in [s.node for s in self.mq.applied]: | 2925 patches = [s.node for s in self.mq.applied] |
| 2926 if parents[0] in patches or parents[1] in patches: | |
| 2926 raise util.Abort(errmsg) | 2927 raise util.Abort(errmsg) |
| 2927 | 2928 |
| 2928 def commit(self, text="", user=None, date=None, match=None, | 2929 def commit(self, text="", user=None, date=None, match=None, |
| 2929 force=False, editor=False, extra={}): | 2930 force=False, editor=False, extra={}): |
| 2930 self.abort_if_wdir_patched( | 2931 self.abort_if_wdir_patched( |