Show More
@@ -1535,6 +1535,7 b' def incoming(ui, repo, source="default",' | |||
|
1535 | 1535 | setremoteconfig(ui, opts) |
|
1536 | 1536 | |
|
1537 | 1537 | other = hg.repository(ui, source) |
|
1538 | ui.status(_('comparing with %s\n') % source) | |
|
1538 | 1539 | incoming = repo.findincoming(other, force=opts["force"]) |
|
1539 | 1540 | if not incoming: |
|
1540 | 1541 | try: |
@@ -1819,6 +1820,7 b' def outgoing(ui, repo, dest=None, **opts' | |||
|
1819 | 1820 | revs = [repo.lookup(rev) for rev in opts['rev']] |
|
1820 | 1821 | |
|
1821 | 1822 | other = hg.repository(ui, dest) |
|
1823 | ui.status(_('comparing with %s\n') % dest) | |
|
1822 | 1824 | o = repo.findoutgoing(other, force=opts['force']) |
|
1823 | 1825 | if not o: |
|
1824 | 1826 | ui.status(_("no changes found\n")) |
@@ -150,6 +150,7 b' user: test' | |||
|
150 | 150 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
151 | 151 | summary: 0.0 |
|
152 | 152 | |
|
153 | comparing with bundle://../full.hg | |
|
153 | 154 | searching for changes |
|
154 | 155 | changeset: 4:5f4f3ceb285e |
|
155 | 156 | parent: 0:5649c9d34dd8 |
@@ -179,6 +180,7 b' user: test' | |||
|
179 | 180 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
180 | 181 | summary: 0.3m |
|
181 | 182 | |
|
183 | comparing with ../partial2 | |
|
182 | 184 | searching for changes |
|
183 | 185 | changeset: 4:5f4f3ceb285e |
|
184 | 186 | parent: 0:5649c9d34dd8 |
@@ -211,6 +213,7 b' summary: 0.3m' | |||
|
211 | 213 | abort: No such file or directory: ../does-not-exist.hg |
|
212 | 214 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
213 | 215 | searching for changes |
|
216 | comparing with ../bundle.hg | |
|
214 | 217 | searching for changes |
|
215 | 218 | changeset: 2:ed1b79f46b9a |
|
216 | 219 | tag: tip |
@@ -21,6 +21,7 b' adding manifests' | |||
|
21 | 21 | adding file changes |
|
22 | 22 | added 4 changesets with 3 changes to 3 files |
|
23 | 23 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
24 | comparing with b | |
|
24 | 25 | searching for changes |
|
25 | 26 | changeset: 4:fdb3c546e859 |
|
26 | 27 | tag: tip |
@@ -30,6 +31,7 b' user: test' | |||
|
30 | 31 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
31 | 32 | summary: m2 |
|
32 | 33 | |
|
34 | comparing with c | |
|
33 | 35 | searching for changes |
|
34 | 36 | changeset: 3:f40f830c0024 |
|
35 | 37 | parent: 2:de997049e034 |
@@ -38,6 +40,7 b' user: test' | |||
|
38 | 40 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
39 | 41 | summary: m1 |
|
40 | 42 | |
|
43 | comparing with c | |
|
41 | 44 | searching for changes |
|
42 | 45 | changeset: 3:f40f830c0024 |
|
43 | 46 | tag: tip |
@@ -47,6 +50,7 b' user: test' | |||
|
47 | 50 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
48 | 51 | summary: m1 |
|
49 | 52 | |
|
53 | comparing with b | |
|
50 | 54 | searching for changes |
|
51 | 55 | changeset: 3:fdb3c546e859 |
|
52 | 56 | tag: tip |
@@ -4,6 +4,7 b' checking manifests' | |||
|
4 | 4 | crosschecking files in changesets and manifests |
|
5 | 5 | checking files |
|
6 | 6 | 1 files, 9 changesets, 9 total revisions |
|
7 | comparing with http://localhost:20059/ | |
|
7 | 8 | changeset: 0:9cb21d99fe27 |
|
8 | 9 | user: test |
|
9 | 10 | date: Mon Jan 12 13:46:40 1970 +0000 |
@@ -50,6 +51,7 b' user: test' | |||
|
50 | 51 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
51 | 52 | summary: 8 |
|
52 | 53 | |
|
54 | comparing with http://localhost:20059/ | |
|
53 | 55 | changeset: 0:9cb21d99fe27 |
|
54 | 56 | user: test |
|
55 | 57 | date: Mon Jan 12 13:46:40 1970 +0000 |
@@ -75,6 +77,7 b' user: test' | |||
|
75 | 77 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
76 | 78 | summary: 4 |
|
77 | 79 | |
|
80 | comparing with test | |
|
78 | 81 | changeset: 0:9cb21d99fe27 |
|
79 | 82 | user: test |
|
80 | 83 | date: Mon Jan 12 13:46:40 1970 +0000 |
@@ -121,6 +124,7 b' user: test' | |||
|
121 | 124 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
122 | 125 | summary: 8 |
|
123 | 126 | |
|
127 | comparing with test | |
|
124 | 128 | changeset: 0:9cb21d99fe27 |
|
125 | 129 | user: test |
|
126 | 130 | date: Mon Jan 12 13:46:40 1970 +0000 |
@@ -146,6 +150,7 b' user: test' | |||
|
146 | 150 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
147 | 151 | summary: 4 |
|
148 | 152 | |
|
153 | comparing with http://localhost:20059/ | |
|
149 | 154 | changeset: 0:9cb21d99fe27 |
|
150 | 155 | user: test |
|
151 | 156 | date: Mon Jan 12 13:46:40 1970 +0000 |
@@ -192,6 +197,7 b' user: test' | |||
|
192 | 197 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
193 | 198 | summary: 8 |
|
194 | 199 | |
|
200 | comparing with test | |
|
195 | 201 | changeset: 0:9cb21d99fe27 |
|
196 | 202 | user: test |
|
197 | 203 | date: Mon Jan 12 13:46:40 1970 +0000 |
@@ -266,6 +272,7 b' checking manifests' | |||
|
266 | 272 | crosschecking files in changesets and manifests |
|
267 | 273 | checking files |
|
268 | 274 | 1 files, 14 changesets, 14 total revisions |
|
275 | comparing with test | |
|
269 | 276 | searching for changes |
|
270 | 277 | changeset: 9:3741c3ad1096 |
|
271 | 278 | user: test |
@@ -293,6 +300,7 b' user: test' | |||
|
293 | 300 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
294 | 301 | summary: 13 |
|
295 | 302 | |
|
303 | comparing with http://localhost:20059/ | |
|
296 | 304 | searching for changes |
|
297 | 305 | changeset: 9:3741c3ad1096 |
|
298 | 306 | user: test |
@@ -320,6 +328,7 b' user: test' | |||
|
320 | 328 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
321 | 329 | summary: 13 |
|
322 | 330 | |
|
331 | comparing with http://localhost:20059/ | |
|
323 | 332 | searching for changes |
|
324 | 333 | changeset: 9:3741c3ad1096 |
|
325 | 334 | user: test |
@@ -3,6 +3,7 b' adding foo' | |||
|
3 | 3 | #test failure |
|
4 | 4 | abort: repository local already exists! |
|
5 | 5 | # init+push to remote2 |
|
6 | comparing with local | |
|
6 | 7 | changeset: 0:c4e059d443be |
|
7 | 8 | tag: tip |
|
8 | 9 | user: test |
@@ -33,6 +33,7 b' no changes found' | |||
|
33 | 33 | # local change |
|
34 | 34 | # updating rc |
|
35 | 35 | # find outgoing |
|
36 | comparing with ssh://user@dummy/remote | |
|
36 | 37 | searching for changes |
|
37 | 38 | changeset: 1:572896fe480d |
|
38 | 39 | tag: tip |
@@ -41,6 +42,7 b' date: Mon Jan 12 13:46:40 1970 +0' | |||
|
41 | 42 | summary: add |
|
42 | 43 | |
|
43 | 44 | # find incoming on the remote side |
|
45 | comparing with ssh://user@dummy/local | |
|
44 | 46 | searching for changes |
|
45 | 47 | changeset: 1:572896fe480d |
|
46 | 48 | tag: tip |
General Comments 0
You need to be logged in to leave comments.
Login now