# HG changeset patch # User Yuya Nishihara # Date 1542280831 -32400 # Node ID 437520219e0cc6a5e6f6dd4b644929b32eb52dc5 # Parent a182dc714afacc11c4c27f6b268f95bd0e9ec004# Parent 4790732559ade2c1ab13608ba8d9e0c22d335b9b merge with stable diff -r a182dc714afa -r 437520219e0c hgext/phabricator.py --- a/hgext/phabricator.py Mon Nov 05 22:58:19 2018 +0100 +++ b/hgext/phabricator.py Thu Nov 15 20:20:31 2018 +0900 @@ -142,6 +142,7 @@ return fn(*args, **kwargs) return fn(*args, **kwargs) inner.__name__ = fn.__name__ + inner.__doc__ = fn.__doc__ return command(name, fullflags, spec)(inner) return decorate diff -r a182dc714afa -r 437520219e0c mercurial/hg.py --- a/mercurial/hg.py Mon Nov 05 22:58:19 2018 +0100 +++ b/mercurial/hg.py Thu Nov 15 20:20:31 2018 +0900 @@ -366,7 +366,7 @@ try: hardlink = None topic = _('linking') if hardlink else _('copying') - with ui.makeprogress(topic) as progress: + with ui.makeprogress(topic, unit=_('files')) as progress: num = 0 srcpublishing = srcrepo.publishing() srcvfs = vfsmod.vfs(srcrepo.sharedpath) diff -r a182dc714afa -r 437520219e0c mercurial/verify.py --- a/mercurial/verify.py Mon Nov 05 22:58:19 2018 +0100 +++ b/mercurial/verify.py Thu Nov 15 20:20:31 2018 +0900 @@ -302,7 +302,8 @@ ui.status(_("crosschecking files in changesets and manifests\n")) total = len(filelinkrevs) + len(filenodes) - progress = ui.makeprogress(_('crosschecking'), total=total) + progress = ui.makeprogress(_('crosschecking'), unit=_('files'), + total=total) if self.havemf: for f in sorted(filelinkrevs): progress.increment() diff -r a182dc714afa -r 437520219e0c tests/test-clone.t --- a/tests/test-clone.t Mon Nov 05 22:58:19 2018 +0100 +++ b/tests/test-clone.t Thu Nov 15 20:20:31 2018 +0900 @@ -87,47 +87,47 @@ #if hardlink $ hg --debug clone -U . ../c --config progress.debug=true - linking: 1 - linking: 2 - linking: 3 - linking: 4 - linking: 5 - linking: 6 - linking: 7 - linking: 8 + linking: 1 files + linking: 2 files + linking: 3 files + linking: 4 files + linking: 5 files + linking: 6 files + linking: 7 files + linking: 8 files linked 8 files (reporevlogstore !) - linking: 9 (reposimplestore !) - linking: 10 (reposimplestore !) - linking: 11 (reposimplestore !) - linking: 12 (reposimplestore !) - linking: 13 (reposimplestore !) - linking: 14 (reposimplestore !) - linking: 15 (reposimplestore !) - linking: 16 (reposimplestore !) - linking: 17 (reposimplestore !) - linking: 18 (reposimplestore !) + linking: 9 files (reposimplestore !) + linking: 10 files (reposimplestore !) + linking: 11 files (reposimplestore !) + linking: 12 files (reposimplestore !) + linking: 13 files (reposimplestore !) + linking: 14 files (reposimplestore !) + linking: 15 files (reposimplestore !) + linking: 16 files (reposimplestore !) + linking: 17 files (reposimplestore !) + linking: 18 files (reposimplestore !) linked 18 files (reposimplestore !) #else $ hg --debug clone -U . ../c --config progress.debug=true - linking: 1 - copying: 2 - copying: 3 - copying: 4 - copying: 5 - copying: 6 - copying: 7 - copying: 8 + linking: 1 files + copying: 2 files + copying: 3 files + copying: 4 files + copying: 5 files + copying: 6 files + copying: 7 files + copying: 8 files copied 8 files (reporevlogstore !) - copying: 9 (reposimplestore !) - copying: 10 (reposimplestore !) - copying: 11 (reposimplestore !) - copying: 12 (reposimplestore !) - copying: 13 (reposimplestore !) - copying: 14 (reposimplestore !) - copying: 15 (reposimplestore !) - copying: 16 (reposimplestore !) - copying: 17 (reposimplestore !) - copying: 18 (reposimplestore !) + copying: 9 files (reposimplestore !) + copying: 10 files (reposimplestore !) + copying: 11 files (reposimplestore !) + copying: 12 files (reposimplestore !) + copying: 13 files (reposimplestore !) + copying: 14 files (reposimplestore !) + copying: 15 files (reposimplestore !) + copying: 16 files (reposimplestore !) + copying: 17 files (reposimplestore !) + copying: 18 files (reposimplestore !) copied 18 files (reposimplestore !) #endif $ cd ../c diff -r a182dc714afa -r 437520219e0c tests/test-hardlinks.t --- a/tests/test-hardlinks.t Mon Nov 05 22:58:19 2018 +0100 +++ b/tests/test-hardlinks.t Thu Nov 15 20:20:31 2018 +0900 @@ -61,13 +61,13 @@ Create hardlinked clone r2: $ hg clone -U --debug r1 r2 --config progress.debug=true - linking: 1 - linking: 2 - linking: 3 - linking: 4 - linking: 5 - linking: 6 - linking: 7 + linking: 1 files + linking: 2 files + linking: 3 files + linking: 4 files + linking: 5 files + linking: 6 files + linking: 7 files linked 7 files Create non-hardlinked clone r3: diff -r a182dc714afa -r 437520219e0c tests/test-profile.t --- a/tests/test-profile.t Mon Nov 05 22:58:19 2018 +0100 +++ b/tests/test-profile.t Thu Nov 15 20:20:31 2018 +0900 @@ -90,7 +90,7 @@ $ head -n 3 ../out % cumulative self time seconds seconds name - * sleepext.py:*:sleep (glob) + * sleepext.py:*:sleep (glob) $ cat ../out | statprofran $ hg --profile --config profiling.statformat=bymethod sleep 2>../out || cat ../out diff -r a182dc714afa -r 437520219e0c tests/test-wireproto-content-redirects.t --- a/tests/test-wireproto-content-redirects.t Mon Nov 05 22:58:19 2018 +0100 +++ b/tests/test-wireproto-content-redirects.t Thu Nov 15 20:20:31 2018 +0900 @@ -68,17 +68,20 @@ s> Content-Length: 2259\r\n s> \r\n s> \xa3GapibaseDapi/Dapis\xa1Pexp-http-v2-0003\xa5Hcommands\xacIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullMchangesetdata\xa2Dargs\xa2Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x84IbookmarksGparentsEphaseHrevisionIrevisions\xa2Hrequired\xf5DtypeDlistKpermissions\x81DpullHfiledata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x83HlinknodeGparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolEnodes\xa2Hrequired\xf5DtypeDlistDpath\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullIfilesdata\xa3Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x84NfirstchangesetHlinknodeGparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolJpathfilter\xa3Gdefault\xf6Hrequired\xf4DtypeDdictIrevisions\xa2Hrequired\xf5DtypeDlistKpermissions\x81DpullTrecommendedbatchsize\x19\xc3PEheads\xa2Dargs\xa1Jpubliconly\xa3Gdefault\xf4Hrequired\xf4DtypeDboolKpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\xa3Gdefault\x80Hrequired\xf4DtypeDlistKpermissions\x81DpullHlistkeys\xa2Dargs\xa1Inamespace\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullFlookup\xa2Dargs\xa1Ckey\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullLmanifestdata\xa3Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x82GparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolEnodes\xa2Hrequired\xf5DtypeDlistDtree\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullTrecommendedbatchsize\x1a\x00\x01\x86\xa0Gpushkey\xa2Dargs\xa4Ckey\xa2Hrequired\xf5DtypeEbytesInamespace\xa2Hrequired\xf5DtypeEbytesCnew\xa2Hrequired\xf5DtypeEbytesCold\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpushPrawstorefiledata\xa2Dargs\xa2Efiles\xa2Hrequired\xf5DtypeDlistJpathfilter\xa3Gdefault\xf6Hrequired\xf4DtypeDlistKpermissions\x81DpullQframingmediatypes\x81X&application/mercurial-exp-framing-0006Rpathfilterprefixes\xd9\x01\x02\x82Epath:Lrootfilesin:Nrawrepoformats\x82LgeneraldeltaHrevlogv1Hredirect\xa2Fhashes\x82Fsha256Dsha1Gtargets\x81\xa5DnameHtarget-aHprotocolDhttpKsnirequired\xf4Ktlsversions\x82C1.2C1.3Duris\x81Shttp://example.com/Nv1capabilitiesY\x01\xd3batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash - (remote redirect target target-a is compatible) + (remote redirect target target-a is compatible) (tls1.2 !) + (remote redirect target target-a requires unsupported TLS versions: 1.2, 1.3) (no-tls1.2 !) sending capabilities command s> POST /api/exp-http-v2-0003/ro/capabilities HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> accept: application/mercurial-exp-framing-0006\r\n s> content-type: application/mercurial-exp-framing-0006\r\n - s> content-length: 111\r\n + s> content-length: 111\r\n (tls1.2 !) + s> content-length: 102\r\n (no-tls1.2 !) s> host: $LOCALIP:$HGPORT\r\n (glob) s> user-agent: Mercurial debugwireproto\r\n s> \r\n - s> \x1c\x00\x00\x01\x00\x01\x01\x82\xa1Pcontentencodings\x81HidentityC\x00\x00\x01\x00\x01\x00\x11\xa2DnameLcapabilitiesHredirect\xa2Fhashes\x82Fsha256Dsha1Gtargets\x81Htarget-a + s> \x1c\x00\x00\x01\x00\x01\x01\x82\xa1Pcontentencodings\x81HidentityC\x00\x00\x01\x00\x01\x00\x11\xa2DnameLcapabilitiesHredirect\xa2Fhashes\x82Fsha256Dsha1Gtargets\x81Htarget-a (tls1.2 !) + s> \x1c\x00\x00\x01\x00\x01\x01\x82\xa1Pcontentencodings\x81Hidentity:\x00\x00\x01\x00\x01\x00\x11\xa2DnameLcapabilitiesHredirect\xa2Fhashes\x82Fsha256Dsha1Gtargets\x80 (no-tls1.2 !) s> makefile('rb', None) s> HTTP/1.1 200 OK\r\n s> Server: testing stub value\r\n