Mercurial > hg

comparison tests/test-import.out @ 6338:0750f11152fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 4b0c9c674707
children ba0b2dacc623
comparison
equal deleted inserted replaced
6337:d2713d902524 6338:0750f11152fe
4 requesting all changes 4 requesting all changes
5 adding changesets 5 adding changesets
6 adding manifests 6 adding manifests
7 adding file changes 7 adding file changes
8 added 1 changesets with 2 changes to 2 files 8 added 1 changesets with 2 changes to 2 files
9 updating working directory
9 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 10 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
10 applying ../tip.patch 11 applying ../tip.patch
11 % message should be same 12 % message should be same
12 summary: second change 13 summary: second change
13 % committer should be same 14 % committer should be same
16 requesting all changes 17 requesting all changes
17 adding changesets 18 adding changesets
18 adding manifests 19 adding manifests
19 adding file changes 20 adding file changes
20 added 1 changesets with 2 changes to 2 files 21 added 1 changesets with 2 changes to 2 files
22 updating working directory
21 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 23 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
22 applying ../tip.patch 24 applying ../tip.patch
23 transaction abort! 25 transaction abort!
24 rollback completed 26 rollback completed
25 abort: empty commit message 27 abort: empty commit message
27 requesting all changes 29 requesting all changes
28 adding changesets 30 adding changesets
29 adding manifests 31 adding manifests
30 adding file changes 32 adding file changes
31 added 1 changesets with 2 changes to 2 files 33 added 1 changesets with 2 changes to 2 files
34 updating working directory
32 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 35 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
33 applying ../tip.patch 36 applying ../tip.patch
34 % import of plain diff with specific date and user 37 % import of plain diff with specific date and user
35 requesting all changes 38 requesting all changes
36 adding changesets 39 adding changesets
37 adding manifests 40 adding manifests
38 adding file changes 41 adding file changes
39 added 1 changesets with 2 changes to 2 files 42 added 1 changesets with 2 changes to 2 files
43 updating working directory
40 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 44 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
41 applying ../tip.patch 45 applying ../tip.patch
42 changeset: 1:ca68f19f3a40 46 changeset: 1:ca68f19f3a40
43 tag: tip 47 tag: tip
44 user: user@nowhere.net 48 user: user@nowhere.net
59 requesting all changes 63 requesting all changes
60 adding changesets 64 adding changesets
61 adding manifests 65 adding manifests
62 adding file changes 66 adding file changes
63 added 1 changesets with 2 changes to 2 files 67 added 1 changesets with 2 changes to 2 files
68 updating working directory
64 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 69 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
65 applying ../tip.patch 70 applying ../tip.patch
66 diff -r 80971e65b431 a 71 diff -r 80971e65b431 a
67 --- a/a 72 --- a/a
68 +++ b/a 73 +++ b/a
73 requesting all changes 78 requesting all changes
74 adding changesets 79 adding changesets
75 adding manifests 80 adding manifests
76 adding file changes 81 adding file changes
77 added 1 changesets with 2 changes to 2 files 82 added 1 changesets with 2 changes to 2 files
83 updating working directory
78 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 84 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
79 applying tip.patch 85 applying tip.patch
80 % import from stdin 86 % import from stdin
81 requesting all changes 87 requesting all changes
82 adding changesets 88 adding changesets
83 adding manifests 89 adding manifests
84 adding file changes 90 adding file changes
85 added 1 changesets with 2 changes to 2 files 91 added 1 changesets with 2 changes to 2 files
92 updating working directory
86 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 93 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
87 applying patch from stdin 94 applying patch from stdin
88 % override commit message 95 % override commit message
89 requesting all changes 96 requesting all changes
90 adding changesets 97 adding changesets
91 adding manifests 98 adding manifests
92 adding file changes 99 adding file changes
93 added 1 changesets with 2 changes to 2 files 100 added 1 changesets with 2 changes to 2 files
101 updating working directory
94 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 102 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
95 applying patch from stdin 103 applying patch from stdin
96 summary: override 104 summary: override
97 % plain diff in email, subject, message body 105 % plain diff in email, subject, message body
98 requesting all changes 106 requesting all changes
99 adding changesets 107 adding changesets
100 adding manifests 108 adding manifests
101 adding file changes 109 adding file changes
102 added 1 changesets with 2 changes to 2 files 110 added 1 changesets with 2 changes to 2 files
111 updating working directory
103 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 112 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
104 applying ../msg.patch 113 applying ../msg.patch
105 user: email patcher 114 user: email patcher
106 summary: email patch 115 summary: email patch
107 % plain diff in email, no subject, message body 116 % plain diff in email, no subject, message body
108 requesting all changes 117 requesting all changes
109 adding changesets 118 adding changesets
110 adding manifests 119 adding manifests
111 adding file changes 120 adding file changes
112 added 1 changesets with 2 changes to 2 files 121 added 1 changesets with 2 changes to 2 files
122 updating working directory
113 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 123 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
114 applying patch from stdin 124 applying patch from stdin
115 % plain diff in email, subject, no message body 125 % plain diff in email, subject, no message body
116 requesting all changes 126 requesting all changes
117 adding changesets 127 adding changesets
118 adding manifests 128 adding manifests
119 adding file changes 129 adding file changes
120 added 1 changesets with 2 changes to 2 files 130 added 1 changesets with 2 changes to 2 files
131 updating working directory
121 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 132 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
122 applying patch from stdin 133 applying patch from stdin
123 % plain diff in email, no subject, no message body, should fail 134 % plain diff in email, no subject, no message body, should fail
124 requesting all changes 135 requesting all changes
125 adding changesets 136 adding changesets
126 adding manifests 137 adding manifests
127 adding file changes 138 adding file changes
128 added 1 changesets with 2 changes to 2 files 139 added 1 changesets with 2 changes to 2 files
140 updating working directory
129 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 141 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
130 applying patch from stdin 142 applying patch from stdin
131 transaction abort! 143 transaction abort!
132 rollback completed 144 rollback completed
133 abort: empty commit message 145 abort: empty commit message
135 requesting all changes 147 requesting all changes
136 adding changesets 148 adding changesets
137 adding manifests 149 adding manifests
138 adding file changes 150 adding file changes
139 added 1 changesets with 2 changes to 2 files 151 added 1 changesets with 2 changes to 2 files
152 updating working directory
140 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 153 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
141 applying patch from stdin 154 applying patch from stdin
142 summary: second change 155 summary: second change
143 % plain diff in email, [PATCH] subject, message body with subject 156 % plain diff in email, [PATCH] subject, message body with subject
144 requesting all changes 157 requesting all changes
145 adding changesets 158 adding changesets
146 adding manifests 159 adding manifests
147 adding file changes 160 adding file changes
148 added 1 changesets with 2 changes to 2 files 161 added 1 changesets with 2 changes to 2 files
162 updating working directory
149 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 163 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
150 applying patch from stdin 164 applying patch from stdin
151 email patch 165 email patch
152 166
153 next line 167 next line
162 requesting all changes 176 requesting all changes
163 adding changesets 177 adding changesets
164 adding manifests 178 adding manifests
165 adding file changes 179 adding file changes
166 added 1 changesets with 2 changes to 2 files 180 added 1 changesets with 2 changes to 2 files
181 updating working directory
167 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 182 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
168 applying ../../../tip.patch 183 applying ../../../tip.patch
169 % message should be 'subdir change' 184 % message should be 'subdir change'
170 summary: subdir change 185 summary: subdir change
171 % committer should be 'someoneelse' 186 % committer should be 'someoneelse'