mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
856e8ab3ef
Summary: Re-implement the `findcommonheads` logic using `changelog` APIs that are going to have native support from Rust. This decouples from revlog-based Python DAG logic, namely `dagutil.revlogdag`, and `ancestor.incrementalmissingancestors`, unblocking Rust DAG progress, and cleans up the algorithm to not use revision numbers. The core algorithm is unchanged. The sampling logic is simplified and tweaked a bit (ex. no 'initial' / 'quick initial' special cases). The debug and progress messages are more verbose, and variable names are chosen to match the docstrings. I improved the doc a bit, and added some TODO notes about where I think can be improved. Reviewed By: sfilipco Differential Revision: D22519582 fbshipit-source-id: ac8cc8bebad91b4045d69f402e69b7ca28146414
91 lines
2.7 KiB
Perl
91 lines
2.7 KiB
Perl
$ . "$TESTDIR/library.sh"
|
|
$ setconfig devel.print-metrics=1
|
|
$ setconfig treemanifest.treeonly=False
|
|
|
|
$ hginit master
|
|
$ cd master
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> pushrebase=
|
|
> treemanifest=
|
|
> [remotefilelog]
|
|
> server=True
|
|
> [treemanifest]
|
|
> server=True
|
|
> EOF
|
|
$ mkcommit a
|
|
$ mkcommit b
|
|
$ hg debugmakepublic -r 'all()'
|
|
|
|
Clone it
|
|
$ cd ..
|
|
$ hgcloneshallow ssh://user@dummy/master client1 -q --config extensions.treemanifest= --config treemanifest.treeonly=True
|
|
fetching tree '' a539ce0c1a22b0ecf34498f9f5ce8ea56df9ecb7, found via d2ae7f538514
|
|
1 trees fetched over * (glob)
|
|
2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over * (glob) (?)
|
|
{ metrics : { ssh : { connections : 2,
|
|
getpack : { calls : 1, revs : 2},
|
|
gettreepack : { basemfnodes : 0,
|
|
calls : 1,
|
|
mfnodes : 1},
|
|
read : { bytes : 2404},
|
|
write : { bytes : 1003}}}}
|
|
$ cd client1
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> treemanifest=
|
|
>
|
|
> [treemanifest]
|
|
> treeonly=True
|
|
> sendtrees=True
|
|
> EOF
|
|
|
|
Add a few more public server comits
|
|
$ cd ../master
|
|
$ mkcommit c
|
|
$ cp -R . ../master-lagged
|
|
$ mkcommit d
|
|
$ mkcommit e
|
|
$ hg debugmakepublic -r 'all()'
|
|
|
|
Create an extension the prints out whenever we compare manifests on the server
|
|
$ cat > "$TESTTMP/diffdebug.py" << EOF
|
|
> from edenscm.mercurial import manifest
|
|
> class manifestdict(manifest.manifestdict):
|
|
> ui = None
|
|
> def diff(self, *args, **kwargs):
|
|
> if self.ui:
|
|
> self.ui.warn("*** manifestdict is comparing manifests\n")
|
|
> return super(manifestdict, self).diff(*args, **kwargs)
|
|
> def extsetup(ui):
|
|
> manifestdict.ui = ui
|
|
> manifest.manifestdict = manifestdict
|
|
> EOF
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> diffdebug=$TESTTMP/diffdebug.py
|
|
> EOF
|
|
|
|
Pull exactly up to d into the client
|
|
$ cd ../client1
|
|
$ hg pull -r 055a42cdd887
|
|
pulling from ssh://user@dummy/master
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 2 changesets with 0 changes to 0 files
|
|
{ metrics : { ssh : { connections : 1,
|
|
read : { bytes : 1124},
|
|
write : { bytes : 690}}}}
|
|
|
|
Test error message about MissingNodesError
|
|
$ drawdag --config paths.default=ssh://user@dummy/master-lagged --config remotefilelog.debug=0 --config devel.print-metrics=0 << 'EOS'
|
|
> x
|
|
> |
|
|
> tip
|
|
> EOS
|
|
abort: "unable to find the following nodes locally or on the server: ('', f064a7f8e3e138341587096641d86e9d23cd9778)"
|
|
(commit: 055a42cdd88768532f9cf79daa407fc8d138de9b)
|
|
|