1658 # mm, dd, aa = repo.status(top, patchparent)[:3] |
1658 # mm, dd, aa = repo.status(top, patchparent)[:3] |
1659 # but we do it backwards to take advantage of manifest/changelog |
1659 # but we do it backwards to take advantage of manifest/changelog |
1660 # caching against the next repo.status call |
1660 # caching against the next repo.status call |
1661 mm, aa, dd = repo.status(patchparent, top)[:3] |
1661 mm, aa, dd = repo.status(patchparent, top)[:3] |
1662 changes = repo.changelog.read(top) |
1662 changes = repo.changelog.read(top) |
1663 man = repo.manifest.read(changes[0]) |
1663 man = repo.manifestlog[changes[0]].read() |
1664 aaa = aa[:] |
1664 aaa = aa[:] |
1665 matchfn = scmutil.match(repo[None], pats, opts) |
1665 matchfn = scmutil.match(repo[None], pats, opts) |
1666 # in short mode, we only diff the files included in the |
1666 # in short mode, we only diff the files included in the |
1667 # patch already plus specified files |
1667 # patch already plus specified files |
1668 if opts.get('short'): |
1668 if opts.get('short'): |