This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8397

tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
ClosedPublic

Authored by joerg.sonnenberger on Apr 10 2020, 2:07 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG5c2a4f37eace: tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Summary

BSD-derived systems will use "ls -A" when running as root. Adjust the
test cases to always use the flag and include .hg and related output as
appropiately.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

joerg.sonnenberger added a commit: rHG5c2a4f37eace: tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems.Apr 16 2020, 12:43 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG5c2a4f37eace: tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems (authored by joerg.sonnenberger). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 21032

tests/test-audit-subrepo.t

> EOF > EOF
$ cd .. $ cd ..
on clone (and update) with various substitutions: on clone (and update) with various substitutions:
$ hg clone -q main main2 $ hg clone -q main main2
abort: subrepo path contains illegal component: $SUB abort: subrepo path contains illegal component: $SUB
[255] [255]
$ ls main2 $ ls -A main2
.hg
.hgsub
.hgsubstate
$ SUB=sub1 hg clone -q main main3 $ SUB=sub1 hg clone -q main main3
abort: subrepo path contains illegal component: $SUB abort: subrepo path contains illegal component: $SUB
[255] [255]
$ ls main3 $ ls -A main3
.hg
.hgsub
.hgsubstate
$ SUB=sub2 hg clone -q main main4 $ SUB=sub2 hg clone -q main main4
abort: subrepo path contains illegal component: $SUB abort: subrepo path contains illegal component: $SUB
[255] [255]
$ ls main4 $ ls -A main4
.hg
.hgsub
.hgsubstate
on clone empty subrepo into .hg, then pull (and update), which at least fails: on clone empty subrepo into .hg, then pull (and update), which at least fails:
$ SUB=.hg hg clone -qr0 main main5 $ SUB=.hg hg clone -qr0 main main5
abort: subrepo path contains illegal component: $SUB abort: subrepo path contains illegal component: $SUB
[255] [255]
$ ls main5 $ ls -A main5
.hg
.hgsub
.hgsubstate
$ test -d main5/.hg/.hg $ test -d main5/.hg/.hg
[1] [1]
$ SUB=.hg hg -R main5 pull -u $ SUB=.hg hg -R main5 pull -u
pulling from $TESTTMP/envvar/main pulling from $TESTTMP/envvar/main
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
new changesets 7a2f0e59146f new changesets 7a2f0e59146f
.hgsubstate: untracked file differs .hgsubstate: untracked file differs
abort: untracked files in working directory differ from files in requested revision abort: untracked files in working directory differ from files in requested revision
[255] [255]
$ cat main5/.hg/hgrc | grep pwned $ cat main5/.hg/hgrc | grep pwned
[1] [1]
on clone (and update) into .hg, which at least fails: on clone (and update) into .hg, which at least fails:
$ SUB=.hg hg clone -q main main6 $ SUB=.hg hg clone -q main main6
abort: subrepo path contains illegal component: $SUB abort: subrepo path contains illegal component: $SUB
[255] [255]
$ ls main6 $ ls -A main6
.hg
.hgsub
.hgsubstate
$ cat main6/.hg/hgrc | grep pwned $ cat main6/.hg/hgrc | grep pwned
[1] [1]
on clone (and update) into .hg/* subdir: on clone (and update) into .hg/* subdir:
$ SUB=.hg/foo hg clone -q main main7 $ SUB=.hg/foo hg clone -q main main7
abort: subrepo path contains illegal component: $SUB abort: subrepo path contains illegal component: $SUB
[255] [255]
$ ls main7 $ ls -A main7
.hg
.hgsub
.hgsubstate
$ test -d main7/.hg/.hg $ test -d main7/.hg/.hg
[1] [1]
on clone (and update) into outer tree: on clone (and update) into outer tree:
$ SUB=../out-of-tree-write hg clone -q main main8 $ SUB=../out-of-tree-write hg clone -q main main8
abort: subrepo path contains illegal component: $SUB abort: subrepo path contains illegal component: $SUB
[255] [255]
$ ls main8 $ ls -A main8
.hg
.hgsub
.hgsubstate
on clone (and update) into e.g. $HOME, which doesn't work since subrepo paths on clone (and update) into e.g. $HOME, which doesn't work since subrepo paths
are concatenated prior to variable expansion: are concatenated prior to variable expansion:
$ SUB="$TESTTMP/envvar/fakehome" hg clone -q main main9 $ SUB="$TESTTMP/envvar/fakehome" hg clone -q main main9
abort: subrepo path contains illegal component: $SUB abort: subrepo path contains illegal component: $SUB
[255] [255]
$ ls main9 | wc -l $ ls -A main9 | wc -l
\s*0 (re) \s*3 (re)
$ ls $ ls
main main
main2 main2
main3 main3
main4 main4
main5 main5
main6 main6
$ rm -fR "$FAKEHOME" $ rm -fR "$FAKEHOME"
$ hg init "$FAKEHOME" $ hg init "$FAKEHOME"
$ touch "$FAKEHOME/a" $ touch "$FAKEHOME/a"
$ hg -R "$FAKEHOME" ci -qAm 'add fakehome file' $ hg -R "$FAKEHOME" ci -qAm 'add fakehome file'
$ SUB="$FAKEHOME" hg clone -qr1 main main6 $ SUB="$FAKEHOME" hg clone -qr1 main main6
abort: subrepo path contains illegal component: $SUB abort: subrepo path contains illegal component: $SUB
[255] [255]
$ ls "$FAKEHOME" $ ls -A "$FAKEHOME"
.hg
a a
$ SUB="$FAKEHOME" hg -R main6 pull -u $ SUB="$FAKEHOME" hg -R main6 pull -u
pulling from $TESTTMP/envvarsym/main pulling from $TESTTMP/envvarsym/main
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
new changesets * (glob) new changesets * (glob)
.hgsubstate: untracked file differs .hgsubstate: untracked file differs
abort: untracked files in working directory differ from files in requested revision abort: untracked files in working directory differ from files in requested revision
[255] [255]
$ ls "$FAKEHOME" $ ls -A "$FAKEHOME"
.hg
a a
on clone only symlink with hg-managed fakehome directory, on clone only symlink with hg-managed fakehome directory,
then pull (and update): then pull (and update):
$ rm -fR "$FAKEHOME" $ rm -fR "$FAKEHOME"
$ hg init "$FAKEHOME" $ hg init "$FAKEHOME"
$ touch "$FAKEHOME/a" $ touch "$FAKEHOME/a"
$ hg -R "$FAKEHOME" ci -qAm 'add fakehome file' $ hg -R "$FAKEHOME" ci -qAm 'add fakehome file'
$ SUB="$FAKEHOME" hg clone -qr0 main main7 $ SUB="$FAKEHOME" hg clone -qr0 main main7
$ ls "$FAKEHOME" $ ls -A "$FAKEHOME"
.hg
a a
$ SUB="$FAKEHOME" hg -R main7 pull -uf $ SUB="$FAKEHOME" hg -R main7 pull -uf
pulling from $TESTTMP/envvarsym/main pulling from $TESTTMP/envvarsym/main
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 3 changes to 2 files added 2 changesets with 3 changes to 2 files
new changesets * (glob) new changesets * (glob)
abort: subrepo path contains illegal component: $SUB abort: subrepo path contains illegal component: $SUB
[255] [255]
$ ls "$FAKEHOME" $ ls -A "$FAKEHOME"
.hg
a a
$ cd .. $ cd ..
#endif #endif
Test drive letter Test drive letter
----------------- -----------------
$ hg clone -q driveletter driveletter2 $ hg clone -q driveletter driveletter2
abort: path contains illegal component: X: abort: path contains illegal component: X:
[255] [255]
#else #else
$ hg clone -q driveletter driveletter2 $ hg clone -q driveletter driveletter2
$ ls driveletter2 $ ls -A driveletter2
.hg
.hgsub
.hgsubstate
X: X:
#endif #endif

tests/test-backwards-remove.t

$ hg init $ hg init
$ echo This is file a1 > a $ echo This is file a1 > a
$ hg add a $ hg add a
$ hg commit -m "commit #0" $ hg commit -m "commit #0"
$ ls $ ls -A
.hg
a a
$ echo This is file b1 > b $ echo This is file b1 > b
$ hg add b $ hg add b
$ hg commit -m "commit #1" $ hg commit -m "commit #1"
$ hg co 0 $ hg co 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
B should disappear B should disappear
$ ls $ ls -A
.hg
a a

tests/test-clone.t

-U is respected in share clone mode -U is respected in share clone mode
$ hg --config share.pool=share clone -U source1a share-1anowc $ hg --config share.pool=share clone -U source1a share-1anowc
(sharing from existing pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1) (sharing from existing pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1)
searching for changes searching for changes
no changes found no changes found
adding remote bookmark bookA adding remote bookmark bookA
$ ls share-1anowc $ ls -A share-1anowc
.hg
Test that auto sharing doesn't cause failure of "hg clone local remote" Test that auto sharing doesn't cause failure of "hg clone local remote"
$ cd $TESTTMP $ cd $TESTTMP
$ hg -R a id -r 0 $ hg -R a id -r 0
acb14030fe0a acb14030fe0a
$ hg id -R remote -r 0 $ hg id -R remote -r 0
abort: repository remote not found! abort: repository remote not found!

tests/test-copytrace-heuristics.t

|/ desc: mv a b |/ desc: mv a b
o rev: 0, phase: draft o rev: 0, phase: draft
desc: initial desc: initial
$ hg rebase -s 1 -d 2 $ hg rebase -s 1 -d 2
rebasing 1:472e38d57782 "mv a b" rebasing 1:472e38d57782 "mv a b"
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-17d50e29-rebase.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-17d50e29-rebase.hg
$ hg up -q c492ed3c7e35dcd1dc938053b8adf56e2cfbd062 $ hg up -q c492ed3c7e35dcd1dc938053b8adf56e2cfbd062
$ ls $ ls -A
.hg
b b
$ cd .. $ cd ..
$ rm -rf repo $ rm -rf repo
Move a directory in draft branch Move a directory in draft branch
-------------------------------- --------------------------------
$ hg init repo $ hg init repo
|/ desc: mv a b |/ desc: mv a b
o rev: 0 o rev: 0
desc: initial desc: initial
$ hg rebase -s . -d 2 $ hg rebase -s . -d 2
rebasing 3:ef716627c70b "mod a" (tip) rebasing 3:ef716627c70b "mod a" (tip)
merging b and a to b merging b and a to b
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg
$ ls $ ls -A
.hg
b b
c c
$ cat b $ cat b
b b
$ rm -rf repo $ rm -rf repo
Merge test Merge test
---------- ----------
o rev: 0 o rev: 0
desc: initial desc: initial
$ hg merge 1 $ hg merge 1
merging b and a to b merging b and a to b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m merge $ hg ci -m merge
$ ls $ ls -A
.hg
b b
$ cd .. $ cd ..
$ rm -rf repo $ rm -rf repo
Copy and move file Copy and move file
------------------ ------------------
$ hg init repo $ hg init repo
o rev: 0 o rev: 0
desc: initial desc: initial
$ hg rebase -s . -d 1 $ hg rebase -s . -d 1
rebasing 2:ef716627c70b "mod a" (tip) rebasing 2:ef716627c70b "mod a" (tip)
merging b and a to b merging b and a to b
merging c and a to c merging c and a to c
saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg
$ ls $ ls -A
.hg
b b
c c
$ cat b $ cat b
b b
$ cat c $ cat c
b b
$ cd .. $ cd ..
$ rm -rf repo $ rm -rf repo
| o rev: 3, phase: draft | o rev: 3, phase: draft
| | desc: mv b c | | desc: mv b c
| o rev: 2, phase: draft | o rev: 2, phase: draft
| | desc: mv a b | | desc: mv a b
o | rev: 1, phase: draft o | rev: 1, phase: draft
|/ desc: mod a |/ desc: mod a
o rev: 0, phase: draft o rev: 0, phase: draft
desc: initial desc: initial
$ ls $ ls -A
.hg
c c
$ cd .. $ cd ..
$ rm -rf repo $ rm -rf repo
Test shelve/unshelve Test shelve/unshelve
------------------- -------------------
$ hg init repo $ hg init repo
@ rev: 1 @ rev: 1
| desc: mv a b | desc: mv a b
o rev: 0 o rev: 0
desc: initial desc: initial
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
rebasing shelved changes rebasing shelved changes
merging b and a to b merging b and a to b
$ ls $ ls -A
.hg
b b
$ cat b $ cat b
b b
$ cd .. $ cd ..
$ rm -rf repo $ rm -rf repo
Test full copytrace ability on draft branch Test full copytrace ability on draft branch
------------------------------------------- -------------------------------------------

tests/test-fetch.t

adding file changes adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads) added 1 changesets with 1 changes to 1 files (+1 heads)
new changesets d2ae7f538514 new changesets d2ae7f538514
updating to 2:d2ae7f538514 updating to 2:d2ae7f538514
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging with 1:d36c0562f908 merging with 1:d36c0562f908
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
new changeset 3:a323a0c43ec4 merges remote changes with local new changeset 3:a323a0c43ec4 merges remote changes with local
$ ls c $ ls -A c
.hg
a a
b b
c c
$ hg serve --cwd a -a localhost -p $HGPORT -d --pid-file=hg.pid $ hg serve --cwd a -a localhost -p $HGPORT -d --pid-file=hg.pid
$ cat a/hg.pid >> "$DAEMON_PIDS" $ cat a/hg.pid >> "$DAEMON_PIDS"
fetch over http, no auth fetch over http, no auth
(this also tests that editor is invoked if '--edit' is specified) (this also tests that editor is invoked if '--edit' is specified)

tests/test-import.t

--- a/b Thu Jan 01 00:00:00 1970 +0000 --- a/b Thu Jan 01 00:00:00 1970 +0000
+++ b/b Thu Jan 01 00:00:00 1970 +0000 +++ b/b Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,2 @@ @@ -1,1 +1,2 @@
b b
+bb +bb
$ hg status -c . $ hg status -c .
C a C a
C b C b
$ ls $ ls -A
.hg
a a
a.rej a.rej
b b
Importing with zero success: Importing with zero success:
$ hg update --rev 'desc(initial)' $ hg update --rev 'desc(initial)'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
# Thu Jan 01 00:00:00 1970 +0000 # Thu Jan 01 00:00:00 1970 +0000
# Node ID cb9b1847a74d9ad52e93becaf14b98dbcc274e1e # Node ID cb9b1847a74d9ad52e93becaf14b98dbcc274e1e
# Parent 8e4f0351909eae6b9cf68c2c076cb54c42b54b2e # Parent 8e4f0351909eae6b9cf68c2c076cb54c42b54b2e
four four
$ hg status -c . $ hg status -c .
C a C a
C b C b
$ ls $ ls -A
.hg
a a
a.rej a.rej
b b
Importing with unknown file: Importing with unknown file:
$ hg update --rev 'desc(initial)' $ hg update --rev 'desc(initial)'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
# Thu Jan 01 00:00:00 1970 +0000 # Thu Jan 01 00:00:00 1970 +0000
# Node ID 1fb1f86bef43c5a75918178f8d23c29fb0a7398d # Node ID 1fb1f86bef43c5a75918178f8d23c29fb0a7398d
# Parent 8e4f0351909eae6b9cf68c2c076cb54c42b54b2e # Parent 8e4f0351909eae6b9cf68c2c076cb54c42b54b2e
extended jungle extended jungle
$ hg status -c . $ hg status -c .
C a C a
C b C b
$ ls $ ls -A
.hg
a a
a.rej a.rej
b b
jungle.rej jungle.rej
Importing multiple failing patches: Importing multiple failing patches:
$ hg update --rev 'desc(initial)' $ hg update --rev 'desc(initial)'

tests/test-largefiles.t

$ hg remove normal1 large1 $ hg remove normal1 large1
$ hg status large1 $ hg status large1
R large1 R large1
$ hg commit -m "remove files" $ hg commit -m "remove files"
Invoking status precommit hook Invoking status precommit hook
R large1 R large1
R normal1 R normal1
$ ls $ ls -A
.hg
.hglf
sub sub
$ echo "testlargefile" > large1-test $ echo "testlargefile" > large1-test
$ hg add --large large1-test $ hg add --large large1-test
$ hg st $ hg st
A large1-test A large1-test
$ hg rm large1-test $ hg rm large1-test
not removing large1-test: file has been marked for add (use forget to undo) not removing large1-test: file has been marked for add (use forget to undo)
[1] [1]
normal11 normal11
$ cat large1 $ cat large1
large11 large11
$ cat sub/normal2 $ cat sub/normal2
normal22 normal22
$ cat sub/large2 $ cat sub/large2
large22 large22
$ cd ../archive2 $ cd ../archive2
$ ls $ ls -A
.hg_archival.txt
sub sub
$ cat sub/normal2 $ cat sub/normal2
normal22 normal22
$ cat sub/large2 $ cat sub/large2
large22 large22
$ cd ../archive3 $ cd ../archive3
$ cat normal1 $ cat normal1
normal22 normal22

tests/test-narrow-acl.t

adding manifests adding manifests
adding file changes adding file changes
added 3 changesets with 2 changes to 2 files added 3 changesets with 2 changes to 2 files
new changesets * (glob) new changesets * (glob)
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
The clone directory should only contain f1 and f2 The clone directory should only contain f1 and f2
$ ls -1 narrowclone1 | sort $ ls -A -1 narrowclone1 | sort
.hg
f1 f1
f2 f2
Requirements should contain narrowhg Requirements should contain narrowhg
$ cat narrowclone1/.hg/requires | grep narrowhg $ cat narrowclone1/.hg/requires | grep narrowhg
narrowhg-experimental narrowhg-experimental
NarrowHG should track f1 and f2 NarrowHG should track f1 and f2
$ hg -R narrowclone1 tracked $ hg -R narrowclone1 tracked
I path:f1 I path:f1
I path:f2 I path:f2

tests/test-narrow-clone-stream.t

Cloning a specific file when stream clone is supported Cloning a specific file when stream clone is supported
$ hg clone --narrow ssh://user@dummy/master narrow --noupdate --include "dir/src/F10" --stream $ hg clone --narrow ssh://user@dummy/master narrow --noupdate --include "dir/src/F10" --stream
streaming all changes streaming all changes
* files to transfer, * KB of data (glob) * files to transfer, * KB of data (glob)
transferred * KB in * seconds (* */sec) (glob) transferred * KB in * seconds (* */sec) (glob)
$ cd narrow $ cd narrow
$ ls $ ls -A
.hg
$ hg tracked $ hg tracked
I path:dir/src/F10 I path:dir/src/F10
Making sure we have the correct set of requirements Making sure we have the correct set of requirements
$ cat .hg/requires $ cat .hg/requires
dotencode (tree !) dotencode (tree !)
dotencode (flat-fncache !) dotencode (flat-fncache !)

