mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +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
334 lines
6.8 KiB
Perl
334 lines
6.8 KiB
Perl
#require icasefs
|
|
|
|
################################
|
|
test for branch merging
|
|
################################
|
|
|
|
test for rename awareness of case-folding collision check:
|
|
|
|
(1) colliding file is one renamed from collided file:
|
|
this is also case for issue3370.
|
|
|
|
$ hg init branch_merge_renaming
|
|
$ cd branch_merge_renaming
|
|
|
|
$ echo a > a
|
|
$ hg add a
|
|
$ echo b > b
|
|
$ hg add b
|
|
$ hg commit -m '#0'
|
|
$ hg rename a tmp
|
|
$ hg rename tmp A
|
|
$ hg commit -m '#1'
|
|
$ hg update -q 0
|
|
$ touch x
|
|
$ hg add x
|
|
$ hg commit -m '#2'
|
|
|
|
$ hg merge -q
|
|
$ hg status -A
|
|
M A
|
|
R a
|
|
C b
|
|
C x
|
|
|
|
$ hg update -q --clean 1
|
|
$ hg merge -q
|
|
$ hg status -A
|
|
M x
|
|
C A
|
|
C b
|
|
$ hg commit -m '(D)'
|
|
|
|
additional test for issue3452:
|
|
|
|
| this assumes the history below.
|
|
|
|
|
| (A) -- (C) -- (E) -------
|
|
| \ \ \
|
|
| \ \ \
|
|
| (B) -- (D) -- (F) -- (G)
|
|
|
|
|
| A: add file 'a'
|
|
| B: rename from 'a' to 'A'
|
|
| C: add 'x' (or operation other than modification of 'a')
|
|
| D: merge C into B
|
|
| E: modify 'a'
|
|
| F: modify 'A'
|
|
| G: merge E into F
|
|
|
|
|
| issue3452 occurs when (B) is recorded before (C)
|
|
|
|
$ hg update -q --clean 2
|
|
$ echo "modify 'a' at (E)" > a
|
|
$ echo "modify 'b' at (E)" > b
|
|
$ hg commit -m '(E)'
|
|
|
|
$ hg update -q --clean 3
|
|
$ echo "modify 'A' at (F)" > A
|
|
$ hg commit -m '(F)'
|
|
|
|
$ hg merge -q --tool internal:other 4
|
|
$ hg status -A
|
|
M A
|
|
a
|
|
M b
|
|
C x
|
|
$ cat A
|
|
modify 'a' at (E)
|
|
|
|
test also the case that (B) is recorded after (C), to prevent
|
|
regression by changes in the future.
|
|
|
|
to avoid unexpected (successful) behavior by filelog unification,
|
|
target file is not 'a'/'A' but 'b'/'B' in this case.
|
|
|
|
$ hg update -q --clean 0
|
|
$ hg rename b tmp
|
|
$ hg rename tmp B
|
|
$ hg commit -m '(B1)'
|
|
|
|
$ hg merge -q 2
|
|
$ hg status -A
|
|
M x
|
|
C B
|
|
C a
|
|
$ hg commit -m '(D1)'
|
|
|
|
$ echo "modify 'B' at (F1)" > B
|
|
$ hg commit -m '(F1)'
|
|
|
|
$ hg merge -q --tool internal:other 4
|
|
$ hg status -A
|
|
M B
|
|
b
|
|
M a
|
|
C x
|
|
$ cat B
|
|
modify 'b' at (E)
|
|
|
|
$ cd ..
|
|
|
|
(2) colliding file is not related to collided file
|
|
|
|
$ hg init branch_merge_collding
|
|
$ cd branch_merge_collding
|
|
|
|
$ echo a > a
|
|
$ hg add a
|
|
$ hg commit -m '#0'
|
|
$ hg remove a
|
|
$ hg commit -m '#1'
|
|
$ echo A > A
|
|
$ hg add A
|
|
$ hg commit -m '#2'
|
|
$ hg update --clean 0
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ echo x > x
|
|
$ hg add x
|
|
$ hg commit -m '#3'
|
|
$ echo 'modified at #4' > a
|
|
$ hg commit -m '#4'
|
|
|
|
$ hg merge
|
|
abort: case-folding collision between [aA] and [Aa] (re)
|
|
[255]
|
|
$ hg parents --template '{node}\n'
|
|
5cde3e8ada523402ae83d66767be9332f0fc1c80
|
|
$ hg status -A
|
|
C a
|
|
C x
|
|
$ cat a
|
|
modified at #4
|
|
|
|
$ hg update --clean 2
|
|
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
$ hg merge
|
|
abort: case-folding collision between [aA] and [Aa] (re)
|
|
[255]
|
|
$ hg parents --template '{node}\n'
|
|
f2bf84af4a6f05abc8d9f0e760d5081bb737b00a
|
|
$ hg status -A
|
|
C A
|
|
$ cat A
|
|
A
|
|
|
|
test for deletion awareness of case-folding collision check (issue3648):
|
|
revision '#3' doesn't change 'a', so 'a' should be recognized as
|
|
safely removed in merging between #2 and #3.
|
|
|
|
$ hg update --clean 3
|
|
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ hg merge 2
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg status -A
|
|
M A
|
|
R a
|
|
C x
|
|
|
|
$ hg update --clean 2
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ hg merge 3
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg status -A
|
|
M x
|
|
C A
|
|
|
|
$ cd ..
|
|
|
|
Prepare for tests of directory case-folding collisions
|
|
|
|
$ hg init directory-casing
|
|
$ cd directory-casing
|
|
$ touch 0 # test: file without directory
|
|
$ mkdir 0a
|
|
$ touch 0a/f
|
|
$ mkdir aA
|
|
$ touch aA/a
|
|
$ hg ci -Aqm0
|
|
|
|
Directory/file case-folding collision:
|
|
|
|
$ hg up -q null
|
|
$ touch 00 # test: starts as '0'
|
|
$ mkdir 000 # test: starts as '0'
|
|
$ touch 000/f
|
|
$ touch Aa # test: collision with 'aA/a'
|
|
$ hg ci -Aqm1
|
|
|
|
$ hg merge 0
|
|
abort: case-folding collision between Aa and directory of aA/a
|
|
[255]
|
|
(note: no collision between 0 and 00 or 000/f)
|
|
|
|
Directory case-folding collision:
|
|
|
|
$ hg up -qC null
|
|
$ hg purge
|
|
$ mkdir 0A0
|
|
$ touch 0A0/f # test: starts as '0a'
|
|
$ mkdir Aa
|
|
$ touch Aa/b # test: collision with 'aA/a'
|
|
$ hg ci -Aqm2
|
|
|
|
$ hg merge 0
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ cd ..
|
|
|
|
################################
|
|
test for linear updates
|
|
################################
|
|
|
|
test for rename awareness of case-folding collision check:
|
|
|
|
(1) colliding file is one renamed from collided file
|
|
|
|
$ hg init linearupdate_renameaware_1
|
|
$ cd linearupdate_renameaware_1
|
|
|
|
$ echo a > a
|
|
$ hg add a
|
|
$ hg commit -m '#0'
|
|
$ hg rename a tmp
|
|
$ hg rename tmp A
|
|
$ hg commit -m '#1'
|
|
|
|
$ hg update 0
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ echo 'this is added line' >> a
|
|
$ hg update 1
|
|
merging a and A to A
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
$ hg status -A
|
|
M A
|
|
$ cat A
|
|
a
|
|
this is added line
|
|
|
|
$ cd ..
|
|
|
|
(2) colliding file is not related to collided file
|
|
|
|
$ hg init linearupdate_renameaware_2
|
|
$ cd linearupdate_renameaware_2
|
|
|
|
$ echo a > a
|
|
$ hg add a
|
|
$ hg commit -m '#0'
|
|
$ hg remove a
|
|
$ hg commit -m '#1'
|
|
$ echo A > A
|
|
$ hg add A
|
|
$ hg commit -m '#2'
|
|
|
|
$ hg update 0
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ hg parents --template '{node}\n'
|
|
bf5e395ced2c2bd0d77b2b1d06907af3a19a7836
|
|
$ hg status -A
|
|
C a
|
|
$ cat A
|
|
a
|
|
$ hg up -qC 2
|
|
|
|
$ hg update --check 0
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ hg parents --template '{node}\n'
|
|
bf5e395ced2c2bd0d77b2b1d06907af3a19a7836
|
|
$ hg status -A
|
|
C a
|
|
$ cat a
|
|
a
|
|
|
|
$ hg update --clean 2
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ hg parents --template '{node}\n'
|
|
f2bf84af4a6f05abc8d9f0e760d5081bb737b00a
|
|
$ hg status -A
|
|
C A
|
|
$ cat A
|
|
A
|
|
|
|
$ cd ..
|
|
|
|
(3) colliding file is not related to collided file: added in working dir
|
|
|
|
$ hg init linearupdate_renameaware_3
|
|
$ cd linearupdate_renameaware_3
|
|
|
|
$ echo a > a
|
|
$ hg add a
|
|
$ hg commit -m '#0'
|
|
$ hg rename a b
|
|
$ hg commit -m '#1'
|
|
$ hg update 0
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ echo B > B
|
|
$ hg add B
|
|
$ hg status
|
|
A B
|
|
$ hg update
|
|
abort: case-folding collision between [bB] and [Bb] (re)
|
|
[255]
|
|
|
|
$ hg update --check
|
|
abort: uncommitted changes
|
|
[255]
|
|
|
|
$ hg update --clean
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ hg parents --template '{node}\n'
|
|
e419dd32c623b89f5fd3b5870b5df6a3666d4d3a
|
|
$ hg status -A
|
|
C b
|
|
$ cat b
|
|
a
|
|
|
|
$ cd ..
|