Mercurial > evolve

changeset 4182:4d30cb45b57f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with default
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 17 Oct 2018 14:02:18 +0200
parents ab3581bc0637 (current diff) 96525b95d083 (diff)
children 536c67823962
files hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py
diffstat 7 files changed, 53 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Oct 17 13:44:06 2018 +0200
+++ b/.hgtags	Wed Oct 17 14:02:18 2018 +0200
@@ -72,3 +72,4 @@
 f1cde4c97806fc6d6cc4c1e09ea2f4081a3ebaec 8.1.2
 8d8f08245f9715adf48d6f0f59772b04fd7de1f7 8.2.0
 c6362c4abd695fb96e2fd63c150c051852303c7e 8.2.1
+45d4b49d81d9ed23e40126f72bfc3fb339522356 8.3.0
--- a/CHANGELOG	Wed Oct 17 13:44:06 2018 +0200
+++ b/CHANGELOG	Wed Oct 17 14:02:18 2018 +0200
@@ -1,13 +1,25 @@
 Changelog
 =========
 
-8.3.0 - in progress
+8.3.0 - in pprogress
+-------------------
+
+ * use "new" unstabilities vocabulary in help
+
+8.3.0 -- 2018-10-12
 -------------------
 
   * evolve: avoid redundant output when handling linear orphans
   * evolve: use stack alias s# in `hg evolve` messages
   * next, prev: use stack alias s# when relevant
   * rewind: add an undo alias
+  * caches: skip warming the stablerange cache on strip in "auto" mode
+  * topic: properly register the '{topicidx}' for mercurial <= 4.5
+
+  * pullbundle: experimental extension to slice pull in multiple slices whose
+                associated bundle can be cached. The extensions is shipped
+                alongside evolve only for convenience. It it requires data
+                structures that currently live in the evolve extensions.
 
 8.2.1 -- 2018-09-14
 -------------------
--- a/debian/changelog	Wed Oct 17 13:44:06 2018 +0200
+++ b/debian/changelog	Wed Oct 17 14:02:18 2018 +0200
@@ -1,3 +1,9 @@
+mercurial-evolve (8.3.0-1) unstable; urgency=medium
+
+  * new upstream release
+
+ -- Pierre-Yves David <pierre-yves.david@ens-lyon.org>  Fri, 12 Oct 2018 16:19:17 +0200
+
 mercurial-evolve (8.2.1-1) unstable; urgency=medium
 
   * new upstream release
--- a/hgext3rd/evolve/evolvecmd.py	Wed Oct 17 13:44:06 2018 +0200
+++ b/hgext3rd/evolve/evolvecmd.py	Wed Oct 17 14:02:18 2018 +0200
@@ -1341,11 +1341,11 @@
       _('also consider troubled changesets unrelated to current working '
         'directory')),
      ('r', 'rev', [], _('solves troubles of these revisions')),
-     ('', 'bumped', False, _('solves only bumped changesets')),
+     ('', 'bumped', False, _('solves only bumped changesets (DEPRECATED)')),
      ('', 'phase-divergent', False, _('solves only phase-divergent changesets')),
-     ('', 'divergent', False, _('solves only divergent changesets')),
+     ('', 'divergent', False, _('solves only divergent changesets (DEPRECATED)')),
      ('', 'content-divergent', False, _('solves only content-divergent changesets')),
-     ('', 'unstable', False, _('solves only unstable changesets')),
+     ('', 'unstable', False, _('solves only unstable changesets (DEPRECATED)')),
      ('', 'orphan', False, _('solves only orphan changesets (default)')),
      ('a', 'all', False, _('evolve all troubled changesets related to the '
                            'current  working directory and its descendants')),