tests/test-narrow-clone.t

adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 0 changes to 0 files added 1 changesets with 0 changes to 0 files
new changesets * (glob) new changesets * (glob)
$ cd narrowempty $ cd narrowempty
$ hg tracked $ hg tracked
$ hg update $ hg update
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ ls $ ls -A
.hg
$ cd .. $ cd ..
simple clone simple clone
$ hg clone ssh://user@dummy/master simpleclone $ hg clone ssh://user@dummy/master simpleclone
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests

tests/test-narrow-pull.t

adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 5 changesets with 2 changes to 2 files added 5 changesets with 2 changes to 2 files
new changesets *:* (glob) new changesets *:* (glob)
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd narrow $ cd narrow
$ ls $ ls -A
.hg
f2 f2
f8 f8
$ cat f2 f8 $ cat f2 f8
2 2
8 8
$ cd .. $ cd ..

tests/test-narrow-trackedcmd.t

adding file changes adding file changes
added 2 changesets with 1 changes to 1 files added 2 changesets with 1 changes to 1 files
new changesets *:* (glob) new changesets *:* (glob)
updating to branch default updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd narrow $ cd narrow
$ hg tracked $ hg tracked
I path:inside I path:inside
$ ls $ ls -A
.hg
inside inside
$ cat inside/f $ cat inside/f
inside inside
$ cd .. $ cd ..
add more upstream files which we will include in a wider narrow spec add more upstream files which we will include in a wider narrow spec
$ cd master $ cd master

