Mercurial > evolve

changeset 4982:ba683c5fe932

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 04 Dec 2019 11:00:00 +0100
parents 191ed83dbc07 (current diff) 60be1bd580c7 (diff)
children 6d40e0166522
files hgext3rd/evolve/__init__.py
diffstat 4 files changed, 28 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.gitlab-ci.yml	Mon Nov 18 14:33:59 2019 +0700
+++ b/.gitlab-ci.yml	Wed Dec 04 11:00:00 2019 +0100
@@ -7,26 +7,30 @@
     image: octobus/ci-py2-hgext3rd
     script:
         - hg pull -R /ci/repos/mercurial/
-        - hg -R /ci/repos/mercurial/ update `hg log -r . -T '{branch}'`
+        - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')")
+        - hg -R /ci/repos/mercurial/ update "$hg_rev"
         - (cd tests; /ci/repos/mercurial/tests/run-tests.py --color=always)
 
 tests-py2-pure:
     image: octobus/ci-py2-hgext3rd
     script:
         - hg pull -R /ci/repos/mercurial/
-        - hg -R /ci/repos/mercurial/ update `hg log -r . -T '{branch}'`
+        - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')")
+        - hg -R /ci/repos/mercurial/ update "$hg_rev"
         - (cd tests; /ci/repos/mercurial/tests/run-tests.py --color=always --pure)
 
 tests-py3-cext:
     image: octobus/ci-py3-hgext3rd
     script:
         - hg pull -R /ci/repos/mercurial/
-        - hg -R /ci/repos/mercurial/ update `hg log -r . -T '{branch}'`
+        - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')")
+        - hg -R /ci/repos/mercurial/ update "$hg_rev"
         - (cd tests; python3 /ci/repos/mercurial/tests/run-tests.py --color=always)
 
 tests-py3-pure:
     image: octobus/ci-py3-hgext3rd
     script:
         - hg pull -R /ci/repos/mercurial/
-        - hg -R /ci/repos/mercurial/ update `hg log -r . -T '{branch}'`
+        - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')")
+        - hg -R /ci/repos/mercurial/ update "$hg_rev"
         - (cd tests; python3 /ci/repos/mercurial/tests/run-tests.py --color=always --pure)
--- a/docs/sharing.rst	Mon Nov 18 14:33:59 2019 +0700
+++ b/docs/sharing.rst	Wed Dec 04 11:00:00 2019 +0100
@@ -686,7 +686,10 @@
 
 Figure 10 shows how Bob's repository looks now.
 
-  [figure SG10: only one visible head, 7:aa82, successor to hidden 5:541f and 6:e3a5]
+.. figure:: figures/figure-sg10.svg
+
+  Figure 10: only one visible head, 7:aa82, successor to hidden 5:541f and
+  6:e3a5
 
 We carefully dodged a merge conflict by specifying a merge tool
 (``internal:other``) that will take Alice's changes over Bob's. (You
--- a/hgext3rd/evolve/__init__.py	Mon Nov 18 14:33:59 2019 +0700
+++ b/hgext3rd/evolve/__init__.py	Wed Dec 04 11:00:00 2019 +0100
@@ -765,7 +765,7 @@
     node = ctx.node()
     isobs = ctx.obsolete()
 
-    def warnobsolete():
+    def warnobsolete(*args):
         _warnobsoletewc(ui, repo, node, isobs)
     wlock = None
     try:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/testlib/map-hg-rev.sh	Wed Dec 04 11:00:00 2019 +0100
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -eu
+
+case $1 in
+    default)
+        echo default
+        ;;
+    mercurial-*)
+        exp=$(echo "$1" | cut -d- -f2 | sed 's#\.#\\.#g')
+        echo 'max(tag("re:^'"$exp"'"))'
+        ;;
+    *)
+        echo stable
+        ;;
+esac