| hg-reviewers |
| Lint Skipped |
| Unit Tests Skipped |
I don't know if this is the right way to catch unshelve run because it is breaking so many things. May be there is some other way to catch a unshelve run so that I can disable those checks. Although it is working for the case mentioned in the issue.
| patches = [s.node for s in self.mq.applied] | patches = [s.node for s in self.mq.applied] | ||||
| if parents[0] in patches or parents[1] in patches: | if parents[0] in patches or parents[1] in patches: | ||||
| raise error.Abort(errmsg) | raise error.Abort(errmsg) | ||||
| def commit(self, text="", user=None, date=None, match=None, | def commit(self, text="", user=None, date=None, match=None, | ||||
| force=False, editor=False, extra=None): | force=False, editor=False, extra=None): | ||||
| if extra is None: | if extra is None: | ||||
| extra = {} | extra = {} | ||||
| if not repo.vfs.readlines('journal.desc')[1] == 'unshelve\n': | |||||
| self.abortifwdirpatched( | self.abortifwdirpatched( | ||||
| _('cannot commit over an applied mq patch'), | _('cannot commit over an applied mq patch'), | ||||
| force) | force) | ||||
| return super(mqrepo, self).commit(text, user, date, match, force, | return super(mqrepo, self).commit(text, user, date, match, force, | ||||
| editor, extra) | editor, extra) | ||||
| def checkpush(self, pushop): | def checkpush(self, pushop): | ||||
| if self.mq.applied and self.mq.checkapplied and not pushop.force: | if self.mq.applied and self.mq.checkapplied and not pushop.force: | ||||
| outapplied = [e.node for e in self.mq.applied] | outapplied = [e.node for e in self.mq.applied] | ||||
| if pushop.revs: | if pushop.revs: | ||||
| destmap: {srcrev: destrev} | destmap: {srcrev: destrev} | ||||
| ''' | ''' | ||||
| rebaseset = destmap.keys() | rebaseset = destmap.keys() | ||||
| originalwd = repo['.'].rev() | originalwd = repo['.'].rev() | ||||
| # This check isn't strictly necessary, since mq detects commits over an | # This check isn't strictly necessary, since mq detects commits over an | ||||
| # applied patch. But it prevents messing up the working directory when | # applied patch. But it prevents messing up the working directory when | ||||
| # a partially completed rebase is blocked by mq. | # a partially completed rebase is blocked by mq. | ||||
| if not repo.vfs.readlines('journal.desc')[1] == 'unshelve\n': | |||||
| if 'qtip' in repo.tags(): | if 'qtip' in repo.tags(): | ||||
| mqapplied = set(repo[s.node].rev() for s in repo.mq.applied) | mqapplied = set(repo[s.node].rev() for s in repo.mq.applied) | ||||
| if set(destmap.values()) & mqapplied: | if set(destmap.values()) & mqapplied: | ||||
| raise error.Abort(_('cannot rebase onto an applied mq patch')) | raise error.Abort(_('cannot rebase onto an applied mq patch')) | ||||
| # Get "cycle" error early by exhausting the generator. | # Get "cycle" error early by exhausting the generator. | ||||
| sortedsrc = list(sortsource(destmap)) # a list of sorted revs | sortedsrc = list(sortsource(destmap)) # a list of sorted revs | ||||
| if not sortedsrc: | if not sortedsrc: | ||||
| raise error.Abort(_('no matching revisions')) | raise error.Abort(_('no matching revisions')) | ||||
| # Only check the first batch of revisions to rebase not depending on other | # Only check the first batch of revisions to rebase not depending on other | ||||
| # rebaseset. This means "source is ancestor of destination" for the second | # rebaseset. This means "source is ancestor of destination" for the second | ||||