2913 # If there are changes to amend or if copy information needs to be read |
2913 # If there are changes to amend or if copy information needs to be read |
2914 # from the changeset extras, we cannot take the fast path of using |
2914 # from the changeset extras, we cannot take the fast path of using |
2915 # filectxs from the old commit. |
2915 # filectxs from the old commit. |
2916 if changes or changeset_copies: |
2916 if changes or changeset_copies: |
2917 # Recompute copies (avoid recording a -> b -> a) |
2917 # Recompute copies (avoid recording a -> b -> a) |
2918 copied = copies.pathcopies(base, wctx, matcher) |
2918 copied = copies.pathcopies(base, wctx) |
2919 if old.p2: |
2919 if old.p2(): |
2920 copied.update(copies.pathcopies(old.p2(), wctx, matcher)) |
2920 copied.update(copies.pathcopies(old.p2(), wctx)) |
2921 |
2921 |
2922 # Prune files which were reverted by the updates: if old |
2922 # Prune files which were reverted by the updates: if old |
2923 # introduced file X and the file was renamed in the working |
2923 # introduced file X and the file was renamed in the working |
2924 # copy, then those two files are the same and |
2924 # copy, then those two files are the same and |
2925 # we can discard X from our list of files. Likewise if X |
2925 # we can discard X from our list of files. Likewise if X |