tests/test-narrow-widen-no-ellipsis.t

comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 0 changesets with 1 changes to 1 files added 0 changesets with 1 changes to 1 files
$ hg tracked $ hg tracked
I path:inside I path:inside
$ ls $ ls -A
.hg
inside inside
$ cat inside/f $ cat inside/f
inside inside
$ cd .. $ cd ..
add more upstream files which we will include in a wider narrow spec add more upstream files which we will include in a wider narrow spec
$ cd master $ cd master

tests/test-narrow-widen.t

adding file changes adding file changes
added 2 changesets with 1 changes to 1 files added 2 changesets with 1 changes to 1 files
new changesets *:* (glob) new changesets *:* (glob)
updating to branch default updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd narrow $ cd narrow
$ hg tracked $ hg tracked
I path:inside I path:inside
$ ls $ ls -A
.hg
inside inside
$ cat inside/f $ cat inside/f
inside inside
$ cd .. $ cd ..
add more upstream files which we will include in a wider narrow spec add more upstream files which we will include in a wider narrow spec
$ cd master $ cd master

tests/test-purge.t

delete an empty directory delete an empty directory
$ mkdir empty_dir $ mkdir empty_dir
$ hg purge -p -v $ hg purge -p -v
empty_dir empty_dir
$ hg purge -v $ hg purge -v
removing directory empty_dir removing directory empty_dir
$ ls $ ls -A
.hg
.hgignore
directory directory
r1 r1
delete an untracked directory delete an untracked directory
$ mkdir untracked_dir $ mkdir untracked_dir
$ touch untracked_dir/untracked_file1 $ touch untracked_dir/untracked_file1
$ touch untracked_dir/untracked_file2 $ touch untracked_dir/untracked_file2
$ hg purge -p $ hg purge -p
untracked_dir/untracked_file1 untracked_dir/untracked_file1
untracked_dir/untracked_file2 untracked_dir/untracked_file2
$ hg purge -v $ hg purge -v
removing file untracked_dir/untracked_file1 removing file untracked_dir/untracked_file1
removing file untracked_dir/untracked_file2 removing file untracked_dir/untracked_file2
removing directory untracked_dir removing directory untracked_dir
$ ls $ ls -A
.hg
.hgignore
directory directory
r1 r1
delete an untracked file delete an untracked file
$ touch untracked_file $ touch untracked_file
$ touch untracked_file_readonly $ touch untracked_file_readonly
$ "$PYTHON" <<EOF $ "$PYTHON" <<EOF
> import os > import os
> import stat > import stat
> f = 'untracked_file_readonly' > f = 'untracked_file_readonly'
> os.chmod(f, stat.S_IMODE(os.stat(f).st_mode) & ~stat.S_IWRITE) > os.chmod(f, stat.S_IMODE(os.stat(f).st_mode) & ~stat.S_IWRITE)
> EOF > EOF
$ hg purge -p $ hg purge -p
untracked_file untracked_file
untracked_file_readonly untracked_file_readonly
$ hg purge -v $ hg purge -v
removing file untracked_file removing file untracked_file
removing file untracked_file_readonly removing file untracked_file_readonly
$ ls $ ls -A
.hg
.hgignore
directory directory
r1 r1
delete an untracked file in a tracked directory delete an untracked file in a tracked directory
$ touch directory/untracked_file $ touch directory/untracked_file
$ hg purge -p $ hg purge -p
directory/untracked_file directory/untracked_file
$ hg purge -v $ hg purge -v
removing file directory/untracked_file removing file directory/untracked_file
$ ls $ ls -A
.hg
.hgignore
directory directory
r1 r1
delete nested directories delete nested directories
$ mkdir -p untracked_directory/nested_directory $ mkdir -p untracked_directory/nested_directory
$ hg purge -p $ hg purge -p
untracked_directory/nested_directory untracked_directory/nested_directory
$ hg purge -v $ hg purge -v
removing directory untracked_directory/nested_directory removing directory untracked_directory/nested_directory
removing directory untracked_directory removing directory untracked_directory
$ ls $ ls -A
.hg
.hgignore
directory directory
r1 r1
delete nested directories from a subdir delete nested directories from a subdir
$ mkdir -p untracked_directory/nested_directory $ mkdir -p untracked_directory/nested_directory
$ cd directory $ cd directory
$ hg purge -p $ hg purge -p
untracked_directory/nested_directory untracked_directory/nested_directory
$ hg purge -v $ hg purge -v
removing directory untracked_directory/nested_directory removing directory untracked_directory/nested_directory
removing directory untracked_directory removing directory untracked_directory
$ cd .. $ cd ..
$ ls $ ls -A
.hg
.hgignore
directory directory
r1 r1
delete only part of the tree delete only part of the tree
$ mkdir -p untracked_directory/nested_directory $ mkdir -p untracked_directory/nested_directory
$ touch directory/untracked_file $ touch directory/untracked_file
$ cd directory $ cd directory
$ hg purge -p ../untracked_directory $ hg purge -p ../untracked_directory
untracked_directory/nested_directory untracked_directory/nested_directory
$ hg purge -v ../untracked_directory $ hg purge -v ../untracked_directory
removing directory untracked_directory/nested_directory removing directory untracked_directory/nested_directory
removing directory untracked_directory removing directory untracked_directory
$ cd .. $ cd ..
$ ls $ ls -A
.hg
.hgignore
directory directory
r1 r1
$ ls directory/untracked_file $ ls directory/untracked_file
directory/untracked_file directory/untracked_file
$ rm directory/untracked_file $ rm directory/untracked_file
skip ignored files if -i or --all not specified skip ignored files if -i or --all not specified
$ touch ignored $ touch ignored
$ hg purge -p $ hg purge -p
$ hg purge -v $ hg purge -v
$ touch untracked_file $ touch untracked_file
$ ls $ ls
directory directory
ignored ignored
r1 r1
untracked_file untracked_file
$ hg purge -p -i $ hg purge -p -i
ignored ignored
$ hg purge -v -i $ hg purge -v -i
removing file ignored removing file ignored
$ ls $ ls -A
.hg
.hgignore
directory directory
r1 r1
untracked_file untracked_file
$ touch ignored $ touch ignored
$ hg purge -p --all $ hg purge -p --all
ignored ignored
untracked_file untracked_file
$ hg purge -v --all $ hg purge -v --all
$ hg purge -v $ hg purge -v
removing file untracked_file removing file untracked_file
skip excluded files skip excluded files
$ touch excluded_file $ touch excluded_file
$ hg purge -p -X excluded_file $ hg purge -p -X excluded_file
$ hg purge -v -X excluded_file $ hg purge -v -X excluded_file
$ ls $ ls -A
.hg
.hgignore
directory directory
excluded_file excluded_file
r1 r1
$ rm excluded_file $ rm excluded_file
skip files in excluded dirs skip files in excluded dirs
$ mkdir excluded_dir $ mkdir excluded_dir
$ touch excluded_dir/file $ touch excluded_dir/file
$ hg purge -p -X excluded_dir $ hg purge -p -X excluded_dir
$ hg purge -v -X excluded_dir $ hg purge -v -X excluded_dir
$ ls $ ls -A
.hg
.hgignore
directory directory
excluded_dir excluded_dir
r1 r1
$ ls excluded_dir $ ls excluded_dir
file file
$ rm -R excluded_dir $ rm -R excluded_dir
skip excluded empty dirs skip excluded empty dirs
$ mkdir excluded_dir $ mkdir excluded_dir
$ hg purge -p -X excluded_dir $ hg purge -p -X excluded_dir
$ hg purge -v -X excluded_dir $ hg purge -v -X excluded_dir
$ ls $ ls -A
.hg
.hgignore
directory directory
excluded_dir excluded_dir
r1 r1
$ rmdir excluded_dir $ rmdir excluded_dir
skip patterns skip patterns
$ mkdir .svn $ mkdir .svn
$ mkdir -p empty_dir dir $ mkdir -p empty_dir dir
$ touch untracked_file dir/untracked_file $ touch untracked_file dir/untracked_file
$ hg purge -p --files $ hg purge -p --files
dir/untracked_file dir/untracked_file
untracked_file untracked_file
$ hg purge -v --files $ hg purge -v --files
removing file dir/untracked_file removing file dir/untracked_file
removing file untracked_file removing file untracked_file
$ ls $ ls -A
.hg
.hgignore
dir dir
empty_dir empty_dir
$ ls dir $ ls dir
only remove dirs only remove dirs
$ mkdir -p empty_dir dir $ mkdir -p empty_dir dir
$ touch untracked_file dir/untracked_file $ touch untracked_file dir/untracked_file
$ hg purge -p --dirs $ hg purge -p --dirs
empty_dir empty_dir
$ hg purge -v --dirs $ hg purge -v --dirs
removing directory empty_dir removing directory empty_dir
$ ls $ ls -A
.hg
.hgignore
dir dir
untracked_file untracked_file
$ ls dir $ ls dir
untracked_file untracked_file
remove both files and dirs remove both files and dirs
$ mkdir -p empty_dir dir $ mkdir -p empty_dir dir
$ touch untracked_file dir/untracked_file $ touch untracked_file dir/untracked_file
$ hg purge -p --files --dirs $ hg purge -p --files --dirs
dir/untracked_file dir/untracked_file
untracked_file untracked_file
empty_dir empty_dir
$ hg purge -v --files --dirs $ hg purge -v --files --dirs
removing file dir/untracked_file removing file dir/untracked_file
removing file untracked_file removing file untracked_file
removing directory empty_dir removing directory empty_dir
removing directory dir removing directory dir
$ ls $ ls -A
.hg
.hgignore
$ cd .. $ cd ..

