Mercurial > hg
annotate tests/test-narrow-widen-no-ellipsis.t @ 48549:28f0092ec89f
exchange: add fast path for subrepo check on push
Try to check if .hgsub and .hgsubstate exist at all before looking
for them in every changeset to be pushed. The latter can be quite
expensive for large repositories and the existance check is almost free.
Differential Revision: https://phab.mercurial-scm.org/D11956
author | Joerg Sonnenberger <joerg@bec.de> |
---|---|
date | Mon, 03 Jan 2022 01:09:56 +0100 |
parents | d72378f93a44 |
children | 2f2682f40ea0 |
rev | line source |
---|---|
39358
57b2a02420cd
tests: add flat manifest case in test-narrow-widen-non-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39357
diff
changeset
|
1 #testcases tree flat |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
2 $ . "$TESTDIR/narrow-library.sh" |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
3 |
39358
57b2a02420cd
tests: add flat manifest case in test-narrow-widen-non-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39357
diff
changeset
|
4 #if tree |
36084
dc01484606da
tests: fold narrow treemanifest tests into main test file using testcases
Augie Fackler <augie@google.com>
parents:
36079
diff
changeset
|
5 $ cat << EOF >> $HGRCPATH |
dc01484606da
tests: fold narrow treemanifest tests into main test file using testcases
Augie Fackler <augie@google.com>
parents:
36079
diff
changeset
|
6 > [experimental] |
dc01484606da
tests: fold narrow treemanifest tests into main test file using testcases
Augie Fackler <augie@google.com>
parents:
36079
diff
changeset
|
7 > treemanifest = 1 |
dc01484606da
tests: fold narrow treemanifest tests into main test file using testcases
Augie Fackler <augie@google.com>
parents:
36079
diff
changeset
|
8 > EOF |
39358
57b2a02420cd
tests: add flat manifest case in test-narrow-widen-non-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39357
diff
changeset
|
9 #endif |
36084
dc01484606da
tests: fold narrow treemanifest tests into main test file using testcases
Augie Fackler <augie@google.com>
parents:
36079
diff
changeset
|
10 |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
11 $ hg init master |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
12 $ cd master |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
13 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
14 $ mkdir inside |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
15 $ echo 'inside' > inside/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
16 $ hg add inside/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
17 $ hg commit -m 'add inside' |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
18 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
19 $ mkdir widest |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
20 $ echo 'widest' > widest/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
21 $ hg add widest/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
22 $ hg commit -m 'add widest' |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
23 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
24 $ mkdir outside |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
25 $ echo 'outside' > outside/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
26 $ hg add outside/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
27 $ hg commit -m 'add outside' |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
28 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
29 $ cd .. |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
30 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
31 narrow clone the inside file |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
32 |
40343
a69d5823af6d
tests: add test for widening from an empty clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
40337
diff
changeset
|
33 $ hg clone --narrow ssh://user@dummy/master narrow |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
34 requesting all changes |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
35 adding changesets |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
36 adding manifests |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
37 adding file changes |
40343
a69d5823af6d
tests: add test for widening from an empty clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
40337
diff
changeset
|
38 added 3 changesets with 0 changes to 0 files |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
39 new changesets *:* (glob) |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
40 updating to branch default |
40343
a69d5823af6d
tests: add test for widening from an empty clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
40337
diff
changeset
|
41 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
42 $ cd narrow |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
43 $ hg tracked |
40343
a69d5823af6d
tests: add test for widening from an empty clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
40337
diff
changeset
|
44 $ hg files |
a69d5823af6d
tests: add test for widening from an empty clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
40337
diff
changeset
|
45 [1] |
a69d5823af6d
tests: add test for widening from an empty clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
40337
diff
changeset
|
46 |
a69d5823af6d
tests: add test for widening from an empty clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
40337
diff
changeset
|
47 widen from an empty clone |
a69d5823af6d
tests: add test for widening from an empty clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
40337
diff
changeset
|
48 |
a69d5823af6d
tests: add test for widening from an empty clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
40337
diff
changeset
|
49 $ hg tracked --addinclude inside |
a69d5823af6d
tests: add test for widening from an empty clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
40337
diff
changeset
|
50 comparing with ssh://user@dummy/master |
a69d5823af6d
tests: add test for widening from an empty clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
40337
diff
changeset
|
51 searching for changes |
a69d5823af6d
tests: add test for widening from an empty clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
40337
diff
changeset
|
52 adding changesets |
a69d5823af6d
tests: add test for widening from an empty clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
40337
diff
changeset
|
53 adding manifests |
a69d5823af6d
tests: add test for widening from an empty clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
40337
diff
changeset
|
54 adding file changes |
a69d5823af6d
tests: add test for widening from an empty clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
40337
diff
changeset
|
55 added 0 changesets with 1 changes to 1 files |
a69d5823af6d
tests: add test for widening from an empty clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
40337
diff
changeset
|
56 $ hg tracked |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
57 I path:inside |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
42931
diff
changeset
|
58 $ ls -A |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
42931
diff
changeset
|
59 .hg |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
60 inside |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
61 $ cat inside/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
62 inside |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
63 $ cd .. |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
64 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
65 add more upstream files which we will include in a wider narrow spec |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
66 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
67 $ cd master |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
68 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
69 $ mkdir wider |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
70 $ echo 'wider' > wider/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
71 $ hg add wider/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
72 $ echo 'widest v2' > widest/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
73 $ hg commit -m 'add wider, update widest' |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
74 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
75 $ echo 'widest v3' > widest/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
76 $ hg commit -m 'update widest v3' |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
77 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
78 $ echo 'inside v2' > inside/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
79 $ hg commit -m 'update inside' |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
80 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
81 $ mkdir outside2 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
82 $ echo 'outside2' > outside2/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
83 $ hg add outside2/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
84 $ hg commit -m 'add outside2' |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
85 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
86 $ echo 'widest v4' > widest/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
87 $ hg commit -m 'update widest v4' |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
88 |
39361
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
89 $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
90 7: update widest v4 |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
91 6: add outside2 |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
92 5: update inside |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
93 4: update widest v3 |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
94 3: add wider, update widest |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
95 2: add outside |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
96 1: add widest |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
97 0: add inside |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
98 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
99 $ cd .. |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
100 |
39466
83dd656586b1
tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39391
diff
changeset
|
101 Widen the narrow spec to see the widest file. This should not get the newly |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
102 added upstream revisions. |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
103 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
104 $ cd narrow |
39963
693dda764efe
narrow: don't do the dirstate dance if ellipses is not enabled
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39709
diff
changeset
|
105 $ hg id -n |
693dda764efe
narrow: don't do the dirstate dance if ellipses is not enabled
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39709
diff
changeset
|
106 2 |
693dda764efe
narrow: don't do the dirstate dance if ellipses is not enabled
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39709
diff
changeset
|
107 |
39671
dee887072f27
tests: add debug output in test-narrow-widen-no-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39665
diff
changeset
|
108 $ hg tracked --addinclude widest/f --debug |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
109 comparing with ssh://user@dummy/master |
46012
d72378f93a44
tests: use the right python when running dummyssh for narrow
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44724
diff
changeset
|
110 running * "*dummyssh" *user@dummy* *hg -R master serve --stdio* (glob) |
39671
dee887072f27
tests: add debug output in test-narrow-widen-no-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39665
diff
changeset
|
111 sending hello command |
dee887072f27
tests: add debug output in test-narrow-widen-no-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39665
diff
changeset
|
112 sending between command |
dee887072f27
tests: add debug output in test-narrow-widen-no-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39665
diff
changeset
|
113 remote: * (glob) |
dee887072f27
tests: add debug output in test-narrow-widen-no-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39665
diff
changeset
|
114 remote: capabilities: * (glob) |
dee887072f27
tests: add debug output in test-narrow-widen-no-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39665
diff
changeset
|
115 remote: 1 |
dee887072f27
tests: add debug output in test-narrow-widen-no-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39665
diff
changeset
|
116 sending protocaps command |
dee887072f27
tests: add debug output in test-narrow-widen-no-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39665
diff
changeset
|
117 query 1; heads |
dee887072f27
tests: add debug output in test-narrow-widen-no-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39665
diff
changeset
|
118 sending batch command |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
119 searching for changes |
42884
775224e26d74
discovery: replace "heads" by "changesets" in a output note (BC)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42505
diff
changeset
|
120 all local changesets known remotely |
40070
8feae5b989bc
narrow: the first version of narrow_widen wireprotocol command
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39963
diff
changeset
|
121 sending narrow_widen command |
39671
dee887072f27
tests: add debug output in test-narrow-widen-no-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39665
diff
changeset
|
122 bundle2-input-bundle: with-transaction |
dee887072f27
tests: add debug output in test-narrow-widen-no-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39665
diff
changeset
|
123 bundle2-input-part: "changegroup" (params: * mandatory) supported (glob) |
39356
c8e4eae84808
narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39355
diff
changeset
|
124 adding changesets |
c8e4eae84808
narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39355
diff
changeset
|
125 adding manifests |
39671
dee887072f27
tests: add debug output in test-narrow-widen-no-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39665
diff
changeset
|
126 adding widest/ revisions (tree !) |
39356
c8e4eae84808
narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39355
diff
changeset
|
127 adding file changes |
42505
c1850798f995
run-tests: stop matching line for missing feature
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41420
diff
changeset
|
128 adding widest/f revisions |
39671
dee887072f27
tests: add debug output in test-narrow-widen-no-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39665
diff
changeset
|
129 bundle2-input-part: total payload size * (glob) |
42931
181ee2118a96
bundle2: fix an off-by-one in debug message of number of parts
Martin von Zweigbergk <martinvonz@google.com>
parents:
42897
diff
changeset
|
130 bundle2-input-bundle: 1 parts total |
42897
d7304434390f
changegroup: move message about added changes to transaction summary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42884
diff
changeset
|
131 added 0 changesets with 1 changes to 1 files |
41237
ad9ab2523149
narrow: reuse narrowspec.updateworkingcopy() when widening
Martin von Zweigbergk <martinvonz@google.com>
parents:
40436
diff
changeset
|
132 widest/f: narrowspec updated -> g |
39671
dee887072f27
tests: add debug output in test-narrow-widen-no-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39665
diff
changeset
|
133 getting widest/f |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
134 $ hg tracked |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
135 I path:inside |
39466
83dd656586b1
tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39391
diff
changeset
|
136 I path:widest/f |
83dd656586b1
tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39391
diff
changeset
|
137 |
83dd656586b1
tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39391
diff
changeset
|
138 $ cat widest/f |
83dd656586b1
tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39391
diff
changeset
|
139 widest |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
140 |
39963
693dda764efe
narrow: don't do the dirstate dance if ellipses is not enabled
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39709
diff
changeset
|
141 $ hg id -n |
693dda764efe
narrow: don't do the dirstate dance if ellipses is not enabled
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39709
diff
changeset
|
142 2 |
693dda764efe
narrow: don't do the dirstate dance if ellipses is not enabled
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39709
diff
changeset
|
143 |
40435
d362a41ee5dd
tests: show that adding an already included path still calls narrow_widen()
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
40343
diff
changeset
|
144 Test that extending already included files should not call narrow_widen |
d362a41ee5dd
tests: show that adding an already included path still calls narrow_widen()
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
40343
diff
changeset
|
145 wireprotocol command |
d362a41ee5dd
tests: show that adding an already included path still calls narrow_widen()
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
40343
diff
changeset
|
146 |
d362a41ee5dd
tests: show that adding an already included path still calls narrow_widen()
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
40343
diff
changeset
|
147 $ hg tracked --addinclude widest/f |
40436
30a7d3b6b281
narrow: rework logic to check whether we need to widen and narrow
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
40435
diff
changeset
|
148 nothing to widen or narrow |
40435
d362a41ee5dd
tests: show that adding an already included path still calls narrow_widen()
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
40343
diff
changeset
|
149 |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
150 Pull down the newly added upstream revision. |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
151 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
152 $ hg pull |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
153 pulling from ssh://user@dummy/master |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
154 searching for changes |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
155 adding changesets |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
156 adding manifests |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
157 adding file changes |
39466
83dd656586b1
tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39391
diff
changeset
|
158 added 5 changesets with 4 changes to 2 files |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
159 new changesets *:* (glob) |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
160 (run 'hg update' to get a working copy) |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
161 $ hg update -r 'desc("add wider")' |
39357
2b8adb7ca39a
narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39356
diff
changeset
|
162 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
39466
83dd656586b1
tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39391
diff
changeset
|
163 |
83dd656586b1
tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39391
diff
changeset
|
164 $ cat widest/f |
83dd656586b1
tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39391
diff
changeset
|
165 widest v2 |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
166 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
167 $ hg update -r 'desc("update inside")' |
39466
83dd656586b1
tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39391
diff
changeset
|
168 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
83dd656586b1
tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39391
diff
changeset
|
169 $ cat widest/f |
83dd656586b1
tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39391
diff
changeset
|
170 widest v3 |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
171 $ cat inside/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
172 inside v2 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
173 |
39361
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
174 $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
175 7: update widest v4 |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
176 6: add outside2 |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
177 5: update inside |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
178 4: update widest v3 |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
179 3: add wider, update widest |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
180 2: add outside |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
181 1: add widest |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
182 0: add inside |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
183 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
184 Check that widening with a newline fails |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
185 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
186 $ hg tracked --addinclude 'widest |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
187 > ' |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
188 abort: newlines are not allowed in narrowspec paths |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
189 [255] |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
190 |
39466
83dd656586b1
tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39391
diff
changeset
|
191 widen the narrow spec to include the wider file |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
192 |
39466
83dd656586b1
tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39391
diff
changeset
|
193 $ hg tracked --addinclude wider |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
194 comparing with ssh://user@dummy/master |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
195 searching for changes |
39356
c8e4eae84808
narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39355
diff
changeset
|
196 adding changesets |
c8e4eae84808
narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39355
diff
changeset
|
197 adding manifests |
c8e4eae84808
narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39355
diff
changeset
|
198 adding file changes |
39665
c73c7653dfb9
narrow: use diffmatcher to send only new filelogs in non-ellipses widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39489
diff
changeset
|
199 added 0 changesets with 1 changes to 1 files |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
200 $ hg tracked |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
201 I path:inside |
39466
83dd656586b1
tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39391
diff
changeset
|
202 I path:wider |
83dd656586b1
tests: improve the widening testing in test-narrow-widen*
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39391
diff
changeset
|
203 I path:widest/f |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
204 $ hg update 'desc("add widest")' |
39357
2b8adb7ca39a
narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39356
diff
changeset
|
205 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
2b8adb7ca39a
narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39356
diff
changeset
|
206 $ cat widest/f |
2b8adb7ca39a
narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39356
diff
changeset
|
207 widest |
2b8adb7ca39a
narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39356
diff
changeset
|
208 $ hg update 'desc("add wider, update widest")' |
2b8adb7ca39a
narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39356
diff
changeset
|
209 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2b8adb7ca39a
narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39356
diff
changeset
|
210 $ cat wider/f |
2b8adb7ca39a
narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39356
diff
changeset
|
211 wider |
2b8adb7ca39a
narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39356
diff
changeset
|
212 $ cat widest/f |
2b8adb7ca39a
narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39356
diff
changeset
|
213 widest v2 |
2b8adb7ca39a
narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39356
diff
changeset
|
214 $ hg update 'desc("update widest v3")' |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
215 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
216 $ cat widest/f |
39357
2b8adb7ca39a
narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39356
diff
changeset
|
217 widest v3 |
2b8adb7ca39a
narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39356
diff
changeset
|
218 $ hg update 'desc("update widest v4")' |
2b8adb7ca39a
narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39356
diff
changeset
|
219 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
39355
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
220 $ cat widest/f |
39357
2b8adb7ca39a
narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39356
diff
changeset
|
221 widest v4 |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
222 |
39361
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
223 $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
224 7: update widest v4 |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
225 6: add outside2 |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
226 5: update inside |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
227 4: update widest v3 |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
228 3: add wider, update widest |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
229 2: add outside |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
230 1: add widest |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
231 0: add inside |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
232 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
233 separate suite of tests: files from 0-10 modified in changes 0-10. This allows |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
234 more obvious precise tests tickling particular corner cases. |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
235 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
236 $ cd .. |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
237 $ hg init upstream |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
238 $ cd upstream |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
239 $ for x in `$TESTDIR/seq.py 0 10` |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
240 > do |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
241 > mkdir d$x |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
242 > echo $x > d$x/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
243 > hg add d$x/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
244 > hg commit -m "add d$x/f" |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
245 > done |
39361
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
246 $ hg log -T "{rev}: {desc}\n" |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
247 10: add d10/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
248 9: add d9/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
249 8: add d8/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
250 7: add d7/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
251 6: add d6/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
252 5: add d5/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
253 4: add d4/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
254 3: add d3/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
255 2: add d2/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
256 1: add d1/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
257 0: add d0/f |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
258 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
259 make narrow clone with every third node. |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
260 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
261 $ cd .. |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
262 $ hg clone --narrow ssh://user@dummy/upstream narrow2 --include d0 --include d3 --include d6 --include d9 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
263 requesting all changes |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
264 adding changesets |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
265 adding manifests |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
266 adding file changes |
39355
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
267 added 11 changesets with 4 changes to 4 files |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
268 new changesets *:* (glob) |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
269 updating to branch default |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
270 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
271 $ cd narrow2 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
272 $ hg tracked |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
273 I path:d0 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
274 I path:d3 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
275 I path:d6 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
276 I path:d9 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
277 $ hg verify |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
278 checking changesets |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
279 checking manifests |
39358
57b2a02420cd
tests: add flat manifest case in test-narrow-widen-non-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39357
diff
changeset
|
280 checking directory manifests (tree !) |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
281 crosschecking files in changesets and manifests |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
282 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39466
diff
changeset
|
283 checked 11 changesets with 4 changes to 4 files |
39361
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
284 $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
285 10: add d10/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
286 9: add d9/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
287 8: add d8/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
288 7: add d7/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
289 6: add d6/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
290 5: add d5/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
291 4: add d4/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
292 3: add d3/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
293 2: add d2/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
294 1: add d1/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
295 0: add d0/f |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
296 $ hg tracked --addinclude d1 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
297 comparing with ssh://user@dummy/upstream |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
298 searching for changes |
39356
c8e4eae84808
narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39355
diff
changeset
|
299 adding changesets |
c8e4eae84808
narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39355
diff
changeset
|
300 adding manifests |
c8e4eae84808
narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39355
diff
changeset
|
301 adding file changes |
39665
c73c7653dfb9
narrow: use diffmatcher to send only new filelogs in non-ellipses widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39489
diff
changeset
|
302 added 0 changesets with 1 changes to 1 files |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
303 $ hg tracked |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
304 I path:d0 |
39357
2b8adb7ca39a
narrow: update the narrowspecs to new ones after pulling when widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39356
diff
changeset
|
305 I path:d1 |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
306 I path:d3 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
307 I path:d6 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
308 I path:d9 |
39361
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
309 $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
310 10: add d10/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
311 9: add d9/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
312 8: add d8/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
313 7: add d7/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
314 6: add d6/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
315 5: add d5/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
316 4: add d4/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
317 3: add d3/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
318 2: add d2/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
319 1: add d1/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
320 0: add d0/f |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
321 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
322 Verify shouldn't claim the repo is corrupt after a widen. |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
323 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
324 $ hg verify |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
325 checking changesets |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
326 checking manifests |
39358
57b2a02420cd
tests: add flat manifest case in test-narrow-widen-non-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39357
diff
changeset
|
327 checking directory manifests (tree !) |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
328 crosschecking files in changesets and manifests |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
329 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39466
diff
changeset
|
330 checked 11 changesets with 5 changes to 5 files |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
331 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
332 Widening preserves parent of local commit |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
333 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
334 $ cd .. |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
335 $ hg clone -q --narrow ssh://user@dummy/upstream narrow3 --include d2 -r 2 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
336 $ cd narrow3 |
39361
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
337 $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
338 2: add d2/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
339 1: add d1/f |
5ebfb7cc6f2c
tests: use {rev} instead of {node|short} and (glob) in narrow tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
39358
diff
changeset
|
340 0: add d0/f |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
341 $ hg pull -q -r 3 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
342 $ hg co -q tip |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
343 $ hg pull -q -r 4 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
344 $ echo local > d2/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
345 $ hg ci -m local |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
346 created new head |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
347 $ hg tracked -q --addinclude d0 --addinclude d9 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
348 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
349 Widening preserves bookmarks |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
350 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
351 $ cd .. |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
352 $ hg clone -q --narrow ssh://user@dummy/upstream narrow-bookmarks --include d4 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
353 $ cd narrow-bookmarks |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
354 $ echo local > d4/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
355 $ hg ci -m local |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
356 $ hg bookmarks bookmark |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
357 $ hg bookmarks |
39358
57b2a02420cd
tests: add flat manifest case in test-narrow-widen-non-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39357
diff
changeset
|
358 * bookmark 11:* (glob) |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
359 $ hg -q tracked --addinclude d2 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
360 $ hg bookmarks |
39358
57b2a02420cd
tests: add flat manifest case in test-narrow-widen-non-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39357
diff
changeset
|
361 * bookmark 11:* (glob) |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
362 $ hg log -r bookmark -T '{desc}\n' |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
363 local |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
364 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
365 Widening that fails can be recovered from |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
366 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
367 $ cd .. |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
368 $ hg clone -q --narrow ssh://user@dummy/upstream interrupted --include d0 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
369 $ cd interrupted |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
370 $ echo local > d0/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
371 $ hg ci -m local |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
372 $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" |
39355
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
373 11: local |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
374 10: add d10/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
375 9: add d9/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
376 8: add d8/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
377 7: add d7/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
378 6: add d6/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
379 5: add d5/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
380 4: add d4/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
381 3: add d3/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
382 2: add d2/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
383 1: add d1/f |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
384 0: add d0/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
385 $ hg bookmarks bookmark |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
386 $ hg --config hooks.pretxnchangegroup.bad=false tracked --addinclude d1 |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
387 comparing with ssh://user@dummy/upstream |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
388 searching for changes |
39356
c8e4eae84808
narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39355
diff
changeset
|
389 adding changesets |
c8e4eae84808
narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39355
diff
changeset
|
390 adding manifests |
c8e4eae84808
narrow: add server logic to send cg while widening without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39355
diff
changeset
|
391 adding file changes |
39665
c73c7653dfb9
narrow: use diffmatcher to send only new filelogs in non-ellipses widening
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39489
diff
changeset
|
392 added 0 changesets with 1 changes to 1 files |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
393 $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" |
39355
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
394 11: local |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
395 10: add d10/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
396 9: add d9/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
397 8: add d8/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
398 7: add d7/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
399 6: add d6/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
400 5: add d5/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
401 4: add d4/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
402 3: add d3/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
403 2: add d2/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
404 1: add d1/f |
36079
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
405 0: add d0/f |
a2a6e724d61a
narrow: import experimental extension from narrowhg revision cb51d673e9c5
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
406 $ hg bookmarks |
39358
57b2a02420cd
tests: add flat manifest case in test-narrow-widen-non-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39357
diff
changeset
|
407 * bookmark 11:* (glob) |
39355
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
408 $ hg unbundle .hg/strip-backup/*-widen.hg |
39391
3d8b73c0fadf
tests: conditionalize narrow-widen error output for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39363
diff
changeset
|
409 abort: .hg/strip-backup/*-widen.hg: $ENOTDIR$ (windows !) |
41420
b6673e9bdcf6
dispatch: quote filename in IOError as well
Yuya Nishihara <yuya@tcha.org>
parents:
41237
diff
changeset
|
410 abort: $ENOENT$: '.hg/strip-backup/*-widen.hg' (no-windows !) |
39355
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
411 [255] |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
412 $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
413 11: local |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
414 10: add d10/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
415 9: add d9/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
416 8: add d8/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
417 7: add d7/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
418 6: add d6/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
419 5: add d5/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
420 4: add d4/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
421 3: add d3/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
422 2: add d2/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
423 1: add d1/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
424 0: add d0/f |
bca0546a44bf
tests: add test to show widening is broken without ellipsis
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
36084
diff
changeset
|
425 $ hg bookmarks |
39358
57b2a02420cd
tests: add flat manifest case in test-narrow-widen-non-ellipsis.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39357
diff
changeset
|
426 * bookmark 11:* (glob) |