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
220 lines
5.7 KiB
Perl
220 lines
5.7 KiB
Perl
#chg-compatible
|
|
|
|
Race detector will complain about this test.
|
|
|
|
$ setconfig fsmonitor.detectrace=0
|
|
|
|
$ hg init repo
|
|
$ cd repo
|
|
$ echo a > a
|
|
$ hg add a
|
|
$ hg commit -m test
|
|
|
|
Do we ever miss a sub-second change?:
|
|
|
|
$ for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
|
|
> hg co -qC 0
|
|
> echo b > a
|
|
> hg st
|
|
> done
|
|
M a
|
|
M a
|
|
M a
|
|
M a
|
|
M a
|
|
M a
|
|
M a
|
|
M a
|
|
M a
|
|
M a
|
|
M a
|
|
M a
|
|
M a
|
|
M a
|
|
M a
|
|
M a
|
|
M a
|
|
M a
|
|
M a
|
|
M a
|
|
|
|
$ echo test > b
|
|
$ mkdir dir1
|
|
$ echo test > dir1/c
|
|
$ echo test > d
|
|
|
|
$ echo test > e
|
|
#if execbit
|
|
A directory will typically have the execute bit -- make sure it doesn't get
|
|
confused with a file with the exec bit set
|
|
$ chmod +x e
|
|
#endif
|
|
|
|
$ hg add b dir1 d e
|
|
adding dir1/c
|
|
$ hg commit -m test2
|
|
|
|
$ cat >> $TESTTMP/dirstaterace.py << EOF
|
|
> from edenscm.mercurial import (
|
|
> extensions,
|
|
> filesystem,
|
|
> )
|
|
> from edenscm.hgext import fsmonitor
|
|
> def extsetup():
|
|
> extensions.wrapfunction(filesystem.physicalfilesystem, '_postpendingfixup', overridepostpending)
|
|
> extensions.wrapfunction(fsmonitor.fsmonitorfilesystem, '_fspostpendingfixup', overridepostpending)
|
|
> def overridepostpending(orig, self, *args):
|
|
> # make an update that changes the dirstate from underneath
|
|
> self.dirstate._repo.ui.system(r"sh '$TESTTMP/dirstaterace.sh'",
|
|
> cwd=self.dirstate._repo.root)
|
|
> return orig(self, *args)
|
|
> EOF
|
|
|
|
$ hg debugrebuilddirstate
|
|
$ hg debugdirstate
|
|
n 0 -1 unset a
|
|
n 0 -1 unset b
|
|
n 0 -1 unset d
|
|
n 0 -1 unset dir1/c
|
|
n 0 -1 unset e
|
|
|
|
Test deleting some files after lookup but before being marked clean. Verify
|
|
they remain lookup/unset afterwards.
|
|
|
|
$ cat > $TESTTMP/dirstaterace.sh <<EOF
|
|
> rm b && rm -r dir1 && rm d && mkdir d && rm e && mkdir e
|
|
> EOF
|
|
|
|
$ hg status --traceback --config extensions.dirstaterace=$TESTTMP/dirstaterace.py
|
|
$ hg status
|
|
! b
|
|
! d
|
|
! dir1/c
|
|
! e
|
|
|
|
$ hg debugdirstate
|
|
n 644 2 * a (glob)
|
|
n 0 -1 unset b
|
|
n 0 -1 unset d
|
|
n 0 -1 unset dir1/c
|
|
n 0 -1 unset e
|
|
|
|
$ hg status
|
|
! b
|
|
! d
|
|
! dir1/c
|
|
! e
|
|
|
|
$ rmdir d e
|
|
$ hg update -C -q .
|
|
|
|
Test that dirstate changes aren't written out at the end of "hg
|
|
status", if .hg/dirstate is already changed simultaneously before
|
|
acquisition of wlock in workingctx._poststatusfixup().
|
|
|
|
This avoidance is important to keep consistency of dirstate in race
|
|
condition (see issue5584 for detail).
|
|
|
|
$ hg parents -q
|
|
* (glob)
|
|
|
|
$ hg debugrebuilddirstate
|
|
$ hg debugdirstate
|
|
n 0 -1 unset a
|
|
n 0 -1 unset b
|
|
n 0 -1 unset d
|
|
n 0 -1 unset dir1/c
|
|
n 0 -1 unset e
|
|
|
|
$ cat > $TESTTMP/dirstaterace.sh <<EOF
|
|
> # This script assumes timetable of typical issue5584 case below:
|
|
> #
|
|
> # 1. "hg status" loads .hg/dirstate
|
|
> # 2. "hg status" confirms clean-ness of FILE
|
|
> # 3. "hg update -C 0" updates the working directory simultaneously
|
|
> # (FILE is removed, and FILE is dropped from .hg/dirstate)
|
|
> # 4. "hg status" acquires wlock
|
|
> # (.hg/dirstate is re-loaded = no FILE entry in dirstate)
|
|
> # 5. "hg status" marks FILE in dirstate as clean
|
|
> # (FILE entry is added to in-memory dirstate)
|
|
> # 6. "hg status" writes dirstate changes into .hg/dirstate
|
|
> # (FILE entry is written into .hg/dirstate)
|
|
> #
|
|
> # To reproduce similar situation easily and certainly, #2 and #3
|
|
> # are swapped. "hg cat" below ensures #2 on "hg status" side.
|
|
>
|
|
> hg update -q -C 0
|
|
> hg cat -r 1 b > b
|
|
> EOF
|
|
|
|
"hg status" below should excludes "e", of which exec flag is set, for
|
|
portability of test scenario, because unsure but missing "e" is
|
|
treated differently in _checklookup() according to runtime platform.
|
|
|
|
- "missing(!)" on POSIX, "pctx[f].cmp(self[f])" raises ENOENT
|
|
- "modified(M)" on Windows, "self.flags(f) != pctx.flags(f)" is True
|
|
|
|
#if fsmonitor
|
|
$ hg status --config extensions.dirstaterace=$TESTTMP/dirstaterace.py --debug -X path:e
|
|
skip updating dirstate: identity mismatch
|
|
#else
|
|
$ hg status --config extensions.dirstaterace=$TESTTMP/dirstaterace.py --debug -X path:e
|
|
skip marking lookups clean: identity mismatch
|
|
#endif
|
|
|
|
$ hg status --debug -X path:e
|
|
? b
|
|
|
|
$ hg parents -q
|
|
* (glob)
|
|
$ hg files
|
|
a
|
|
$ hg debugdirstate
|
|
n * * * a (glob)
|
|
|
|
$ rm b
|
|
|
|
Set up a rebase situation for issue5581.
|
|
|
|
$ echo c2 > a
|
|
$ echo c2 > b
|
|
$ hg add b
|
|
$ hg commit -m c2
|
|
$ echo c3 >> a
|
|
$ hg commit -m c3
|
|
$ hg update 'desc(c2)'
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo c4 >> a
|
|
$ echo c4 >> b
|
|
$ hg commit -m c4
|
|
|
|
Configure a merge tool that runs status in the middle of the rebase. The goal of
|
|
the status call is to trigger a potential bug if fsmonitor's state is written
|
|
even though the wlock is held by another process. The output of 'hg status' in
|
|
the merge tool goes to /dev/null because we're more interested in the results of
|
|
'hg status' run after the rebase.
|
|
|
|
$ cat >> $TESTTMP/mergetool-race.sh << EOF
|
|
> echo "custom merge tool"
|
|
> printf "c2\nc3\nc4\n" > \$1
|
|
> hg --cwd "$TESTTMP/repo" status --pager=off > /dev/null
|
|
> echo "custom merge tool end"
|
|
> EOF
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [extensions]
|
|
> rebase =
|
|
> [merge-tools]
|
|
> test.executable=sh
|
|
> test.args=$TESTTMP/mergetool-race.sh \$output
|
|
> EOF
|
|
|
|
$ hg rebase -s . -d 'desc(c3)' --tool test
|
|
rebasing b08445fd6b2a "c4"
|
|
merging a
|
|
custom merge tool
|
|
custom merge tool end
|
|
|
|
This hg status should be empty, whether or not fsmonitor is enabled (issue5581).
|
|
|
|
$ hg status
|