tests/test-remotefilelog-local.t

$ hg strip -r . $ hg strip -r .
2 files updated, 0 files merged, 1 files removed, 0 files unresolved 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/19edf50f4de7-df3d0f74-backup.hg (glob) saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/19edf50f4de7-df3d0f74-backup.hg (glob)
4 files fetched over 2 fetches - (4 misses, 0.00% hit ratio) over *s (glob) 4 files fetched over 2 fetches - (4 misses, 0.00% hit ratio) over *s (glob)
# unbundle # unbundle
$ clearcache $ clearcache
$ ls $ ls -A
.hg
w w
x x
y y
z z
$ hg debugrebuilddirstate # fixes dirstate non-determinism $ hg debugrebuilddirstate # fixes dirstate non-determinism
$ hg unbundle .hg/strip-backup/19edf50f4de7-df3d0f74-backup.hg $ hg unbundle .hg/strip-backup/19edf50f4de7-df3d0f74-backup.hg
adding changesets adding changesets

tests/test-revert-interactive.t

$ echo a > a $ echo a > a
$ hg ci -qAm a $ hg ci -qAm a
$ hg rm a $ hg rm a
$ hg revert -i<<EOF $ hg revert -i<<EOF
> y > y
> EOF > EOF
add back removed file a (Yn)? y add back removed file a (Yn)? y
undeleting a undeleting a
$ ls $ ls -A
.hg
a a
$ hg rm a $ hg rm a
$ hg revert -i<<EOF $ hg revert -i<<EOF
> n > n
> EOF > EOF
add back removed file a (Yn)? n add back removed file a (Yn)? n
$ ls $ ls -A
.hg
$ hg revert -a $ hg revert -a
undeleting a undeleting a
$ cd .. $ cd ..
Test "keep" mode Test "keep" mode
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [experimental] > [experimental]

