changeset 3200:c78c3d2283c6

branching: merge with stable

--- a/hgext3rd/evolve/__init__.py	Fri Nov 17 00:48:08 2017 +0100
+++ b/hgext3rd/evolve/__init__.py	Fri Nov 17 00:49:09 2017 +0100
@@ -831,17 +831,10 @@
         raise
 
 def summaryhook(ui, repo):
-    def write(fmt, count):
-        s = fmt % count
-        if count:
-            ui.write(s)
-        else:
-            ui.note(s)
-
     state = _evolvestateread(repo)
     if state is not None:
         # i18n: column positioning for "hg summary"
-        ui.write(_('evolve: (evolve --continue)\n'))
+        ui.status(_('evolve: (evolve --continue)\n'))
 
 @eh.extsetup
 def obssummarysetup(ui):
@@ -2031,7 +2024,8 @@
             finally:
                 lockmod.release(tr, lock)
 
-    displayer.show(target)
+    if not repo.ui.quiet:
+        displayer.show(target)
 
 def _findprevtarget(repo, displayer, movebookmark=False, topic=True):
     target = bookmark = None
@@ -2174,7 +2168,8 @@
                         tr.close()
                     finally:
                         lockmod.release(tr, lock)
-            displayer.show(c)
+            if not ui.quiet:
+                displayer.show(c)
             result = 0
         elif children:
             ui.warn(_("ambigious next changeset:\n"))

--- a/hgext3rd/evolve/metadata.py	Fri Nov 17 00:48:08 2017 +0100
+++ b/hgext3rd/evolve/metadata.py	Fri Nov 17 00:49:09 2017 +0100
@@ -5,7 +5,7 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-__version__ = '7.0.2.dev'
+__version__ = '7.1.0.dev'
 testedwith = '4.1.3 4.2.3 4.3.2 4.4.1'
 minimumhgversion = '4.1'
 buglink = 'https://bz.mercurial-scm.org/'

--- a/hgext3rd/evolve/obshistory.py	Fri Nov 17 00:48:08 2017 +0100
+++ b/hgext3rd/evolve/obshistory.py	Fri Nov 17 00:49:09 2017 +0100
@@ -787,8 +787,15 @@
         verb = 'split'
     return {'verb': verb}
 
+# Use a more advanced version of obsfateverb that uses effect-flag
+if util.safehasattr(obsutil, 'obsfateverb'):
+
+    @eh.wrapfunction(obsutil, 'obsfateverb')
+    def obsfateverb(orig, *args, **kwargs):
+        return _successorsetverb(*args, **kwargs)['verb']
+
 # Hijack callers of successorsetverb
-if util.safehasattr(obsutil, 'obsfateprinter'):
+elif util.safehasattr(obsutil, 'obsfateprinter'):
 
     @eh.wrapfunction(obsutil, 'obsfateprinter')
     def obsfateprinter(orig, successors, markers, ui):

--- a/hgext3rd/topic/__init__.py	Fri Nov 17 00:48:08 2017 +0100
+++ b/hgext3rd/topic/__init__.py	Fri Nov 17 00:49:09 2017 +0100
@@ -174,7 +174,7 @@
               'topic.active': 'green',
              }
 
-__version__ = '0.5.2.dev'
+__version__ = '0.6.0.dev'
 
 testedwith = '4.1.3 4.2.3 4.3.3 4.4.1'
 minimumhgversion = '4.1'

--- a/tests/test-prev-next.t	Fri Nov 17 00:48:08 2017 +0100
+++ b/tests/test-prev-next.t	Fri Nov 17 00:49:09 2017 +0100
@@ -3,7 +3,7 @@
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
-hg prev -B should move active bookmark
+hg prev & next move to parent/child
   $ hg init test-repo
   $ cd test-repo
   $ touch a
@@ -12,6 +12,18 @@
   $ touch b
   $ hg add b
   $ hg commit -m 'added b'
+  $ hg prev
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  [0] added a
+  $ hg next
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  [1] added b
+
+hg prev & next respect --quiet
+  $ hg prev -q
+  $ hg next -q
+
+hg prev -B should move active bookmark
   $ hg bookmark mark
   $ hg bookmarks
    * mark                      1:6e742c9127b3

--- a/tests/test-topic-stack.t	Fri Nov 17 00:48:08 2017 +0100
+++ b/tests/test-topic-stack.t	Fri Nov 17 00:49:09 2017 +0100
@@ -864,13 +864,13 @@
   |    rewritten(parent, content) as dde94df880e9, e7ea874afbd5 by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  907f7d3c2333 (18) c_G
-  |    rewritten as b24bab30ac12 by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(content) as b24bab30ac12 by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  3ab2eedae500 (13) c_G
-  |    rewritten as 907f7d3c2333 by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(parent) as 907f7d3c2333 by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  c7d60a180d05 (6) c_G
-       rewritten as 3ab2eedae500 by test (Thu Jan 01 00:00:00 1970 +0000)
+       rewritten(user) as 3ab2eedae500 by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg export .
   # HG changeset patch