# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1477746447 -7200
# Node ID 6d54fd20bb816e97040ff44c9dfa513d25e4c773
# Parent  bc590681de77c423934e3c3b2df2c7320698f83e# Parent  ad04f3c3b1a94278a986aa529f439a6100a18288
merge with latest fix

diff -r bc590681de77 -r 6d54fd20bb81 README
--- a/README	Fri Oct 28 17:02:56 2016 +0200
+++ b/README	Sat Oct 29 15:07:27 2016 +0200
@@ -66,6 +66,7 @@
  - split: avoid crash on empty commit (issue5191),
  - next: improve locking to avoid issue with working copy parent (issue5244)
  - prev: improve locking to avoid issue with working copy parent (issue5244)
+ - evolve: fix abort suggestion to include '.' in 'hg update -C .'
 
 5.4.1 -- 2016-08-01
 
diff -r bc590681de77 -r 6d54fd20bb81 hgext/evolve.py
--- a/hgext/evolve.py	Fri Oct 28 17:02:56 2016 +0200
+++ b/hgext/evolve.py	Sat Oct 29 15:07:27 2016 +0200
@@ -20,7 +20,7 @@
 '''
 
 __version__ = '5.4.1'
-testedwith = '3.4.3 3.5.2 3.6.2 3.7.3 3.8.1 3.9'
+testedwith = '3.4.3 3.5.2 3.6.2 3.7.3 3.8.1 3.9 4.0'
 buglink = 'https://bz.mercurial-scm.org/'
 
 
@@ -689,7 +689,7 @@
     if repo['.'].obsolete():
         ui.warn(_('working directory parent is obsolete!\n'))
         if (not ui.quiet) and obsolete.isenabled(repo, commandopt):
-            ui.warn(_('(use "hg evolve" to update to its successor)\n'))
+            ui.warn(_("(use 'hg evolve' to update to its successor)\n"))
 
 @eh.wrapcommand("update")
 @eh.wrapcommand("pull")
@@ -1945,8 +1945,8 @@
             _evolvestatewrite(repo, {'current': orig.node()})
             repo.ui.write_err(_('evolve failed!\n'))
             repo.ui.write_err(
-                _('fix conflict and run "hg evolve --continue"'
-                  ' or use "hg update -C" to abort\n'))
+                _("fix conflict and run 'hg evolve --continue'"
+                  " or use 'hg update -C .' to abort\n"))
             raise
 
 def _solvebumped(ui, repo, bumped, dryrun=False, confirm=False,
@@ -2002,7 +2002,7 @@
             repo.opener.write('graftstate', bumped.hex() + '\n')
             repo.ui.write_err(_('evolution failed!\n'))
             repo.ui.write_err(
-                _('fix conflict and run "hg evolve --continue"\n'))
+                _("fix conflict and run 'hg evolve --continue'\n"))
             raise
     # Create the new commit context
     repo.ui.status(_('computing new diff\n'))
@@ -2148,7 +2148,7 @@
     hg._showstats(repo, stats)
     if stats[3]:
         repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
-                         "or 'hg update -C .' to abandon\n"))
+                         "or 'hg update -C .' to abort\n"))
     if stats[3] > 0:
         raise error.Abort('merge conflict between several amendments '
             '(this is not automated yet)',
@@ -2364,7 +2364,7 @@
                 ui.warn(_("ambigious next (unstable) changeset:\n"))
                 for c in aspchildren:
                     displayer.show(repo[c])
-                ui.warn(_('(run "hg evolve --rev REV" on one of them)\n'))
+                ui.warn(_("(run 'hg evolve --rev REV' on one of them)\n"))
                 return 1
             else:
                 cmdutil.bailifchanged(repo)
@@ -2508,7 +2508,7 @@
             if not cp.mutable():
                 # note: createmarkers() would have raised something anyway
                 raise error.Abort('cannot prune immutable changeset: %s' % cp,
-                                 hint='see "hg help phases" for details')
+                                 hint="see 'hg help phases' for details")
             precs.append(cp)
         if not precs:
             raise error.Abort('nothing to prune')
@@ -2832,7 +2832,7 @@
         updatebookmarks(newid)
         if not repo[newid].files():
             ui.warn(_("new changeset is empty\n"))
-            ui.status(_('(use "hg prune ." to remove it)\n'))
+            ui.status(_("(use 'hg prune .' to remove it)\n"))
         tr.close()
     finally:
         lockmod.release(tr, lock, wlock)
@@ -4044,7 +4044,7 @@
 @eh.uisetup
 def setupevolveunfinished(ui):
     data = ('evolvestate', True, False, _('evolve in progress'),
-           _("use 'hg evolve --continue' or 'hg update' to abort"))
+           _("use 'hg evolve --continue' or 'hg update -C .' to abort"))
     cmdutil.unfinishedstates.append(data)
 
 @eh.wrapfunction(hg, 'clean')
diff -r bc590681de77 -r 6d54fd20bb81 hgext/obsolete.py
--- a/hgext/obsolete.py	Fri Oct 28 17:02:56 2016 +0200
+++ b/hgext/obsolete.py	Sat Oct 29 15:07:27 2016 +0200
@@ -13,7 +13,7 @@
 were such user.
 """
 
-from mercurial import util
+from mercurial import error
 
 try:
     from mercurial import obsolete
@@ -24,9 +24,9 @@
 import json
 
 from mercurial import cmdutil
-from mercurial import error
 from mercurial.i18n import _
 from mercurial.node import bin, nullid
+from mercurial import util
 
 
 #####################################################################
diff -r bc590681de77 -r 6d54fd20bb81 hgext/pushexperiment.py
--- a/hgext/pushexperiment.py	Fri Oct 28 17:02:56 2016 +0200
+++ b/hgext/pushexperiment.py	Sat Oct 29 15:07:27 2016 +0200
@@ -12,6 +12,7 @@
 from StringIO import StringIO
 
 from mercurial.i18n import _
+from mercurial import error
 from mercurial import extensions
 from mercurial import wireproto
 from mercurial import obsolete
diff -r bc590681de77 -r 6d54fd20bb81 hgext/simple4server.py
--- a/hgext/simple4server.py	Fri Oct 28 17:02:56 2016 +0200
+++ b/hgext/simple4server.py	Sat Oct 29 15:07:27 2016 +0200
@@ -15,6 +15,7 @@
 
 import hashlib
 import struct
+from mercurial import error
 from mercurial import util
 from mercurial import wireproto
 from mercurial import extensions
diff -r bc590681de77 -r 6d54fd20bb81 tests/test-evolve.t
--- a/tests/test-evolve.t	Fri Oct 28 17:02:56 2016 +0200
+++ b/tests/test-evolve.t	Sat Oct 29 15:07:27 2016 +0200
@@ -115,7 +115,7 @@
   1 public 
   $ hg prune 1
   abort: cannot prune immutable changeset: 7c3bad9141dc
-  (see "hg help phases" for details)
+  (see 'hg help phases' for details)
   [255]
   $ hg log -r 1 --template '{rev} {phase} {obsolete}\n'
   1 public 
@@ -1249,7 +1249,7 @@
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg uncommit --all
   new changeset is empty
-  (use "hg prune ." to remove it)
+  (use 'hg prune .' to remove it)
   $ glog -r "18::"
   @  26:044804d0c10d@default(draft) add j1
   |
@@ -1431,7 +1431,7 @@
   warning: conflicts during merge.
   merging newfile incomplete! (edit conflicts, then use 'hg resolve --mark')
   evolve failed!
-  fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
+  fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
diff -r bc590681de77 -r 6d54fd20bb81 tests/test-obsolete.t
--- a/tests/test-obsolete.t	Fri Oct 28 17:02:56 2016 +0200
+++ b/tests/test-obsolete.t	Sat Oct 29 15:07:27 2016 +0200
@@ -131,7 +131,7 @@
   summary:     add obsol_c
   
   working directory parent is obsolete!
-  (use "hg evolve" to update to its successor)
+  (use 'hg evolve' to update to its successor)
   $ mkcommit d # 5 (on 3)
   1 new unstable changesets
   $ qlog -r 'obsolete()'
@@ -706,7 +706,7 @@
   $ hg up --hidden 2
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory parent is obsolete!
-  (use "hg evolve" to update to its successor)
+  (use 'hg evolve' to update to its successor)
   $ hg export 9468a5f5d8b2 | hg import -
   applying patch from stdin
   1 new unstable changesets
diff -r bc590681de77 -r 6d54fd20bb81 tests/test-prev-next.t
--- a/tests/test-prev-next.t	Fri Oct 28 17:02:56 2016 +0200
+++ b/tests/test-prev-next.t	Sat Oct 29 15:07:27 2016 +0200
@@ -200,7 +200,7 @@
   ambigious next (unstable) changeset:
   [4] added c
   [5] added d
-  (run "hg evolve --rev REV" on one of them)
+  (run 'hg evolve --rev REV' on one of them)
   [1]
   $ hg evolve -r 5
   move:[5] added d
diff -r bc590681de77 -r 6d54fd20bb81 tests/test-prune.t
--- a/tests/test-prune.t	Fri Oct 28 17:02:56 2016 +0200
+++ b/tests/test-prune.t	Sat Oct 29 15:07:27 2016 +0200
@@ -85,7 +85,7 @@
 
   $ hg prune 0
   abort: cannot prune immutable changeset: 1f0dee641bb7
-  (see "hg help phases" for details)
+  (see 'hg help phases' for details)
   [255]
   $ hg debugobsolete
   9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'}
diff -r bc590681de77 -r 6d54fd20bb81 tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Fri Oct 28 17:02:56 2016 +0200
+++ b/tests/test-stabilize-conflict.t	Sat Oct 29 15:07:27 2016 +0200
@@ -130,7 +130,7 @@
   warning: conflicts during merge.
   merging babar incomplete! (edit conflicts, then use 'hg resolve --mark')
   evolve failed!
-  fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
+  fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg resolve -l
@@ -220,7 +220,7 @@
   was merge successful (yn)? n
   merging babar failed!
   evolve failed!
-  fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
+  fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg resolve -l
diff -r bc590681de77 -r 6d54fd20bb81 tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t	Fri Oct 28 17:02:56 2016 +0200
+++ b/tests/test-stabilize-result.t	Sat Oct 29 15:07:27 2016 +0200
@@ -85,7 +85,7 @@
   warning: conflicts during merge.
   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
   evolve failed!
-  fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
+  fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg revert -r 'unstable()' a
@@ -224,7 +224,7 @@
   $ hg up --hidden 15
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete!
-  (use "hg evolve" to update to its successor)
+  (use 'hg evolve' to update to its successor)
   $ mv a a.old
   $ echo 'jungle' > a
   $ cat a.old >> a
@@ -336,7 +336,7 @@
   $ hg up --hidden 15
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete!
-  (use "hg evolve" to update to its successor)
+  (use 'hg evolve' to update to its successor)
   $ echo 'gotta break' >> a
   $ hg amend
   2 new divergent changesets
@@ -360,7 +360,7 @@
   warning: conflicts during merge.
   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
+  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abort
   abort: merge conflict between several amendments (this is not automated yet)
   (/!\ You can try:
   /!\ * manual merge + resolve => new cset X
diff -r bc590681de77 -r 6d54fd20bb81 tests/test-touch.t
--- a/tests/test-touch.t	Fri Oct 28 17:02:56 2016 +0200
+++ b/tests/test-touch.t	Sat Oct 29 15:07:27 2016 +0200
@@ -34,7 +34,7 @@
   $ hg up --hidden 1
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory parent is obsolete!
-  (use "hg evolve" to update to its successor)
+  (use 'hg evolve' to update to its successor)
   $ hg log -G
   o  3:[0-9a-f]{12} ab (re)
   
diff -r bc590681de77 -r 6d54fd20bb81 tests/test-tutorial.t
--- a/tests/test-tutorial.t	Fri Oct 28 17:02:56 2016 +0200
+++ b/tests/test-tutorial.t	Sat Oct 29 15:07:27 2016 +0200
@@ -750,14 +750,14 @@
   pull obsolescence markers
   0 obsolescence markers added
   working directory parent is obsolete!
-  (use "hg evolve" to update to its successor)
+  (use 'hg evolve' to update to its successor)
 
 now let's see where we are, and update to the successor
 
   $ hg parents
   bf1b0d202029 (draft): animals
   working directory parent is obsolete!
-  (use "hg evolve" to update to its successor)
+  (use 'hg evolve' to update to its successor)
   $ hg evolve
   update:[8] animals
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff -r bc590681de77 -r 6d54fd20bb81 tests/test-uncommit.t
--- a/tests/test-uncommit.t	Fri Oct 28 17:02:56 2016 +0200
+++ b/tests/test-uncommit.t	Sat Oct 29 15:07:27 2016 +0200
@@ -241,7 +241,7 @@
   8 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (leaving bookmark touncommit-bm)
   working directory parent is obsolete!
-  (use "hg evolve" to update to its successor)
+  (use 'hg evolve' to update to its successor)
   $ hg --config extensions.purge= purge
   $ hg uncommit -I 'set:added() and e'
   2 new divergent changesets
@@ -286,7 +286,7 @@
   $ hg up -C 3 --hidden
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete!
-  (use "hg evolve" to update to its successor)
+  (use 'hg evolve' to update to its successor)
   $ hg --config extensions.purge= purge
   $ hg uncommit --all -X e
   1 new divergent changesets
@@ -320,7 +320,7 @@
 
   $ hg uncommit e
   new changeset is empty
-  (use "hg prune ." to remove it)
+  (use 'hg prune .' to remove it)
   $ hg debugobsolete
   5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'user': 'test'} (glob)
   5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c706fe2c12f83ba5010cb60ea6af3bd1f0c2d6d3 0 (*) {'user': 'test'} (glob)