tests/test-revert-unknown.t

Should show unknown and b removed Should show unknown and b removed
$ hg status $ hg status
R b R b
? unknown ? unknown
Should show a and unknown Should show a and unknown
$ ls $ ls -A
.hg
a a
unknown unknown

tests/test-revert.t

$ rm b $ rm b
$ hg status b $ hg status b
! b ! b
$ hg revert -v b $ hg revert -v b
forgetting b forgetting b
$ hg status b $ hg status b
b: * (glob) b: * (glob)
$ ls $ ls -A
.hg
a a
c c
e e
Test creation of backup (.orig) files Test creation of backup (.orig) files
------------------------------------- -------------------------------------
$ echo z > e $ echo z > e

tests/test-shelve.t

examine changes to 'd'? examine changes to 'd'?
(enter ? for help) [Ynesfdaq?] y (enter ? for help) [Ynesfdaq?] y
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+ +
record change 2/2 to 'd'? record change 2/2 to 'd'?
(enter ? for help) [Ynesfdaq?] n (enter ? for help) [Ynesfdaq?] n
$ ls $ ls -A
.hg
b b
c c
e e
-- shelve should not contain `c` now -- shelve should not contain `c` now
$ hg shelve --patch $ hg shelve --patch
default (*s ago) changes to: b (glob) default (*s ago) changes to: b (glob)
diff --git a/d b/d diff --git a/d b/d
+ +
record this change to 'd'? record this change to 'd'?
(enter ? for help) [Ynesfdaq?] y (enter ? for help) [Ynesfdaq?] y
$ hg status -v $ hg status -v
A c A c
A d A d
$ ls $ ls -A
.hg
b b
c c
d d
e e
$ hg shelve --list $ hg shelve --list
-- now, unshelve selected changes from a file -- now, unshelve selected changes from a file

tests/test-sparse-clear.t

> [include] > [include]
> *.html > *.html
> EOF > EOF
$ hg ci -Aqm 'initial' $ hg ci -Aqm 'initial'
Clear rules when there are includes Clear rules when there are includes
$ hg debugsparse --include *.py $ hg debugsparse --include *.py
$ ls $ ls -A
.hg
data.py data.py
$ hg debugsparse --clear-rules $ hg debugsparse --clear-rules
$ ls $ ls -A
.hg
base.sparse base.sparse
data.py data.py
index.html index.html
readme.txt readme.txt
webpage.sparse webpage.sparse
Clear rules when there are excludes Clear rules when there are excludes
$ hg debugsparse --exclude *.sparse $ hg debugsparse --exclude *.sparse
$ ls $ ls -A
.hg
data.py data.py
index.html index.html
readme.txt readme.txt
$ hg debugsparse --clear-rules $ hg debugsparse --clear-rules
$ ls $ ls -A
.hg
base.sparse base.sparse
data.py data.py
index.html index.html
readme.txt readme.txt
webpage.sparse webpage.sparse
Clearing rules should not alter profiles Clearing rules should not alter profiles
$ hg debugsparse --enable-profile webpage.sparse $ hg debugsparse --enable-profile webpage.sparse
$ ls $ ls -A
.hg
base.sparse base.sparse
index.html index.html
webpage.sparse webpage.sparse
$ hg debugsparse --include *.py $ hg debugsparse --include *.py
$ ls $ ls -A
.hg
base.sparse base.sparse
data.py data.py
index.html index.html
webpage.sparse webpage.sparse
$ hg debugsparse --clear-rules $ hg debugsparse --clear-rules
$ ls $ ls -A
.hg
base.sparse base.sparse
index.html index.html
webpage.sparse webpage.sparse

tests/test-sparse-clone.t

Verify local clone with a sparse profile works Verify local clone with a sparse profile works
$ hg clone --enable-profile webpage.sparse myrepo clone1 $ hg clone --enable-profile webpage.sparse myrepo clone1
updating to branch default updating to branch default
warning: sparse profile 'webpage.sparse' not found in rev 000000000000 - ignoring it warning: sparse profile 'webpage.sparse' not found in rev 000000000000 - ignoring it
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd clone1 $ cd clone1
$ ls $ ls -A
.hg
index.html index.html
$ cd .. $ cd ..
Verify local clone with include works Verify local clone with include works
$ hg clone --include *.sparse myrepo clone2 $ hg clone --include *.sparse myrepo clone2
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd clone2 $ cd clone2
$ ls $ ls -A
.hg
backend.sparse backend.sparse
webpage.sparse webpage.sparse
$ cd .. $ cd ..
Verify local clone with exclude works Verify local clone with exclude works
$ hg clone --exclude data.py myrepo clone3 $ hg clone --exclude data.py myrepo clone3
updating to branch default updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd clone3 $ cd clone3
$ ls $ ls -A
.hg
backend.sparse backend.sparse
index.html index.html
readme.txt readme.txt
webpage.sparse webpage.sparse
$ cd .. $ cd ..
Verify sparse clone profile over ssh works Verify sparse clone profile over ssh works
$ hg clone -q --enable-profile webpage.sparse ssh://user@dummy/myrepo clone4 $ hg clone -q --enable-profile webpage.sparse ssh://user@dummy/myrepo clone4
warning: sparse profile 'webpage.sparse' not found in rev 000000000000 - ignoring it warning: sparse profile 'webpage.sparse' not found in rev 000000000000 - ignoring it
$ cd clone4 $ cd clone4
$ ls $ ls -A
.hg
index.html index.html
$ cd .. $ cd ..

tests/test-sparse-import.t

Import a rules file against a 'blank' sparse profile Import a rules file against a 'blank' sparse profile
$ cat > $TESTTMP/rules_to_import <<EOF $ cat > $TESTTMP/rules_to_import <<EOF
> [include] > [include]
> *.py > *.py
> EOF > EOF
$ hg debugsparse --import-rules $TESTTMP/rules_to_import $ hg debugsparse --import-rules $TESTTMP/rules_to_import
$ ls $ ls -A
.hg
data.py data.py
$ hg debugsparse --reset $ hg debugsparse --reset
$ rm .hg/sparse $ rm .hg/sparse
$ cat > $TESTTMP/rules_to_import <<EOF $ cat > $TESTTMP/rules_to_import <<EOF
> %include base.sparse > %include base.sparse
> [include] > [include]
> *.py > *.py
> EOF > EOF
$ hg debugsparse --import-rules $TESTTMP/rules_to_import $ hg debugsparse --import-rules $TESTTMP/rules_to_import
$ ls $ ls -A
.hg
base.sparse base.sparse
data.py data.py
webpage.sparse webpage.sparse
$ hg debugsparse --reset $ hg debugsparse --reset
$ rm .hg/sparse $ rm .hg/sparse
Start against an existing profile; rules *already active* should be ignored Start against an existing profile; rules *already active* should be ignored
$ hg debugsparse --enable-profile webpage.sparse $ hg debugsparse --enable-profile webpage.sparse
$ hg debugsparse --include *.py $ hg debugsparse --include *.py
$ cat > $TESTTMP/rules_to_import <<EOF $ cat > $TESTTMP/rules_to_import <<EOF
> %include base.sparse > %include base.sparse
> [include] > [include]
> *.html > *.html
> *.txt > *.txt
> [exclude] > [exclude]
> *.py > *.py
> EOF > EOF
$ hg debugsparse --import-rules $TESTTMP/rules_to_import $ hg debugsparse --import-rules $TESTTMP/rules_to_import
$ ls $ ls -A
.hg
base.sparse base.sparse
index.html index.html
readme.txt readme.txt
webpage.sparse webpage.sparse
$ cat .hg/sparse $ cat .hg/sparse
%include webpage.sparse %include webpage.sparse
[include] [include]
*.py *.py

