Mercurial > hg
annotate tests/test-bundle-phase-internal.t @ 52316:a820a7a1fce0 default tip
setup: require TLS 1.2 support from the Python interpreter (BC)
Before it was optional, and either 1.1 or 1.2 was sufficient. Now that the
default minimum is 1.2, it needs to be present to work out of the box.
The code here is more convoluted than the corresponding checks in `sslutil.py`,
but I'm leaving it alone because it can all be simplified when py38 is dropped.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 21 Nov 2024 11:46:10 -0500 |
parents | a878d260ec57 |
children |
rev | line source |
---|---|
50397
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
1 ===================================================== |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2 test behavior of the `internal` phase around bundling |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
3 ===================================================== |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
4 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
5 Long story short, internal changeset are internal implementation details and |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
6 they should never leave the repository. Hence, they should never be in a |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
7 bundle. |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
8 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
9 Setup |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
10 ===== |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
11 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
12 $ cat << EOF >> $HGRCPATH |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
13 > [ui] |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
14 > logtemplate="{node|short} [{phase}] {desc|firstline}" |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
15 > EOF |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
16 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
17 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
18 $ hg init reference-repo --config format.use-internal-phase=yes |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
19 $ cd reference-repo |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
20 $ echo a > a |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
21 $ hg add a |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
22 $ hg commit -m "a" |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
23 $ echo b > b |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
24 $ hg add b |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
25 $ hg commit -m "b" |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
26 $ echo b > c |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
27 $ hg add c |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
28 $ hg commit -m "c" |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
29 $ hg log -G |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
30 @ 07f0cc02c068 [draft] c |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
31 | |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
32 o d2ae7f538514 [draft] b |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
33 | |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
34 o cb9a9f314b8b [draft] a |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
35 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
36 $ hg up ".^" |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
38 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
39 do a shelve |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
40 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
41 $ touch a_file.txt |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
42 $ hg shelve -A |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
43 adding a_file.txt |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
44 shelved as default |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
45 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
46 $ hg log -G --hidden |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
47 o 2ec3cf310d86 [internal] changes to: b |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
48 | |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
49 | o 07f0cc02c068 [draft] c |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
50 |/ |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
51 @ d2ae7f538514 [draft] b |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
52 | |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
53 o cb9a9f314b8b [draft] a |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
54 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
55 $ shelved_node=`hg log --rev tip --hidden -T '{node|short}'` |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
56 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
57 add more changeset above it |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
58 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
59 $ hg up 'desc(a)' |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
60 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
61 $ echo d > d |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
62 $ hg add d |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
63 $ hg commit -m "d" |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
64 created new head |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
65 $ echo d > e |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
66 $ hg add e |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
67 $ hg commit -m "e" |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
68 $ hg up null |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
69 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
70 $ hg log -G |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
71 o 636bc07920e3 [draft] e |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
72 | |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
73 o 980f7dc84c29 [draft] d |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
74 | |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
75 | o 07f0cc02c068 [draft] c |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
76 | | |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
77 | o d2ae7f538514 [draft] b |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
78 |/ |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
79 o cb9a9f314b8b [draft] a |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
80 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
81 $ hg log -G --hidden |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
82 o 636bc07920e3 [draft] e |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
83 | |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
84 o 980f7dc84c29 [draft] d |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
85 | |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
86 | o 2ec3cf310d86 [internal] changes to: b |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
87 | | |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
88 | | o 07f0cc02c068 [draft] c |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
89 | |/ |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
90 | o d2ae7f538514 [draft] b |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
91 |/ |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
92 o cb9a9f314b8b [draft] a |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
93 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
94 $ cd .. |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
95 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
96 backup bundle from strip |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
97 ======================== |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
98 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
99 strip an ancestors of the internal changeset |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
100 -------------------------------------------- |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
101 |
50804
ac8b7bd915a0
compat: use cp -R in `test-bundle-phase-internal.t` (issue6835)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50398
diff
changeset
|
102 $ cp -aR reference-repo strip-ancestor |
50397
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
103 $ cd strip-ancestor |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
104 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
105 The internal change is stripped, yet it should be skipped from the backup bundle. |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
106 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
107 $ hg log -G |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
108 o 636bc07920e3 [draft] e |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
109 | |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
110 o 980f7dc84c29 [draft] d |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
111 | |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
112 | o 07f0cc02c068 [draft] c |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
113 | | |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
114 | o d2ae7f538514 [draft] b |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
115 |/ |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
116 o cb9a9f314b8b [draft] a |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
117 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
118 $ hg debugstrip 'desc(b)' |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
119 saved backup bundle to $TESTTMP/strip-ancestor/.hg/strip-backup/d2ae7f538514-59bd8bc3-backup.hg |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
120 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
121 The change should be either gone or hidden |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
122 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
123 $ hg log -G |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
124 o 636bc07920e3 [draft] e |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
125 | |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
126 o 980f7dc84c29 [draft] d |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
127 | |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
128 o cb9a9f314b8b [draft] a |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
129 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
130 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
131 The backup should not include it (as people tend to manipulate these directly) |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
132 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
133 $ ls -1 .hg/strip-backup/ |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
134 d2ae7f538514-59bd8bc3-backup.hg |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
135 $ hg debugbundle .hg/strip-backup/*.hg |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
136 Stream params: {Compression: BZ} |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
137 changegroup -- {nbchanges: 2, version: 03} (mandatory: True) |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
138 d2ae7f538514cd87c17547b0de4cea71fe1af9fb |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
139 07f0cc02c06869c81ebf33867edef30554020c0d |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
140 cache:rev-branch-cache -- {} (mandatory: False) |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
141 phase-heads -- {} (mandatory: True) |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
142 07f0cc02c06869c81ebf33867edef30554020c0d draft |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
143 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
144 Shelve should still work |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
145 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
146 $ hg unshelve |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
147 unshelving change 'default' |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
148 rebasing shelved changes |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
149 $ hg status |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
150 A a_file.txt |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
151 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
152 $ cd .. |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
153 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
154 strip an unrelated changeset with a lower revnum |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
155 ------------------------------------------------ |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
156 |
50804
ac8b7bd915a0
compat: use cp -R in `test-bundle-phase-internal.t` (issue6835)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50398
diff
changeset
|
157 $ cp -aR reference-repo strip-unrelated |
50397
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
158 $ cd strip-unrelated |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
159 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
160 The internal change is not directly stripped, but it is affected by the strip |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
161 and it is in the "temporary backup" zone. The zone that needs to be put in a |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
162 temporary bundle while we affect data under it. |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
163 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
164 $ hg debugstrip 'desc(c)' |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
165 saved backup bundle to $TESTTMP/strip-unrelated/.hg/strip-backup/07f0cc02c068-8fd0515f-backup.hg |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
166 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
167 The change should be either gone or hidden |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
168 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
169 $ hg log -G |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
170 o 636bc07920e3 [draft] e |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
171 | |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
172 o 980f7dc84c29 [draft] d |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
173 | |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
174 | o d2ae7f538514 [draft] b |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
175 |/ |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
176 o cb9a9f314b8b [draft] a |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
177 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
178 The backup should not include it (as people tend to manipulate these directly) |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
179 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
180 $ ls -1 .hg/strip-backup/ |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
181 07f0cc02c068-8fd0515f-backup.hg |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
182 $ hg debugbundle .hg/strip-backup/*.hg |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
183 Stream params: {Compression: BZ} |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
184 changegroup -- {nbchanges: 1, version: 03} (mandatory: True) |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
185 07f0cc02c06869c81ebf33867edef30554020c0d |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
186 cache:rev-branch-cache -- {} (mandatory: False) |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
187 phase-heads -- {} (mandatory: True) |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
188 07f0cc02c06869c81ebf33867edef30554020c0d draft |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
189 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
190 Shelve should still work |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
191 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
192 $ hg unshelve |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
193 unshelving change 'default' |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
194 rebasing shelved changes |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
195 $ hg status |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
196 A a_file.txt |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
197 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
198 $ cd .. |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
199 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
200 explicitly strip the internal changeset |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
201 --------------------------------------- |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
202 |
50804
ac8b7bd915a0
compat: use cp -R in `test-bundle-phase-internal.t` (issue6835)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50398
diff
changeset
|
203 $ cp -aR reference-repo strip-explicit |
50397
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
204 $ cd strip-explicit |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
205 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
206 The internal change is directly selected for stripping. |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
207 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
208 $ hg debugstrip --hidden $shelved_node |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
209 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
210 The change should be gone |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
211 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
212 $ hg log -G --hidden |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
213 o 636bc07920e3 [draft] e |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
214 | |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
215 o 980f7dc84c29 [draft] d |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
216 | |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
217 | o 07f0cc02c068 [draft] c |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
218 | | |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
219 | o d2ae7f538514 [draft] b |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
220 |/ |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
221 o cb9a9f314b8b [draft] a |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
222 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
223 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
224 We don't need to backup anything |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
225 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
226 $ ls -1 .hg/strip-backup/ |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
227 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
228 Shelve should still work |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
229 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
230 $ hg unshelve |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
231 unshelving change 'default' |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
232 rebasing shelved changes |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
233 $ hg status |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
234 A a_file.txt |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
235 |
f24c2e42e654
strip: do now include internal changeset in the strip backup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
236 $ cd .. |
50398
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
237 |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
238 Explicitly bundling the internal change |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
239 ======================================= |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
240 |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
241 $ cd reference-repo |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
242 |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
243 try to bundle it alone explicitly |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
244 --------------------------------- |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
245 |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
246 We should not allow it |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
247 |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
248 $ hg bundle --type v3 --exact --rev $shelved_node --hidden ../internal-01.hg |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
249 abort: cannot bundle internal changesets |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
250 (1 internal changesets selected) |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
251 [255] |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
252 $ hg debugbundle ../internal-01.hg |
51984
a878d260ec57
tests: stabilize `test-bundle-phase-internal.t` on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
50804
diff
changeset
|
253 abort: $ENOENT$: '../internal-01.hg' (no-windows !) |
a878d260ec57
tests: stabilize `test-bundle-phase-internal.t` on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
50804
diff
changeset
|
254 abort: ../internal-01.hg: $ENOENT$ (windows !) |
50398
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
255 [255] |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
256 |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
257 try to bundle it with other, somewhat explicitly |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
258 ------------------------------------------------ |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
259 |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
260 We should not allow it |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
261 |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
262 $ hg bundle --type v3 --exact --rev 'desc(b)':: --hidden ../internal-02.hg |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
263 abort: cannot bundle internal changesets |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
264 (1 internal changesets selected) |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
265 [255] |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
266 $ hg debugbundle ../internal-02.hg |
51984
a878d260ec57
tests: stabilize `test-bundle-phase-internal.t` on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
50804
diff
changeset
|
267 abort: $ENOENT$: '../internal-02.hg' (no-windows !) |
a878d260ec57
tests: stabilize `test-bundle-phase-internal.t` on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
50804
diff
changeset
|
268 abort: ../internal-02.hg: $ENOENT$ (windows !) |
50398
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
269 [255] |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
270 |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
271 bundle visible ancestors |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
272 ------------------------ |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
273 |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
274 This should succeed as the standard filtering is skipping the internal change naturally |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
275 |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
276 $ hg bundle --type v3 --exact --rev 'desc(b)':: ../internal-03.hg |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
277 2 changesets found |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
278 $ hg debugbundle ../internal-03.hg |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
279 Stream params: {Compression: BZ} |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
280 changegroup -- {nbchanges: 2, version: 03} (mandatory: True) |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
281 d2ae7f538514cd87c17547b0de4cea71fe1af9fb |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
282 07f0cc02c06869c81ebf33867edef30554020c0d |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
283 cache:rev-branch-cache -- {} (mandatory: False) |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
284 phase-heads -- {} (mandatory: True) |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
285 07f0cc02c06869c81ebf33867edef30554020c0d draft |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
286 |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
287 $ cd .. |
cc712ce3361f
bundle: abort if the user request bundling of internal changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50397
diff
changeset
|
288 |