equal
deleted
inserted
replaced
2982 # amend to "normal" in the dirstate. We need to use "normallookup" since |
2982 # amend to "normal" in the dirstate. We need to use "normallookup" since |
2983 # the files may have changed since the command started; using "normal" |
2983 # the files may have changed since the command started; using "normal" |
2984 # would mark them as clean but with uncommitted contents. |
2984 # would mark them as clean but with uncommitted contents. |
2985 normalfiles = set(wctx.modified() + wctx.added()) & filestoamend |
2985 normalfiles = set(wctx.modified() + wctx.added()) & filestoamend |
2986 for f in normalfiles: |
2986 for f in normalfiles: |
2987 dirstate.normallookup(f) |
2987 dirstate.update_file( |
|
2988 f, p1_tracked=True, wc_tracked=True, possibly_dirty=True |
|
2989 ) |
2988 |
2990 |
2989 # Update the state of files which were removed in the amend |
2991 # Update the state of files which were removed in the amend |
2990 # to "removed" in the dirstate. |
2992 # to "removed" in the dirstate. |
2991 removedfiles = set(wctx.removed()) & filestoamend |
2993 removedfiles = set(wctx.removed()) & filestoamend |
2992 for f in removedfiles: |
2994 for f in removedfiles: |