This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6719

branchmap: refresh all "heads" of the branchmap subsets
AbandonedPublic

Authored by spectral on Aug 5 2019, 9:07 PM.

Details

Reviewers
durin42
marmoute
Group Reviewers
hg-reviewers
Summary

The comment about 'served' refreshing all the others only applies when served is
the head of the branchmap cache subsets. This was already no longer the case
(and is presumably why served.hidden was added) but the comment was not
adjusted. Currently, the "heads" of the branchmap cache subsets are the three
specified here: visible, visible-hidden, served.hidden.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

spectral created this revision.Aug 5 2019, 9:07 PM
spectral added a reviewer: marmoute.Aug 5 2019, 9:13 PM

Adding marmoute as explicit reviewer.

marmoute requested changes to this revision.Aug 8 2019, 12:47 PM

It seems like we are not warming enought cache with the new scheme.

mercurial/localrepo.py
2204

We are no longer warming served explicitly If served and served.hidden are different this will be an issue (since served is much more used than served.hidden.

I would also add a XXX to the comment about visible-hidden to encourage people to investigate. This said. The same apply, we would need to warm both visible and visible.hidden explciitly.

mercurial/utils/repoviewutil.py
28

Oops, it seems like visible-hidden and served.hidden has inconsistent naming. Feel free to fix that along the way.

This revision now requires changes to proceed.Aug 8 2019, 12:47 PM
spectral abandoned this revision.Apr 19 2021, 3:01 PM

I'm apparently not going to resolve the comments, sorry for leaving this open so long.

Revision Contents
Changeset List

Diff 16128

mercurial/localrepo.py

transaction, transaction,
txnutil, txnutil,
util, util,
vfs as vfsmod, vfs as vfsmod,
) )
from .utils import ( from .utils import (
interfaceutil, interfaceutil,
procutil, procutil,
repoviewutil,
stringutil, stringutil,
) )
from .revlogutils import ( from .revlogutils import (
constants as revlogconst, constants as revlogconst,
) )
release = lockmod.release release = lockmod.release
repo = reporef() repo = reporef()
repo.updatecaches(tr) repo.updatecaches(tr)
return updater return updater
@unfilteredmethod @unfilteredmethod
def updatecaches(self, tr=None, full=False): def updatecaches(self, tr=None, full=False):
"""warm appropriate caches """warm appropriate caches
If this function is called after a transaction closed. The transaction If this function is called after a transaction closed, the transaction
will be available in the 'tr' argument. This can be used to selectively will be available in the 'tr' argument. This can be used to selectively
update caches relevant to the changes in that transaction. update caches relevant to the changes in that transaction.
If 'full' is set, make sure all caches the function knows about have If 'full' is set, make sure all caches the function knows about have
up-to-date data. Even the ones usually loaded more lazily. up-to-date data. Even the ones usually loaded more lazily.
""" """
if tr is not None and tr.hookargs.get('source') == 'strip': if tr is not None and tr.hookargs.get('source') == 'strip':
# During strip, many caches are invalid but # During strip, many caches are invalid but
# later call to `destroyed` will refresh them. # later call to `destroyed` will refresh them.
return return
if tr is None or tr.changes['origrepolen'] < len(self): if tr is None or tr.changes['origrepolen'] < len(self):
# accessing the 'ser ved' branchmap should refresh all the others, # Updating all of the "heads" of the cache hierarchy should cause
# all others that are stale to be updated.
self.ui.debug('updating the branch cache\n') self.ui.debug('updating the branch cache\n')
self.filtered('served').branchmap() for filt in repoviewutil.subsettableheads:
self.filtered('served.hidden').branchmap() # Refreshing visible-hidden caused a lot of test failures, so
# we'll only do 'visible' for now.
if filt == 'visible-hidden':
filt = 'visible'
self.filtered(filt).branchmap()
marmouteUnsubmitted
Not Done

