Mercurial > hg
annotate tests/test-purge.t @ 44856:b7808443ed6a
mergestate: split out merge state handling code from main merge module
There's already some pretty reasonable encapsulation here, but I want
to make the mergestate storage a property of the context so memctx
instances can do a reasonable thing. This is the first step in a
reshuffle to make that easier.
Differential Revision: https://phab.mercurial-scm.org/D8550
author | Augie Fackler <augie@google.com> |
---|---|
date | Mon, 18 May 2020 14:59:59 -0400 |
parents | 5c2a4f37eace |
children | 135056e8b5a8 |
rev | line source |
---|---|
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
1 $ cat <<EOF >> $HGRCPATH |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
2 > [extensions] |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
3 > purge = |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
4 > EOF |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
5 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
6 init |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
7 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
8 $ hg init t |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
9 $ cd t |
4145
2ebdd33fe456
Add a test for the purge extension
Emanuele Aina <faina.mail@tiscali.it>
parents:
diff
changeset
|
10 |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
11 setup |
4145
2ebdd33fe456
Add a test for the purge extension
Emanuele Aina <faina.mail@tiscali.it>
parents:
diff
changeset
|
12 |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
13 $ echo r1 > r1 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
14 $ hg ci -qAmr1 -d'0 0' |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
15 $ mkdir directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
16 $ echo r2 > directory/r2 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
17 $ hg ci -qAmr2 -d'1 0' |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
18 $ echo 'ignored' > .hgignore |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
19 $ hg ci -qAmr3 -d'2 0' |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
20 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
21 delete an empty directory |
4145
2ebdd33fe456
Add a test for the purge extension
Emanuele Aina <faina.mail@tiscali.it>
parents:
diff
changeset
|
22 |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
23 $ mkdir empty_dir |
20565
f1c3ba167b0c
purge: avoid duplicate output for --print (issue4092)
anuraggoel <anurag.dsps@gmail.com>
parents:
16930
diff
changeset
|
24 $ hg purge -p -v |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
25 empty_dir |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
26 $ hg purge -v |
16930
9efe4a95c099
purge: lowercase messages
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
27 removing directory empty_dir |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
28 $ ls -A |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
29 .hg |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
30 .hgignore |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
31 directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
32 r1 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
33 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
34 delete an untracked directory |
4145
2ebdd33fe456
Add a test for the purge extension
Emanuele Aina <faina.mail@tiscali.it>
parents:
diff
changeset
|
35 |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
36 $ mkdir untracked_dir |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
37 $ touch untracked_dir/untracked_file1 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
38 $ touch untracked_dir/untracked_file2 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
39 $ hg purge -p |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
40 untracked_dir/untracked_file1 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
41 untracked_dir/untracked_file2 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
42 $ hg purge -v |
16930
9efe4a95c099
purge: lowercase messages
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
43 removing file untracked_dir/untracked_file1 |
9efe4a95c099
purge: lowercase messages
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
44 removing file untracked_dir/untracked_file2 |
9efe4a95c099
purge: lowercase messages
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
45 removing directory untracked_dir |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
46 $ ls -A |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
47 .hg |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
48 .hgignore |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
49 directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
50 r1 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
51 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
52 delete an untracked file |
4145
2ebdd33fe456
Add a test for the purge extension
Emanuele Aina <faina.mail@tiscali.it>
parents:
diff
changeset
|
53 |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
54 $ touch untracked_file |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
55 $ touch untracked_file_readonly |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
33262
diff
changeset
|
56 $ "$PYTHON" <<EOF |
40369
ef6cab7930b3
py3: fix module imports in tests, as flagged by test-check-module-imports.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
39707
diff
changeset
|
57 > import os |
ef6cab7930b3
py3: fix module imports in tests, as flagged by test-check-module-imports.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
39707
diff
changeset
|
58 > import stat |
41738
c70bdd222dcd
tests: bulk changes to avoid whitespace errors of check-code.py
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
40369
diff
changeset
|
59 > f = 'untracked_file_readonly' |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
60 > os.chmod(f, stat.S_IMODE(os.stat(f).st_mode) & ~stat.S_IWRITE) |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
61 > EOF |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
62 $ hg purge -p |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
63 untracked_file |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
64 untracked_file_readonly |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
65 $ hg purge -v |
16930
9efe4a95c099
purge: lowercase messages
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
66 removing file untracked_file |
9efe4a95c099
purge: lowercase messages
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
67 removing file untracked_file_readonly |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
68 $ ls -A |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
69 .hg |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
70 .hgignore |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
71 directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
72 r1 |
4145
2ebdd33fe456
Add a test for the purge extension
Emanuele Aina <faina.mail@tiscali.it>
parents:
diff
changeset
|
73 |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
74 delete an untracked file in a tracked directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
75 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
76 $ touch directory/untracked_file |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
77 $ hg purge -p |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
78 directory/untracked_file |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
79 $ hg purge -v |
16930
9efe4a95c099
purge: lowercase messages
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
80 removing file directory/untracked_file |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
81 $ ls -A |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
82 .hg |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
83 .hgignore |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
84 directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
85 r1 |
4145
2ebdd33fe456
Add a test for the purge extension
Emanuele Aina <faina.mail@tiscali.it>
parents:
diff
changeset
|
86 |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
87 delete nested directories |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
88 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
89 $ mkdir -p untracked_directory/nested_directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
90 $ hg purge -p |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
91 untracked_directory/nested_directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
92 $ hg purge -v |
16930
9efe4a95c099
purge: lowercase messages
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
93 removing directory untracked_directory/nested_directory |
9efe4a95c099
purge: lowercase messages
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
94 removing directory untracked_directory |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
95 $ ls -A |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
96 .hg |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
97 .hgignore |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
98 directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
99 r1 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
100 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
101 delete nested directories from a subdir |
4145
2ebdd33fe456
Add a test for the purge extension
Emanuele Aina <faina.mail@tiscali.it>
parents:
diff
changeset
|
102 |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
103 $ mkdir -p untracked_directory/nested_directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
104 $ cd directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
105 $ hg purge -p |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
106 untracked_directory/nested_directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
107 $ hg purge -v |
16930
9efe4a95c099
purge: lowercase messages
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
108 removing directory untracked_directory/nested_directory |
9efe4a95c099
purge: lowercase messages
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
109 removing directory untracked_directory |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
110 $ cd .. |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
111 $ ls -A |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
112 .hg |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
113 .hgignore |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
114 directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
115 r1 |
4145
2ebdd33fe456
Add a test for the purge extension
Emanuele Aina <faina.mail@tiscali.it>
parents:
diff
changeset
|
116 |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
117 delete only part of the tree |
4155
4c714ed245d6
purge.py: fix invocation of statwalk
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4145
diff
changeset
|
118 |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
119 $ mkdir -p untracked_directory/nested_directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
120 $ touch directory/untracked_file |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
121 $ cd directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
122 $ hg purge -p ../untracked_directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
123 untracked_directory/nested_directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
124 $ hg purge -v ../untracked_directory |
16930
9efe4a95c099
purge: lowercase messages
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
125 removing directory untracked_directory/nested_directory |
9efe4a95c099
purge: lowercase messages
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
126 removing directory untracked_directory |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
127 $ cd .. |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
128 $ ls -A |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
129 .hg |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
130 .hgignore |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
131 directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
132 r1 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
133 $ ls directory/untracked_file |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
134 directory/untracked_file |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
135 $ rm directory/untracked_file |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
136 |
44289
9f8eddd2723f
purge: add -i flag to delete ignored files instead of untracked files
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
41738
diff
changeset
|
137 skip ignored files if -i or --all not specified |
4155
4c714ed245d6
purge.py: fix invocation of statwalk
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4145
diff
changeset
|
138 |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
139 $ touch ignored |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
140 $ hg purge -p |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
141 $ hg purge -v |
44289
9f8eddd2723f
purge: add -i flag to delete ignored files instead of untracked files
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
41738
diff
changeset
|
142 $ touch untracked_file |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
143 $ ls |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
144 directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
145 ignored |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
146 r1 |
44289
9f8eddd2723f
purge: add -i flag to delete ignored files instead of untracked files
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
41738
diff
changeset
|
147 untracked_file |
9f8eddd2723f
purge: add -i flag to delete ignored files instead of untracked files
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
41738
diff
changeset
|
148 $ hg purge -p -i |
9f8eddd2723f
purge: add -i flag to delete ignored files instead of untracked files
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
41738
diff
changeset
|
149 ignored |
9f8eddd2723f
purge: add -i flag to delete ignored files instead of untracked files
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
41738
diff
changeset
|
150 $ hg purge -v -i |
9f8eddd2723f
purge: add -i flag to delete ignored files instead of untracked files
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
41738
diff
changeset
|
151 removing file ignored |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
152 $ ls -A |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
153 .hg |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
154 .hgignore |
44289
9f8eddd2723f
purge: add -i flag to delete ignored files instead of untracked files
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
41738
diff
changeset
|
155 directory |
9f8eddd2723f
purge: add -i flag to delete ignored files instead of untracked files
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
41738
diff
changeset
|
156 r1 |
9f8eddd2723f
purge: add -i flag to delete ignored files instead of untracked files
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
41738
diff
changeset
|
157 untracked_file |
9f8eddd2723f
purge: add -i flag to delete ignored files instead of untracked files
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
41738
diff
changeset
|
158 $ touch ignored |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
159 $ hg purge -p --all |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
160 ignored |
44289
9f8eddd2723f
purge: add -i flag to delete ignored files instead of untracked files
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
41738
diff
changeset
|
161 untracked_file |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
162 $ hg purge -v --all |
16930
9efe4a95c099
purge: lowercase messages
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
163 removing file ignored |
44289
9f8eddd2723f
purge: add -i flag to delete ignored files instead of untracked files
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
41738
diff
changeset
|
164 removing file untracked_file |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
165 $ ls |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
166 directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
167 r1 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
168 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
169 abort with missing files until we support name mangling filesystems |
4310
c8919eb0f315
purge: abort with missing files avoiding problems with name-mangling fs
Emanuele Aina <em@nerd.ocracy.org>
parents:
4155
diff
changeset
|
170 |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
171 $ touch untracked_file |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
172 $ rm r1 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
173 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
174 hide error messages to avoid changing the output when the text changes |
6757 | 175 |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
176 $ hg purge -p 2> /dev/null |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
177 untracked_file |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
178 $ hg st |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
179 ! r1 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
180 ? untracked_file |
6757 | 181 |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
182 $ hg purge -p |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
183 untracked_file |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
184 $ hg purge -v 2> /dev/null |
16930
9efe4a95c099
purge: lowercase messages
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
185 removing file untracked_file |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
186 $ hg st |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
187 ! r1 |
4463
a73cf208b2a0
purge: add --include and --exclude options
Emanuele Aina <em@nerd.ocracy.org>
parents:
4311
diff
changeset
|
188 |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
189 $ hg purge -v |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
190 $ hg revert --all --quiet |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
191 $ hg st -a |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
192 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
193 tracked file in ignored directory (issue621) |
5517
98d5f9b95699
purge: simplify safety net for case mangling filesystems
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4691
diff
changeset
|
194 |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
195 $ echo directory >> .hgignore |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
196 $ hg ci -m 'ignore directory' |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
197 $ touch untracked_file |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
198 $ hg purge -p |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
199 untracked_file |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
200 $ hg purge -v |
16930
9efe4a95c099
purge: lowercase messages
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
201 removing file untracked_file |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
202 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
203 skip excluded files |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
204 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
205 $ touch excluded_file |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
206 $ hg purge -p -X excluded_file |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
207 $ hg purge -v -X excluded_file |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
208 $ ls -A |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
209 .hg |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
210 .hgignore |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
211 directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
212 excluded_file |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
213 r1 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
214 $ rm excluded_file |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
215 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
216 skip files in excluded dirs |
4463
a73cf208b2a0
purge: add --include and --exclude options
Emanuele Aina <em@nerd.ocracy.org>
parents:
4311
diff
changeset
|
217 |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
218 $ mkdir excluded_dir |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
219 $ touch excluded_dir/file |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
220 $ hg purge -p -X excluded_dir |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
221 $ hg purge -v -X excluded_dir |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
222 $ ls -A |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
223 .hg |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
224 .hgignore |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
225 directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
226 excluded_dir |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
227 r1 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
228 $ ls excluded_dir |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
229 file |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
230 $ rm -R excluded_dir |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
231 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
232 skip excluded empty dirs |
4463
a73cf208b2a0
purge: add --include and --exclude options
Emanuele Aina <em@nerd.ocracy.org>
parents:
4311
diff
changeset
|
233 |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
234 $ mkdir excluded_dir |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
235 $ hg purge -p -X excluded_dir |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
236 $ hg purge -v -X excluded_dir |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
237 $ ls -A |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
238 .hg |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
239 .hgignore |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
240 directory |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
241 excluded_dir |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
242 r1 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
243 $ rmdir excluded_dir |
4463
a73cf208b2a0
purge: add --include and --exclude options
Emanuele Aina <em@nerd.ocracy.org>
parents:
4311
diff
changeset
|
244 |
12122
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
245 skip patterns |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
246 |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
247 $ mkdir .svn |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
248 $ touch .svn/foo |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
249 $ mkdir directory/.svn |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
250 $ touch directory/.svn/foo |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
251 $ hg purge -p -X .svn -X '*/.svn' |
9bab9ee901e8
tests: unify test-purge
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10119
diff
changeset
|
252 $ hg purge -p -X re:.*.svn |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12122
diff
changeset
|
253 |
21853
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
254 $ rm -R .svn directory r1 |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
255 |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
256 only remove files |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
257 |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
258 $ mkdir -p empty_dir dir |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
259 $ touch untracked_file dir/untracked_file |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
260 $ hg purge -p --files |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
261 dir/untracked_file |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
262 untracked_file |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
263 $ hg purge -v --files |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
264 removing file dir/untracked_file |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
265 removing file untracked_file |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
266 $ ls -A |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
267 .hg |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
268 .hgignore |
21853
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
269 dir |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
270 empty_dir |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
271 $ ls dir |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
272 |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
273 only remove dirs |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
274 |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
275 $ mkdir -p empty_dir dir |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
276 $ touch untracked_file dir/untracked_file |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
277 $ hg purge -p --dirs |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
278 empty_dir |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
279 $ hg purge -v --dirs |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
280 removing directory empty_dir |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
281 $ ls -A |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
282 .hg |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
283 .hgignore |
21853
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
284 dir |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
285 untracked_file |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
286 $ ls dir |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
287 untracked_file |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
288 |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
289 remove both files and dirs |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
290 |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
291 $ mkdir -p empty_dir dir |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
292 $ touch untracked_file dir/untracked_file |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
293 $ hg purge -p --files --dirs |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
294 dir/untracked_file |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
295 untracked_file |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
296 empty_dir |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
297 $ hg purge -v --files --dirs |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
298 removing file dir/untracked_file |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
299 removing file untracked_file |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
300 removing directory empty_dir |
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
301 removing directory dir |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
302 $ ls -A |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
303 .hg |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
44289
diff
changeset
|
304 .hgignore |
21853
8127b9e798b1
purge: add options for deleting only files or only directories
Ben Kehoe <benk@berkeley.edu>
parents:
20565
diff
changeset
|
305 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12122
diff
changeset
|
306 $ cd .. |