Mercurial > evolve

changeset 3836:b91db6989231

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with stable Merging with the new 8.0.1 release.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 12 Jun 2018 10:40:57 +0200
parents fb821ed44f86 (current diff) 4f147d56980c (diff)
children dda5b2134b32
files CHANGELOG hgext3rd/evolve/__init__.py hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py
diffstat 7 files changed, 76 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jun 11 20:17:56 2018 +0530
+++ b/.hgtags	Tue Jun 12 10:40:57 2018 +0200
@@ -66,3 +66,4 @@
 6c772398eb4e209914e1074cdac4f3ebf714e437 7.2.1
 e4ac2e2c2086f977afa35e23a62f849e9305a225 7.3.0
 116cdd8c102ab0ae6295fb4886b0882e75e4d8f7 8.0.0
+0887c30255a1a1808d74a63b16e896d457f8ef32 8.0.1
--- a/CHANGELOG	Mon Jun 11 20:17:56 2018 +0530
+++ b/CHANGELOG	Tue Jun 12 10:40:57 2018 +0200
@@ -8,11 +8,19 @@
   * evolve: add a help section dedicated to interrupted evolve,
   * evolve: merge commit messages when resolving content divergence (issue5877)
 
-8.0.1 -- in-progress
----------------------
+8.0.1 -- 2018-06-11
+-------------------
 
+  * compatibility with mercurial 4.6.1
   * next-prev: respect commands.update.check config option (issue5808)
   * next-prev: fix `evolve --abort` on conflicts (issue5897)
+  * obslog: fix breakage when commit has no description
+  * amend: use context manager for locks (issue5887)
+  * evolve: fix detection of interactive shell
+
+topic (0.9.1)
+
+  * topic: fix documentation formatting
 
 8.0.0 -- 2018-04-25
 -------------------
--- a/debian/changelog	Mon Jun 11 20:17:56 2018 +0530
+++ b/debian/changelog	Tue Jun 12 10:40:57 2018 +0200
@@ -1,8 +1,8 @@
-mercurial-evolve (8.0.0-1) UNRELEASED; urgency=medium
+mercurial-evolve (8.0.1-1) unstable; urgency=medium
 
   * New upstream release
 
- -- Pierre-Yves David <pierre-yves.david@ens-lyon.org>  Wed, 25 Apr 2018 14:01:18 +0100
+ -- Pierre-Yves David <pierre-yves.david@ens-lyon.org>  Wed, 11 June 2018 19:00:18 +0100
 
 mercurial-evolve (7.3.0-1) unstable; urgency=medium
 
--- a/hgext3rd/evolve/__init__.py	Mon Jun 11 20:17:56 2018 +0530
+++ b/hgext3rd/evolve/__init__.py	Tue Jun 12 10:40:57 2018 +0200
@@ -966,15 +966,21 @@
 def _getcurrenttopic(repo):
     return getattr(repo, 'currenttopic', '')
 
-def _prevupdate(repo, displayer, target, bookmark, dryrun):
+def _prevupdate(repo, displayer, target, bookmark, dryrun, mergeopt):
     if dryrun:
         repo.ui.write(_('hg update %s;\n') % target)
         if bookmark is not None:
             repo.ui.write(_('hg bookmark %s -r %s;\n')
                           % (bookmark, target))
     else:
+        updatecheck = None
+        # --merge is passed, we don't need to care about commands.update.check
+        # config option
+        if mergeopt:
+            updatecheck = 'none'
         try:
-            ret = hg.updatetotally(repo.ui, repo, target.node(), None)
+            ret = hg.updatetotally(repo.ui, repo, target.node(), None,
+                                   updatecheck=updatecheck)
         except error.Abort as exc:
             # replace the hint to mention about --merge option
             exc.hint = _('do you want --merge?')