We are no longer warming served explicitly If served and served.hidden are different this will be an issue (since served is much more used than served.hidden.

I would also add a XXX to the comment about visible-hidden to encourage people to investigate. This said. The same apply, we would need to warm both visible and visible.hidden explciitly.

marmoute: We are no longer warming `served` explicitly If `served` and `served.hidden` are different this…
if full: if full:
unfi = self.unfiltered() unfi = self.unfiltered()
rbc = unfi.revbranchcache() rbc = unfi.revbranchcache()
for r in unfi.changelog: for r in unfi.changelog:
rbc.branchinfo(r) rbc.branchinfo(r)
rbc.write() rbc.write()

mercurial/utils/repoviewutil.py

# This create and ordering used for branchmap purpose. # This create and ordering used for branchmap purpose.
# the ordering may be partial # the ordering may be partial
subsettable = {None: 'visible', subsettable = {None: 'visible',
'visible-hidden': 'visible', 'visible-hidden': 'visible',
'visible': 'served', 'visible': 'served',
'served.hidden': 'served', 'served.hidden': 'served',
'served': 'immutable', 'served': 'immutable',
'immutable': 'base'} 'immutable': 'base'}
# List of "heads" from `subsettable`: filters that do not have any superset that
# would cause them to be populated, so they must be populated explicitly. This
# can be calculated from `subsettable` but `subsettable` is essentially
# constant, so we just hard-code it.
subsettableheads = frozenset({'visible-hidden', 'served.hidden'})
marmouteUnsubmitted
Not Done

Oops, it seems like visible-hidden and served.hidden has inconsistent naming. Feel free to fix that along the way.

marmoute: Oops, it seems like `visible-hidden` and `served.hidden` has inconsistent naming. Feel free to…

tests/test-blackbox.t

pulling from $TESTTMP/blackboxtest pulling from $TESTTMP/blackboxtest
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
new changesets d02f48003e62 new changesets d02f48003e62
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg blackbox -l 6 $ hg blackbox -l 8
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> pull 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> pull
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> updated served branch cache in * seconds (glob) 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> updated * branch cache in * seconds (glob)
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> wrote served branch cache with 1 labels and 2 nodes 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> wrote * branch cache with 1 labels and 2 nodes (glob)
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> updated * branch cache in * seconds (glob)
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> wrote * branch cache with 1 labels and 2 nodes (glob)
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> 1 incoming changes - new heads: d02f48003e62 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> 1 incoming changes - new heads: d02f48003e62
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> pull exited 0 after * seconds (glob) 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> pull exited 0 after * seconds (glob)
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> blackbox -l 6 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> blackbox -l 8
we must not cause a failure if we cannot write to the log we must not cause a failure if we cannot write to the log
$ hg rollback $ hg rollback
repository tip rolled back to revision 1 (undo pull) repository tip rolled back to revision 1 (undo pull)
$ mv .hg/blackbox.log .hg/blackbox.log- $ mv .hg/blackbox.log .hg/blackbox.log-
$ mkdir .hg/blackbox.log $ mkdir .hg/blackbox.log
files: foo files: foo
extra: branch=default extra: branch=default
description: description:
commit2 commit2
result: 0 result: 0
$ hg blackbox $ hg blackbox
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> updating the branch cache 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> wrote * branch cache with 1 labels and 1 nodes (glob)
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> updated served branch cache in * seconds (glob) 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> updated * branch cache in * seconds (glob)
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> wrote served branch cache with 1 labels and 1 nodes 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> wrote * branch cache with 1 labels and 1 nodes (glob)
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug commit -m commit2 -d 2000-01-02 foo exited 0 after *.?? seconds (glob) 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug commit -m commit2 -d 2000-01-02 foo exited 0 after *.?? seconds (glob)
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r 0 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r 0
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> writing .hg/cache/tags2-visible with 0 tags 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> writing .hg/cache/tags2-visible with 0 tags
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r 0 exited 0 after *.?? seconds (glob) 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r 0 exited 0 after *.?? seconds (glob)
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r tip 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r tip
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r tip exited 0 after *.?? seconds (glob) 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r tip exited 0 after *.?? seconds (glob)
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> blackbox 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> blackbox

tests/test-branch-change.t

new node id is de1404b45a69f8cc6437d7679033ee33e9efb4ba new node id is de1404b45a69f8cc6437d7679033ee33e9efb4ba
moving bookmarks ['b1'] from 7c19914648869f5b02fc7fed31ddee9783fdd680 to de1404b45a69f8cc6437d7679033ee33e9efb4ba moving bookmarks ['b1'] from 7c19914648869f5b02fc7fed31ddee9783fdd680 to de1404b45a69f8cc6437d7679033ee33e9efb4ba
resolving manifests resolving manifests
branchmerge: False, force: False, partial: False branchmerge: False, force: False, partial: False
ancestor: 7c1991464886, local: 7c1991464886+, remote: de1404b45a69 ancestor: 7c1991464886, local: 7c1991464886+, remote: de1404b45a69
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
changed branch on 2 changesets changed branch on 2 changesets
updating the branch cache updating the branch cache
invalid branchheads cache (served): tip differs invalid branchheads cache (*): tip differs (glob)
invalid branchheads cache (*): tip differs (glob)
$ hg glog -r '(.^)::' $ hg glog -r '(.^)::'
@ 9:de1404b45a69 Added e @ 9:de1404b45a69 Added e
| wat (b1) | wat (b1)
* 8:343660ccab74 Added d * 8:343660ccab74 Added d
| wat () | wat ()
~ ~

tests/test-branches.t

situation where the cache is out of sync and the hash check detects it situation where the cache is out of sync and the hash check detects it
$ hg --config extensions.strip= strip -r tip --nob $ hg --config extensions.strip= strip -r tip --nob
$ f --size .hg/cache/rbc-revs* $ f --size .hg/cache/rbc-revs*
.hg/cache/rbc-revs-v1: size=152 .hg/cache/rbc-revs-v1: size=152
cache is rebuilt when corruption is detected cache is rebuilt when corruption is detected
$ echo > .hg/cache/rbc-names-v1 $ echo > .hg/cache/rbc-names-v1
$ hg log -r '5:&branch(.)' -T '{rev} ' --debug $ hg log -r '5:&branch(.)' -T '{rev} ' --debug
invalid branchheads cache (visible): tip differs
referenced branch names not found - rebuilding revision branch cache from scratch referenced branch names not found - rebuilding revision branch cache from scratch
8 9 10 11 12 13 truncating cache/rbc-revs-v1 to 40 8 9 10 11 12 13 truncating cache/rbc-revs-v1 to 40
$ f --size --hexdump .hg/cache/rbc-* $ f --size --hexdump .hg/cache/rbc-*
.hg/cache/rbc-names-v1: size=84 .hg/cache/rbc-names-v1: size=84
0000: 62 00 61 00 63 00 61 20 62 72 61 6e 63 68 20 6e |b.a.c.a branch n| 0000: 62 00 61 00 63 00 61 20 62 72 61 6e 63 68 20 6e |b.a.c.a branch n|
0010: 61 6d 65 20 6d 75 63 68 20 6c 6f 6e 67 65 72 20 |ame much longer | 0010: 61 6d 65 20 6d 75 63 68 20 6c 6f 6e 67 65 72 20 |ame much longer |
0020: 74 68 61 6e 20 74 68 65 20 64 65 66 61 75 6c 74 |than the default| 0020: 74 68 61 6e 20 74 68 65 20 64 65 66 61 75 6c 74 |than the default|
0030: 20 6a 75 73 74 69 66 69 63 61 74 69 6f 6e 20 75 | justification u| 0030: 20 6a 75 73 74 69 66 69 63 61 74 69 6f 6e 20 75 | justification u|

tests/test-clone-uncompressed.t

1027 files to transfer, 96.3 KB of data 1027 files to transfer, 96.3 KB of data
transferred 96.3 KB in * seconds (*/sec) (glob) transferred 96.3 KB in * seconds (*/sec) (glob)
searching for changes searching for changes
no changes found no changes found
#endif #endif
#if stream-bundle2 #if stream-bundle2
$ hg clone --stream -U http://localhost:$HGPORT clone1 $ hg clone --stream -U http://localhost:$HGPORT clone1
streaming all changes streaming all changes
1030 files to transfer, 96.5 KB of data 1031 files to transfer, 96.6 KB of data
transferred 96.5 KB in * seconds (* */sec) (glob) transferred 96.6 KB in * seconds (* */sec) (glob)
$ ls -1 clone1/.hg/cache $ ls -1 clone1/.hg/cache
branch2-served branch2-served
branch2-visible
rbc-names-v1 rbc-names-v1
rbc-revs-v1 rbc-revs-v1
#endif #endif
getbundle requests with stream=1 are uncompressed getbundle requests with stream=1 are uncompressed
$ get-with-headers.py $LOCALIP:$HGPORT '?cmd=getbundle' content-type --bodyfile body --hgproto '0.1 0.2 comp=zlib,none' --requestheader "x-hgarg-1=bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=0000000000000000000000000000000000000000&heads=c17445101a72edac06facd130d14808dfbd5c7c2&stream=1" $ get-with-headers.py $LOCALIP:$HGPORT '?cmd=getbundle' content-type --bodyfile body --hgproto '0.1 0.2 comp=zlib,none' --requestheader "x-hgarg-1=bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=0000000000000000000000000000000000000000&heads=c17445101a72edac06facd130d14808dfbd5c7c2&stream=1"
200 Script output follows 200 Script output follows
content-type: application/mercurial-0.2 content-type: application/mercurial-0.2
$ f --size --hex --bytes 256 body $ f --size --hex --bytes 256 body
body: size=112262 body: size=112374
0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......| 0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
0010: 7f 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 |..STREAM2.......| 0010: 7f 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 |..STREAM2.......|
0020: 05 09 04 0c 44 62 79 74 65 63 6f 75 6e 74 39 38 |....Dbytecount98| 0020: 05 09 04 0c 44 62 79 74 65 63 6f 75 6e 74 39 38 |....Dbytecount98|
0030: 37 37 35 66 69 6c 65 63 6f 75 6e 74 31 30 33 30 |775filecount1030| 0030: 38 36 39 66 69 6c 65 63 6f 75 6e 74 31 30 33 31 |869filecount1031|
0040: 72 65 71 75 69 72 65 6d 65 6e 74 73 64 6f 74 65 |requirementsdote| 0040: 72 65 71 75 69 72 65 6d 65 6e 74 73 64 6f 74 65 |requirementsdote|
0050: 6e 63 6f 64 65 25 32 43 66 6e 63 61 63 68 65 25 |ncode%2Cfncache%| 0050: 6e 63 6f 64 65 25 32 43 66 6e 63 61 63 68 65 25 |ncode%2Cfncache%|
0060: 32 43 67 65 6e 65 72 61 6c 64 65 6c 74 61 25 32 |2Cgeneraldelta%2| 0060: 32 43 67 65 6e 65 72 61 6c 64 65 6c 74 61 25 32 |2Cgeneraldelta%2|
0070: 43 72 65 76 6c 6f 67 76 31 25 32 43 73 70 61 72 |Crevlogv1%2Cspar| 0070: 43 72 65 76 6c 6f 67 76 31 25 32 43 73 70 61 72 |Crevlogv1%2Cspar|
0080: 73 65 72 65 76 6c 6f 67 25 32 43 73 74 6f 72 65 |serevlog%2Cstore| 0080: 73 65 72 65 76 6c 6f 67 25 32 43 73 74 6f 72 65 |serevlog%2Cstore|
0090: 00 00 80 00 73 08 42 64 61 74 61 2f 30 2e 69 00 |....s.Bdata/0.i.| 0090: 00 00 80 00 73 08 42 64 61 74 61 2f 30 2e 69 00 |....s.Bdata/0.i.|
00a0: 03 00 01 00 00 00 00 00 00 00 02 00 00 00 01 00 |................| 00a0: 03 00 01 00 00 00 00 00 00 00 02 00 00 00 01 00 |................|
00b0: 00 00 00 00 00 00 01 ff ff ff ff ff ff ff ff 80 |................| 00b0: 00 00 00 00 00 00 01 ff ff ff ff ff ff ff ff 80 |................|
1027 files to transfer, 96.3 KB of data 1027 files to transfer, 96.3 KB of data
transferred 96.3 KB in * seconds (*/sec) (glob) transferred 96.3 KB in * seconds (*/sec) (glob)
searching for changes searching for changes
no changes found no changes found
#endif #endif
#if stream-bundle2 #if stream-bundle2
$ hg clone --uncompressed -U http://localhost:$HGPORT clone1-uncompressed $ hg clone --uncompressed -U http://localhost:$HGPORT clone1-uncompressed
streaming all changes streaming all changes
1030 files to transfer, 96.5 KB of data 1031 files to transfer, 96.6 KB of data
transferred 96.5 KB in * seconds (* */sec) (glob) transferred 96.6 KB in * seconds (* */sec) (glob)
#endif #endif
Clone with background file closing enabled Clone with background file closing enabled
#if stream-legacy #if stream-legacy
$ hg --debug --config worker.backgroundclose=true --config worker.backgroundcloseminfilecount=1 clone --stream -U http://localhost:$HGPORT clone-background | grep -v adding $ hg --debug --config worker.backgroundclose=true --config worker.backgroundcloseminfilecount=1 clone --stream -U http://localhost:$HGPORT clone-background | grep -v adding
using http://localhost:$HGPORT/ using http://localhost:$HGPORT/
sending capabilities command sending capabilities command
sending capabilities command sending capabilities command
query 1; heads query 1; heads
sending batch command sending batch command
streaming all changes streaming all changes
sending getbundle command sending getbundle command
bundle2-input-bundle: with-transaction bundle2-input-bundle: with-transaction
bundle2-input-part: "stream2" (params: 3 mandatory) supported bundle2-input-part: "stream2" (params: 3 mandatory) supported
applying stream bundle applying stream bundle
1030 files to transfer, 96.5 KB of data 1031 files to transfer, 96.6 KB of data
starting 4 threads for background file closing starting 4 threads for background file closing
starting 4 threads for background file closing starting 4 threads for background file closing
updating the branch cache updating the branch cache
transferred 96.5 KB in * seconds (* */sec) (glob) transferred 96.6 KB in * seconds (* */sec) (glob)
bundle2-input-part: total payload size 112094 bundle2-input-part: total payload size 112206
bundle2-input-part: "listkeys" (params: 1 mandatory) supported bundle2-input-part: "listkeys" (params: 1 mandatory) supported
bundle2-input-bundle: 1 parts total bundle2-input-bundle: 1 parts total
checking for updated bookmarks checking for updated bookmarks
(sent 3 HTTP requests and * bytes; received * bytes in responses) (glob) (sent 3 HTTP requests and * bytes; received * bytes in responses) (glob)
#endif #endif
Cannot stream clone when there are secret changesets Cannot stream clone when there are secret changesets
1027 files to transfer, 96.3 KB of data 1027 files to transfer, 96.3 KB of data
transferred 96.3 KB in * seconds (*/sec) (glob) transferred 96.3 KB in * seconds (*/sec) (glob)
searching for changes searching for changes
no changes found no changes found
#endif #endif
#if stream-bundle2 #if stream-bundle2
$ hg clone --stream -U http://localhost:$HGPORT secret-allowed $ hg clone --stream -U http://localhost:$HGPORT secret-allowed
streaming all changes streaming all changes
1030 files to transfer, 96.5 KB of data 1031 files to transfer, 96.6 KB of data
transferred 96.5 KB in * seconds (* */sec) (glob) transferred 96.6 KB in * seconds (* */sec) (glob)
#endif #endif
$ killdaemons.py $ killdaemons.py
Verify interaction between preferuncompressed and secret presence Verify interaction between preferuncompressed and secret presence
$ cd server $ cd server
$ hg serve --config server.preferuncompressed=true -p $HGPORT -d --pid-file=hg.pid $ hg serve --config server.preferuncompressed=true -p $HGPORT -d --pid-file=hg.pid

tests/test-clone.t

#endif #endif
Trigger branchcache creation: Trigger branchcache creation:
$ hg branches $ hg branches
default 10:a7949464abda default 10:a7949464abda
$ ls .hg/cache $ ls .hg/cache
branch2-served branch2-served
branch2-visible
rbc-names-v1 rbc-names-v1
rbc-revs-v1 rbc-revs-v1
Default operation: Default operation:
$ hg clone . ../b $ hg clone . ../b
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ../b $ cd ../b
Ensure branchcache got copied over: Ensure branchcache got copied over:
$ ls .hg/cache $ ls .hg/cache
branch2-served branch2-served
branch2-visible
rbc-names-v1 rbc-names-v1
rbc-revs-v1 rbc-revs-v1
$ cat a $ cat a
a a
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
copied 18 files (reposimplestore !) copied 18 files (reposimplestore !)
#endif #endif
$ cd ../c $ cd ../c
Ensure branchcache got copied over: Ensure branchcache got copied over:
$ ls .hg/cache $ ls .hg/cache
branch2-served branch2-served
branch2-visible
rbc-names-v1 rbc-names-v1
rbc-revs-v1 rbc-revs-v1
$ cat a 2>/dev/null || echo "a not present" $ cat a 2>/dev/null || echo "a not present"
a not present a not present
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests

tests/test-clonebundles.t

$ cat > server/.hg/clonebundles.manifest << EOF $ cat > server/.hg/clonebundles.manifest << EOF
> http://localhost:$HGPORT1/gz-a.hg BUNDLESPEC=gzip-v2 > http://localhost:$HGPORT1/gz-a.hg BUNDLESPEC=gzip-v2
> EOF > EOF
$ hg clone -U --stream http://localhost:$HGPORT uncompressed-gzip $ hg clone -U --stream http://localhost:$HGPORT uncompressed-gzip
no compatible clone bundles available on server; falling back to regular clone no compatible clone bundles available on server; falling back to regular clone
(you may want to report this to the server operator) (you may want to report this to the server operator)
streaming all changes streaming all changes
9 files to transfer, 816 bytes of data 10 files to transfer, 910 bytes of data
transferred 816 bytes in * seconds (*) (glob) transferred 910 bytes in * seconds (*) (glob)
A manifest with a stream clone but no BUNDLESPEC A manifest with a stream clone but no BUNDLESPEC
$ cat > server/.hg/clonebundles.manifest << EOF $ cat > server/.hg/clonebundles.manifest << EOF
> http://localhost:$HGPORT1/packed.hg > http://localhost:$HGPORT1/packed.hg
> EOF > EOF
$ hg clone -U --stream http://localhost:$HGPORT uncompressed-no-bundlespec $ hg clone -U --stream http://localhost:$HGPORT uncompressed-no-bundlespec
no compatible clone bundles available on server; falling back to regular clone no compatible clone bundles available on server; falling back to regular clone
(you may want to report this to the server operator) (you may want to report this to the server operator)
streaming all changes streaming all changes
9 files to transfer, 816 bytes of data 10 files to transfer, 910 bytes of data
transferred 816 bytes in * seconds (*) (glob) transferred 910 bytes in * seconds (*) (glob)
A manifest with a gzip bundle and a stream clone A manifest with a gzip bundle and a stream clone
$ cat > server/.hg/clonebundles.manifest << EOF $ cat > server/.hg/clonebundles.manifest << EOF
> http://localhost:$HGPORT1/gz-a.hg BUNDLESPEC=gzip-v2 > http://localhost:$HGPORT1/gz-a.hg BUNDLESPEC=gzip-v2
> http://localhost:$HGPORT1/packed.hg BUNDLESPEC=none-packed1 > http://localhost:$HGPORT1/packed.hg BUNDLESPEC=none-packed1
> EOF > EOF
> http://localhost:$HGPORT1/gz-a.hg BUNDLESPEC=gzip-v2 > http://localhost:$HGPORT1/gz-a.hg BUNDLESPEC=gzip-v2
> http://localhost:$HGPORT1/packed.hg BUNDLESPEC=none-packed1;requirements%3Drevlogv42 > http://localhost:$HGPORT1/packed.hg BUNDLESPEC=none-packed1;requirements%3Drevlogv42
> EOF > EOF
$ hg clone -U --stream http://localhost:$HGPORT uncompressed-gzip-packed-unsupported-requirements $ hg clone -U --stream http://localhost:$HGPORT uncompressed-gzip-packed-unsupported-requirements
no compatible clone bundles available on server; falling back to regular clone no compatible clone bundles available on server; falling back to regular clone
(you may want to report this to the server operator) (you may want to report this to the server operator)
streaming all changes streaming all changes
9 files to transfer, 816 bytes of data 10 files to transfer, 910 bytes of data
transferred 816 bytes in * seconds (*) (glob) transferred 910 bytes in * seconds (*) (glob)
Test clone bundle retrieved through bundle2 Test clone bundle retrieved through bundle2
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [extensions] > [extensions]
> largefiles= > largefiles=
> EOF > EOF
$ killdaemons.py $ killdaemons.py

tests/test-fncache.t

$ hg ci -Amfoo $ hg ci -Amfoo
adding tst.d/foo adding tst.d/foo
$ find .hg | sort $ find .hg | sort
.hg .hg
.hg/00changelog.i .hg/00changelog.i
.hg/00manifest.i .hg/00manifest.i
.hg/cache .hg/cache
.hg/cache/branch2-served .hg/cache/branch2-served
.hg/cache/branch2-visible
.hg/cache/rbc-names-v1 .hg/cache/rbc-names-v1
.hg/cache/rbc-revs-v1 .hg/cache/rbc-revs-v1
.hg/data .hg/data
.hg/data/tst.d.hg .hg/data/tst.d.hg
.hg/data/tst.d.hg/foo.i .hg/data/tst.d.hg/foo.i
.hg/dirstate .hg/dirstate
.hg/fsmonitor.state (fsmonitor !) .hg/fsmonitor.state (fsmonitor !)
.hg/last-message.txt .hg/last-message.txt
$ echo foo > tst.d/Foo $ echo foo > tst.d/Foo
$ hg ci -Amfoo $ hg ci -Amfoo
adding tst.d/Foo adding tst.d/Foo
$ find .hg | sort $ find .hg | sort
.hg .hg
.hg/00changelog.i .hg/00changelog.i
.hg/cache .hg/cache
.hg/cache/branch2-served .hg/cache/branch2-served
.hg/cache/branch2-visible
.hg/cache/rbc-names-v1 .hg/cache/rbc-names-v1
.hg/cache/rbc-revs-v1 .hg/cache/rbc-revs-v1
.hg/dirstate .hg/dirstate
.hg/fsmonitor.state (fsmonitor !) .hg/fsmonitor.state (fsmonitor !)
.hg/last-message.txt .hg/last-message.txt
.hg/requires .hg/requires
.hg/store .hg/store
.hg/store/00changelog.i .hg/store/00changelog.i

tests/test-hardlinks.t

r4 has hardlinks in the working dir (not just inside .hg): r4 has hardlinks in the working dir (not just inside .hg):
$ nlinksdir r4 $ nlinksdir r4
2 r4/.hg/00changelog.i 2 r4/.hg/00changelog.i
2 r4/.hg/branch 2 r4/.hg/branch
2 r4/.hg/cache/branch2-base 2 r4/.hg/cache/branch2-base
2 r4/.hg/cache/branch2-served 2 r4/.hg/cache/branch2-served
2 r4/.hg/cache/branch2-visible
2 r4/.hg/cache/rbc-names-v1 2 r4/.hg/cache/rbc-names-v1
2 r4/.hg/cache/rbc-revs-v1 2 r4/.hg/cache/rbc-revs-v1
2 r4/.hg/dirstate 2 r4/.hg/dirstate
2 r4/.hg/fsmonitor.state (fsmonitor !) 2 r4/.hg/fsmonitor.state (fsmonitor !)
2 r4/.hg/hgrc 2 r4/.hg/hgrc
2 r4/.hg/last-message.txt 2 r4/.hg/last-message.txt
2 r4/.hg/requires 2 r4/.hg/requires
2 r4/.hg/store/00changelog.i 2 r4/.hg/store/00changelog.i
2 files updated, 0 files merged, 0 files removed, 0 files unresolved (execbit !) 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (execbit !)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-execbit !) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-execbit !)
$ nlinksdir r4 $ nlinksdir r4
2 r4/.hg/00changelog.i 2 r4/.hg/00changelog.i
1 r4/.hg/branch 1 r4/.hg/branch
2 r4/.hg/cache/branch2-base 2 r4/.hg/cache/branch2-base
2 r4/.hg/cache/branch2-served 2 r4/.hg/cache/branch2-served
2 r4/.hg/cache/branch2-visible
2 r4/.hg/cache/rbc-names-v1 2 r4/.hg/cache/rbc-names-v1
2 r4/.hg/cache/rbc-revs-v1 2 r4/.hg/cache/rbc-revs-v1
1 r4/.hg/dirstate 1 r4/.hg/dirstate
1 r4/.hg/fsmonitor.state (fsmonitor !) 1 r4/.hg/fsmonitor.state (fsmonitor !)
2 r4/.hg/hgrc 2 r4/.hg/hgrc
2 r4/.hg/last-message.txt 2 r4/.hg/last-message.txt
2 r4/.hg/requires 2 r4/.hg/requires
2 r4/.hg/store/00changelog.i 2 r4/.hg/store/00changelog.i

