upstream/mercurial-mirror Commit - r40496:4fe63b57

merge with stable

Augie Fackler -

r40496:4fe63b57 default

parent child

.hgsigs

0 +2 0

 ac6a72308a215e6086fbced347ec10aa963b0a 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAlthwaIQHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91atOD/0de4nA55WJpiQzAqTg4xWIRZB6y0pkQ8D4cKNQkNiwPQAdDEPf85RuYmoPusNxhM40qfJlmHOw8sbRaqqabhVBPEzL1DpKe4GBucagLZqoL3pycyMzhkhzMka2RJT6nekCchTKJTIs2gx4FOA/QwaFYNkXFfguAEvi01isVdMo0GFLQ7pf7wU8UO1PPdkYphH0xPUvsreQ3pR3+6WwMLovk4JYW4cSaM4YkLlqJQPSO2YAlyXAwiQRvu2A227ydVqHOgLeV5zMQPy2v2zTgl2AoMdWp8+g2lJrYwclkNR+LAk5OlGYamyZwlmsTO7OX3n7xJYtfjbqdoqEKhO1igMi3ZSjqwkaBxxkXxArrteD19bpUyInTjbwTRO3mSe5aNkEDGoOYWn8UOn5ZkeEo7NyhP4OTXqyxQs9rwjD79xZk+6fGB777vuZDUdLZYRQFOPEximpmCGJDrZWj5PeIALWkrRGWBl2eFJ5sl6/pFlUJDjDEstnrsfosp6NJ3VFiD9EunFWsTlV2qXaueh9+TfaSRmGHVuwFCDt7nATVEzTt8l74xsL3xUPS4u9EcNPuEhCRu1zLojCGjemEA29R9tJS8oWd6SwXKryzjo8SyN7yQVSM/yl212IOiOHTQF8vVZuJnailtcWc3D4NoOxntnnv8fnd1nr8M5QSjYQVzSkHw==
             ede3bf31fe63677fdf5bd8db687977d4e3d792ed 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAluOq84QHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91ao3D/oC9zKNbk+MMUP0cSfl+ESRbP/sAI466IYDkr9f1klooIFMsdqCd16eS36DVwIwrBYapRaNszC6Pg0KCFKCdeAWJLcgeIawwOkZPrLKQmS3I9GTl9gxtExeFvRryaAdP1DAPEU6JkyHo3xmURkJB58VjuBquZz4cYnL2aE1ag04CWAoRFiLu6bt1hEZ8pONU6cbDpHaJVyUZmJRB+llpybgdLnlBTrhfWjNofTh8MM6+vz67lIienYoSbepY+029J98phBTV+UEfWSBWw1hcNT/+QmOBGWWTLfBARsNDZFeYgQQOo3gRghKO7qUA/hqzDTmMG4/a2obs0LGsBlcMZ1Ky//zhdAJ/EN7uH9svM1t1fkw1RgvftmybptK5KiusZ9AWhnggHSwZtj1I6i/sojqsj9MrtdrD+1LfiKuAv/FtcMHSeff8IfItrd2B67JIj4wCzU8vDrAbAAqODHx7AnssvNbYrH2iOigSINFMNJoLU/xLxBhTxitU2Zf8puHA4CQ3+BybgOH9HPqCtGcVAB7bcp4hiezGrachM+2oec2YwcGCpIobMPl43cmWkLhtGF5qfl7APVfbo18UXk8ZGmBY8YAYwEyksk2SBMJV6+XHw9J7uaaugc3uN8PuMVLqvSMpWN1ZdRsSkxrOJK+UNW7kbUi0wHnsV1rN0U0BIfVOQ==
 cb1a79010ac50c58cd84e6f50c4556bf2a4c 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAluyfokQHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91eWpD/0eu/JfD6SfaT4Ozd2767ojNIW4M9BgcRH/FehFBd/3iQ/YQmaMVd6GmdaagM5YUpD9U+rDK95l8rUstuTglXeKD2SVcDM4Oq9ToyZyp5aizWjkxRxHT60W95G5FQO/tBbs63jfNrVDWDElbkpcn/gUG6JbX+q/S/mKd6WsuwNQC1N4VOWp0OWCmFGBWN7t/DqxGLGEajJM0NB97/r/IV6TzrGtaPf1CXaepDVvZwIIeas/eQgGInyqry7WBSn5sCUq4opIh1UigMABUAgzIZbgTg8NLGSmEgRgk0Vb4K+pLejLLDb5YD7ZwuUCkbd8oJImKQfU6++Ajd70TbNQRvVhMtd15iCtOOjLR+VNkUiDXm0g1U53sREMLdj/+SMJZB6Z18DotdgpaeCmwA/wWijXOdt76xwUKjByioxyQilPrzrWGaoSG4ynjiD2Y+eSRS1DxbpDgt4YEuiVA6U3ay99oW7KkhFjQsUtKl4SJ5SQWiEofvgtb2maNrXkPtKOtNRHhc61v73zYnsxtl2qduC99YOTin90FykD80XvgJZfyow/LICb77MNGwYBsJJMDQ3jG1YyUC2CQsb8wyrWM4TO3tspKAQPyMegUaVtBqw7ZhgiC3OXEes+z+AL5YRSZXALfurXPYbja8M8uGL2TYB3/5bKYvBXxvfmSGIeY6VieQ==
+ec6f1320df26f3133ec40f3de866ea0695fd7 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAlvOG20QHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91eZ+EACb/XfPWaMkwIX54JaFWtL/nVkDcaL8xLVzlI+PxL0ZtHdQTGVQNp5f1BnZU9RKPZ9QOuz+QKNvb4hOOXBwmCi2AAjmTYUqtKThHmOT50ZRICkllY+YlZ3tI6JXRDhh7pSXaus8jBFG/VwuUlVmK5sA2TP+lIJijOgV9rThszfS4Q2I8sBTIaeZS1hyujFxGRO++tjYR+jPuo/98FhqJ5EylVYvKmnflWkOYLFNFqgDI6DQs7Dl+u2nrNAzZJQlgk+1ekd66T3WyK8U3tcFLZGRQ+gpzINH0Syn6USaaE+0nGi4we1hJS8JK0txWyHXJGNZYaWQAC2l1hIBfA38azwVLSe2w9JatXhS3HWByILy8JkEQ2kSo1xTD4mBkszZo/kWZpZRsAWydxCnzhNgKmTJYxASFTTX1mpdX4EzJBOs/++52y1OjVc0Ko0+6vSwxsC6zgIGJx1Os7vVgWHql0XbDmJ1NDdNmz7q5HjFcbNOWScKf6UGcBKV4dpW1w+7CvdoMFHUsVTa2zn6YOki3NEt0GWLXq+0aXbHSw8XETcyunQKjDi9ddKOw0rYGip6EKUKhOILZimQ0lgYRE23RDdT5Tl2D8s66SUuipgP9vGjbMaE/FhO3OAb7406jyCrOVfDis7sK0Hvw074GhIfZUjA4W4Ey2TeExCZHHhBdoPTrg==
+            a91a2837150bdcb27ae76b3646e6c93cd6a15904 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAlvclPMQHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91fc0EADF/62jqCARFaQRRcKpobPNBZupwSbnQ7E296ZRwHdZvT8CVGfkWBUIStyh+r8bfmBzzea6d9/SUoRqCoV9rwCXuRbeCZZRMMkqx9IblV3foaIOxyQi0KE2lpzGJAHxPiNxD3czZV4B+P6X2wNmG9OLjmHyQ7o64GvPAJ+Ko/EsND1tkx4qB16mEuEHVxtfaG6hbjgpLekIA3+3xur3E8cWBsNO28HtQBK83r2qURwv6eG3TfkbmiE+Ie5TNC15LPVhAOHVSD7miZdI82uk2063puCKZxIJXsy7EMjHfChTM9c7B4+TdEBjms3y+Byz2EV7kRfjplGOnBbYvfY7qiteTn/22+rLrTTQNkndDN/Sqr1DjwsvxKDeIfsqgXzGQPupLOrGdGf4ILAtA0Reme7VKNN5Px6dNxnjKKwsnSrKTQ7ZcmD+W1LKlL63lBEQvEy+TLmmFLfM2xvvBxL5177AKZrj/8gMUzEi1K2MelDGrasA7OSjTlABoleDvZzVOf1nC0Bv83tFc8FeMHLwNOxkFSsjORvZuIH/G9BYUTAd96iLwQRBxXLOVNitxAOQT+s3hs7JEaUzTHlAY+lNeFAxUujb4H0V40Xgr20O1u7PJ53tzApIrg9JQPgvUXntmRs8fpNo6f3P6Sg8XtaCCHIUAB6qTHiose56llf6bzl66A==