@@ -1362,20 +1362,20 @@
     """solve troubled changesets in your repository
 
     Modifying history can lead to various types of troubled changesets:
-    unstable, bumped, or divergent. The evolve command resolves your troubles
-    by executing one of the following actions:
+    orphan, phase-divergent, or content-divergent. The evolve command resolves
+    your troubles by executing one of the following actions:
 
     - update working copy to a successor
-    - rebase an unstable changeset
-    - extract the desired changes from a bumped changeset
-    - fuse divergent changesets back together
+    - rebase an orphan changeset
+    - extract the desired changes from a phase-divergent changeset
+    - fuse content-divergent changesets back together
 
     If you pass no arguments, evolve works in automatic mode: it will execute a
     single action to reduce instability related to your working copy. There are
     two cases for this action. First, if the parent of your working copy is
     obsolete, evolve updates to the parent's successor. Second, if the working
     copy parent is not obsolete but has obsolete predecessors, then evolve
-    determines if there is an unstable changeset that can be rebased onto the
+    determines if there is an orphan changeset that can be rebased onto the
     working copy parent in order to reduce instability.
     If so, evolve rebases that changeset. If not, evolve refuses to guess your
     intention, and gives a hint about what you might want to do next.
@@ -1385,24 +1385,24 @@
     as well; this may change in future.)
 
     Automatic mode only handles common use cases. For example, it avoids taking
-    action in the case of ambiguity, and it ignores unstable changesets that
-    are not related to your working copy.
-    It also refuses to solve bumped or divergent changesets unless you
-    explicitly request such behavior (see below).
+    action in the case of ambiguity, and it ignores orphan changesets that are
+    not related to your working copy.
+    It also refuses to solve phase-divergent or content-divergent changesets
+    unless you explicitly request such behavior (see below).
 
     Eliminating all instability around your working copy may require multiple
     invocations of :hg:`evolve`. Alternately, use ``--all`` to recursively
-    select and evolve all unstable changesets that can be rebased onto the
+    select and evolve all orphan changesets that can be rebased onto the
     working copy parent.
     This is more powerful than successive invocations, since ``--all`` handles
-    ambiguous cases (e.g. unstable changesets with multiple children) by
-    evolving all branches.
+    ambiguous cases (e.g. orphan changesets with multiple children) by evolving
+    all branches.
 
     When your repository cannot be handled by automatic mode, you might need to
     use ``--rev`` to specify a changeset to evolve. For example, if you have
-    an unstable changeset that is not related to the working copy parent,
+    an orphan changeset that is not related to the working copy parent,
     you could use ``--rev`` to evolve it. Or, if some changeset has multiple
-    unstable children, evolve in automatic mode refuses to guess which one to
+    orphan children, evolve in automatic mode refuses to guess which one to
     evolve; you have to use ``--rev`` in that case.
 
     Alternately, ``--any`` makes evolve search for the next evolvable changeset
@@ -1410,22 +1410,23 @@
 
     You can supply multiple revisions to evolve multiple troubled changesets
     in a single invocation. In revset terms, ``--any`` is equivalent to ``--rev
-    first(unstable())``. ``--rev`` and ``--all`` are mutually exclusive, as are
+    first(orphan())``. ``--rev`` and ``--all`` are mutually exclusive, as are
     ``--rev`` and ``--any``.
 
     ``hg evolve --any --all`` is useful for cleaning up instability across all
     branches, letting evolve figure out the appropriate order and destination.
 
-    When you have troubled changesets that are not unstable, :hg:`evolve`
-    refuses to consider them unless you specify the category of trouble you
-    wish to resolve, with ``--bumped`` or ``--divergent``. These options are
-    currently mutually exclusive with each other and with ``--unstable``
-    (the default). You can combine ``--bumped`` or ``--divergent`` with
-    ``--rev``, ``--all``, or ``--any``.
+    When you have troubled changesets that are not orphan, :hg:`evolve` refuses
+    to consider them unless you specify the category of trouble you
+    wish to resolve, with ``--phase-divergent`` or ``--content-divergent``.
+    These options are currently mutually exclusive with each other and with
+    ``--orphan`` (the default). You can combine ``--phase-divergent`` or
+    ``--content-divergent`` with ``--rev``, ``--all``, or ``--any``.
 
     You can also use the evolve command to list the troubles affecting your
     repository by using the --list flag. You can choose to display only some
-    categories of troubles with the --unstable, --divergent or --bumped flags.
+    categories of troubles with the --orphan, --content-divergent or
+    --phase-divergent flags.
 
     Interrupted
     ===========
--- a/hgext3rd/evolve/metadata.py	Wed Oct 17 13:44:06 2018 +0200
+++ b/hgext3rd/evolve/metadata.py	Wed Oct 17 14:02:18 2018 +0200
@@ -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__ = '8.3.0.dev'
+__version__ = '8.4.0.dev'
 testedwith = '4.3.2 4.4.2 4.5.2 4.6.2 4.7'
 minimumhgversion = '4.3'
 buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/pullbundle.py	Wed Oct 17 13:44:06 2018 +0200
+++ b/hgext3rd/pullbundle.py	Wed Oct 17 14:02:18 2018 +0200
@@ -92,9 +92,9 @@
 
 from mercurial.i18n import _
 
-__version__ = '0.1.0.dev'
-testedwith = '4.7.1'
-# minimumhgversion = ''
+__version__ = '0.1.0'
+testedwith = '4.4 4.5 4.6 4.7.1'
+minimumhgversion = '4.4'
 buglink = 'https://bz.mercurial-scm.org/'
 
 cmdtable = {}
--- a/hgext3rd/topic/__init__.py	Wed Oct 17 13:44:06 2018 +0200
+++ b/hgext3rd/topic/__init__.py	Wed Oct 17 14:02:18 2018 +0200
@@ -178,7 +178,7 @@
               'topic.active': 'green',
              }
 
-__version__ = '0.12.0.dev'
+__version__ = '0.13.0.dev'
 
 testedwith = '4.3.3 4.4.2 4.5.2 4.6.2 4.7'
 minimumhgversion = '4.3'
@@ -355,6 +355,7 @@
 
     if not post45template:
         templatekw.keywords['topic'] = topickw
+        templatekw.keywords['topicidx'] = topicidxkw
     # Wrap workingctx extra to return the topic name
     extensions.wrapfunction(context.workingctx, '__init__', wrapinit)
     # Wrap changelog.add to drop empty topic