tests/test-histedit-drop.t

user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: a summary: a
Check histedit_source Check histedit_source
$ hg log --debug --rev f518305ce889 $ hg log --debug --rev f518305ce889
invalid branchheads cache (visible): tip differs
changeset: 4:f518305ce889c07cb5bd05522176d75590ef3324 changeset: 4:f518305ce889c07cb5bd05522176d75590ef3324
tag: tip tag: tip
phase: draft phase: draft
parent: 3:a4f7421b80f79fcc59fff01bcbf4a53d127dd6d3 parent: 3:a4f7421b80f79fcc59fff01bcbf4a53d127dd6d3
parent: -1:0000000000000000000000000000000000000000 parent: -1:0000000000000000000000000000000000000000
manifest: 4:d3d4f51c157ff242c32ff745d4799aaa26ccda44 manifest: 4:d3d4f51c157ff242c32ff745d4799aaa26ccda44
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000

tests/test-http-proxy.t

$ tinyproxy.py $HGPORT1 localhost 2>proxy.log >/dev/null </dev/null & $ tinyproxy.py $HGPORT1 localhost 2>proxy.log >/dev/null </dev/null &
$ while [ ! -f proxy.pid ]; do sleep 0; done $ while [ ! -f proxy.pid ]; do sleep 0; done
$ cat proxy.pid >> $DAEMON_PIDS $ cat proxy.pid >> $DAEMON_PIDS
url for proxy, stream url for proxy, stream
$ http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone --stream http://localhost:$HGPORT/ b $ http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone --stream http://localhost:$HGPORT/ b
streaming all changes streaming all changes
6 files to transfer, 412 bytes of data (reporevlogstore !) 7 files to transfer, 506 bytes of data (reporevlogstore !)
4 files to transfer, 330 bytes of data (reposimplestore !) 4 files to transfer, 330 bytes of data (reposimplestore !)
transferred * bytes in * seconds (*/sec) (glob) transferred * bytes in * seconds (*/sec) (glob)
updating to branch default updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd b $ cd b
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests

