mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +03:00
98d9269874
Summary: Create a fork of the Mercurial code that we can use to build server rpms. The hg servers will continue to exist for a few more months while we move the darkstorm and ediscovery use cases off them. In the mean time, we want to start making breaking changes to the client, so let's create a stable copy of the hg code to produce rpms for the hg servers. The fork is based off c7770c78d, the latest hg release. This copies the files as is, then adds some minor tweaks to get it to build: - Disables some lint checks that appear to be bypassed by path - sed replace eden/scm with eden/hg-server - Removed a dependency on scm/telemetry from the edenfs-client tests since scm/telemetry pulls in the original eden/scm/lib/configparser which conflicts with the hg-server conflict parser. allow-large-files Reviewed By: quark-zju Differential Revision: D27632557 fbshipit-source-id: b2f442f4ec000ea08e4d62de068750832198e1f4
70 lines
1.6 KiB
Perl
70 lines
1.6 KiB
Perl
#chg-compatible
|
|
|
|
$ disable treemanifest
|
|
|
|
$ cat > echo.py <<EOF
|
|
> #!$PYTHON
|
|
> from __future__ import absolute_import, print_function
|
|
> import os
|
|
> import sys
|
|
> try:
|
|
> import msvcrt
|
|
> msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
|
|
> msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
|
|
> except ImportError:
|
|
> pass
|
|
>
|
|
> for k in ('HG_FILE', 'HG_MY_ISLINK', 'HG_OTHER_ISLINK', 'HG_BASE_ISLINK'):
|
|
> print(k, os.environ[k])
|
|
> EOF
|
|
|
|
Create 2 heads containing the same file, once as
|
|
a file, once as a link. Bundle was generated with:
|
|
|
|
# hg init t
|
|
# cd t
|
|
# echo a > a
|
|
# hg ci -qAm t0 -d '0 0'
|
|
# echo l > l
|
|
# hg ci -qAm t1 -d '1 0'
|
|
# hg up -C 0
|
|
# ln -s a l
|
|
# hg ci -qAm t2 -d '2 0'
|
|
# echo l2 > l2
|
|
# hg ci -qAm t3 -d '3 0'
|
|
|
|
$ hg init t
|
|
$ cd t
|
|
$ hg -q pull "$TESTDIR/bundles/test-merge-symlinks.hg"
|
|
$ hg up -C 'desc(t3)'
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
Merge them and display *_ISLINK vars
|
|
merge heads
|
|
|
|
$ hg merge --tool="$PYTHON ../echo.py"
|
|
merging l
|
|
HG_FILE l
|
|
HG_MY_ISLINK 1
|
|
HG_OTHER_ISLINK 0
|
|
HG_BASE_ISLINK 0
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
Test working directory symlink bit calculation wrt copies,
|
|
especially on non-supporting systems.
|
|
merge working directory
|
|
|
|
$ hg up -C 'desc(t2)'
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ hg copy l l2
|
|
$ HGMERGE="$PYTHON ../echo.py" hg up 'desc(t3)'
|
|
merging l2
|
|
HG_FILE l2
|
|
HG_MY_ISLINK 1
|
|
HG_OTHER_ISLINK 0
|
|
HG_BASE_ISLINK 0
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ cd ..
|