tests/test-sparse-merges.t

$ hg merge feature $ hg merge feature
temporarily included 1 file(s) in the sparse checkout for merging temporarily included 1 file(s) in the sparse checkout for merging
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
Verify bar was merged temporarily Verify bar was merged temporarily
$ ls $ ls -A
.hg
bar bar
foo foo
$ hg status $ hg status
M bar M bar
Verify bar disappears automatically when the working copy becomes clean Verify bar disappears automatically when the working copy becomes clean
$ hg commit -m "merged" $ hg commit -m "merged"
cleaned up 1 temporarily added file(s) from the sparse checkout cleaned up 1 temporarily added file(s) from the sparse checkout
$ hg status $ hg status
$ ls $ ls -A
.hg
foo foo
$ hg cat -r . bar $ hg cat -r . bar
bar bar
bar2 bar2
Test merging things outside of the sparse checkout that are not in the working Test merging things outside of the sparse checkout that are not in the working
copy copy
|/ |/
o 2:f29feff37cfc added d o 2:f29feff37cfc added d
| |
o 1:617125d27d6b added a o 1:617125d27d6b added a
| |
o 0:53f3774ed939 added .hgignore o 0:53f3774ed939 added .hgignore
$ hg debugsparse --exclude "d" $ hg debugsparse --exclude "d"
$ ls $ ls -A
.hg
.hgignore
a a
$ hg merge $ hg merge
temporarily included 1 file(s) in the sparse checkout for merging temporarily included 1 file(s) in the sparse checkout for merging
file 'd' was deleted in other [merge rev] but was modified in local [working copy]. file 'd' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved. You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u What do you want to do? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|/ |/
o 2:f29feff37cfc added d o 2:f29feff37cfc added d
| |
o 1:617125d27d6b added a o 1:617125d27d6b added a
| |
o 0:53f3774ed939 added .hgignore o 0:53f3774ed939 added .hgignore
$ hg debugsparse --exclude "a" $ hg debugsparse --exclude "a"
$ ls $ ls -A
.hg
.hgignore
d d
$ hg merge $ hg merge
temporarily included 1 file(s) in the sparse checkout for merging temporarily included 1 file(s) in the sparse checkout for merging
merging a and amove to amove merging a and amove to amove
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)

tests/test-sparse-profiles.t

> EOF > EOF
$ hg ci -Aqm 'initial' $ hg ci -Aqm 'initial'
$ hg debugsparse --include '*.sparse' $ hg debugsparse --include '*.sparse'
Verify enabling a single profile works Verify enabling a single profile works
$ hg debugsparse --enable-profile webpage.sparse $ hg debugsparse --enable-profile webpage.sparse
$ ls $ ls -A
.hg
backend.sparse backend.sparse
index.html index.html
webpage.sparse webpage.sparse
Verify enabling two profiles works Verify enabling two profiles works
$ hg debugsparse --enable-profile backend.sparse $ hg debugsparse --enable-profile backend.sparse
$ ls $ ls -A
.hg
backend.sparse backend.sparse
data.py data.py
index.html index.html
webpage.sparse webpage.sparse
Verify disabling a profile works Verify disabling a profile works
$ hg debugsparse --disable-profile webpage.sparse $ hg debugsparse --disable-profile webpage.sparse
$ ls $ ls -A
.hg
backend.sparse backend.sparse
data.py data.py
webpage.sparse webpage.sparse
Verify that a profile is updated across multiple commits Verify that a profile is updated across multiple commits
$ cat > webpage.sparse <<EOF $ cat > webpage.sparse <<EOF
> # frontend sparse profile > # frontend sparse profile
> [include] > [include]
> *.html > *.html
> EOF > EOF
$ cat > backend.sparse <<EOF $ cat > backend.sparse <<EOF
> # backend sparse profile > # backend sparse profile
> [include] > [include]
> *.py > *.py
> *.txt > *.txt
> EOF > EOF
$ echo foo >> data.py $ echo foo >> data.py
$ hg ci -m 'edit profile' $ hg ci -m 'edit profile'
$ ls $ ls -A
.hg
backend.sparse backend.sparse
data.py data.py
readme.txt readme.txt
webpage.sparse webpage.sparse
$ hg up -q 0 $ hg up -q 0
$ ls $ ls -A
.hg
backend.sparse backend.sparse
data.py data.py
webpage.sparse webpage.sparse
$ hg up -q 1 $ hg up -q 1
$ ls $ ls -A
.hg
backend.sparse backend.sparse
data.py data.py
readme.txt readme.txt
webpage.sparse webpage.sparse
Introduce a conflicting .hgsparse change Introduce a conflicting .hgsparse change
$ hg up -q 0 $ hg up -q 0
$ cat > backend.sparse <<EOF $ cat > backend.sparse <<EOF
> # Different backend sparse profile > # Different backend sparse profile
> [include] > [include]
> *.html > *.html
> EOF > EOF
$ echo bar >> data.py $ echo bar >> data.py
$ hg ci -qAm "edit profile other" $ hg ci -qAm "edit profile other"
$ ls $ ls -A
.hg
backend.sparse backend.sparse
index.html index.html
webpage.sparse webpage.sparse
Verify conflicting merge pulls in the conflicting changes Verify conflicting merge pulls in the conflicting changes
$ hg merge 1 $ hg merge 1
temporarily included 2 file(s) in the sparse checkout for merging temporarily included 2 file(s) in the sparse checkout for merging
merging backend.sparse merging backend.sparse
merging data.py merging data.py
warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark') warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark')
warning: conflicts while merging data.py! (edit, then use 'hg resolve --mark') warning: conflicts while merging data.py! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 2 files unresolved 0 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ rm *.orig $ rm *.orig
$ ls $ ls -A
.hg
backend.sparse backend.sparse
data.py data.py
index.html index.html
webpage.sparse webpage.sparse
Verify resolving the merge removes the temporarily unioned files Verify resolving the merge removes the temporarily unioned files
$ cat > backend.sparse <<EOF $ cat > backend.sparse <<EOF
> # backend sparse profile > # backend sparse profile
> [include] > [include]
> *.html > *.html
> *.txt > *.txt
> EOF > EOF
$ hg resolve -m backend.sparse $ hg resolve -m backend.sparse
$ cat > data.py <<EOF $ cat > data.py <<EOF
> x > x
> foo > foo
> bar > bar
> EOF > EOF
$ hg resolve -m data.py $ hg resolve -m data.py
(no more unresolved files) (no more unresolved files)
$ hg ci -qAm "merge profiles" $ hg ci -qAm "merge profiles"
$ ls $ ls -A
.hg
backend.sparse backend.sparse
index.html index.html
readme.txt readme.txt
webpage.sparse webpage.sparse
$ hg cat -r . data.py $ hg cat -r . data.py
x x
foo foo
bar bar
Verify stripping refreshes dirstate Verify stripping refreshes dirstate
$ hg strip -q -r . $ hg strip -q -r .
$ ls $ ls -A
.hg
backend.sparse backend.sparse
index.html index.html
webpage.sparse webpage.sparse
Verify rebase conflicts pulls in the conflicting changes Verify rebase conflicts pulls in the conflicting changes
$ hg up -q 1 $ hg up -q 1
$ ls $ ls -A
.hg
backend.sparse backend.sparse
data.py data.py
readme.txt readme.txt
webpage.sparse webpage.sparse
$ hg rebase -d 2 $ hg rebase -d 2
rebasing 1:a2b1de640a62 "edit profile" rebasing 1:a2b1de640a62 "edit profile"
temporarily included 2 file(s) in the sparse checkout for merging temporarily included 2 file(s) in the sparse checkout for merging
merging backend.sparse merging backend.sparse
merging data.py merging data.py
warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark') warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark')
warning: conflicts while merging data.py! (edit, then use 'hg resolve --mark') warning: conflicts while merging data.py! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ rm *.orig $ rm *.orig
$ ls $ ls -A
.hg
backend.sparse backend.sparse
data.py data.py
index.html index.html
webpage.sparse webpage.sparse
Verify resolving conflict removes the temporary files Verify resolving conflict removes the temporary files
$ cat > backend.sparse <<EOF $ cat > backend.sparse <<EOF
> [include] > [include]
> *.html > *.html
> *.txt > *.txt
> EOF > EOF
$ hg resolve -m backend.sparse $ hg resolve -m backend.sparse
$ cat > data.py <<EOF $ cat > data.py <<EOF
> x > x
> foo > foo
> bar > bar
> EOF > EOF
$ hg resolve -m data.py $ hg resolve -m data.py
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase -q --continue $ hg rebase -q --continue
$ ls $ ls -A
.hg
backend.sparse backend.sparse
index.html index.html
readme.txt readme.txt
webpage.sparse webpage.sparse
$ hg cat -r . data.py $ hg cat -r . data.py
x x
foo foo
bar bar
Test checking out a commit that does not contain the sparse profile. The Test checking out a commit that does not contain the sparse profile. The
warning message can be suppressed by setting missingwarning = false in warning message can be suppressed by setting missingwarning = false in
[sparse] section of your config: [sparse] section of your config:
$ hg debugsparse --reset $ hg debugsparse --reset
$ hg rm *.sparse $ hg rm *.sparse
$ hg commit -m "delete profiles" $ hg commit -m "delete profiles"
$ hg up -q ".^" $ hg up -q ".^"
$ hg debugsparse --enable-profile backend.sparse $ hg debugsparse --enable-profile backend.sparse
$ ls $ ls -A
.hg
index.html index.html
readme.txt readme.txt
$ hg up tip | grep warning $ hg up tip | grep warning
warning: sparse profile 'backend.sparse' not found in rev bfcb76de99cc - ignoring it warning: sparse profile 'backend.sparse' not found in rev bfcb76de99cc - ignoring it
[1] [1]
$ ls $ ls -A
.hg
data.py data.py
index.html index.html
readme.txt readme.txt
$ hg debugsparse --disable-profile backend.sparse | grep warning $ hg debugsparse --disable-profile backend.sparse | grep warning
warning: sparse profile 'backend.sparse' not found in rev bfcb76de99cc - ignoring it warning: sparse profile 'backend.sparse' not found in rev bfcb76de99cc - ignoring it
[1] [1]
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [sparse] > [sparse]