tests/test-http.t

$ cd .. $ cd ..
$ cat hg1.pid hg2.pid >> $DAEMON_PIDS $ cat hg1.pid hg2.pid >> $DAEMON_PIDS
clone via stream clone via stream
#if no-reposimplestore #if no-reposimplestore
$ hg clone --stream http://localhost:$HGPORT/ copy 2>&1 $ hg clone --stream http://localhost:$HGPORT/ copy 2>&1
streaming all changes streaming all changes
9 files to transfer, 715 bytes of data 10 files to transfer, 809 bytes of data
transferred * bytes in * seconds (*/sec) (glob) transferred * bytes in * seconds (*/sec) (glob)
updating to branch default updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg verify -R copy $ hg verify -R copy
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
> EOF > EOF
$ hg id http://localhost:$HGPORT2/ --config extensions.x=use_digests.py $ hg id http://localhost:$HGPORT2/ --config extensions.x=use_digests.py
5fed3813f7f5 5fed3813f7f5
#if no-reposimplestore #if no-reposimplestore
$ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1 $ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1
streaming all changes streaming all changes
10 files to transfer, 1.01 KB of data 11 files to transfer, 1.10 KB of data
transferred * KB in * seconds (*/sec) (glob) transferred * KB in * seconds (*/sec) (glob)
updating to branch default updating to branch default
5 files updated, 0 files merged, 0 files removed, 0 files unresolved 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
#endif #endif
--pull should override server's preferuncompressed --pull should override server's preferuncompressed
$ hg clone --pull http://user:pass@localhost:$HGPORT2/ dest-pull 2>&1 $ hg clone --pull http://user:pass@localhost:$HGPORT2/ dest-pull 2>&1
requesting all changes requesting all changes

