Mercurial > evolve
changeset 3981:b4d0245c7f40 stable
evolve: delete evolvestate after aborting interrupted `next --evolve`
We didn't use to delete the evolvestate after aborting an interrupted `next
--evolve`. This patch makes sure we do that. The test changes demonstrate the
fix and we add a CHANGELOG entry about the fix.
| author | Pulkit Goyal <pulkit@yandex-team.ru> |
|---|---|
| date | Mon, 20 Aug 2018 12:21:39 +0300 |
| parents | 828b423545b1 |
| children | a689f07d5663 33f795a17622 |
| files | CHANGELOG hgext3rd/evolve/evolvecmd.py tests/test-evolve-abort-orphan.t |
| diffstat | 3 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG Mon Aug 20 12:19:05 2018 +0300 +++ b/CHANGELOG Mon Aug 20 12:21:39 2018 +0300 @@ -9,6 +9,7 @@ * clone: fix possible crash when using clone bundle and forcing cache warming * obshashrange: fix speed and consistency issues during cache invalidation * obshashrange: properly persist all caches involved in obshashrange discovery + * delete the evolvestate after aborting interrupted `next --evolve` 8.1.0 -- 2018-08-03 -------------------
--- a/hgext3rd/evolve/evolvecmd.py Mon Aug 20 12:19:05 2018 +0300 +++ b/hgext3rd/evolve/evolvecmd.py Mon Aug 20 12:21:39 2018 +0300 @@ -1543,6 +1543,7 @@ ui.status(_('evolve aborted\n')) ui.status(_('working directory is now at %s\n') % pctx.hex()[:12]) + evolvestate.delete() return 0 return abortevolve(ui, repo, evolvestate) else: