Show More
@@ -1700,8 +1700,8 b' class queue(object):' | |||
|
1700 | 1700 | # but we do it backwards to take advantage of manifest/changelog |
|
1701 | 1701 | # caching against the next repo.status call |
|
1702 | 1702 | mm, aa, dd = repo.status(patchparent, top)[:3] |
|
1703 |
c |
|
|
1704 |
man = |
|
|
1703 | ctx = repo[top] | |
|
1704 | man = ctx.manifest() | |
|
1705 | 1705 | aaa = aa[:] |
|
1706 | 1706 | match1 = scmutil.match(repo[None], pats, opts) |
|
1707 | 1707 | # in short mode, we only diff the files included in the |
@@ -1813,7 +1813,7 b' class queue(object):' | |||
|
1813 | 1813 | for f in forget: |
|
1814 | 1814 | repo.dirstate.drop(f) |
|
1815 | 1815 | |
|
1816 |
user = ph.user or c |
|
|
1816 | user = ph.user or ctx.user() | |
|
1817 | 1817 | |
|
1818 | 1818 | oldphase = repo[top].phase() |
|
1819 | 1819 |
General Comments 0
You need to be logged in to leave comments.
Login now