tests/test-inherit-mode.t

(in particular, store/**, dirstate, branch cache file, undo files) (in particular, store/**, dirstate, branch cache file, undo files)
new directories are setgid new directories are setgid
$ "$PYTHON" ../printmodes.py . $ "$PYTHON" ../printmodes.py .
00700 ./.hg/ 00700 ./.hg/
00600 ./.hg/00changelog.i 00600 ./.hg/00changelog.i
00770 ./.hg/cache/ 00770 ./.hg/cache/
00660 ./.hg/cache/branch2-served 00660 ./.hg/cache/branch2-served
00660 ./.hg/cache/branch2-visible
00660 ./.hg/cache/rbc-names-v1 00660 ./.hg/cache/rbc-names-v1
00660 ./.hg/cache/rbc-revs-v1 00660 ./.hg/cache/rbc-revs-v1
00660 ./.hg/dirstate 00660 ./.hg/dirstate
00660 ./.hg/fsmonitor.state (fsmonitor !) 00660 ./.hg/fsmonitor.state (fsmonitor !)
00660 ./.hg/last-message.txt 00660 ./.hg/last-message.txt
00600 ./.hg/requires 00600 ./.hg/requires
00770 ./.hg/store/ 00770 ./.hg/store/
00660 ./.hg/store/00changelog.i 00660 ./.hg/store/00changelog.i

tests/test-keyword.t

$ hg cp a c $ hg cp a c
$ hg kwfiles $ hg kwfiles
a a
c c
Commit and show expansion in original and copy Commit and show expansion in original and copy
$ hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>' $ hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>'
invalid branchheads cache (visible): tip differs
committing files: committing files:
c c
c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
committing manifest committing manifest
committing changelog committing changelog
overwriting c expanding keywords overwriting c expanding keywords
updating the branch cache updating the branch cache
committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d
$ hg status $ hg status
M a M a
? c ? c
? log ? log
Commit with multi-line message and custom expansion Commit with multi-line message and custom expansion
$ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>' $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>'
invalid branchheads cache (visible): tip differs
committing files: committing files:
a a
committing manifest committing manifest
committing changelog committing changelog
overwriting a expanding keywords overwriting a expanding keywords
updating the branch cache updating the branch cache
committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83
$ rm log $ rm log
kwexpand x/a should abort kwexpand x/a should abort
$ hg --verbose kwexpand x/a $ hg --verbose kwexpand x/a
abort: outstanding uncommitted changes abort: outstanding uncommitted changes
[255] [255]
$ cd x $ cd x
$ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>' $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>'
invalid branchheads cache (visible): tip differs
committing files: committing files:
x/a x/a
x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
committing manifest committing manifest
committing changelog committing changelog
overwriting x/a expanding keywords overwriting x/a expanding keywords
updating the branch cache updating the branch cache
committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4

tests/test-merge-no-file-change.t

$ hg ci -qm2 $ hg ci -qm2
$ echo foo > a $ echo foo > a
$ hg ci -qm3 --amend $ hg ci -qm3 --amend
$ hg merge $ hg merge
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci --debug -m merge $ hg ci --debug -m merge
invalid branchheads cache (visible): tip differs
reusing manifest from p1 (no file change) reusing manifest from p1 (no file change)
committing changelog committing changelog
updating the branch cache updating the branch cache
committed changeset 3:314e5bc5adf5c58ea571efabe33eedba20a201aa committed changeset 3:314e5bc5adf5c58ea571efabe33eedba20a201aa
$ hg log -GT'{l} branch={branch}' $ hg log -GT'{l} branch={branch}'
@ 3:314e5bc5adf5 p=2,1 m=1:d33ea248bd73 f=[] branch=default @ 3:314e5bc5adf5 p=2,1 m=1:d33ea248bd73 f=[] branch=default
|\ |\
| o 2:de9c64f226a3 p=0,-1 m=1:d33ea248bd73 f=["a"] branch=default | o 2:de9c64f226a3 p=0,-1 m=1:d33ea248bd73 f=["a"] branch=default
| | | |
o | 1:6a74aec01b3c p=0,-1 m=1:d33ea248bd73 f=["a"] branch=default o | 1:6a74aec01b3c p=0,-1 m=1:d33ea248bd73 f=["a"] branch=default
|/ |/
o 0:487a0a245cea p=-1,-1 m=0:8515d4bfda76 f=["a"] branch=default o 0:487a0a245cea p=-1,-1 m=0:8515d4bfda76 f=["a"] branch=default
$ cd .. $ cd ..
$ check_convert_identity amend-p1 $ check_convert_identity amend-p1

tests/test-newbranch.t

parent: 1:6c0e42da283a parent: 1:6c0e42da283a
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: modify a branch summary: modify a branch
$ cp .hg/bc-invalid $branchcache $ cp .hg/bc-invalid $branchcache
$ hg --debug log -r foo $ hg --debug log -r foo
invalid branchheads cache (visible): tip differs
changeset: 4:adf1a74a7f7b4cd193d12992f5d0d6a004ed21d6 changeset: 4:adf1a74a7f7b4cd193d12992f5d0d6a004ed21d6
branch: foo branch: foo
tag: tip tag: tip
phase: draft phase: draft
parent: 1:6c0e42da283a56b5edc5b4fadb491365ec7f5fa8 parent: 1:6c0e42da283a56b5edc5b4fadb491365ec7f5fa8
parent: -1:0000000000000000000000000000000000000000 parent: -1:0000000000000000000000000000000000000000
manifest: 1:8c342a37dfba0b3d3ce073562a00d8a813c54ffe manifest: 1:8c342a37dfba0b3d3ce073562a00d8a813c54ffe
user: test user: test

tests/test-phases.t

:note: The "(+1 heads)" is wrong as we do not had any visible head :note: The "(+1 heads)" is wrong as we do not had any visible head
check that branch cache with "served" filter are properly computed and stored check that branch cache with "served" filter are properly computed and stored
$ ls ../push-dest/.hg/cache/branch2* $ ls ../push-dest/.hg/cache/branch2*
../push-dest/.hg/cache/branch2-base ../push-dest/.hg/cache/branch2-base
../push-dest/.hg/cache/branch2-served ../push-dest/.hg/cache/branch2-served
../push-dest/.hg/cache/branch2-visible
$ cat ../push-dest/.hg/cache/branch2-served $ cat ../push-dest/.hg/cache/branch2-served
6d6770faffce199f1fddd1cf87f6f026138cf061 6 465891ffab3c47a3c23792f7dc84156e19a90722 6d6770faffce199f1fddd1cf87f6f026138cf061 6 465891ffab3c47a3c23792f7dc84156e19a90722
b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default
6d6770faffce199f1fddd1cf87f6f026138cf061 o default 6d6770faffce199f1fddd1cf87f6f026138cf061 o default
$ hg heads -R ../push-dest --template '{rev}:{node} {phase}\n' #update visible cache too $ hg heads -R ../push-dest --template '{rev}:{node} {phase}\n' #update visible cache too
6:6d6770faffce199f1fddd1cf87f6f026138cf061 draft 6:6d6770faffce199f1fddd1cf87f6f026138cf061 draft
5:2713879da13d6eea1ff22b442a5a87cb31a7ce6a secret 5:2713879da13d6eea1ff22b442a5a87cb31a7ce6a secret
3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e draft 3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e draft

tests/test-rebase-conflicts.t

bundle2-input-part: total payload size 1686 bundle2-input-part: total payload size 1686
bundle2-input-part: "cache:rev-branch-cache" (advisory) supported bundle2-input-part: "cache:rev-branch-cache" (advisory) supported
bundle2-input-part: total payload size 74 bundle2-input-part: total payload size 74
truncating cache/rbc-revs-v1 to 56 truncating cache/rbc-revs-v1 to 56
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 2 parts total bundle2-input-bundle: 2 parts total
updating the branch cache updating the branch cache
invalid branchheads cache (served): tip differs invalid branchheads cache (*): tip differs (glob)
invalid branchheads cache (served.hidden): tip differs invalid branchheads cache (*): tip differs (glob)
invalid branchheads cache (*): tip differs (glob)
rebase completed rebase completed
Test minimization of merge conflicts Test minimization of merge conflicts
$ hg up -q null $ hg up -q null
$ echo a > a $ echo a > a
$ hg add a $ hg add a
$ hg commit -q -m 'a' $ hg commit -q -m 'a'
$ echo b >> a $ echo b >> a

tests/test-share.t

[1] [1]
$ ls -1 .hg/wcache || true $ ls -1 .hg/wcache || true
checkisexec (execbit !) checkisexec (execbit !)
checklink (symlink !) checklink (symlink !)
checklink-target (symlink !) checklink-target (symlink !)
manifestfulltextcache (reporevlogstore !) manifestfulltextcache (reporevlogstore !)
$ ls -1 ../repo1/.hg/cache $ ls -1 ../repo1/.hg/cache
branch2-served branch2-served
branch2-visible
rbc-names-v1 rbc-names-v1
rbc-revs-v1 rbc-revs-v1
tags2-visible tags2-visible
Some sed versions appends newline, some don't, and some just fails Some sed versions appends newline, some don't, and some just fails
$ cat .hg/sharedpath; echo $ cat .hg/sharedpath; echo
$TESTTMP/repo1/.hg $TESTTMP/repo1/.hg

tests/test-ssh.t

[255] [255]
clone remote via stream clone remote via stream
#if no-reposimplestore #if no-reposimplestore
$ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream ssh://user@dummy/remote local-stream $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream ssh://user@dummy/remote local-stream
streaming all changes streaming all changes
8 files to transfer, 827 bytes of data 9 files to transfer, 971 bytes of data
transferred 827 bytes in * seconds (*) (glob) transferred 971 bytes in * seconds (*) (glob)
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd local-stream $ cd local-stream
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 3 changesets with 2 changes to 2 files checked 3 changesets with 2 changes to 2 files
$ hg branches $ hg branches
default 0:1160648e36ce default 0:1160648e36ce
$ cd $TESTTMP $ cd $TESTTMP
clone bookmarks via stream clone bookmarks via stream
$ hg -R local-stream book mybook $ hg -R local-stream book mybook
$ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream ssh://user@dummy/local-stream stream2 $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream ssh://user@dummy/local-stream stream2
streaming all changes streaming all changes
9 files to transfer, 870 bytes of data 10 files to transfer, 1014 bytes of data
transferred 870 bytes in * seconds (*) (glob) transferred 1014 bytes in * seconds (*) (glob)
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd stream2 $ cd stream2
$ hg book $ hg book
mybook 0:1160648e36ce mybook 0:1160648e36ce
$ cd $TESTTMP $ cd $TESTTMP
$ rm -rf local-stream stream2 $ rm -rf local-stream stream2

tests/test-strip.t

6625a516847449b6f0fa3737b9ba56e9f0f3032c 6625a516847449b6f0fa3737b9ba56e9f0f3032c
d8db9d1372214336d2b5570f20ee468d2c72fa8b d8db9d1372214336d2b5570f20ee468d2c72fa8b
bundle2-output-bundle: "HG20", (1 params) 3 parts total bundle2-output-bundle: "HG20", (1 params) 3 parts total
bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload
bundle2-output-part: "phase-heads" 24 bytes payload bundle2-output-part: "phase-heads" 24 bytes payload
saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg
updating the branch cache updating the branch cache
invalid branchheads cache (served): tip differs invalid branchheads cache (*): tip differs (glob)
invalid branchheads cache (*): tip differs (glob)
$ hg log -G $ hg log -G
o changeset: 2:5c51d8d6557d o changeset: 2:5c51d8d6557d
| tag: tip | tag: tip
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: commitC | summary: commitC
| |
@ changeset: 1:eca11cf91c71 @ changeset: 1:eca11cf91c71

tests/test-treemanifest.t

crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 4 changesets with 18 changes to 8 files checked 4 changesets with 18 changes to 8 files
Stream clone with fncachestore Stream clone with fncachestore
$ hg clone --config experimental.changegroup3=True --stream -U \ $ hg clone --config experimental.changegroup3=True --stream -U \
> http://localhost:$HGPORT stream-clone-fncachestore > http://localhost:$HGPORT stream-clone-fncachestore
streaming all changes streaming all changes
22 files to transfer, * of data (glob) 23 files to transfer, * of data (glob)
transferred * in * seconds (*) (glob) transferred * in * seconds (*) (glob)
$ hg -R stream-clone-fncachestore verify $ hg -R stream-clone-fncachestore verify
checking changesets checking changesets
checking manifests checking manifests
checking directory manifests checking directory manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 4 changesets with 18 changes to 8 files checked 4 changesets with 18 changes to 8 files