This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1310

tests: add a test demonstrating issue5731
ClosedPublic

Authored by mbthomas on Nov 3 2017, 12:25 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGad671b4cb9fc: tests: add a test demonstrating issue5731
Summary

If origbackups are in use, a symlink to a valid directory is backed up, and an
update is made that attempts to backup a file or link over that symlink, we
abort with a bad error message instead of successfully updating.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mbthomas created this revision.Nov 3 2017, 12:25 PM
mbthomas updated this revision to Diff 3264.Nov 3 2017, 12:27 PM
yuja accepted this revision.Nov 9 2017, 8:17 AM
This revision is now accepted and ready to land.Nov 9 2017, 8:17 AM
Closed by commit rHGad671b4cb9fc: tests: add a test demonstrating issue5731 (authored by mbthomas). · Explain WhyNov 9 2017, 8:32 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-origbackup-conflict.t (42 lines)

Diff 3369

tests/test-origbackup-conflict.t

Set up repo Set up repo
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [ui] > [ui]
> origbackuppath=.hg/origbackups > origbackuppath=.hg/origbackups
> [merge] > [merge]
> checkunknown=warn > checkunknown=warn
> EOF > EOF
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ echo base > base $ echo base > base
$ hg add base $ hg add base
$ hg commit -m "base" $ hg commit -m "base"
Make a dir named b that contains a file Make a dir named b that contains a file, and a file named d
$ mkdir -p b $ mkdir -p b
$ echo c1 > b/c $ echo c1 > b/c
$ hg add b/c $ echo d1 > d
$ hg add b/c d
$ hg commit -m "c1" $ hg commit -m "c1"
$ hg bookmark c1 $ hg bookmark c1
Peform an update that causes b/c to be backed up Peform an update that causes b/c to be backed up
$ hg up -q 0 $ hg up -q 0
$ mkdir -p b $ mkdir -p b
$ echo c2 > b/c $ echo c2 > b/c
$ hg up --verbose c1 $ hg up --verbose c1
resolving manifests resolving manifests
b/c: replacing untracked file b/c: replacing untracked file
getting b/c getting b/c
creating directory: $TESTTMP/repo/.hg/origbackups/b (glob) creating directory: $TESTTMP/repo/.hg/origbackups/b (glob)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved getting d
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark c1) (activating bookmark c1)
$ test -f .hg/origbackups/b/c $ test -f .hg/origbackups/b/c
Make a file named b Make files named b and d
$ hg up -q 0 $ hg up -q 0
$ echo b1 > b $ echo b1 > b
$ hg add b $ echo d2 > d
$ hg add b d
$ hg commit -m b1 $ hg commit -m b1
created new head created new head
$ hg bookmark b1 $ hg bookmark b1
Perform an update that causes b to be backed up - it should replace the backup b dir Perform an update that causes b to be backed up - it should replace the backup b dir
$ hg up -q 0 $ hg up -q 0
$ echo b2 > b $ echo b2 > b
$ hg up --verbose b1 $ hg up --verbose b1
resolving manifests resolving manifests
b: replacing untracked file b: replacing untracked file
getting b getting b
removing conflicting directory: $TESTTMP/repo/.hg/origbackups/b (glob) removing conflicting directory: $TESTTMP/repo/.hg/origbackups/b (glob)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved getting d
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark b1) (activating bookmark b1)
$ test -f .hg/origbackups/b $ test -f .hg/origbackups/b
Perform an update the causes b/c to be backed up again - it should replace the backup b file Perform an update the causes b/c to be backed up again - it should replace the backup b file
$ hg up -q 0 $ hg up -q 0
$ mkdir b $ mkdir b
$ echo c3 > b/c $ echo c3 > b/c
$ hg up --verbose c1 $ hg up --verbose c1
resolving manifests resolving manifests
b/c: replacing untracked file b/c: replacing untracked file
getting b/c getting b/c
creating directory: $TESTTMP/repo/.hg/origbackups/b (glob) creating directory: $TESTTMP/repo/.hg/origbackups/b (glob)
removing conflicting file: $TESTTMP/repo/.hg/origbackups/b (glob) removing conflicting file: $TESTTMP/repo/.hg/origbackups/b (glob)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved getting d
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark c1) (activating bookmark c1)
$ test -d .hg/origbackups/b $ test -d .hg/origbackups/b
Cause a symlink to be backed up that points to a valid location from the backup dir Cause two symlinks to be backed up that points to a valid location from the backup dir
$ hg up -q 0 $ hg up -q 0
$ mkdir ../sym-link-target $ mkdir ../sym-link-target
#if symlink #if symlink
$ ln -s ../../../sym-link-target b $ ln -s ../../../sym-link-target b
$ ln -s ../../../sym-link-target d
#else #else
$ touch b $ touch b d
#endif #endif
$ hg up b1 $ hg up b1
b: replacing untracked file b: replacing untracked file
1 files updated, 0 files merged, 0 files removed, 0 files unresolved d: replacing untracked file
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark b1) (activating bookmark b1)
#if symlink #if symlink
$ readlink.py .hg/origbackups/b $ readlink.py .hg/origbackups/b
.hg/origbackups/b -> ../../../sym-link-target .hg/origbackups/b -> ../../../sym-link-target
#endif #endif
Perform an update that causes b/c to be backed up again - it should not go into the target dir 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 0 $ hg up -q 0
$ mkdir b $ mkdir b
$ echo c4 > b/c $ echo c4 > b/c
$ echo d3 > d
$ hg up --verbose c1 $ hg up --verbose c1
resolving manifests resolving manifests
b/c: replacing untracked file b/c: replacing untracked file
d: replacing untracked file
getting b/c getting b/c
creating directory: $TESTTMP/repo/.hg/origbackups/b (glob) creating directory: $TESTTMP/repo/.hg/origbackups/b (glob)
removing conflicting file: $TESTTMP/repo/.hg/origbackups/b (glob) removing conflicting file: $TESTTMP/repo/.hg/origbackups/b (glob)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved getting d
removing conflicting directory: $TESTTMP/repo/.hg/origbackups/d (glob)
abort: None
[255]
Workaround issue by deleting d:
$ rm d
$ hg up c1
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark c1) (activating bookmark c1)
$ cat .hg/origbackups/b/c $ cat .hg/origbackups/b/c
c4 c4
$ ls ../sym-link-target $ ls ../sym-link-target
Incorrectly configure origbackuppath to be under a file Incorrectly configure origbackuppath to be under a file
$ echo data > .hg/badorigbackups $ echo data > .hg/badorigbackups