equal
deleted
inserted
replaced
3150 newid = repo.commitctx(new) |
3150 newid = repo.commitctx(new) |
3151 |
3151 |
3152 # Reroute the working copy parent to the new changeset |
3152 # Reroute the working copy parent to the new changeset |
3153 repo.setparents(newid, nullid) |
3153 repo.setparents(newid, nullid) |
3154 mapping = {old.node(): (newid,)} |
3154 mapping = {old.node(): (newid,)} |
3155 scmutil.cleanupnodes(repo, mapping, 'amend') |
3155 obsmetadata = None |
|
3156 if opts.get('note'): |
|
3157 obsmetadata = {'note': opts['note']} |
|
3158 scmutil.cleanupnodes(repo, mapping, 'amend', metadata=obsmetadata) |
3156 |
3159 |
3157 # Fixing the dirstate because localrepo.commitctx does not update |
3160 # Fixing the dirstate because localrepo.commitctx does not update |
3158 # it. This is rather convenient because we did not need to update |
3161 # it. This is rather convenient because we did not need to update |
3159 # the dirstate for all the files in the new commit which commitctx |
3162 # the dirstate for all the files in the new commit which commitctx |
3160 # could have done if it updated the dirstate. Now, we can |
3163 # could have done if it updated the dirstate. Now, we can |