merge with stable

hgext/highlight/highlight.py

@@ -57,7 +57,7 b' def pygmentize(field, fctx, style, tmpl,'
         return
 
     # str.splitlines() != unicode.splitlines() because "reasons"
-    for c in b"\x0c\x1c\x1d\x1e":
+    for c in b"\x0c", b"\x1c", b"\x1d", b"\x1e":
         if c in text:
             text = text.replace(c, b'')
 

mercurial/exchange.py

@@ -28,6 +28,7 b' from . import ('
     logexchange,
     narrowspec,
     obsolete,
+    obsutil,
     phases,
     pushkey,
     pycompat,
@@ -99,11 +100,6 b' class bundlespec(object):'
     contentopts = attr.ib()
 
 
-def _sortedmarkers(markers):
-    # last item of marker tuple ('parents') may be None or a tuple
-    return sorted(markers, key=lambda m: m[:-1] + (m[-1] or (),))
-
-
 def parsebundlespec(repo, spec, strict=True):
     """Parse a bundle string specification into parts.
 
@@ -1140,7 +1136,7 b' def _pushb2obsmarkers(pushop, bundler):'
         return
     pushop.stepsdone.add(b'obsmarkers')
     if pushop.outobsmarkers:
-        markers = _sortedmarkers(pushop.outobsmarkers)
+        markers = obsutil.sortedmarkers(pushop.outobsmarkers)
         bundle2.buildobsmarkerspart(bundler, markers)
 
 
@@ -1475,7 +1471,7 b' def _pushobsolete(pushop):'
     if pushop.outobsmarkers:
         pushop.ui.debug(b'try to push obsolete markers to remote\n')
         rslts = []
-        markers = _sortedmarkers(pushop.outobsmarkers)
+        markers = obsutil.sortedmarkers(pushop.outobsmarkers)
         remotedata = obsolete._pushkeyescape(markers)
         for key in sorted(remotedata, reverse=True):
             # reverse sort to ensure we end with dump0
@@ -2573,7 +2569,7 b' def _getbundleobsmarkerpart('
             heads = repo.heads()
         subset = [c.node() for c in repo.set(b'::%ln', heads)]
         markers = repo.obsstore.relevantmarkers(subset)
-        markers = _sortedmarkers(markers)
+        markers = obsutil.sortedmarkers(markers)
         bundle2.buildobsmarkerspart(bundler, markers)
 
 

mercurial/localrepo.py

@@ -1568,7 +1568,7 b' class localrepository(object):'
             else:
                 raise error.ProgrammingError(
                     b"unsupported changeid '%s' of type %s"
-                    % (changeid, type(changeid))
+                    % (changeid, pycompat.sysstr(type(changeid)))
                 )
 
             return context.changectx(self, rev, node)

mercurial/obsutil.py

@@ -112,6 +112,11 b' def getmarkers(repo, nodes=None, exclusi'
         yield marker(repo, markerdata)
 
 
+def sortedmarkers(markers):
+    # last item of marker tuple ('parents') may be None or a tuple
+    return sorted(markers, key=lambda m: m[:-1] + (m[-1] or (),))
+
+
 def closestpredecessors(repo, nodeid):
     """yield the list of next predecessors pointing on visible changectx nodes
 
@@ -675,7 +680,7 b' def successorssets(repo, initialnode, cl'
             #   Having none means pruned node, multiple successors means split,
             #   single successors are standard replacement.
             #
-            for mark in sorted(succmarkers[current]):
+            for mark in sortedmarkers(succmarkers[current]):
                 for suc in mark[1]:
                     if suc not in cache:
                         if suc in stackedset:
@@ -712,7 +717,7 b' def successorssets(repo, initialnode, cl'
                 # duplicated entry and successors set that are strict subset of
                 # another one.
                 succssets = []
-                for mark in sorted(succmarkers[current]):
+                for mark in sortedmarkers(succmarkers[current]):
                     # successors sets contributed by this marker
                     base = _succs()
                     base.markers.add(mark)

relnotes/next

@@ -1,12 +1,5 b''
 == New Features ==
 
- * The amend extension supports the `--currentuser` argument.
-
- * The amend extension supports the `--close-branch` argument.
-
- * The amend extension supports the `--secret` argument.
-
- * The uncommit extension supports the `rewrite.update-timestamp` config option.
 
 == New Experimental Features ==
 
@@ -16,15 +9,6 b''
 
 == Backwards Compatibility Changes ==
 
- * A shell that supports `$(command)`` syntax for command substitution is now
-   required for running the test suite. The test runner normally uses
-   `sh`, so if that is a shell that doesn't support `$(command)` syntax,
-   you can override it by setting `$HGTEST_SHELL` or by passing it to
-   `run-tests.py --shell <shell>`.
-
- * The (experimental) narrow extension's wire protocol changed. If
-   you're using it, you'll need to make sure to upgrade server and
-   client at the same time.
 
 == Internal API Changes ==