tests/test-sparse-requirement.t

fncache fncache
generaldelta generaldelta
revlogv1 revlogv1
sparserevlog sparserevlog
store store
testonly-simplestore (reposimplestore !) testonly-simplestore (reposimplestore !)
$ hg debugsparse --config extensions.sparse= --enable-profile frontend.sparse $ hg debugsparse --config extensions.sparse= --enable-profile frontend.sparse
$ ls $ ls -A
.hg
a.html a.html
b.html b.html
Requirement for sparse added when sparse is enabled Requirement for sparse added when sparse is enabled
$ cat .hg/requires $ cat .hg/requires
dotencode dotencode
exp-sparse exp-sparse

tests/test-sparse.t

$ echo aa > show2 $ echo aa > show2
$ echo xx > hide2 $ echo xx > hide2
$ hg ci -Aqm 'two' $ hg ci -Aqm 'two'
Verify basic --include Verify basic --include
$ hg up -q 0 $ hg up -q 0
$ hg debugsparse --include 'hide' $ hg debugsparse --include 'hide'
$ ls $ ls -A
.hg
hide hide
Absolute paths outside the repo should just be rejected Absolute paths outside the repo should just be rejected
#if no-windows #if no-windows
$ hg debugsparse --include /foo/bar $ hg debugsparse --include /foo/bar
abort: paths cannot be absolute abort: paths cannot be absolute
[255] [255]
subdir/path subdir/path
$ rm -rf subdir $ rm -rf subdir
Verify commiting while sparse includes other files Verify commiting while sparse includes other files
$ echo z > hide $ echo z > hide
$ hg ci -Aqm 'edit hide' $ hg ci -Aqm 'edit hide'
$ ls $ ls -A
.hg
hide hide
$ hg manifest $ hg manifest
hide hide
show show
Verify --reset brings files back Verify --reset brings files back
$ hg debugsparse --reset $ hg debugsparse --reset
$ ls $ ls -A
.hg
hide hide
show show
$ cat hide $ cat hide
z z
$ cat show $ cat show
a a
Verify 'hg debugsparse' default output Verify 'hg debugsparse' default output
$ hg up -q null $ hg up -q null
$ hg debugsparse --include 'show*' $ hg debugsparse --include 'show*'
$ hg debugsparse $ hg debugsparse
[include] [include]
show* show*
Verify update only writes included files Verify update only writes included files
$ hg up -q 0 $ hg up -q 0
$ ls $ ls -A
.hg
show show
$ hg up -q 1 $ hg up -q 1
$ ls $ ls -A
.hg
show show
show2 show2
Verify status only shows included files Verify status only shows included files
$ touch hide $ touch hide
$ touch hide3 $ touch hide3
$ echo c > show $ echo c > show
pending changes to 'hide' pending changes to 'hide'
abort: cannot change sparseness due to pending changes (delete the files or use --force to bring them back dirty) abort: cannot change sparseness due to pending changes (delete the files or use --force to bring them back dirty)
[255] [255]
Verify deleting sparseness with --force brings back files Verify deleting sparseness with --force brings back files
$ hg debugsparse --delete -f 'show*' $ hg debugsparse --delete -f 'show*'
pending changes to 'hide' pending changes to 'hide'
$ ls $ ls -A
.hg
hide hide
hide2 hide2
hide3 hide3
show show
show2 show2
$ hg st $ hg st
M hide M hide
M show M show
? hide3 ? hide3
Verify editing sparseness fails if pending changes Verify editing sparseness fails if pending changes
$ hg debugsparse --include 'show*' $ hg debugsparse --include 'show*'
pending changes to 'hide' pending changes to 'hide'
abort: could not update sparseness due to pending changes abort: could not update sparseness due to pending changes
[255] [255]
Verify adding sparseness hides files Verify adding sparseness hides files
$ hg debugsparse --exclude -f 'hide*' $ hg debugsparse --exclude -f 'hide*'
pending changes to 'hide' pending changes to 'hide'
$ ls $ ls -A
.hg
hide hide
hide3 hide3
show show
show2 show2
$ hg st $ hg st
M show M show
$ hg up -qC . $ hg up -qC .
TODO: add an option to purge to also purge files outside the sparse config? TODO: add an option to purge to also purge files outside the sparse config?
$ hg purge --all --config extensions.purge= $ hg purge --all --config extensions.purge=
$ ls $ ls -A
.hg
hide hide
hide3 hide3
show show
show2 show2
For now, manually remove the files For now, manually remove the files
$ rm hide hide3 $ rm hide hide3
Verify rebase temporarily includes excluded files Verify rebase temporarily includes excluded files
Verify aborting a rebase cleans up temporary files Verify aborting a rebase cleans up temporary files
$ hg rebase --abort --config extensions.rebase= $ hg rebase --abort --config extensions.rebase=
cleaned up 1 temporarily added file(s) from the sparse checkout cleaned up 1 temporarily added file(s) from the sparse checkout
rebase aborted rebase aborted
$ rm hide.orig $ rm hide.orig
$ ls $ ls -A
.hg
show show
show2 show2
Verify merge fails if merging excluded files Verify merge fails if merging excluded files
$ hg up -q 1 $ hg up -q 1
$ hg merge -r 2 $ hg merge -r 2
temporarily included 2 file(s) in the sparse checkout for merging temporarily included 2 file(s) in the sparse checkout for merging

