| Alphare |
| hg-reviewers |
This align MQ behavior with what what scmutil.movedirstate does. (it should
probably use scmutil.movedirstate itself.
| 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 (2 lines) |
| 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.update_file_p1(f, p1_tracked=True) | repo.dirstate.update_file_p1(f, p1_tracked=True) | ||||
| for f in mm: | for f in mm: | ||||
| repo.dirstate.normallookup(f) | repo.dirstate.update_file_p1(f, p1_tracked=True) | ||||
| 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() | ||||
| # assumes strip can roll itself back if interrupted | # assumes strip can roll itself back if interrupted | ||||