Show More
@@ -1494,8 +1494,9 b' class localrepository(repo.repository):' | |||||
1494 | return remote.unbundle(cg, remote_heads, 'push') |
|
1494 | return remote.unbundle(cg, remote_heads, 'push') | |
1495 | return ret[1] |
|
1495 | return ret[1] | |
1496 |
|
1496 | |||
1497 | def changegroupinfo(self, nodes): |
|
1497 | def changegroupinfo(self, nodes, source): | |
1498 | self.ui.note(_("%d changesets found\n") % len(nodes)) |
|
1498 | if self.ui.verbose or source == 'bundle': | |
|
1499 | self.ui.status(_("%d changesets found\n") % len(nodes)) | |||
1499 | if self.ui.debugflag: |
|
1500 | if self.ui.debugflag: | |
1500 | self.ui.debug(_("List of changesets:\n")) |
|
1501 | self.ui.debug(_("List of changesets:\n")) | |
1501 | for node in nodes: |
|
1502 | for node in nodes: | |
@@ -1521,7 +1522,7 b' class localrepository(repo.repository):' | |||||
1521 | # msng is short for missing - compute the list of changesets in this |
|
1522 | # msng is short for missing - compute the list of changesets in this | |
1522 | # changegroup. |
|
1523 | # changegroup. | |
1523 | msng_cl_lst, bases, heads = cl.nodesbetween(bases, heads) |
|
1524 | msng_cl_lst, bases, heads = cl.nodesbetween(bases, heads) | |
1524 | self.changegroupinfo(msng_cl_lst) |
|
1525 | self.changegroupinfo(msng_cl_lst, source) | |
1525 | # Some bases may turn out to be superfluous, and some heads may be |
|
1526 | # Some bases may turn out to be superfluous, and some heads may be | |
1526 | # too. nodesbetween will return the minimal set of bases and heads |
|
1527 | # too. nodesbetween will return the minimal set of bases and heads | |
1527 | # necessary to re-create the changegroup. |
|
1528 | # necessary to re-create the changegroup. | |
@@ -1785,7 +1786,7 b' class localrepository(repo.repository):' | |||||
1785 | cl = self.changelog |
|
1786 | cl = self.changelog | |
1786 | nodes = cl.nodesbetween(basenodes, None)[0] |
|
1787 | nodes = cl.nodesbetween(basenodes, None)[0] | |
1787 | revset = dict.fromkeys([cl.rev(n) for n in nodes]) |
|
1788 | revset = dict.fromkeys([cl.rev(n) for n in nodes]) | |
1788 | self.changegroupinfo(nodes) |
|
1789 | self.changegroupinfo(nodes, source) | |
1789 |
|
1790 | |||
1790 | def identity(x): |
|
1791 | def identity(x): | |
1791 | return x |
|
1792 | return x |
@@ -25,6 +25,7 b' crosschecking files in changesets and ma' | |||||
25 | checking files |
|
25 | checking files | |
26 | 4 files, 9 changesets, 7 total revisions |
|
26 | 4 files, 9 changesets, 7 total revisions | |
27 | searching for changes |
|
27 | searching for changes | |
|
28 | 1 changesets found | |||
28 | adding changesets |
|
29 | adding changesets | |
29 | adding manifests |
|
30 | adding manifests | |
30 | adding file changes |
|
31 | adding file changes | |
@@ -37,6 +38,7 b' checking files' | |||||
37 | 1 files, 1 changesets, 1 total revisions |
|
38 | 1 files, 1 changesets, 1 total revisions | |
38 | 0:5649c9d34dd8 |
|
39 | 0:5649c9d34dd8 | |
39 | searching for changes |
|
40 | searching for changes | |
|
41 | 2 changesets found | |||
40 | adding changesets |
|
42 | adding changesets | |
41 | adding manifests |
|
43 | adding manifests | |
42 | adding file changes |
|
44 | adding file changes | |
@@ -49,6 +51,7 b' checking files' | |||||
49 | 1 files, 2 changesets, 2 total revisions |
|
51 | 1 files, 2 changesets, 2 total revisions | |
50 | 1:10b2180f755b |
|
52 | 1:10b2180f755b | |
51 | searching for changes |
|
53 | searching for changes | |
|
54 | 3 changesets found | |||
52 | adding changesets |
|
55 | adding changesets | |
53 | adding manifests |
|
56 | adding manifests | |
54 | adding file changes |
|
57 | adding file changes | |
@@ -61,6 +64,7 b' checking files' | |||||
61 | 1 files, 3 changesets, 3 total revisions |
|
64 | 1 files, 3 changesets, 3 total revisions | |
62 | 2:d62976ca1e50 |
|
65 | 2:d62976ca1e50 | |
63 | searching for changes |
|
66 | searching for changes | |
|
67 | 4 changesets found | |||
64 | adding changesets |
|
68 | adding changesets | |
65 | adding manifests |
|
69 | adding manifests | |
66 | adding file changes |
|
70 | adding file changes | |
@@ -73,6 +77,7 b' checking files' | |||||
73 | 1 files, 4 changesets, 4 total revisions |
|
77 | 1 files, 4 changesets, 4 total revisions | |
74 | 3:ac69c658229d |
|
78 | 3:ac69c658229d | |
75 | searching for changes |
|
79 | searching for changes | |
|
80 | 2 changesets found | |||
76 | adding changesets |
|
81 | adding changesets | |
77 | adding manifests |
|
82 | adding manifests | |
78 | adding file changes |
|
83 | adding file changes | |
@@ -85,6 +90,7 b' checking files' | |||||
85 | 1 files, 2 changesets, 2 total revisions |
|
90 | 1 files, 2 changesets, 2 total revisions | |
86 | 1:5f4f3ceb285e |
|
91 | 1:5f4f3ceb285e | |
87 | searching for changes |
|
92 | searching for changes | |
|
93 | 3 changesets found | |||
88 | adding changesets |
|
94 | adding changesets | |
89 | adding manifests |
|
95 | adding manifests | |
90 | adding file changes |
|
96 | adding file changes | |
@@ -97,6 +103,7 b' checking files' | |||||
97 | 1 files, 3 changesets, 3 total revisions |
|
103 | 1 files, 3 changesets, 3 total revisions | |
98 | 2:024e4e7df376 |
|
104 | 2:024e4e7df376 | |
99 | searching for changes |
|
105 | searching for changes | |
|
106 | 4 changesets found | |||
100 | adding changesets |
|
107 | adding changesets | |
101 | adding manifests |
|
108 | adding manifests | |
102 | adding file changes |
|
109 | adding file changes | |
@@ -109,6 +116,7 b' checking files' | |||||
109 | 2 files, 4 changesets, 5 total revisions |
|
116 | 2 files, 4 changesets, 5 total revisions | |
110 | 3:1e3f6b843bd6 |
|
117 | 3:1e3f6b843bd6 | |
111 | searching for changes |
|
118 | searching for changes | |
|
119 | 5 changesets found | |||
112 | adding changesets |
|
120 | adding changesets | |
113 | adding manifests |
|
121 | adding manifests | |
114 | adding file changes |
|
122 | adding file changes | |
@@ -121,6 +129,7 b' checking files' | |||||
121 | 3 files, 5 changesets, 6 total revisions |
|
129 | 3 files, 5 changesets, 6 total revisions | |
122 | 4:80fe151401c2 |
|
130 | 4:80fe151401c2 | |
123 | searching for changes |
|
131 | searching for changes | |
|
132 | 5 changesets found | |||
124 | adding changesets |
|
133 | adding changesets | |
125 | adding manifests |
|
134 | adding manifests | |
126 | adding file changes |
|
135 | adding file changes | |
@@ -148,6 +157,11 b' rolling back last transaction' | |||||
148 | % should fail |
|
157 | % should fail | |
149 | abort: --base is incompatible with specifiying a destination |
|
158 | abort: --base is incompatible with specifiying a destination | |
150 | abort: repository default-push not found! |
|
159 | abort: repository default-push not found! | |
|
160 | 2 changesets found | |||
|
161 | 4 changesets found | |||
|
162 | 6 changesets found | |||
|
163 | 1 changesets found | |||
|
164 | 1 changesets found | |||
151 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
165 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
152 | % 2 |
|
166 | % 2 | |
153 | 2:d62976ca1e50 |
|
167 | 2:d62976ca1e50 | |
@@ -202,6 +216,7 b' warning: detected divergent renames of a' | |||||
202 | adifferentfile |
|
216 | adifferentfile | |
203 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
217 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
204 | (branch merge, don't forget to commit) |
|
218 | (branch merge, don't forget to commit) | |
|
219 | 7 changesets found | |||
205 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
220 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
206 | adding changesets |
|
221 | adding changesets | |
207 | adding manifests |
|
222 | adding manifests |
@@ -8,6 +8,7 b' checking files' | |||||
8 | 4 files, 9 changesets, 7 total revisions |
|
8 | 4 files, 9 changesets, 7 total revisions | |
9 | ====== Bundle test to full.hg |
|
9 | ====== Bundle test to full.hg | |
10 | searching for changes |
|
10 | searching for changes | |
|
11 | 9 changesets found | |||
11 | ====== Unbundle full.hg in test |
|
12 | ====== Unbundle full.hg in test | |
12 | adding changesets |
|
13 | adding changesets | |
13 | adding manifests |
|
14 | adding manifests | |
@@ -245,6 +246,8 b' summary: 0.3m' | |||||
245 | ====== Outgoing -R does-not-exist.hg vs partial2 in partial |
|
246 | ====== Outgoing -R does-not-exist.hg vs partial2 in partial | |
246 | abort: No such file or directory: ../does-not-exist.hg |
|
247 | abort: No such file or directory: ../does-not-exist.hg | |
247 | ====== Unbundle incremental bundles into fresh empty in one go |
|
248 | ====== Unbundle incremental bundles into fresh empty in one go | |
|
249 | 1 changesets found | |||
|
250 | 1 changesets found | |||
248 | adding changesets |
|
251 | adding changesets | |
249 | adding manifests |
|
252 | adding manifests | |
250 | adding file changes |
|
253 | adding file changes | |
@@ -257,6 +260,7 b' 1 files updated, 0 files merged, 0 files' | |||||
257 | ====== test for 540d1059c802 |
|
260 | ====== test for 540d1059c802 | |
258 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
261 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
259 | searching for changes |
|
262 | searching for changes | |
|
263 | 1 changesets found | |||
260 | comparing with ../bundle.hg |
|
264 | comparing with ../bundle.hg | |
261 | searching for changes |
|
265 | searching for changes | |
262 | changeset: 2:ed1b79f46b9a |
|
266 | changeset: 2:ed1b79f46b9a |
@@ -15,6 +15,7 b' incoming = --template "{rev}: {desc}\\n"' | |||||
15 | ====== Setup main |
|
15 | ====== Setup main | |
16 | adding one |
|
16 | adding one | |
17 | ====== Bundle main |
|
17 | ====== Bundle main | |
|
18 | 2 changesets found | |||
18 | ====== Incoming to fresh repo |
|
19 | ====== Incoming to fresh repo | |
19 | >> hg -R fresh incoming main.hg |
|
20 | >> hg -R fresh incoming main.hg | |
20 | comparing with main.hg |
|
21 | comparing with main.hg | |
@@ -28,6 +29,7 b' 1: main: one updated.' | |||||
28 | adding two |
|
29 | adding two | |
29 | Patch queue now empty |
|
30 | Patch queue now empty | |
30 | ====== Bundle queue |
|
31 | ====== Bundle queue | |
|
32 | 1 changesets found | |||
31 | ====== Clone base |
|
33 | ====== Clone base | |
32 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
34 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
33 | ====== Incoming queue bundle |
|
35 | ====== Incoming queue bundle |
@@ -110,6 +110,7 b' Writing [PATCH 2 of 2] b ...' | |||||
110 | adding c |
|
110 | adding c | |
111 | % test bundle and description |
|
111 | % test bundle and description | |
112 | searching for changes |
|
112 | searching for changes | |
|
113 | 1 changesets found | |||
113 |
|
114 | |||
114 | Displaying test ... |
|
115 | Displaying test ... | |
115 | Content-Type: multipart/mixed; boundary="=== |
|
116 | Content-Type: multipart/mixed; boundary="=== |
@@ -105,6 +105,7 b' summary: delete' | |||||
105 |
|
105 | |||
106 |
|
106 | |||
107 | % add binary file |
|
107 | % add binary file | |
|
108 | 1 changesets found | |||
108 | diff --git a/tip.bundle b/tip.bundle |
|
109 | diff --git a/tip.bundle b/tip.bundle | |
109 | new file mode 100644 |
|
110 | new file mode 100644 | |
110 | this is a binary file |
|
111 | this is a binary file | |
@@ -119,6 +120,7 b' diff -r a2546574bce9 -r 9e998a545a8b tip' | |||||
119 | Binary file tip.bundle has changed |
|
120 | Binary file tip.bundle has changed | |
120 |
|
121 | |||
121 | % change binary file |
|
122 | % change binary file | |
|
123 | 1 changesets found | |||
122 | diff --git a/tip.bundle b/tip.bundle |
|
124 | diff --git a/tip.bundle b/tip.bundle | |
123 | this modifies a binary file (all or nothing) |
|
125 | this modifies a binary file (all or nothing) | |
124 | examine changes to 'tip.bundle'? [Ynsfdaq?] |
|
126 | examine changes to 'tip.bundle'? [Ynsfdaq?] | |
@@ -132,6 +134,7 b' diff -r 9e998a545a8b -r 93d05561507d tip' | |||||
132 | Binary file tip.bundle has changed |
|
134 | Binary file tip.bundle has changed | |
133 |
|
135 | |||
134 | % rename and change binary file |
|
136 | % rename and change binary file | |
|
137 | 1 changesets found | |||
135 | diff --git a/tip.bundle b/top.bundle |
|
138 | diff --git a/tip.bundle b/top.bundle | |
136 | rename from tip.bundle |
|
139 | rename from tip.bundle | |
137 | rename to top.bundle |
|
140 | rename to top.bundle |
General Comments 0
You need to be logged in to leave comments.
Login now