| hg-reviewers |
Context objects have existed since mid-2006.
| 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) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| # update the dirstate in place, strip off the qtip commit | # update the dirstate in place, strip off the qtip commit | ||||
| # and then commit. | # and then commit. | ||||
| # | # | ||||
| # this should really read: | # this should really read: | ||||
| # mm, dd, aa = repo.status(top, patchparent)[:3] | # mm, dd, aa = repo.status(top, patchparent)[:3] | ||||
| # but we do it backwards to take advantage of manifest/changelog | # but we do it backwards to take advantage of manifest/changelog | ||||
| # caching against the next repo.status call | # caching against the next repo.status call | ||||
| mm, aa, dd = repo.status(patchparent, top)[:3] | mm, aa, dd = repo.status(patchparent, top)[:3] | ||||
| changes = repo.changelog.read(top) | ctx = repo[top] | ||||
| man = repo.manifestlog[changes[0]].read() | man = ctx.manifest() | ||||
| aaa = aa[:] | aaa = aa[:] | ||||
| match1 = scmutil.match(repo[None], pats, opts) | match1 = scmutil.match(repo[None], pats, opts) | ||||
| # in short mode, we only diff the files included in the | # in short mode, we only diff the files included in the | ||||
| # patch already plus specified files | # patch already plus specified files | ||||
| if opts.get('short'): | if opts.get('short'): | ||||
| # if amending a patch, we start with existing | # if amending a patch, we start with existing | ||||
| # files plus specified files - unfiltered | # files plus specified files - unfiltered | ||||
| match = scmutil.matchfiles(repo, mm + aa + dd + match1.files()) | match = scmutil.matchfiles(repo, mm + aa + dd + match1.files()) | ||||
| del m[i] | del m[i] | ||||
| for f in m: | for f in m: | ||||
| repo.dirstate.normal(f) | repo.dirstate.normal(f) | ||||
| 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 changes[1] | 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 | ||||
| repo.setparents(*cparents) | repo.setparents(*cparents) | ||||
| self.applied.pop() | self.applied.pop() | ||||
| self.applieddirty = True | self.applieddirty = True | ||||
| strip(self.ui, repo, [top], update=False, backup=False) | strip(self.ui, repo, [top], update=False, backup=False) | ||||