equal
deleted
inserted
replaced
1980 try: |
1980 try: |
1981 if opts.get('secret'): |
1981 if opts.get('secret'): |
1982 commitphase = 'secret' |
1982 commitphase = 'secret' |
1983 else: |
1983 else: |
1984 commitphase = old.phase() |
1984 commitphase = old.phase() |
1985 repo.ui.setconfig('phases', 'new-commit', commitphase) |
1985 repo.ui.setconfig('phases', 'new-commit', commitphase, 'amend') |
1986 newid = repo.commitctx(new) |
1986 newid = repo.commitctx(new) |
1987 finally: |
1987 finally: |
1988 repo.ui.setconfig('phases', 'new-commit', ph) |
1988 repo.ui.setconfig('phases', 'new-commit', ph, 'amend') |
1989 if newid != old.node(): |
1989 if newid != old.node(): |
1990 # Reroute the working copy parent to the new changeset |
1990 # Reroute the working copy parent to the new changeset |
1991 repo.setparents(newid, nullid) |
1991 repo.setparents(newid, nullid) |
1992 |
1992 |
1993 # Move bookmarks from old parent to amend commit |
1993 # Move bookmarks from old parent to amend commit |