Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pick: register pickstate as an unfinished state stable
authorAnton Shestakov <av6@dwimlabs.net>
Fri, 14 Jun 2019 18:17:03 +0800
branchstable
changeset 4692 a9cf0ba6e6c7
parent 4691 214dab733124
child 4698 b89495215c6e
pick: register pickstate as an unfinished state This way pickstate file will indicate that unfinished pick command needs to be dealt with (--continue or --abort) before modifying the repo. Otherwise it would be e.g. possible to commit during an interrupted pick and that's not expected.
CHANGELOG file | annotate | diff | comparison | revisions
hgext3rd/evolve/__init__.py file | annotate | diff | comparison | revisions 
--- a/CHANGELOG	Fri Jun 14 18:14:57 2019 +0800
+++ b/CHANGELOG	Fri Jun 14 18:17:03 2019 +0800
@@ -5,6 +5,7 @@
 -------------------
 
   * pick: no longer forget file in case of conflict (issue6037)
+  * pick: properly report and cleanup "unfinished state"
   * evolve: properly prune changeset with no change in case of conflict (issue5967)
 
 9.0.0 -- 2019-06-06
--- a/hgext3rd/evolve/__init__.py	Fri Jun 14 18:14:57 2019 +0800
+++ b/hgext3rd/evolve/__init__.py	Fri Jun 14 18:17:03 2019 +0800
@@ -1358,6 +1358,9 @@
     estate = ('evolvestate', False, False, _('evolve in progress'),
               _("use 'hg evolve --continue' or 'hg evolve --abort' to abort"))
     cmdutil.unfinishedstates.append(estate)
+    pstate = ('pickstate', False, False, _('pick in progress'),
+              _("use 'hg pick --continue' or 'hg pick --abort' to abort"))
+    cmdutil.unfinishedstates.append(pstate)
 
     afterresolved = ('evolvestate', _('hg evolve --continue'))
     pickresolved = ('pickstate', _('hg pick --continue'))
evolve