tests/test-subrepo-missing.t

$ rm .hgsub $ rm .hgsub
$ hg up 0 --cwd $TESTTMP -R $TESTTMP/repo $ hg up 0 --cwd $TESTTMP -R $TESTTMP/repo
warning: subrepo spec file 'repo/.hgsub' not found warning: subrepo spec file 'repo/.hgsub' not found
warning: subrepo spec file 'repo/.hgsub' not found warning: subrepo spec file 'repo/.hgsub' not found
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg st $ hg st
warning: subrepo spec file '.hgsub' not found warning: subrepo spec file '.hgsub' not found
! .hgsub ! .hgsub
$ ls subrepo $ ls -A subrepo
.hg
a a
delete .hgsubstate and update delete .hgsubstate and update
$ hg up -C $ hg up -C
warning: subrepo spec file '.hgsub' not found warning: subrepo spec file '.hgsub' not found
warning: subrepo spec file '.hgsub' not found warning: subrepo spec file '.hgsub' not found
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm .hgsubstate $ rm .hgsubstate
$ hg up 0 $ hg up 0
other [destination] changed .hgsubstate which local [working copy] deleted other [destination] changed .hgsubstate which local [working copy] deleted
use (c)hanged version or leave (d)eleted? c use (c)hanged version or leave (d)eleted? c
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg st $ hg st
$ ls subrepo $ ls -A subrepo
.hg
a a
Enable obsolete Enable obsolete
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [ui] > [ui]
> logtemplate= {rev}:{node|short} {desc|firstline} > logtemplate= {rev}:{node|short} {desc|firstline}
> [phases] > [phases]
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 5 changesets with 5 changes to 2 files checked 5 changesets with 5 changes to 2 files
checking subrepo links checking subrepo links
0: repository $TESTTMP/repo/subrepo not found 0: repository $TESTTMP/repo/subrepo not found
1: repository $TESTTMP/repo/subrepo not found 1: repository $TESTTMP/repo/subrepo not found
3: repository $TESTTMP/repo/subrepo not found 3: repository $TESTTMP/repo/subrepo not found
4: repository $TESTTMP/repo/subrepo not found 4: repository $TESTTMP/repo/subrepo not found
$ ls $ ls -A
.hg
.hgsub
.hgsubstate
b b
$ mv b subrepo $ mv b subrepo
$ cd .. $ cd ..

tests/test-subrepo.t

clone with subrepo disabled (update should fail) clone with subrepo disabled (update should fail)
$ hg clone t -U tc2 --config subrepos.allowed=false $ hg clone t -U tc2 --config subrepos.allowed=false
$ hg update -R tc2 --config subrepos.allowed=false $ hg update -R tc2 --config subrepos.allowed=false
abort: subrepos not enabled abort: subrepos not enabled
(see 'hg help config.subrepos' for details) (see 'hg help config.subrepos' for details)
[255] [255]
$ ls tc2 $ ls -A tc2
.hg
.hgsub
.hgsubstate
a a
$ hg clone t tc3 --config subrepos.allowed=false $ hg clone t tc3 --config subrepos.allowed=false
updating to branch default updating to branch default
abort: subrepos not enabled abort: subrepos not enabled
(see 'hg help config.subrepos' for details) (see 'hg help config.subrepos' for details)
[255] [255]
$ ls tc3 $ ls -A tc3
.hg
.hgsub
.hgsubstate
a a
And again with just the hg type disabled And again with just the hg type disabled
$ hg clone t -U tc4 --config subrepos.hg:allowed=false $ hg clone t -U tc4 --config subrepos.hg:allowed=false
$ hg update -R tc4 --config subrepos.hg:allowed=false $ hg update -R tc4 --config subrepos.hg:allowed=false
abort: hg subrepos not allowed abort: hg subrepos not allowed
(see 'hg help config.subrepos' for details) (see 'hg help config.subrepos' for details)
[255] [255]
$ ls tc4 $ ls -A tc4
.hg
.hgsub
.hgsubstate
a a
$ hg clone t tc5 --config subrepos.hg:allowed=false $ hg clone t tc5 --config subrepos.hg:allowed=false
updating to branch default updating to branch default
abort: hg subrepos not allowed abort: hg subrepos not allowed
(see 'hg help config.subrepos' for details) (see 'hg help config.subrepos' for details)
[255] [255]
$ ls tc5 $ ls -A tc5
.hg
.hgsub
.hgsubstate
a a
push push
$ cd tc $ cd tc
$ echo bah > t/t $ echo bah > t/t
$ hg ci -m11 $ hg ci -m11
committing subrepository t committing subrepository t

tests/test-uncommit.t

(no changeset checked out) (no changeset checked out)
[255] [255]
Create some commits Create some commits
$ touch files $ touch files
$ hg add files $ hg add files
$ for i in a ab abc abcd abcde; do echo $i > files; echo $i > file-$i; hg add file-$i; hg commit -m "added file-$i"; done $ for i in a ab abc abcd abcde; do echo $i > files; echo $i > file-$i; hg add file-$i; hg commit -m "added file-$i"; done
$ ls $ ls -A
.hg
file-a file-a
file-ab file-ab
file-abc file-abc
file-abcd file-abcd
file-abcde file-abcde
files files
$ hg log -G -T '{rev}:{node} {desc}' --hidden $ hg log -G -T '{rev}:{node} {desc}' --hidden

tests/test-update-reverse.t

$ hg init $ hg init
$ touch a $ touch a
$ hg add a $ hg add a
$ hg commit -m "Added a" $ hg commit -m "Added a"
$ touch main $ touch main
$ hg add main $ hg add main
$ hg commit -m "Added main" $ hg commit -m "Added main"
$ hg checkout 0 $ hg checkout 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
'main' should be gone: 'main' should be gone:
$ ls $ ls -A
.hg
a a
$ touch side1 $ touch side1
$ hg add side1 $ hg add side1
$ hg commit -m "Added side1" $ hg commit -m "Added side1"
created new head created new head
$ touch side2 $ touch side2
$ hg add side2 $ hg add side2
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: Added side2 summary: Added side2
changeset: 1:71a760306caf changeset: 1:71a760306caf
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: Added main summary: Added main
$ ls $ ls -A
.hg
a a
side1 side1
side2 side2
$ hg update --debug -C 1 $ hg update --debug -C 1
resolving manifests resolving manifests
branchmerge: False, force: True, partial: False branchmerge: False, force: True, partial: False
ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf
side1: other deleted -> r side1: other deleted -> r
removing side1 removing side1
side2: other deleted -> r side2: other deleted -> r
removing side2 removing side2
main: remote created -> g main: remote created -> g
getting main getting main
1 files updated, 0 files merged, 2 files removed, 0 files unresolved 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ ls $ ls -A
.hg
a a
main main