equal
deleted
inserted
replaced
3519 |
3519 |
3520 def abortifwdirpatched(self, errmsg, force=False): |
3520 def abortifwdirpatched(self, errmsg, force=False): |
3521 if self.mq.applied and self.mq.checkapplied and not force: |
3521 if self.mq.applied and self.mq.checkapplied and not force: |
3522 parents = self.dirstate.parents() |
3522 parents = self.dirstate.parents() |
3523 patches = [s.node for s in self.mq.applied] |
3523 patches = [s.node for s in self.mq.applied] |
3524 if parents[0] in patches or parents[1] in patches: |
3524 if any(p in patches for p in parents): |
3525 raise error.Abort(errmsg) |
3525 raise error.Abort(errmsg) |
3526 |
3526 |
3527 def commit(self, text="", user=None, date=None, match=None, |
3527 def commit(self, text="", user=None, date=None, match=None, |
3528 force=False, editor=False, extra=None): |
3528 force=False, editor=False, extra=None): |
3529 if extra is None: |
3529 if extra is None: |