Show More
@@ -429,13 +429,13 b' def dorecord(' | |||||
429 | with repo.ui.configoverride(overrides, b'record'): |
|
429 | with repo.ui.configoverride(overrides, b'record'): | |
430 | # subrepoutil.precommit() modifies the status |
|
430 | # subrepoutil.precommit() modifies the status | |
431 | tmpstatus = scmutil.status( |
|
431 | tmpstatus = scmutil.status( | |
432 |
copymod.copy(status |
|
432 | copymod.copy(status.modified), | |
433 |
copymod.copy(status |
|
433 | copymod.copy(status.added), | |
434 |
copymod.copy(status |
|
434 | copymod.copy(status.removed), | |
435 |
copymod.copy(status |
|
435 | copymod.copy(status.deleted), | |
436 |
copymod.copy(status |
|
436 | copymod.copy(status.unknown), | |
437 |
copymod.copy(status |
|
437 | copymod.copy(status.ignored), | |
438 |
copymod.copy(status |
|
438 | copymod.copy(status.clean), # pytype: disable=wrong-arg-count | |
439 | ) |
|
439 | ) | |
440 |
|
440 | |||
441 | # Force allows -X subrepo to skip the subrepo. |
|
441 | # Force allows -X subrepo to skip the subrepo. | |
@@ -991,8 +991,8 b' def bailifchanged(repo, merge=True, hint' | |||||
991 |
|
991 | |||
992 | if merge and repo.dirstate.p2() != nullid: |
|
992 | if merge and repo.dirstate.p2() != nullid: | |
993 | raise error.Abort(_(b'outstanding uncommitted merge'), hint=hint) |
|
993 | raise error.Abort(_(b'outstanding uncommitted merge'), hint=hint) | |
994 | modified, added, removed, deleted = repo.status()[:4] |
|
994 | st = repo.status() | |
995 | if modified or added or removed or deleted: |
|
995 | if st.modified or st.added or st.removed or st.deleted: | |
996 | raise error.Abort(_(b'uncommitted changes'), hint=hint) |
|
996 | raise error.Abort(_(b'uncommitted changes'), hint=hint) | |
997 | ctx = repo[None] |
|
997 | ctx = repo[None] | |
998 | for s in sorted(ctx.substate): |
|
998 | for s in sorted(ctx.substate): | |
@@ -2565,7 +2565,7 b' def remove(' | |||||
2565 | ): |
|
2565 | ): | |
2566 | ret = 0 |
|
2566 | ret = 0 | |
2567 | s = repo.status(match=m, clean=True) |
|
2567 | s = repo.status(match=m, clean=True) | |
2568 |
modified, added, deleted, clean = s |
|
2568 | modified, added, deleted, clean = s.modified, s.added, s.deleted, s.clean | |
2569 |
|
2569 | |||
2570 | wctx = repo[None] |
|
2570 | wctx = repo[None] | |
2571 |
|
2571 | |||
@@ -2876,7 +2876,8 b' def amend(ui, repo, old, extra, pats, op' | |||||
2876 | if len(old.parents()) > 1: |
|
2876 | if len(old.parents()) > 1: | |
2877 | # ctx.files() isn't reliable for merges, so fall back to the |
|
2877 | # ctx.files() isn't reliable for merges, so fall back to the | |
2878 | # slower repo.status() method |
|
2878 | # slower repo.status() method | |
2879 |
|
|
2879 | st = base.status(old) | |
|
2880 | files = set(st.modified) | set(st.added) | set(st.removed) | |||
2880 | else: |
|
2881 | else: | |
2881 | files = set(old.files()) |
|
2882 | files = set(old.files()) | |
2882 |
|
2883 |
General Comments 0
You need to be logged in to leave comments.
Login now