.hgtags

0 +2 0

 ac6a72308a215e6086fbced347ec10aa963b0a 4.7
             ede3bf31fe63677fdf5bd8db687977d4e3d792ed 4.7.1
 cb1a79010ac50c58cd84e6f50c4556bf2a4c 4.7.2
+ec6f1320df26f3133ec40f3de866ea0695fd7 4.8rc0
+            a91a2837150bdcb27ae76b3646e6c93cd6a15904 4.8

contrib/relnotes

0 +41 -31

             import re
             import subprocess
-            # Regenerate this list with
-            #   hg export 'grep("\.\. [a-z]+::")' | grep '^\.\.' | \
-            #     sed 's/.. //;s/::.*//' | sort -u
-            rnsections = ["api", "bc", "container", "feature", "fix", "note", "perf"]
             rules = {
                 # keep
                 r"\(issue": 100,
                 r"(mq|shelve|rebase):": 20,
                 # newsy
                 r": deprecate": 20,
-                r"(option|feature|command|support)": 10,
+                r"( ability|command|feature|option|support)": 10,
+                # experimental
+                r"hg-experimental": 20,
+                r"(from|graduate).*experimental": 15,
+                r"(hide|mark).*experimental": -10,
                 # bug-like?
                 r"(fix|don't break|improve)": 7,
+                r"(not|n't|avoid|fix|prevent).*crash": 10,
                 # boring stuff, bump down
                 r"^contrib": -5,
                 r"debug": -5,
                 r"help": -5,
-                r"(doc|bundle2|obsolete|obsmarker|rpm|setup|debug\S+:)": -15,
+                r"(doc|metavar|bundle2|obsolete|obsmarker|rpm|setup|debug\S+:)": -15,
-                r"(check-code|check-commit|import-checker)": -20,
+                r"(check-code|check-commit|check-config|import-checker)": -20,
+                r"(flake8|lintian|pyflakes|pylint)": -20,
                 # cleanups and refactoring
-                r"(cleanup|whitespace|nesting|indent|spelling|comment)": -20,
+                r"(cleanup|white ?space|spelling|quoting)": -20,
-                r"(typo|hint|note|style:|correct doc)": -20,
+                r"(flatten|dedent|indent|nesting|unnest)": -20,
+                r"(typo|hint|note|comment|TODO|FIXME)": -20,
+                r"(style:|convention|one-?liner)": -20,
                 r"_": -10,
                 r"(argument|absolute_import|attribute|assignment|mutable)": -15,
-                r"(unused|useless|unnecessary|duplicate|deprecated|scope|True|False)": -10,
+                r"(scope|True|False)": -10,
+                r"(unused|useless|unnecessary|superfluous|duplicate|deprecated)": -10,
                 r"(redundant|pointless|confusing|uninitialized|meaningless|dead)": -10,
-                r": (drop|remove|inherit|rename|simplify|naming|inline)": -10,
+                r": (drop|remove|delete|rip out)": -10,
-                r"(docstring|document .* method)": -20,
+                r": (inherit|rename|simplify|naming|inline)": -10,
-                r"(factor|extract|prepare|split|replace| import)": -20,
+                r"(correct doc|docstring|document .* method)": -20,
-                r": add.*(function|method|implementation|test|example)": -10,
+                r"(abstract|factor|extract|prepare|split|replace| import)": -20,
-                r": (move|extract) .* (to|into|from)": -20,
+                r": add.*(function|method|implementation|example)": -10,
+                r": (move|extract) .* (to|into|from|out of)": -20,
                 r": implement ": -5,
                 r": use .* implementation": -20,
                 r"\S\S\S+\.\S\S\S\S+": -5,
                 # dumb keywords
                 r"\S+/\S+:": -10,
                 r"\S+\.\S+:": -10,
+                # python compatibility
+                r"[Pp]y(|thon) ?[23]": -20,
+                r"pycompat": -20,
+                r"(coerce|convert|encode) .*to (byte|sys|)(s|str|string)": -20,
+                # tests
+                r"^test(|s|ing|runner|-\S+):": -20,
+                r"^(f|hghave|run-tests):": -20,
+                r"add.* tests?": -20,
+                r"(buildbot|fuzz|mock|ratchet)": -10,
                 # drop
                 r"^i18n-": -50,
                 r"^i18n:.*(hint|comment)": -50,
                 r"perf:": -50,
-                r"check-code:": -50,
                 r"Added.*for changeset": -50,
-                r"tests?:": -50,
-                r"test-": -50,
-                r"add.* tests": -50,
                 r"^_": -50,
             }
             groupings = [
                 (r"util|parsers|repo|ctx|context|revlog|filelog|alias|cmdutil", "core"),
-                (r"revset|templater|ui|dirstate|hook|i18n|transaction|wire", "core"),
+                (r"revset|template|ui|dirstate|hook|i18n|transaction|wire|vfs", "core"),
-                (r"color|pager", "core"),
+                (r"dispatch|exchange|localrepo|streamclone|color|pager", "core"),
-                (r"hgweb|paper|coal|gitweb", "hgweb"),
+                (r"hgweb|paper|coal|gitweb|monoblue|spartan", "hgweb"),
                 (r"pull|push|revert|resolve|annotate|bookmark|branch|clone", "commands"),
                 (r"commands|commit|config|files|graft|import|log|merge|patch", "commands"),
                 (r"phases|status|summary|amend|tag|help|verify", "commands"),
             ]
             def main():
-                ap = argparse.ArgumentParser()
+                desc = "example: %(prog)s 4.7.2 --stoprev 4.8rc0"
+                ap = argparse.ArgumentParser(description=desc)
                 ap.add_argument(
                     "startrev",
                     metavar="REV",
                     type=str,
-                    nargs=1,
                     help=(
                         "Starting revision for the release notes. This revision "
                         "won't be included, but later revisions will."
                     metavar="REV",
                     type=str,
                     default="@",
-                    nargs=1,
                     help=(
                         "Stop revision for release notes. This revision will be included,"
                         " but no later revisions will. This revision needs to be "
                         "extensions.releasenotes=",
                         "releasenotes",
                         "-r",
-                        "%s::%s" % (args.startrev[0], args.stoprev[0]),
+                        "only(%s, %s)" % (args.stoprev, args.startrev),
                     ]
                 ).decode("utf-8")
                 # Find all release notes from un-relnotes-flagged commits.
                             "hg",
                             "log",
                             "-r",
-                            r'%s::%s - merge() - grep("\n\.\. (%s)::")'
+                            "only(%s, %s) - merge()" % (args.stoprev, args.startrev),
-                            % (args.startrev[0], args.stoprev[0], "|".join(rnsections)),
                             "-T",
                             r"{desc|firstline}\n",
                         ]
                     for d in sorted(groups[g]):
                         print(" * %s" % d)
-                print("\n=== BC ===\n")
+                if bcs:
+                    print("\n=== Behavior Changes ===\n")
                 for d in sorted(bcs):
                     print(" * %s" % d)
-                print("\n=== API Changes ===\n")
+                if apis:
+                    print("\n=== Internal API Changes ===\n")
                 for d in sorted(apis):
                     print(" * %s" % d)

hgext/fix.py

0 +2 -1

                             # Don't waste memory/time passing unchanged content back, but
                             # produce one result per item either way.
                             yield (rev, path, newdata if newdata != olddata else None)
-                    results = worker.worker(ui, 1.0, getfixes, tuple(), workqueue)
+                    results = worker.worker(ui, 1.0, getfixes, tuple(), workqueue,
+                                            threadsafe=False)
                     # We have to hold on to the data for each successor revision in memory
                     # until all its parents are committed. We ensure this by committing and

hgext/sqlitestore.py

0 +1 -1

                 def emitrevisions(self, nodes, nodesorder=None, revisiondata=False,
                                   assumehaveparentrevisions=False,
                                   deltamode=repository.CG_DELTAMODE_STD):
-                    if nodesorder not in ('nodes', 'storage', None):
+                    if nodesorder not in ('nodes', 'storage', 'linear', None):
                         raise error.ProgrammingError('unhandled value for nodesorder: %s' %
                                                      nodesorder)

mercurial/bundle2.py

