mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 08:47:12 +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
134 lines
3.4 KiB
Perl
134 lines
3.4 KiB
Perl
#chg-compatible
|
|
|
|
Set up repo
|
|
|
|
$ setconfig ui.origbackuppath=.hg/origbackups merge.checkunknown=warn
|
|
$ hg init repo
|
|
$ cd repo
|
|
$ echo base > base
|
|
$ hg add base
|
|
$ hg commit -m "base"
|
|
|
|
Make a dir named b that contains a file, and a file named d
|
|
|
|
$ mkdir -p b
|
|
$ echo c1 > b/c
|
|
$ echo d1 > d
|
|
$ hg add b/c d
|
|
$ hg commit -m "c1"
|
|
$ hg bookmark c1
|
|
|
|
Peform an update that causes b/c to be backed up
|
|
|
|
$ hg up -q 'desc(base)'
|
|
$ mkdir -p b
|
|
$ echo c2 > b/c
|
|
$ hg up --verbose c1
|
|
resolving manifests
|
|
b/c: replacing untracked file
|
|
getting b/c
|
|
creating directory: $TESTTMP/repo/.hg/origbackups/b
|
|
getting d
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark c1)
|
|
$ test -f .hg/origbackups/b/c
|
|
|
|
Make files named b and d
|
|
|
|
$ hg up -q 'desc(base)'
|
|
$ echo b1 > b
|
|
$ echo d2 > d
|
|
$ hg add b d
|
|
$ hg commit -m b1
|
|
$ hg bookmark b1
|
|
|
|
Perform an update that causes b to be backed up - it should replace the backup b dir
|
|
|
|
$ hg up -q 'desc(base)'
|
|
$ echo b2 > b
|
|
$ hg up --verbose b1
|
|
resolving manifests
|
|
b: replacing untracked file
|
|
getting b
|
|
removing conflicting directory: $TESTTMP/repo/.hg/origbackups/b
|
|
getting d
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark b1)
|
|
$ test -f .hg/origbackups/b
|
|
|
|
Perform an update the causes b/c to be backed up again - it should replace the backup b file
|
|
|
|
$ hg up -q 'desc(base)'
|
|
$ mkdir b
|
|
$ echo c3 > b/c
|
|
$ hg up --verbose c1
|
|
resolving manifests
|
|
b/c: replacing untracked file
|
|
getting b/c
|
|
creating directory: $TESTTMP/repo/.hg/origbackups/b
|
|
removing conflicting file: $TESTTMP/repo/.hg/origbackups/b
|
|
getting d
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark c1)
|
|
$ test -d .hg/origbackups/b
|
|
|
|
Cause two symlinks to be backed up that points to a valid location from the backup dir
|
|
|
|
$ hg up -q 'desc(base)'
|
|
$ mkdir ../sym-link-target
|
|
#if symlink
|
|
$ ln -s ../../../sym-link-target b
|
|
$ ln -s ../../../sym-link-target d
|
|
#else
|
|
$ touch b d
|
|
#endif
|
|
$ hg up b1
|
|
b: replacing untracked file
|
|
d: replacing untracked file
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark b1)
|
|
#if symlink
|
|
$ readlink.py .hg/origbackups/b
|
|
.hg/origbackups/b -> ../../../sym-link-target
|
|
#endif
|
|
|
|
Perform an update that causes b/c and d to be backed up again - b/c should not go into the target dir
|
|
|
|
$ hg up -q 'desc(base)'
|
|
$ mkdir b
|
|
$ echo c4 > b/c
|
|
$ echo d3 > d
|
|
$ hg up --verbose c1
|
|
resolving manifests
|
|
b/c: replacing untracked file
|
|
d: replacing untracked file
|
|
getting b/c
|
|
creating directory: $TESTTMP/repo/.hg/origbackups/b
|
|
removing conflicting file: $TESTTMP/repo/.hg/origbackups/b
|
|
getting d
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark c1)
|
|
$ cat .hg/origbackups/b/c
|
|
c4
|
|
$ cat .hg/origbackups/d
|
|
d3
|
|
$ ls ../sym-link-target
|
|
|
|
Incorrectly configure origbackuppath to be under a file
|
|
|
|
$ echo data > .hg/badorigbackups
|
|
$ hg up -q 'desc(base)'
|
|
$ mkdir b
|
|
$ echo c5 > b/c
|
|
$ hg up --verbose c1 --config ui.origbackuppath=.hg/badorigbackups
|
|
resolving manifests
|
|
b/c: replacing untracked file
|
|
getting b/c
|
|
creating directory: $TESTTMP/repo/.hg/badorigbackups/b
|
|
removing conflicting file: $TESTTMP/repo/.hg/badorigbackups
|
|
getting d
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark c1)
|
|
$ ls .hg/badorigbackups/b
|
|
c
|