| Alphare | |
| pulkit |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/mq.py (6 lines) |
| self.backup(repo, tobackup) | self.backup(repo, tobackup) | ||||
| with repo.dirstate.parentchange(): | with repo.dirstate.parentchange(): | ||||
| for f in a: | for f in a: | ||||
| repo.wvfs.unlinkpath(f, ignoremissing=True) | repo.wvfs.unlinkpath(f, ignoremissing=True) | ||||
| repo.dirstate.drop(f) | repo.dirstate.drop(f) | ||||
| for f in m + r: | for f in m + r: | ||||
| fctx = ctx[f] | fctx = ctx[f] | ||||
| repo.wwrite(f, fctx.data(), fctx.flags()) | repo.wwrite(f, fctx.data(), fctx.flags()) | ||||
| repo.dirstate.normal(f) | repo.dirstate.update_file( | ||||
| f, p1_tracked=True, wc_tracked=True | |||||
| ) | |||||
| repo.setparents(qp, repo.nullid) | repo.setparents(qp, repo.nullid) | ||||
| for patch in reversed(self.applied[start:end]): | for patch in reversed(self.applied[start:end]): | ||||
| self.ui.status(_(b"popping %s\n") % patch.name) | self.ui.status(_(b"popping %s\n") % patch.name) | ||||
| del self.applied[start:end] | del self.applied[start:end] | ||||
| strip(self.ui, repo, [rev], update=False, backup=False) | strip(self.ui, repo, [rev], update=False, backup=False) | ||||
| for s, state in repo[b'.'].substate.items(): | for s, state in repo[b'.'].substate.items(): | ||||
| repo[b'.'].sub(s).get(state) | repo[b'.'].sub(s).get(state) | ||||
| if self.applied: | if self.applied: | ||||
| # if the patch excludes a modified file, mark that | # if the patch excludes a modified file, mark that | ||||
| # file with mtime=0 so status can see it. | # file with mtime=0 so status can see it. | ||||
| mm = [] | mm = [] | ||||
| for i in pycompat.xrange(len(m) - 1, -1, -1): | for i in pycompat.xrange(len(m) - 1, -1, -1): | ||||
| if not match1(m[i]): | if not match1(m[i]): | ||||
| mm.append(m[i]) | mm.append(m[i]) | ||||
| del m[i] | del m[i] | ||||
| for f in m: | for f in m: | ||||
| repo.dirstate.normal(f) | repo.dirstate.update_file_p1(f, p1_tracked=True) | ||||
| for f in mm: | for f in mm: | ||||
| repo.dirstate.normallookup(f) | repo.dirstate.normallookup(f) | ||||
| for f in forget: | for f in forget: | ||||
| repo.dirstate.drop(f) | repo.dirstate.drop(f) | ||||
| user = ph.user or ctx.user() | user = ph.user or ctx.user() | ||||
| oldphase = repo[top].phase() | oldphase = repo[top].phase() | ||||