equal
deleted
inserted
replaced
2553 # Reroute the working copy parent to the new changeset |
2553 # Reroute the working copy parent to the new changeset |
2554 repo.setparents(newid, nullid) |
2554 repo.setparents(newid, nullid) |
2555 mapping = {old.node(): (newid,)} |
2555 mapping = {old.node(): (newid,)} |
2556 obsmetadata = None |
2556 obsmetadata = None |
2557 if opts.get('note'): |
2557 if opts.get('note'): |
2558 obsmetadata = {'note': opts['note']} |
2558 obsmetadata = {'note': encoding.fromlocal(opts['note'])} |
2559 scmutil.cleanupnodes(repo, mapping, 'amend', metadata=obsmetadata, |
2559 scmutil.cleanupnodes(repo, mapping, 'amend', metadata=obsmetadata, |
2560 fixphase=True, targetphase=commitphase) |
2560 fixphase=True, targetphase=commitphase) |
2561 |
2561 |
2562 # Fixing the dirstate because localrepo.commitctx does not update |
2562 # Fixing the dirstate because localrepo.commitctx does not update |
2563 # it. This is rather convenient because we did not need to update |
2563 # it. This is rather convenient because we did not need to update |