annotate tests/test-remove.out @ 6338:0750f11152fe

clone: print "updating working directory" status message With this change, "hg clone" looks like this: % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved So the user sees % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory while Mercurial is writing to disk to populate the working directory With this change, "hg clone" looks like this: % hg clone big big-work updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
author Adrian Buehlmann <adrian@cadifra.com>
date Fri, 21 Mar 2008 14:52:24 +0100
parents a6436e9333db
children 8e3b651382f5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2309
b2f37c7026ca remove: rewrite to be ~400x faster, bit more friendly
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2302
diff changeset
1 not removing foo: file is not managed
2180
82385773df6c make test-remove check some more cases.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2175
diff changeset
2 abort: no files specified
82385773df6c make test-remove check some more cases.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2175
diff changeset
3 undeleting foo
82385773df6c make test-remove check some more cases.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2175
diff changeset
4 removing foo
1570
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
5 # HG changeset patch
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
6 # User test
2302
506fcf779cae Corrected test for date in output of 'hg export'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2180
diff changeset
7 # Date 1000000 0
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1645
diff changeset
8 # Node ID 8ba83d44753d6259db5ce6524974dd1174e90f47
1570
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
9 # Parent 0000000000000000000000000000000000000000
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
10 1
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
11
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1645
diff changeset
12 diff -r 000000000000 -r 8ba83d44753d foo
3199
096f1c73cdc3 Add -D/--nodates options to hg diff/export that removes dates from diff headers
Stephen Darnell <stephen@darnell.plus.com>
parents: 2309
diff changeset
13 --- /dev/null
096f1c73cdc3 Add -D/--nodates options to hg diff/export that removes dates from diff headers
Stephen Darnell <stephen@darnell.plus.com>
parents: 2309
diff changeset
14 +++ b/foo
1570
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
15 @@ -0,0 +1,1 @@
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
16 +a
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
17 # HG changeset patch
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
18 # User test
2302
506fcf779cae Corrected test for date in output of 'hg export'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2180
diff changeset
19 # Date 1000000 0
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1645
diff changeset
20 # Node ID a1fce69c50d97881c5c014ab23f580f720c78678
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1645
diff changeset
21 # Parent 8ba83d44753d6259db5ce6524974dd1174e90f47
1570
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
22 2
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
23
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1645
diff changeset
24 diff -r 8ba83d44753d -r a1fce69c50d9 foo
3199
096f1c73cdc3 Add -D/--nodates options to hg diff/export that removes dates from diff headers
Stephen Darnell <stephen@darnell.plus.com>
parents: 2309
diff changeset
25 --- a/foo
096f1c73cdc3 Add -D/--nodates options to hg diff/export that removes dates from diff headers
Stephen Darnell <stephen@darnell.plus.com>
parents: 2309
diff changeset
26 +++ /dev/null
1570
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
27 @@ -1,1 +0,0 @@
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
28 -a
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1645
diff changeset
29 changeset: 0:8ba83d44753d
1570
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
30 user: test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1645
diff changeset
31 date: Mon Jan 12 13:46:40 1970 +0000
1570
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
32 summary: 1
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
33
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1645
diff changeset
34 diff -r 000000000000 -r 8ba83d44753d foo
1953
379ab45b91b7 change default strftime format for better portability
TK Soh <teekaysoh@yahoo.com>
parents: 1933
diff changeset
35 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1645
diff changeset
36 +++ b/foo Mon Jan 12 13:46:40 1970 +0000
1570
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
37 @@ -0,0 +1,1 @@
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
38 +a
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
39
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1645
diff changeset
40 changeset: 1:a1fce69c50d9
1570
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
41 tag: tip
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
42 user: test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1645
diff changeset
43 date: Mon Jan 12 13:46:40 1970 +0000
1570
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
44 summary: 2
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
45
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1645
diff changeset
46 diff -r 8ba83d44753d -r a1fce69c50d9 foo
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1645
diff changeset
47 --- a/foo Mon Jan 12 13:46:40 1970 +0000
1953
379ab45b91b7 change default strftime format for better portability
TK Soh <teekaysoh@yahoo.com>
parents: 1933
diff changeset
48 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
1570
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
49 @@ -1,1 +0,0 @@
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
50 -a
6a104941d56a hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
51
2309
b2f37c7026ca remove: rewrite to be ~400x faster, bit more friendly
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2302
diff changeset
52 not removing a: file has been marked for add (use -f to force removal)
b2f37c7026ca remove: rewrite to be ~400x faster, bit more friendly
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2302
diff changeset
53 adding a
b2f37c7026ca remove: rewrite to be ~400x faster, bit more friendly
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2302
diff changeset
54 adding b
4394
a6436e9333db Also restore old rm -A behavior for inexact patterns
Brendan Cully <brendan@kublai.com>
parents: 4393
diff changeset
55 adding c/d
2309
b2f37c7026ca remove: rewrite to be ~400x faster, bit more friendly
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2302
diff changeset
56 not removing b: file is modified (use -f to force removal)
4393
cf5f35ec4720 Fix rm -A with no patterns, which I just broke.
Brendan Cully <brendan@kublai.com>
parents: 4392
diff changeset
57 R b
4394
a6436e9333db Also restore old rm -A behavior for inexact patterns
Brendan Cully <brendan@kublai.com>
parents: 4393
diff changeset
58 R c/d
a6436e9333db Also restore old rm -A behavior for inexact patterns
Brendan Cully <brendan@kublai.com>
parents: 4393
diff changeset
59 d
a6436e9333db Also restore old rm -A behavior for inexact patterns
Brendan Cully <brendan@kublai.com>
parents: 4393
diff changeset
60 undeleting c/d
a6436e9333db Also restore old rm -A behavior for inexact patterns
Brendan Cully <brendan@kublai.com>
parents: 4393
diff changeset
61 R b
4393
cf5f35ec4720 Fix rm -A with no patterns, which I just broke.
Brendan Cully <brendan@kublai.com>
parents: 4392
diff changeset
62 R b
4394
a6436e9333db Also restore old rm -A behavior for inexact patterns
Brendan Cully <brendan@kublai.com>
parents: 4393
diff changeset
63 removing c/d
4393
cf5f35ec4720 Fix rm -A with no patterns, which I just broke.
Brendan Cully <brendan@kublai.com>
parents: 4392
diff changeset
64 R b
4394
a6436e9333db Also restore old rm -A behavior for inexact patterns
Brendan Cully <brendan@kublai.com>
parents: 4393
diff changeset
65 R c/d
6338
0750f11152fe clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents: 4394
diff changeset
66 updating working directory
4392
9770d260a405 Make rm --after simply mark files as removed, unless --force is also given
Brendan Cully <brendan@kublai.com>
parents: 3645
diff changeset
67 3 files updated, 0 files merged, 0 files removed, 0 files unresolved