@@ -1047,6 +1053,7 @@
     Displays the summary line of the destination for clarity."""
     wlock = None
     dryrunopt = opts['dry_run']
+    mergeopt = opts['merge']
     if not dryrunopt:
         wlock = repo.wlock()
     try:
@@ -1054,7 +1061,7 @@
         wparents = wkctx.parents()
         if len(wparents) != 1:
             raise error.Abort(_('merge in progress'))
-        if not opts['merge']:
+        if not mergeopt:
             # we only skip the check if noconflict is set
             if ui.config('commands', 'update.check') == 'noconflict':
                 pass
@@ -1077,7 +1084,8 @@
                 if topic and _getcurrenttopic(repo) != _gettopic(target):
                     repo.ui.setconfig('_internal', 'keep-topic', 'yes',
                                       source='topic-extension')
-                _prevupdate(repo, displayer, target, bookmark, dryrunopt)
+                _prevupdate(repo, displayer, target, bookmark, dryrunopt,
+                            mergeopt)
             finally:
                 repo.ui.restoreconfig(backup)
             return 0
@@ -1213,8 +1221,14 @@
         if shouldmove:
             ui.write(_('hg bookmark %s -r %s;\n') % (bm, children))
     else:
+        updatecheck = None
+        # --merge is passed, we don't need to care about commands.update.check
+        # config option
+        if opts['merge']:
+            updatecheck = 'none'
         try:
-            ret = hg.updatetotally(ui, repo, children.node(), None)
+            ret = hg.updatetotally(ui, repo, children.node(), None,
+                                   updatecheck=updatecheck)
         except error.Abort as exc:
             # replace the hint to mention about --merge option
             exc.hint = _('do you want --merge?')
--- a/hgext3rd/evolve/metadata.py	Mon Jun 11 20:17:56 2018 +0530
+++ b/hgext3rd/evolve/metadata.py	Tue Jun 12 10:40:57 2018 +0200
@@ -6,6 +6,6 @@
 # GNU General Public License version 2 or any later version.
 
 __version__ = '8.1.0.dev'
-testedwith = '4.3.2 4.4.2 4.5.2 4.6'
+testedwith = '4.3.2 4.4.2 4.5.2 4.6.1'
 minimumhgversion = '4.3'
 buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py	Mon Jun 11 20:17:56 2018 +0530
+++ b/hgext3rd/topic/__init__.py	Tue Jun 12 10:40:57 2018 +0200
@@ -183,7 +183,7 @@
 
 __version__ = '0.10.0.dev'
 
-testedwith = '4.3.3 4.4.2 4.5.2 4.6'
+testedwith = '4.3.3 4.4.2 4.5.2 4.6.1'
 minimumhgversion = '4.3'
 buglink = 'https://bz.mercurial-scm.org/'
 
--- a/tests/test-prev-next.t	Mon Jun 11 20:17:56 2018 +0530
+++ b/tests/test-prev-next.t	Tue Jun 12 10:40:57 2018 +0200
@@ -439,3 +439,45 @@
   abort: conflicting changes
   (do you want --merge?)
   [255]
+
+Test that --merge still works fine with commands.update.check set
+
+XXX: yes we want --merge and we passed that!
+  $ echo hi > bar
+  $ echo bar >> bar
+  $ hg next --merge
+  merging bar
+  warning: conflicts while merging bar! (edit, 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
+  [2] added bar
+
+  $ echo babar > bar
+  $ hg resolve -m
+  (no more unresolved files)
+
+Testing --merge works with other values of commands.update.check also
+
+XXX: things are broken!
+  $ hg prev --merge --config commands.update.check=abort
+  local [working copy] changed bar which other [destination] deleted
+  use (c)hanged version, (d)elete, or leave (u)nresolved? 
+  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+  use 'hg resolve' to retry unresolved file merges
+  [1] added foo
+
+  $ hg revert --all
+  forgetting bar
+  reverting wat
+  $ hg resolve -m
+  (no more unresolved files)
+
+  $ echo bar > bar
+  $ hg add bar
+
+  $ hg next --merge --config commands.update.check=abort
+  merging bar
+  warning: conflicts while merging bar! (edit, 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
+  [2] added bar