| hg-reviewers |
This removes dependence on filelog.renamed().
| 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 (8 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| # 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] | ||||
| ctx = repo[top] | ctx = repo[top] | ||||
| 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()) | ||||
| src = repo.dirstate.copied(dst) | src = repo.dirstate.copied(dst) | ||||
| # during qfold, the source file for copies may | # during qfold, the source file for copies may | ||||
| # be removed. Treat this as a simple add. | # be removed. Treat this as a simple add. | ||||
| if src is not None and src in repo.dirstate: | if src is not None and src in repo.dirstate: | ||||
| copies.setdefault(src, []).append(dst) | copies.setdefault(src, []).append(dst) | ||||
| repo.dirstate.add(dst) | repo.dirstate.add(dst) | ||||
| # remember the copies between patchparent and qtip | # remember the copies between patchparent and qtip | ||||
| for dst in aaa: | for dst in aaa: | ||||
| f = repo.file(dst) | src = ctx[dst].copysource() | ||||
| src = f.renamed(man[dst]) | |||||
| if src: | if src: | ||||
| copies.setdefault(src[0], []).extend( | copies.setdefault(src, []).extend( | ||||
| copies.get(dst, [])) | copies.get(dst, [])) | ||||
| if dst in a: | if dst in a: | ||||
| copies[src[0]].append(dst) | copies[src].append(dst) | ||||
| # we can't copy a file created by the patch itself | # we can't copy a file created by the patch itself | ||||
| if dst in copies: | if dst in copies: | ||||
| del copies[dst] | del copies[dst] | ||||
| for src, dsts in copies.iteritems(): | for src, dsts in copies.iteritems(): | ||||
| for dst in dsts: | for dst in dsts: | ||||
| repo.dirstate.copy(src, dst) | repo.dirstate.copy(src, dst) | ||||
| else: | else: | ||||
| for dst in a: | for dst in a: | ||||