Mercurial > hg
comparison mercurial/cmdutil.py @ 19024:ab04e87a5f3b
amend: fix unlocking order - first lock then wlock
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 17 Apr 2013 03:41:08 +0200 |
| parents | c1af1fb314bc |
| children | bd19587a3347 |
comparison
equal
deleted
inserted
replaced
| 19023:86531a7038ed | 19024:ab04e87a5f3b |
|---|---|
| 1788 ui.note(_('stripping amended changeset %s\n') % old) | 1788 ui.note(_('stripping amended changeset %s\n') % old) |
| 1789 repair.strip(ui, repo, old.node(), topic='amend-backup') | 1789 repair.strip(ui, repo, old.node(), topic='amend-backup') |
| 1790 finally: | 1790 finally: |
| 1791 if newid is None: | 1791 if newid is None: |
| 1792 repo.dirstate.invalidate() | 1792 repo.dirstate.invalidate() |
| 1793 lockmod.release(wlock, lock) | 1793 lockmod.release(lock, wlock) |
| 1794 return newid | 1794 return newid |
| 1795 | 1795 |
| 1796 def commiteditor(repo, ctx, subs): | 1796 def commiteditor(repo, ctx, subs): |
| 1797 if ctx.description(): | 1797 if ctx.description(): |
| 1798 return ctx.description() | 1798 return ctx.description() |