equal
deleted
inserted
replaced
747 for f in removed: |
747 for f in removed: |
748 repo.dirstate.remove(f) |
748 repo.dirstate.remove(f) |
749 for f in merged: |
749 for f in merged: |
750 repo.dirstate.merge(f) |
750 repo.dirstate.merge(f) |
751 p1, p2 = repo.dirstate.parents() |
751 p1, p2 = repo.dirstate.parents() |
752 repo.dirstate.setparents(p1, merge) |
752 repo.setparents(p1, merge) |
753 |
753 |
754 match = scmutil.matchfiles(repo, files or []) |
754 match = scmutil.matchfiles(repo, files or []) |
755 oldtip = repo['tip'] |
755 oldtip = repo['tip'] |
756 n = newcommit(repo, None, message, ph.user, ph.date, match=match, |
756 n = newcommit(repo, None, message, ph.user, ph.date, match=match, |
757 force=True) |
757 force=True) |
1353 repo.dirstate.drop(f) |
1353 repo.dirstate.drop(f) |
1354 for f in m + r: |
1354 for f in m + r: |
1355 fctx = ctx[f] |
1355 fctx = ctx[f] |
1356 repo.wwrite(f, fctx.data(), fctx.flags()) |
1356 repo.wwrite(f, fctx.data(), fctx.flags()) |
1357 repo.dirstate.normal(f) |
1357 repo.dirstate.normal(f) |
1358 repo.dirstate.setparents(qp, nullid) |
1358 repo.setparents(qp, nullid) |
1359 for patch in reversed(self.applied[start:end]): |
1359 for patch in reversed(self.applied[start:end]): |
1360 self.ui.status(_("popping %s\n") % patch.name) |
1360 self.ui.status(_("popping %s\n") % patch.name) |
1361 del self.applied[start:end] |
1361 del self.applied[start:end] |
1362 self.strip(repo, [rev], update=False, backup='strip') |
1362 self.strip(repo, [rev], update=False, backup='strip') |
1363 if self.applied: |
1363 if self.applied: |
1544 user = ph.user or changes[1] |
1544 user = ph.user or changes[1] |
1545 |
1545 |
1546 oldphase = repo[top].phase() |
1546 oldphase = repo[top].phase() |
1547 |
1547 |
1548 # assumes strip can roll itself back if interrupted |
1548 # assumes strip can roll itself back if interrupted |
1549 repo.dirstate.setparents(*cparents) |
1549 repo.setparents(*cparents) |
1550 self.applied.pop() |
1550 self.applied.pop() |
1551 self.applieddirty = True |
1551 self.applieddirty = True |
1552 self.strip(repo, [top], update=False, |
1552 self.strip(repo, [top], update=False, |
1553 backup='strip') |
1553 backup='strip') |
1554 except: |
1554 except: |