0 +2 -2

                 includepats = kwargs.get(r'includepats')
                 excludepats = kwargs.get(r'excludepats')
-                narrowstream = repo.ui.configbool('experimental.server',
+                narrowstream = repo.ui.configbool('experimental',
-                                                  'stream-narrow-clones')
+                                                  'server.stream-narrow-clones')
                 if (includepats or excludepats) and not narrowstream:
                     raise error.Abort(_('server does not support narrow stream clones'))

mercurial/cext/revlog.c

0 +1 -1

             	/* to pass index_get_parents() */
             	int (*)(indexObject *, Py_ssize_t, int*, int),
             	/* intrevs vector */
-            	int initrevslen, long *initrevs,
+            	Py_ssize_t initrevslen, long *initrevs,
             	long stoprev,
             	int inclusive);
             void rustlazyancestors_drop(rustlazyancestorsObject *self);

mercurial/configitems.py

0 +2 -2

             coreconfigitem('experimental', 'server.manifestdata.recommended-batch-size',
                 default=100000,
             )
-            coreconfigitem('experimental.server', 'stream-narrow-clones',
+            coreconfigitem('experimental', 'server.stream-narrow-clones',
                 default=False,
             )
             coreconfigitem('experimental', 'single-head-per-branch',
                 default='hotpath',
             )
             coreconfigitem('profiling', 'time-track',
-                default='real',
+                default=dynamicdefault,
             )
             coreconfigitem('profiling', 'type',
                 default='stat',

mercurial/copies.py

0 +4 -2

             def _forwardcopies(a, b, match=None):
                 """find {dst@b: src@a} copy mapping where a is an ancestor of b"""
+                match = a.repo().narrowmatch(match)
                 # check for working copy
                 if b.rev() is None:
                     if a == b.p1():
                     # unmatched file from topological common ancestors (no DAG rotation)
                     # need to recompute this for directory move handling when grafting
                     mta = tca.manifest()
-                    u1u, u2u = _computenonoverlap(repo, c1, c2, m1.filesnotin(mta),
+                    u1u, u2u = _computenonoverlap(repo, c1, c2,
-                                                                m2.filesnotin(mta),
+                                                  m1.filesnotin(mta, repo.narrowmatch()),
+                                                  m2.filesnotin(mta, repo.narrowmatch()),
                                                   baselabel='topological common ancestor')
                 for f in u1u:

mercurial/crecord.py

0 +1 -1

                         nextitem = currentitem
                     else:
                         parent = nextitem.parentitem()
-                        if parent.folded:
+                        if parent is not None and parent.folded:
                             self.togglefolded(parent)
                     self.currentselecteditem = nextitem

mercurial/exewrapper.c

0 +6 -5

             #define _tcscpy_s strcpy_s
             #define _tcscat_s strcat_s
-            #define _countof(array) (sizeof(array)/sizeof(array[0]))
+            #define _countof(array) (sizeof(array) / sizeof(array[0]))
             #endif
             static TCHAR pyscript[MAX_PATH + 10];
             	HANDLE hfind;
             	const char *err;
             	HMODULE pydll;
-            	void(__cdecl * Py_SetPythonHome)(TCHAR *home);
+            	void(__cdecl * Py_SetPythonHome)(TCHAR * home);
             	int(__cdecl * Py_Main)(int argc, TCHAR *argv[]);
             	if (GetModuleFileName(NULL, pyscript, _countof(pyscript)) == 0) {
             		scenario, so let's load python dll from this dir. */
             		FindClose(hfind);
             		_tcscpy_s(pydllfile, _countof(pydllfile), pyhome);
-            		_tcscat_s(pydllfile, _countof(pydllfile), _T("\\") _T(HGPYTHONLIB)
+            		_tcscat_s(pydllfile, _countof(pydllfile),
-            					_T(".dll"));
+            		          _T("\\") _T(HGPYTHONLIB) _T(".dll"));
             		pydll = LoadLibrary(pydllfile);
             		if (pydll == NULL) {
-            			err = "failed to load private Python DLL " HGPYTHONLIB ".dll";
+            			err = "failed to load private Python DLL " HGPYTHONLIB
+            			      ".dll";
             			goto bail;
             		}
             		Py_SetPythonHome =

mercurial/help.py

0 +12 0

             import itertools
             import os
+            import re
             import textwrap
             from .i18n import (
                 templatefilters,
                 templatefuncs,
                 templatekw,
+                ui as uimod,
                 util,
             )
             from .hgweb import (
             addtopicsymbols('hgweb', '.. webcommandsmarker', webcommands.commands,
                             dedent=True)
+            def inserttweakrc(ui, topic, doc):
+                marker = '.. tweakdefaultsmarker'
+                repl = uimod.tweakrc
+                def sub(m):
+                    lines = [m.group(1) + s for s in repl.splitlines()]
+                    return '\n'.join(lines)
+                return re.sub(br'( *)%s' % re.escape(marker), sub, doc)
+            addtopichook('config', inserttweakrc)
             def help_(ui, commands, name, unknowncmd=False, full=True, subtopic=None,
                       **opts):
                 '''

mercurial/help/config.txt

0 +5 -1

             ``time-track``
                 Control if the stat profiler track ``cpu`` or ``real`` time.
-                (default: ``cpu``)
+                (default: ``cpu`` on Windows, otherwise ``real``)
             ``limit``
                 Number of lines to show. Specific to the ``ls`` instrumenting profiler.
                 effect if ``HGPLAIN`` is set or ``HGPLAINEXCEPT`` is set and does
                 not include ``tweakdefaults``. (default: False)
+                It currently means::
+                  .. tweakdefaultsmarker
             ``username``
                 The committer of a changeset created when running "commit".
                 Typically a person's name and email address, e.g. ``Fred Widget

mercurial/httppeer.py

0 +7 -3

                     return True
                 def close(self):
+                    try:
+                        reqs, sent, recv = (self._urlopener.requestscount,
+                                            self._urlopener.sentbytescount,
+                                            self._urlopener.receivedbytescount)
+                    except AttributeError:
+                        return
                     self.ui.note(_('(sent %d HTTP requests and %d bytes; '
                                    'received %d bytes in responses)\n') %
-                                 (self._urlopener.requestscount,
+                                 (reqs, sent, recv))
-                                  self._urlopener.sentbytescount,
-                                  self._urlopener.receivedbytescount))
                 # End of ipeerconnection interface.

mercurial/keepalive.py

0 +4 -1

                     data = self._raw_read(amt)
                     self.receivedbytescount += len(data)
-                    self._connection.receivedbytescount += len(data)
+                    try:
+                        self._connection.receivedbytescount += len(data)
+                    except AttributeError:
+                        pass
                     try:
                         self._handler.parent.receivedbytescount += len(data)
                     except AttributeError:

mercurial/logexchange.py

0 +6 -1

                 # use the string given to us
                 rpath = remote
                 if local:
-                    rpath = remote._repo.root
+                    rpath = util.pconvert(remote._repo.root)
                 elif not isinstance(remote, bytes):
                     rpath = remote._url
                 for path, url in repo.ui.configitems('paths'):
                     # remove auth info from user defined url
                     noauthurl = util.removeauth(url)
+                    # Standardize on unix style paths, otherwise some {remotenames} end up
+                    # being an absolute path on Windows.
+                    url = util.pconvert(bytes(url))
+                    noauthurl = util.pconvert(noauthurl)
                     if url == rpath or noauthurl == rpath:
                         rpath = path
                         break

mercurial/phases.py

0 +5 -2

             # record phase index
             public, draft, secret = range(3)
             internal = INTERNAL_FLAG | HIDEABLE_FLAG
+            archived = HIDEABLE_FLAG
             allphases = range(internal + 1)
             trackedphases = allphases[1:]
             # record phase names
             phasenames = [None] * len(allphases)
             phasenames[:3] = ['public', 'draft', 'secret']
+            phasenames[archived] = 'archived'
             phasenames[internal] = 'internal'
             # record phase property
             mutablephases = tuple(allphases[1:])
                 def _retractboundary(self, repo, tr, targetphase, nodes):
                     # Be careful to preserve shallow-copied values: do not update
                     # phaseroots values, replace them.
-                    if targetphase == internal and not supportinternal(repo):
+                    if targetphase in (archived, internal) and not supportinternal(repo):
-                        msg = 'this repository does not support the internal phase'
+                        name = phasenames[targetphase]
+                        msg = 'this repository does not support the %s phase' % name
                         raise error.ProgrammingError(msg)
                     repo = repo.unfiltered()

mercurial/profiling.py

0 +2 -1

                 else:
                     ui.warn(_("invalid sampling frequency '%s' - ignoring\n") % freq)
-                track = ui.config('profiling', 'time-track')
+                track = ui.config('profiling', 'time-track',
+                                  pycompat.iswindows and 'cpu' or 'real')
                 statprof.start(mechanism='thread', track=track)
                 try:

mercurial/revlog.py

0 +1 -1

                 def emitrevisions(self, nodes, nodesorder=None, revisiondata=False,
                                   assumehaveparentrevisions=False,
                                   deltamode=repository.CG_DELTAMODE_STD):
-                    if nodesorder not in ('nodes', 'storage', None):
+                    if nodesorder not in ('nodes', 'storage', 'linear', None):
                         raise error.ProgrammingError('unhandled value for nodesorder: %s' %
                                                      nodesorder)

mercurial/revlogutils/deltas.py

0 +9 -1

                     group = []
                     for rev in temptative:
                         # skip over empty delta (no need to include them in a chain)
-                        while not (rev == nullrev or rev in tested or deltalength(rev)):
+                        while (revlog._generaldelta
+                               and not (rev == nullrev
+                                        or rev in tested
+                                        or deltalength(rev))):
                             tested.add(rev)
                             rev = deltaparent(rev)
                         # filter out revision we tested already
                     if good is not None:
                         break
+                # If sparse revlog is enabled, we can try to refine the available deltas
+                if not revlog._sparserevlog:
+                    yield None
+                    return
                 # if we have a refinable value, try to refine it
                 if good is not None and good not in (p1, p2) and revlog.issnapshot(good):
                     # refine snapshot down

mercurial/utils/storageutil.py

0 +3 -3

                 if nodesorder == 'nodes':
                     revs = [frev(n) for n in nodes]
-                elif nodesorder == 'storage':
+                elif nodesorder == 'linear':
-                    revs = sorted(frev(n) for n in nodes)
-                else:
                     revs = set(frev(n) for n in nodes)
                     revs = dagop.linearize(revs, store.parentrevs)
+                else: # storage and default
+                    revs = sorted(frev(n) for n in nodes)
                 prevrev = None

rust/hg-direct-ffi/src/ancestors.rs

0 +3 -2

             pub extern "C" fn rustlazyancestors_init(
                 index: IndexPtr,
                 parents: IndexParentsFn,
-                initrevslen: usize,
+                initrevslen: ssize_t,
                 initrevs: *mut c_long,
                 stoprev: c_long,
                 inclusive: c_int,
             ) -> *mut AncestorsIterator<Index> {
+                assert!(initrevslen >= 0);
                 unsafe {
                     raw_init(
                         Index::new(index, parents),
-                        initrevslen,
+                        initrevslen as usize,
                         initrevs,
                         stoprev,
                         inclusive,

setup.py

0 +3 0

             from distutils.sysconfig import get_python_inc, get_config_var
             from distutils.version import StrictVersion
+            # Explain to distutils.StrictVersion how our release candidates are versionned
+            StrictVersion.version_re = re.compile(r'^(\d+)\.(\d+)(\.(\d+))?-?(rc(\d+))?$')
             def write_if_changed(path, content):
                 """Write content to a file iff the content hasn't changed."""
                 if os.path.exists(path):

tests/hghave.py

0 +5 -1

             def has_sqlite():
                 try:
                     import sqlite3
-                    sqlite3.sqlite_version
+                    version = sqlite3.sqlite_version_info
                 except ImportError:
                     return False
+                if version < (3, 8, 3):
+                    # WITH clause not supported
+                    return False
                 return matchoutput('sqlite3 -version', b'^3\.\d+')
             @check('vcr', 'vcr http mocking library')

tests/test-contrib-relnotes.t

0 +47 -21

                * bookmark: introduce a 'bookmarks' part
                * bookmark: introduce in advance a variant of the exchange test
                * bookmark: run 'pushkey' hooks after bookmark move, not 'prepushkey'
+               * bookmark: use the 'bookmarks' bundle2 part to push bookmark update (Bts:issue5165)
                * bookmarks: add bookmarks to hidden revs if directaccess config is set
                * bookmarks: calculate visibility exceptions only once
                * bookmarks: display the obsfate of hidden revision we create a bookmark on
                * bookmarks: fix pushkey compatibility mode (Bts:issue5777)
                * bookmarks: use context managers for lock and transaction in update()
                * bookmarks: use context managers for locks and transaction in pushbookmark()
+               * branch: add a --rev flag to change branch name of given revisions
                * branch: allow changing branch name to existing name if possible
                * clone: add support for storing remotenames while cloning
                * clone: use utility function to write hgrc
                * clonebundle: make it possible to retrieve the initial bundle through largefile
+               * commands: use the new API to access hidden changesets in various commands
                * commandserver: restore cwd in case of exception
                * commandserver: unblock SIGCHLD
+               * fileset: do not crash by unary negate operation
                * help: deprecate ui.slash in favor of slashpath template filter (Bts:issue5572)
                * log: allow matchfn to be non-null even if both --patch/--stat are off
                * log: build follow-log filematcher at once
                * log: don't expand aliases in revset built from command options
+               * log: follow file history across copies even with -rREV (BC) (Bts:issue4959)
                * log: make "slowpath" condition slightly more readable
                * log: make opt2revset table a module constant
                * log: merge getlogrevs() and getgraphlogrevs()
                * log: remove temporary variable 'date' used only once
                * log: resolve --follow thoroughly in getlogrevs()
                * log: resolve --follow with -rREV in cmdutil.getlogrevs()
+               * log: rewrite --follow-first -rREV like --follow for consistency (BC)
                * log: simplify 'x or ancestors(x)' expression
                * log: translate column labels at once (Bts:issue5750)
                * log: use revsetlang.formatspec() thoroughly
                * pull: store binary node in pullop.remotebookmarks
                * push: include a 'check:bookmarks' part when possible
                * push: restrict common discovery to the pushed set
+               * revert: do not reverse hunks in interactive when REV is not parent (Bts:issue5096)
                * revert: support reverting to hidden cset if directaccess config is set
               === core ===
+               * color: respect HGPLAINEXCEPT=color to allow colors while scripting (Bts:issue5749)
+               * dirstate: add explicit methods for querying directories (API)
+               * dispatch: abort if early boolean options can't be parsed
+               * dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options
+               * dispatch: add option to not strip command args parsed by _earlygetopt()
+               * dispatch: alias --repo to --repository while parsing early options
+               * dispatch: fix early parsing of short option with value like -R=foo
+               * dispatch: handle IOError when writing to stderr
+               * dispatch: stop parsing of early boolean option at "--"
+               * dispatch: verify result of early command parsing
+               * exchange: return bundle info from getbundlechunks() (API)
                * filelog: add the ability to report the user facing name
+               * localrepo: specify optional callback parameter to pathauditor as a keyword
                * revlog: choose between ifh and dfh once for all
                * revlog: don't use slicing to return parents
                * revlog: group delta computation methods under _deltacomputer object
                * revlog: separate diff computation from the collection of other info
                * revset: evaluate filesets against each revision for 'file()' (Bts:issue5778)
                * revset: parse x^:: as (x^):: (Bts:issue5764)
+               * streamclone: add support for bundle2 based stream clone
+               * streamclone: add support for cloning non append-only file
+               * streamclone: also stream caches to the client
+               * streamclone: define first iteration of version 2 of stream format
+               * streamclone: move wire protocol status code from wireproto command
+               * streamclone: rework canperformstreamclone
+               * streamclone: tests phase exchange during stream clone
+               * streamclone: use readexactly when reading stream v2
+               * templater: fix crash by empty group expression
+               * templater: keep default resources per template engine (API)
                * templater: look up symbols/resources as if they were separated (Bts:issue5699)
                * transaction: register summary callbacks only at start of transaction (BC)
                * util: whitelist NTFS for hardlink creation (Bts:issue4580)
+               * vfs: drop text mode flag (API)
+               * wireproto: drop support for reader interface from streamres (API)
               === extensions ===
                * convert: restore the ability to use bzr < 2.6.0 (Bts:issue5733)
                * largefiles: add a 'debuglfput' command to put largefile into the store
                * largefiles: add support for 'largefiles://' url scheme
                * largefiles: allow to run 'debugupgraderepo' on repo with largefiles
-               * largefiles: convert EOL of hgrc before appending to bytes IO
                * largefiles: explicitly set the source and sink types to 'hg' for lfconvert
                * largefiles: modernize how capabilities are added to the wire protocol
                * largefiles: pay attention to dropped standin files when updating largefiles
                * rebase: don't run IMM if running rebase in a transaction
                * rebase: don't take out a dirstate guard for in-memory rebase
                * rebase: drop --style option
+               * rebase: enable multidest by default
+               * rebase: exclude descendants of obsoletes w/o a successor in dest (Bts:issue5300)
                * rebase: fix for hgsubversion
                * rebase: pass the wctx object (IMM or on-disk) to merge.update
                * rebase: pass wctx to rebasenode()
               === unsorted ===
                * archive: add support to specify hidden revs if directaccess config is set
                * atomicupdate: add an experimental option to use atomictemp when updating
+               * bundle2: don't use seekable bundle2 parts by default (Bts:issue5691)
                * bundle: allow bundlerepo to support alternative manifest implementations
                * changelog: introduce a 'tiprev' method
                * changelog: use 'tiprev()' in 'tip()'
                * completion: add support for new "amend" command
+               * crecord: fix revert -ir '.^' crash caused by 3649c3f2cd
                * debugssl: convert port number to int (Bts:issue5757)
                * diff: disable diff.noprefix option for diffstat (Bts:issue5759)
-               * dispatch: abort if early boolean options can't be parsed
-               * dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options
-               * dispatch: add option to not strip command args parsed by _earlygetopt()
-               * dispatch: alias --repo to --repository while parsing early options
-               * dispatch: convert non-list option parsed by _earlygetopt() to string
-               * dispatch: fix early parsing of short option with value like -R=foo
-               * dispatch: handle IOError when writing to stderr
-               * dispatch: stop parsing of early boolean option at "--"
-               * dispatch: verify result of early command parsing
                * evolution: make reporting of new unstable changesets optional
                * extdata: abort if external command exits with non-zero status (BC)
                * fancyopts: add early-options parser compatible with getopt()
                * httppeer: add support for tracing all http request made by the peer
                * identify: document -r. explicitly how to disable wdir scanning (Bts:issue5622)
                * lfs: register config options
-               * localrepo: specify optional callback parameter to pathauditor as a keyword
                * match: do not weirdly include explicit files excluded by -X option
                * memfilectx: make changectx argument mandatory in constructor (API)
                * morestatus: don't crash with different drive letters for repo.root and CWD
                * rewriteutil: use precheck() in uncommit and amend commands
                * scmutil: don't try to delete origbackup symlinks to directories (Bts:issue5731)
                * sshpeer: add support for request tracing
-               * streamclone: add support for bundle2 based stream clone
-               * streamclone: add support for cloning non append-only file
-               * streamclone: also stream caches to the client
-               * streamclone: define first iteration of version 2 of stream format
-               * streamclone: move wire protocol status code from wireproto command
-               * streamclone: rework canperformstreamclone
-               * streamclone: tests phase exchange during stream clone
-               * streamclone: use readexactly when reading stream v2
                * subrepo: add config option to reject any subrepo operations (SEC)
                * subrepo: disable git and svn subrepos by default (BC) (SEC)
                * subrepo: extend config option to disable subrepos by type (SEC)
                * subrepo: handle 'C:' style paths on the command line (Bts:issue5770)
                * subrepo: use per-type config options to enable subrepos
                * svnsubrepo: check if subrepo is missing when checking dirty state (Bts:issue5657)
+               * test-bookmarks-pushpull: stabilize for Windows
+               * test-run-tests: stabilize the test (Bts:issue5735)
                * tr-summary: keep a weakref to the unfiltered repository
                * unamend: fix command summary line
                * uncommit: unify functions _uncommitdirstate and _unamenddirstate to one
+               * update: fix crash on bare update when directaccess is enabled
                * update: support updating to hidden cset if directaccess config is set
-              === BC ===
+              === Behavior Changes ===
                * extdata: abort if external command exits with non-zero status (BC)
                * graphlog: add another graph node type, unstable, using character "*" (BC)
                * hgweb: drop support of browsers that don't understand <canvas> (BC)
                * hgweb: only include graph-related data in jsdata variable on /graph pages (BC)
                * hgweb: stop adding strings to innerHTML of #graphnodes and #nodebgs (BC)
+               * log: follow file history across copies even with -rREV (BC) (Bts:issue4959)
+               * log: rewrite --follow-first -rREV like --follow for consistency (BC)
                * remove: print message for each file in verbose mode only while using '-A' (BC)
                * subrepo: disable git and svn subrepos by default (BC) (SEC)
                * transaction: register summary callbacks only at start of transaction (BC)
-              === API Changes ===
+              === Internal API Changes ===
+               * dirstate: add explicit methods for querying directories (API)
+               * exchange: return bundle info from getbundlechunks() (API)
                * memfilectx: make changectx argument mandatory in constructor (API)
+               * templater: keep default resources per template engine (API)
+               * vfs: drop text mode flag (API)
+               * wireproto: drop support for reader interface from streamres (API)

tests/test-generaldelta.t

0 +108 -108

@@ -279,61 +279,61 b' test maxdeltachainspan'
279	14 files updated, 0 files merged, 0 files removed, 0 files unresolved	279	14 files updated, 0 files merged, 0 files removed, 0 files unresolved
280	$ hg -R relax-chain debugdeltachain -m	280	$ hg -R relax-chain debugdeltachain -m
281	rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio	281	rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
282	0 1 1 -1 base 47 46 47 1.02~~174~~ 47 0 0.00000	282	0 1 1 -1 base 46 45 46 1.02222 46 0 0.00000
283	1 1 2 0 p1 58 92 105 1.14~~130~~ 105 0 0.00000	283	1 1 2 0 p1 57 90 103 1.14444 103 0 0.00000
284	2 1 3 1 p1 58 138 163 1.18~~116~~ 163 0 0.00000	284	2 1 3 1 p1 57 135 160 1.18519 160 0 0.00000
285	3 1 4 2 p1 58 184 221 1.20~~109~~ 221 0 0.00000	285	3 1 4 2 p1 57 180 217 1.20556 217 0 0.00000
286	4 1 5 3 p1 58 230 279 1.21~~304~~ 279 0 0.00000	286	4 1 5 3 p1 57 225 274 1.21778 274 0 0.00000
287	5 1 6 4 p1 58 276 337 1.22~~101~~ 337 0 0.00000	287	5 1 6 4 p1 57 270 331 1.22593 331 0 0.00000
288	6 1 7 5 p1 58 ~~322~~ ~~395~~ ~~1.22671~~ ~~395~~ 0 0.00000	288	6 2 1 -1 base 46 45 46 1.02222 46 0 0.00000
289	7 1 8 6 p1 58 ~~368~~ 453 1.~~23098~~ 453 0 0.00000	289	7 2 2 6 p1 57 90 103 1.14444 103 0 0.00000
290	8 1 9 7 p1 58 ~~414~~ 511 1.~~23430~~ 511 0 0.00000	290	8 2 3 7 p1 57 135 160 1.18519 160 0 0.00000
291	9 1 10 8 p1 58 460 ~~569~~ 1.2~~369~~6 ~~569~~ 0 0.00000	291	9 2 4 8 p1 57 180 217 1.20556 217 0 0.00000
292	10 1 11 9 p1 58 506 627 1.2~~3913~~ 627 0 0.00000	292	10 2 5 9 p1 58 226 275 1.21681 275 0 0.00000
293	11 1 12 10 p1 58 552 ~~685~~ 1.2~~4094~~ ~~685~~ 0 0.00000	293	11 2 6 10 p1 58 272 333 1.22426 333 0 0.00000
294	12 1 13 11 p1 58 598 743 1.2~~4247~~ 743 0 0.00000	294	12 2 7 11 p1 58 318 391 1.22956 391 0 0.00000
295	13 1 14 12 p1 58 644 ~~801~~ 1.2~~4379~~ ~~801~~ 0 0.00000	295	13 2 8 12 p1 58 364 449 1.23352 449 0 0.00000
296	14 1 15 13 p1 58 690 ~~859~~ 1.2~~449~~3 ~~859~~ 0 0.00000	296	14 2 9 13 p1 58 410 507 1.23659 507 0 0.00000
297	15 1 16 14 p1 58 736 ~~917~~ 1.2~~4592~~ ~~917~~ 0 0.00000	297	15 2 10 14 p1 58 456 565 1.23904 565 0 0.00000
298	16 1 17 15 p1 58 782 ~~975~~ 1.24~~680~~ ~~975~~ 0 0.00000	298	16 2 11 15 p1 58 502 623 1.24104 623 0 0.00000
299	17 1 18 16 p1 58 ~~828~~ ~~1033~~ ~~1.24758~~ ~~1033~~ 0 0.00000	299	17 2 12 16 p1 58 548 681 1.24270 681 0 0.00000
300	18 1 19 17 p1 58 ~~874~~ ~~1091~~ ~~1.24828~~ ~~1091~~ 0 0.00000	300	18 3 1 -1 base 47 46 47 1.02174 47 0 0.00000
301	19 1 20 18 p1 58 920 1~~149~~ ~~1.24891~~ ~~1149~~ 0 0.00000	301	19 3 2 18 p1 58 92 105 1.14130 105 0 0.00000
302	20 1 21 19 p1 58 966 1~~207~~ ~~1.24948~~ ~~1207~~ 0 0.00000	302	20 3 3 19 p1 58 138 163 1.18116 163 0 0.00000
303	21 1 22 20 p1 58 ~~101~~2 1265 1~~.25000~~ ~~1265~~ 0 0.00000	303	21 3 4 20 p1 58 184 221 1.20109 221 0 0.00000
304	22 1 23 21 p1 58 ~~1058~~ ~~1323~~ ~~1.25047~~ ~~1323~~ 0 0.00000	304	22 3 5 21 p1 58 230 279 1.21304 279 0 0.00000
305	23 1 24 22 p1 58 ~~1104~~ ~~1381~~ ~~1.25091~~ ~~1381~~ 0 0.00000	305	23 3 6 22 p1 58 276 337 1.22101 337 0 0.00000
306	24 1 25 23 p1 58 ~~1150~~ 1439 ~~1.2~~5~~130~~ ~~1439~~ 0 0.00000	306	24 3 7 23 p1 58 322 395 1.22671 395 0 0.00000
307	25 1 26 24 p1 58 ~~1196~~ ~~1497~~ ~~1.25167~~ ~~1497~~ 0 0.00000	307	25 3 8 24 p1 58 368 453 1.23098 453 0 0.00000
308	26 1 27 25 p1 58 ~~1242~~ 1555 1~~.2520~~1 ~~1555~~ 0 0.00000	308	26 3 9 25 p1 58 414 511 1.23430 511 0 0.00000
309	27 1 28 26 p1 58 ~~1288~~ ~~1613~~ ~~1.25233~~ ~~1613~~ 0 0.00000	309	27 3 10 26 p1 58 460 569 1.23696 569 0 0.00000
310	28 1 29 27 p1 58 ~~1334~~ 1671 1.2~~5262~~ 1671 0 0.00000	310	28 3 11 27 p1 58 506 627 1.23913 627 0 0.00000
311	29 1 30 28 p1 58 ~~1380~~ ~~1729~~ ~~1.25290~~ ~~1729~~ 0 0.00000	311	29 3 12 28 p1 58 552 685 1.24094 685 0 0.00000
312	30 1 31 29 p1 58 ~~1426~~ ~~1787~~ ~~1.25316~~ ~~1787~~ 0 0.00000	312	30 3 13 29 p1 58 598 743 1.24247 743 0 0.00000
313	31 2 1 -1 ~~base~~ 46 45 46 ~~1.02222~~ 46 0 0.00000	313	31 3 14 30 p1 58 644 801 1.24379 801 0 0.00000
314	32 2 2 31 p1 57 90 ~~103~~ 1.~~14444~~ ~~103~~ 0 0.00000	314	32 3 15 31 p1 58 690 859 1.24493 859 0 0.00000
315	33 2 3 32 p1 57 ~~135~~ ~~160~~ 1.~~18519~~ ~~160~~ 0 0.00000	315	33 3 16 32 p1 58 736 917 1.24592 917 0 0.00000
316	34 2 4 33 p1 57 ~~180~~ ~~217~~ 1.2~~0556~~ ~~217~~ 0 0.00000	316	34 3 17 33 p1 58 782 975 1.24680 975 0 0.00000
317	35 2 5 34 p1 57 ~~225~~ ~~274~~ 1.2~~1778~~ ~~274~~ 0 0.00000	317	35 3 18 34 p1 58 828 1033 1.24758 1033 0 0.00000
318	36 2 6 35 p1 57 ~~270~~ 331 1.2~~2593~~ 331 0 0.00000	318	36 3 19 35 p1 58 874 1091 1.24828 1091 0 0.00000
319	37 2 7 36 p1 58 ~~316~~ 389 1.2~~3101~~ 389 0 0.00000	319	37 3 20 36 p1 58 920 1149 1.24891 1149 0 0.00000
320	38 2 8 37 p1 58 ~~362~~ 447 1.2~~3481~~ 447 0 0.00000	320	38 3 21 37 p1 58 966 1207 1.24948 1207 0 0.00000
321	39 3 1 -1 ~~base~~ 46 45 46 1.~~02222~~ 46 0 0.00000	321	39 3 22 38 p1 58 1012 1265 1.25000 1265 0 0.00000
322	40 3 2 39 p1 57 90 103 1.~~14444~~ 103 0 0.00000	322	40 3 23 39 p1 58 1058 1323 1.25047 1323 0 0.00000
323	41 3 3 40 p1 57 ~~135~~ ~~160~~ 1.~~18519~~ ~~160~~ 0 0.00000	323	41 3 24 40 p1 58 1104 1381 1.25091 1381 0 0.00000
324	42 3 4 41 p1 57 ~~180~~ ~~217~~ 1.2~~0556~~ ~~217~~ 0 0.00000	324	42 3 25 41 p1 58 1150 1439 1.25130 1439 0 0.00000
325	43 3 5 42 p1 58 ~~226~~ ~~275~~ 1.2~~1681~~ ~~275~~ 0 0.00000	325	43 3 26 42 p1 58 1196 1497 1.25167 1497 0 0.00000
326	44 3 6 43 p1 58 ~~272~~ ~~333~~ 1.2~~2426~~ ~~333~~ 0 0.00000	326	44 3 27 43 p1 58 1242 1555 1.25201 1555 0 0.00000
327	45 3 7 44 p1 58 318 391 1.2~~2956~~ 391 0 0.00000	327	45 3 28 44 p1 58 1288 1613 1.25233 1613 0 0.00000
328	46 3 8 45 p1 58 ~~364~~ ~~449~~ 1.23352 ~~449~~ 0 0.00000	328	46 3 29 45 p1 58 1334 1671 1.25262 1671 0 0.00000
329	47 3 9 46 p1 58 410 ~~507~~ 1.2~~3659~~ ~~507~~ 0 0.00000	329	47 3 30 46 p1 58 1380 1729 1.25290 1729 0 0.00000
330	48 3 10 47 p1 58 ~~456~~ ~~565~~ 1.2~~3904~~ ~~565~~ 0 0.00000	330	48 3 31 47 p1 58 1426 1787 1.25316 1787 0 0.00000
331	49 3 11 48 p1 58 ~~502~~ ~~623~~ ~~1.24104~~ ~~623~~ 0 0.00000	331	49 4 1 -1 base 197 316 197 0.62342 197 0 0.00000
332	50 3 12 49 p1 58 ~~548~~ ~~681~~ ~~1.24270~~ ~~681~~ 0 0.00000	332	50 4 2 49 p1 58 362 255 0.70442 255 0 0.00000
333	51 3 13 50 p1 58 594 739 1.24411 ~~739~~ 0 ~~0.00000~~	333	51 2 13 17 p1 58 594 739 1.24411 2781 2042 2.76319
334	52 3 14 51 p1 58 640 ~~797~~ ~~1.24531~~ ~~797~~ 0 0.00000	334	52 5 1 -1 base 369 640 369 0.57656 369 0 0.00000
335	53 4 1 -1 base 0 0 0 0.00000 0 0 0.00000	335	53 6 1 -1 base 0 0 0 0.00000 0 0 0.00000
336	54 5 1 -1 base 369 640 369 0.57656 369 0 0.00000	336	54 7 1 -1 base 369 640 369 0.57656 369 0 0.00000
337	$ hg clone --pull source-repo --config experimental.maxdeltachainspan=0 noconst-chain --config format.generaldelta=yes	337	$ hg clone --pull source-repo --config experimental.maxdeltachainspan=0 noconst-chain --config format.generaldelta=yes
338	requesting all changes	338	requesting all changes
339	adding changesets	339	adding changesets
@@ -345,58 +345,58 b' test maxdeltachainspan'
345	14 files updated, 0 files merged, 0 files removed, 0 files unresolved	345	14 files updated, 0 files merged, 0 files removed, 0 files unresolved
346	$ hg -R noconst-chain debugdeltachain -m	346	$ hg -R noconst-chain debugdeltachain -m
347	rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio	347	rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
348	0 1 1 -1 base 47 46 47 1.02~~174~~ 47 0 0.00000	348	0 1 1 -1 base 46 45 46 1.02222 46 0 0.00000
349	1 1 2 0 p1 58 92 105 1.14~~130~~ 105 0 0.00000	349	1 1 2 0 p1 57 90 103 1.14444 103 0 0.00000
350	2 1 3 1 p1 58 138 163 1.18~~116~~ 163 0 0.00000	350	2 1 3 1 p1 57 135 160 1.18519 160 0 0.00000
351	3 1 4 2 p1 58 184 221 1.20~~109~~ 221 0 0.00000	351	3 1 4 2 p1 57 180 217 1.20556 217 0 0.00000
352	4 1 5 3 p1 58 230 279 1.21~~304~~ 279 0 0.00000	352	4 1 5 3 p1 57 225 274 1.21778 274 0 0.00000
353	5 1 6 4 p1 58 276 337 1.22~~101~~ 337 0 0.00000	353	5 1 6 4 p1 57 270 331 1.22593 331 0 0.00000
354	6 1 7 5 p1 58 ~~322~~ ~~395~~ ~~1.22671~~ ~~395~~ 0 0.00000	354	6 2 1 -1 base 46 45 46 1.02222 46 0 0.00000
355	7 1 8 6 p1 58 ~~368~~ 453 1.~~23098~~ 453 0 0.00000	355	7 2 2 6 p1 57 90 103 1.14444 103 0 0.00000
356	8 1 9 7 p1 58 ~~414~~ 511 1.~~23430~~ 511 0 0.00000	356	8 2 3 7 p1 57 135 160 1.18519 160 0 0.00000
357	9 1 10 8 p1 58 460 ~~569~~ 1.2~~369~~6 ~~569~~ 0 0.00000	357	9 2 4 8 p1 57 180 217 1.20556 217 0 0.00000
358	10 1 11 9 p1 58 506 627 1.2~~3913~~ 627 0 0.00000	358	10 2 5 9 p1 58 226 275 1.21681 275 0 0.00000
359	11 1 12 10 p1 58 552 ~~685~~ 1.2~~4094~~ ~~685~~ 0 0.00000	359	11 2 6 10 p1 58 272 333 1.22426 333 0 0.00000
360	12 1 13 11 p1 58 598 743 1.2~~4247~~ 743 0 0.00000	360	12 2 7 11 p1 58 318 391 1.22956 391 0 0.00000
361	13 1 14 12 p1 58 644 ~~801~~ 1.2~~4379~~ ~~801~~ 0 0.00000	361	13 2 8 12 p1 58 364 449 1.23352 449 0 0.00000
362	14 1 15 13 p1 58 690 ~~859~~ 1.2~~449~~3 ~~859~~ 0 0.00000	362	14 2 9 13 p1 58 410 507 1.23659 507 0 0.00000
363	15 1 16 14 p1 58 736 ~~917~~ 1.2~~4592~~ ~~917~~ 0 0.00000	363	15 2 10 14 p1 58 456 565 1.23904 565 0 0.00000
364	16 1 17 15 p1 58 782 ~~975~~ 1.24~~680~~ ~~975~~ 0 0.00000	364	16 2 11 15 p1 58 502 623 1.24104 623 0 0.00000
365	17 1 18 16 p1 58 ~~828~~ ~~1033~~ ~~1.24758~~ ~~1033~~ 0 0.00000	365	17 2 12 16 p1 58 548 681 1.24270 681 0 0.00000
366	18 1 19 17 p1 58 ~~874~~ ~~1091~~ ~~1.24828~~ ~~1091~~ 0 0.00000	366	18 3 1 -1 base 47 46 47 1.02174 47 0 0.00000
367	19 1 20 18 p1 58 920 1~~149~~ ~~1.24891~~ ~~1149~~ 0 0.00000	367	19 3 2 18 p1 58 92 105 1.14130 105 0 0.00000
368	20 1 21 19 p1 58 966 1~~207~~ ~~1.24948~~ ~~1207~~ 0 0.00000	368	20 3 3 19 p1 58 138 163 1.18116 163 0 0.00000
369	21 1 22 20 p1 58 ~~101~~2 1265 1~~.25000~~ ~~1265~~ 0 0.00000	369	21 3 4 20 p1 58 184 221 1.20109 221 0 0.00000
370	22 1 23 21 p1 58 ~~1058~~ ~~1323~~ ~~1.25047~~ ~~1323~~ 0 0.00000	370	22 3 5 21 p1 58 230 279 1.21304 279 0 0.00000
371	23 1 24 22 p1 58 ~~1104~~ ~~1381~~ ~~1.25091~~ ~~1381~~ 0 0.00000	371	23 3 6 22 p1 58 276 337 1.22101 337 0 0.00000
372	24 1 25 23 p1 58 ~~1150~~ 1439 ~~1.2~~5~~130~~ ~~1439~~ 0 0.00000	372	24 3 7 23 p1 58 322 395 1.22671 395 0 0.00000
373	25 1 26 24 p1 58 ~~1196~~ ~~1497~~ ~~1.25167~~ ~~1497~~ 0 0.00000	373	25 3 8 24 p1 58 368 453 1.23098 453 0 0.00000
374	26 1 27 25 p1 58 ~~1242~~ 1555 1~~.2520~~1 ~~1555~~ 0 0.00000	374	26 3 9 25 p1 58 414 511 1.23430 511 0 0.00000
375	27 1 28 26 p1 58 ~~1288~~ ~~1613~~ ~~1.25233~~ ~~1613~~ 0 0.00000	375	27 3 10 26 p1 58 460 569 1.23696 569 0 0.00000
376	28 1 29 27 p1 58 ~~1334~~ 1671 1.2~~5262~~ 1671 0 0.00000	376	28 3 11 27 p1 58 506 627 1.23913 627 0 0.00000
377	29 1 30 28 p1 58 ~~1380~~ ~~1729~~ ~~1.25290~~ ~~1729~~ 0 0.00000	377	29 3 12 28 p1 58 552 685 1.24094 685 0 0.00000
378	30 1 31 29 p1 58 ~~1426~~ ~~1787~~ ~~1.25316~~ ~~1787~~ 0 0.00000	378	30 3 13 29 p1 58 598 743 1.24247 743 0 0.00000
379	31 2 1 -1 ~~base~~ 46 45 46 ~~1.02222~~ 46 0 0.00000	379	31 3 14 30 p1 58 644 801 1.24379 801 0 0.00000
380	32 2 2 31 p1 57 90 ~~103~~ 1.~~14444~~ ~~103~~ 0 0.00000	380	32 3 15 31 p1 58 690 859 1.24493 859 0 0.00000
381	33 2 3 32 p1 57 ~~135~~ ~~160~~ 1.~~18519~~ ~~160~~ 0 0.00000	381	33 3 16 32 p1 58 736 917 1.24592 917 0 0.00000
382	34 2 4 33 p1 57 ~~180~~ ~~217~~ 1.2~~0556~~ ~~217~~ 0 0.00000	382	34 3 17 33 p1 58 782 975 1.24680 975 0 0.00000
383	35 2 5 34 p1 57 ~~225~~ ~~274~~ 1.2~~1778~~ ~~274~~ 0 0.00000	383	35 3 18 34 p1 58 828 1033 1.24758 1033 0 0.00000
384	36 2 6 35 p1 57 ~~270~~ 331 1.2~~2593~~ 331 0 0.00000	384	36 3 19 35 p1 58 874 1091 1.24828 1091 0 0.00000
385	37 2 7 36 p1 58 ~~316~~ 389 1.2~~3101~~ 389 0 0.00000	385	37 3 20 36 p1 58 920 1149 1.24891 1149 0 0.00000
386	38 2 8 37 p1 58 ~~362~~ 447 1.2~~3481~~ 447 0 0.00000	386	38 3 21 37 p1 58 966 1207 1.24948 1207 0 0.00000
387	39 3 1 -1 ~~base~~ 46 45 46 1.~~02222~~ 46 0 0.00000	387	39 3 22 38 p1 58 1012 1265 1.25000 1265 0 0.00000
388	40 3 2 39 p1 57 90 103 1.~~14444~~ 103 0 0.00000	388	40 3 23 39 p1 58 1058 1323 1.25047 1323 0 0.00000
389	41 3 3 40 p1 57 ~~135~~ ~~160~~ 1.~~18519~~ ~~160~~ 0 0.00000	389	41 3 24 40 p1 58 1104 1381 1.25091 1381 0 0.00000
390	42 3 4 41 p1 57 ~~180~~ ~~217~~ 1.2~~0556~~ ~~217~~ 0 0.00000	390	42 3 25 41 p1 58 1150 1439 1.25130 1439 0 0.00000
391	43 3 5 42 p1 58 ~~226~~ ~~275~~ 1.2~~1681~~ ~~275~~ 0 0.00000	391	43 3 26 42 p1 58 1196 1497 1.25167 1497 0 0.00000
392	44 3 6 43 p1 58 ~~272~~ ~~333~~ 1.2~~2426~~ ~~333~~ 0 0.00000	392	44 3 27 43 p1 58 1242 1555 1.25201 1555 0 0.00000
393	45 3 7 44 p1 58 318 391 1.2~~2956~~ 391 0 0.00000	393	45 3 28 44 p1 58 1288 1613 1.25233 1613 0 0.00000
394	46 3 8 45 p1 58 ~~364~~ ~~449~~ 1.23352 ~~449~~ 0 0.00000	394	46 3 29 45 p1 58 1334 1671 1.25262 1671 0 0.00000
395	47 3 9 46 p1 58 410 ~~507~~ 1.2~~3659~~ ~~507~~ 0 0.00000	395	47 3 30 46 p1 58 1380 1729 1.25290 1729 0 0.00000
396	48 3 10 47 p1 58 ~~456~~ ~~565~~ 1.2~~3904~~ ~~565~~ 0 0.00000	396	48 3 31 47 p1 58 1426 1787 1.25316 1787 0 0.00000
397	49 3 11 48 p1 58 ~~502~~ 623 1.2~~4104~~ ~~623~~ 0 ~~0.00000~~	397	49 1 7 5 p1 58 316 389 1.23101 2857 2468 6.34447
398	50 3 12 49 p1 58 ~~548~~ ~~681~~ 1.2~~4270~~ ~~681~~ 0 ~~0.00000~~	398	50 1 8 49 p1 58 362 447 1.23481 2915 2468 5.52125
399	51 3 13 50 p1 58 594 739 1.24411 ~~739~~ 0 ~~0.0000~~0	399	51 2 13 17 p1 58 594 739 1.24411 2642 1903 2.57510
400	52 3 14 51 p1 58 640 797 1.24531 ~~797~~ 0 ~~0.0000~~0	400	52 2 14 51 p1 58 640 797 1.24531 2700 1903 2.38770
401	53 4 1 -1 base 0 0 0 0.00000 0 0 0.00000	401	53 4 1 -1 base 0 0 0 0.00000 0 0 0.00000
402	54 5 1 -1 base 369 640 369 0.57656 369 0 0.00000	402	54 5 1 -1 base 369 640 369 0.57656 369 0 0.00000

tests/test-narrow-copies.t

0 +19 -2

@@ -18,10 +18,12 b' create full repo'
18	$ echo modified > inside/f2	18	$ echo modified > inside/f2
19	$ hg ci -qm 'modify inside/f2'	19	$ hg ci -qm 'modify inside/f2'
20		20
		21	$ mkdir outside
		22	$ echo new > outside/f3
		23	$ hg ci -Aqm 'add outside/f3'
21	$ cd ..	24	$ cd ..
22		25
23	$ hg clone --narrow ssh://user@dummy/master narrow --include inside	26	$ hg clone --narrow ssh://user@dummy/master narrow --include inside -r 2
24	requesting all changes
25	adding changesets	27	adding changesets
26	adding manifests	28	adding manifests
27	adding file changes	29	adding file changes
@@ -55,3 +57,18 b' create full repo'
55	date: Thu Jan 01 00:00:00 1970 +0000	57	date: Thu Jan 01 00:00:00 1970 +0000
56	summary: move f2 from outside	58	summary: move f2 from outside
57		59
		60	$ echo new > inside/f4
		61	$ hg ci -Aqm 'add inside/f4'
		62	$ hg pull -q
		63	$ hg --config extensions.rebase= rebase -d tip
		64	rebasing 3:4f84b666728c "add inside/f4"
		65	saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/4f84b666728c-4269b76e-rebase.hg
		66
		67	$ hg co -q 0
		68	$ echo modified > inside/f1
		69	$ hg ci -qm 'modify inside/f1'
		70	$ echo new > inside/f5
		71	$ hg ci -Aqm 'add inside/f5'
		72	$ hg --config extensions.rebase= rebase -d 'public()' -r .
		73	rebasing 6:610b60178c28 "add inside/f5" (tip)
		74	saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/610b60178c28-65716a78-rebase.hg

tests/test-phases.t

0 +48 -1

@@ -850,6 +850,10 b' Check we deny its usage on older reposit'
850	** ProgrammingError: this repository does not support the internal phase	850	** ProgrammingError: this repository does not support the internal phase
851	raise error.ProgrammingError(msg)	851	raise error.ProgrammingError(msg)
852	mercurial.error.ProgrammingError: this repository does not support the internal phase	852	mercurial.error.ProgrammingError: this repository does not support the internal phase
		853	$ hg --config "phases.new-commit=archived" commit -m "my test archived commit" 2>&1 \| grep ProgrammingError
		854	** ProgrammingError: this repository does not support the archived phase
		855	raise error.ProgrammingError(msg)
		856	mercurial.error.ProgrammingError: this repository does not support the archived phase
853		857
854	$ cd ..	858	$ cd ..
855		859
@@ -878,7 +882,8 b' Commit an internal changesets'
878	test-debug-phase: new rev 1: x -> 96	882	test-debug-phase: new rev 1: x -> 96
879	test-hook-close-phase: c01c42dffc7f81223397e99652a0703f83e1c5ea: -> internal	883	test-hook-close-phase: c01c42dffc7f81223397e99652a0703f83e1c5ea: -> internal
880		884
881	Usual visibility rules apply when working directory parents	885	The changeset is a working parent descendant.
		886	Per the usual visibility rules, it is made visible.
882		887
883	$ hg log -G -l 3	888	$ hg log -G -l 3
884	@ changeset: 1:c01c42dffc7f	889	@ changeset: 1:c01c42dffc7f
@@ -904,3 +909,45 b' Commit is hidden as expected'
904	date: Thu Jan 01 00:00:00 1970 +0000	909	date: Thu Jan 01 00:00:00 1970 +0000
905	summary: A	910	summary: A
906		911
		912
		913	Test for archived phase
		914	-----------------------
		915
		916	Commit an archived changesets
		917
		918	$ echo B > B
		919	$ hg add B
		920	$ hg status
		921	A B
		922	$ hg --config "phases.new-commit=archived" commit -m "my test archived commit"
		923	test-debug-phase: new rev 2: x -> 32
		924	test-hook-close-phase: 8df5997c3361518f733d1ae67cd3adb9b0eaf125: -> archived
		925
		926	The changeset is a working parent descendant.
		927	Per the usual visibility rules, it is made visible.
		928
		929	$ hg log -G -l 3
		930	@ changeset: 2:8df5997c3361
		931	\| tag: tip
		932	\| parent: 0:4a2df7238c3b
		933	\| user: test
		934	\| date: Thu Jan 01 00:00:00 1970 +0000
		935	\| summary: my test archived commit
		936	\|
		937	o changeset: 0:4a2df7238c3b
		938	user: test
		939	date: Thu Jan 01 00:00:00 1970 +0000
		940	summary: A
		941
		942
		943	Commit is hidden as expected
		944
		945	$ hg up 0
		946	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		947	$ hg log -G
		948	@ changeset: 0:4a2df7238c3b
		949	tag: tip
		950	user: test
		951	date: Thu Jan 01 00:00:00 1970 +0000
		952	summary: A
		953

tests/test-storage.py

0 +8 0

                 sqlitestore = None
             try:
+                import sqlite3
+                if sqlite3.sqlite_version_info < (3, 8, 3):
+                    # WITH clause not supported
+                    sqlitestore = None
+            except ImportError:
+                pass
+            try:
                 from mercurial import zstd
                 zstd.__version__
             except ImportError:

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages