Mercurial > hg
annotate tests/test-treemanifest.t @ 40417:49c7b701fdc2 stable
phase: add an archived phase
This phase allows for hidden changesets in the "user space". It differs from
the "internal" phase which is intended for internal by-product only. There
have been discussions at the 4.8 sprint to use such phase to speedup cleanup
after history rewriting operation.
Shipping it in the same release as the 'internal-phase' groups the associated
`requires` entry. The important bit is to have support for this phase in the
earliest version of mercurial possible. Adding the UI to manipulate this new
phase later seems fine.
The current plan for archived usage and user interface are as follow. On a
repository with internal-phase on and evolution off:
* history rewriting command set rewritten changeset in the archived phase.
(This mean updating the cleanupnodes method).
* keep `hg unbundle .hg/strip-backup/X.hg` as a way to restore changeset for
now
(backup bundle need to contains phase data)
* [maybe] add a `hg strip --soft` advance flag
(a light way to expose the feature without getting in the way of a better
UI)
Mercurial 4.8 freeze is too close to get the above in by then.
We don't introduce a new repository `requirement` as we reuse the one
introduced with the 'archived' phase during the 4.8 cycle.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Wed, 17 Oct 2018 14:47:01 +0200 |
parents | 4bd6e444c76f |
children | 37cc627c5959 |
rev | line source |
---|---|
26920
4d1a96bb831f
test: enable generaldelta early in 'test-treemanifest.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25398
diff
changeset
|
1 $ cat << EOF >> $HGRCPATH |
27953
88609cfa3745
changegroup: fix pulling to treemanifest repo from flat repo (issue5066)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27952
diff
changeset
|
2 > [ui] |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
39489
diff
changeset
|
3 > ssh="$PYTHON" "$TESTDIR/dummyssh" |
26920
4d1a96bb831f
test: enable generaldelta early in 'test-treemanifest.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25398
diff
changeset
|
4 > EOF |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
5 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
6 Set up repo |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
7 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
8 $ hg --config experimental.treemanifest=True init repo |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
9 $ cd repo |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
10 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
11 Requirements get set on init |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
12 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
13 $ grep treemanifest .hg/requires |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
14 treemanifest |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
15 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
16 Without directories, looks like any other repo |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
17 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
18 $ echo 0 > a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
19 $ echo 0 > b |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
20 $ hg ci -Aqm initial |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
21 $ hg debugdata -m 0 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
22 a\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (esc) |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
23 b\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (esc) |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
24 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
25 Submanifest is stored in separate revlog |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
26 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
27 $ mkdir dir1 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
28 $ echo 1 > dir1/a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
29 $ echo 1 > dir1/b |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
30 $ echo 1 > e |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
31 $ hg ci -Aqm 'add dir1' |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
32 $ hg debugdata -m 1 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
33 a\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (esc) |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
34 b\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (esc) |
27271
2a31433a59ba
manifest: use 't' for tree manifest flag
Martin von Zweigbergk <martinvonz@google.com>
parents:
27251
diff
changeset
|
35 dir1\x008b3ffd73f901e83304c83d33132c8e774ceac44et (esc) |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
36 e\x00b8e02f6433738021a065f94175c7cd23db5f05be (esc) |
25119
49c583ca48c4
treemanifest: add --dir option to debug{revlog,data,index}
Martin von Zweigbergk <martinvonz@google.com>
parents:
25091
diff
changeset
|
37 $ hg debugdata --dir dir1 0 |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
38 a\x00b8e02f6433738021a065f94175c7cd23db5f05be (esc) |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
39 b\x00b8e02f6433738021a065f94175c7cd23db5f05be (esc) |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
40 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
41 Can add nested directories |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
42 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
43 $ mkdir dir1/dir1 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
44 $ echo 2 > dir1/dir1/a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
45 $ echo 2 > dir1/dir1/b |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
46 $ mkdir dir1/dir2 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
47 $ echo 2 > dir1/dir2/a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
48 $ echo 2 > dir1/dir2/b |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
49 $ hg ci -Aqm 'add dir1/dir1' |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
50 $ hg files -r . |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
51 a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
52 b |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
53 dir1/a |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
54 dir1/b |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
55 dir1/dir1/a |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
56 dir1/dir1/b |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
57 dir1/dir2/a |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
58 dir1/dir2/b |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
59 e |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
60 |
29699
6943dacc3b4c
test-treemanifest: ensure manifest command isn't broken
Augie Fackler <augie@google.com>
parents:
29464
diff
changeset
|
61 The manifest command works |
6943dacc3b4c
test-treemanifest: ensure manifest command isn't broken
Augie Fackler <augie@google.com>
parents:
29464
diff
changeset
|
62 |
6943dacc3b4c
test-treemanifest: ensure manifest command isn't broken
Augie Fackler <augie@google.com>
parents:
29464
diff
changeset
|
63 $ hg manifest |
6943dacc3b4c
test-treemanifest: ensure manifest command isn't broken
Augie Fackler <augie@google.com>
parents:
29464
diff
changeset
|
64 a |
6943dacc3b4c
test-treemanifest: ensure manifest command isn't broken
Augie Fackler <augie@google.com>
parents:
29464
diff
changeset
|
65 b |
6943dacc3b4c
test-treemanifest: ensure manifest command isn't broken
Augie Fackler <augie@google.com>
parents:
29464
diff
changeset
|
66 dir1/a |
6943dacc3b4c
test-treemanifest: ensure manifest command isn't broken
Augie Fackler <augie@google.com>
parents:
29464
diff
changeset
|
67 dir1/b |
6943dacc3b4c
test-treemanifest: ensure manifest command isn't broken
Augie Fackler <augie@google.com>
parents:
29464
diff
changeset
|
68 dir1/dir1/a |
6943dacc3b4c
test-treemanifest: ensure manifest command isn't broken
Augie Fackler <augie@google.com>
parents:
29464
diff
changeset
|
69 dir1/dir1/b |
6943dacc3b4c
test-treemanifest: ensure manifest command isn't broken
Augie Fackler <augie@google.com>
parents:
29464
diff
changeset
|
70 dir1/dir2/a |
6943dacc3b4c
test-treemanifest: ensure manifest command isn't broken
Augie Fackler <augie@google.com>
parents:
29464
diff
changeset
|
71 dir1/dir2/b |
6943dacc3b4c
test-treemanifest: ensure manifest command isn't broken
Augie Fackler <augie@google.com>
parents:
29464
diff
changeset
|
72 e |
6943dacc3b4c
test-treemanifest: ensure manifest command isn't broken
Augie Fackler <augie@google.com>
parents:
29464
diff
changeset
|
73 |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
74 Revision is not created for unchanged directory |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
75 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
76 $ mkdir dir2 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
77 $ echo 3 > dir2/a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
78 $ hg add dir2 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
79 adding dir2/a |
25119
49c583ca48c4
treemanifest: add --dir option to debug{revlog,data,index}
Martin von Zweigbergk <martinvonz@google.com>
parents:
25091
diff
changeset
|
80 $ hg debugindex --dir dir1 > before |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
81 $ hg ci -qm 'add dir2' |
25119
49c583ca48c4
treemanifest: add --dir option to debug{revlog,data,index}
Martin von Zweigbergk <martinvonz@google.com>
parents:
25091
diff
changeset
|
82 $ hg debugindex --dir dir1 > after |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
83 $ diff before after |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
84 $ rm before after |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
85 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
86 Removing directory does not create an revlog entry |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
87 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
88 $ hg rm dir1/dir1 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
89 removing dir1/dir1/a |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
90 removing dir1/dir1/b |
25119
49c583ca48c4
treemanifest: add --dir option to debug{revlog,data,index}
Martin von Zweigbergk <martinvonz@google.com>
parents:
25091
diff
changeset
|
91 $ hg debugindex --dir dir1/dir1 > before |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
92 $ hg ci -qm 'remove dir1/dir1' |
25119
49c583ca48c4
treemanifest: add --dir option to debug{revlog,data,index}
Martin von Zweigbergk <martinvonz@google.com>
parents:
25091
diff
changeset
|
93 $ hg debugindex --dir dir1/dir1 > after |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
94 $ diff before after |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
95 $ rm before after |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
96 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
97 Check that hg files (calls treemanifest.walk()) works |
25222
0de132d5328a
treemanifest: lazily load manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
25153
diff
changeset
|
98 without loading all directory revlogs |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
99 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
100 $ hg co 'desc("add dir2")' |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
101 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
25222
0de132d5328a
treemanifest: lazily load manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
25153
diff
changeset
|
102 $ mv .hg/store/meta/dir2 .hg/store/meta/dir2-backup |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
103 $ hg files -r . dir1 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
104 dir1/a |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
105 dir1/b |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
106 dir1/dir1/a |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
107 dir1/dir1/b |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
108 dir1/dir2/a |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
109 dir1/dir2/b |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
110 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
111 Check that status between revisions works (calls treemanifest.matches()) |
25222
0de132d5328a
treemanifest: lazily load manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
25153
diff
changeset
|
112 without loading all directory revlogs |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
113 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
114 $ hg status --rev 'desc("add dir1")' --rev . dir1 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
115 A dir1/dir1/a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
116 A dir1/dir1/b |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
117 A dir1/dir2/a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
118 A dir1/dir2/b |
25222
0de132d5328a
treemanifest: lazily load manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
25153
diff
changeset
|
119 $ mv .hg/store/meta/dir2-backup .hg/store/meta/dir2 |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
120 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
121 Merge creates 2-parent revision of directory revlog |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
122 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
123 $ echo 5 > dir1/a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
124 $ hg ci -Aqm 'modify dir1/a' |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
125 $ hg co '.^' |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
126 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
127 $ echo 6 > dir1/b |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
128 $ hg ci -Aqm 'modify dir1/b' |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
129 $ hg merge 'desc("modify dir1/a")' |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
130 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
131 (branch merge, don't forget to commit) |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
132 $ hg ci -m 'conflict-free merge involving dir1/' |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
133 $ cat dir1/a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
134 5 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
135 $ cat dir1/b |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
136 6 |
25119
49c583ca48c4
treemanifest: add --dir option to debug{revlog,data,index}
Martin von Zweigbergk <martinvonz@google.com>
parents:
25091
diff
changeset
|
137 $ hg debugindex --dir dir1 |
37283
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
138 rev linkrev nodeid p1 p2 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
139 0 1 8b3ffd73f901 000000000000 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
140 1 2 68e9d057c5a8 8b3ffd73f901 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
141 2 4 4698198d2624 68e9d057c5a8 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
142 3 5 44844058ccce 68e9d057c5a8 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
143 4 6 bf3d9b744927 68e9d057c5a8 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
144 5 7 dde7c0af2a03 bf3d9b744927 44844058ccce |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
145 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
146 Merge keeping directory from parent 1 does not create revlog entry. (Note that |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
147 dir1's manifest does change, but only because dir1/a's filelog changes.) |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
148 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
149 $ hg co 'desc("add dir2")' |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
150 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
151 $ echo 8 > dir2/a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
152 $ hg ci -m 'modify dir2/a' |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
153 created new head |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
154 |
25119
49c583ca48c4
treemanifest: add --dir option to debug{revlog,data,index}
Martin von Zweigbergk <martinvonz@google.com>
parents:
25091
diff
changeset
|
155 $ hg debugindex --dir dir2 > before |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
156 $ hg merge 'desc("modify dir1/a")' |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
157 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
158 (branch merge, don't forget to commit) |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
159 $ hg revert -r 'desc("modify dir2/a")' . |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
160 reverting dir1/a |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
161 $ hg ci -m 'merge, keeping parent 1' |
25119
49c583ca48c4
treemanifest: add --dir option to debug{revlog,data,index}
Martin von Zweigbergk <martinvonz@google.com>
parents:
25091
diff
changeset
|
162 $ hg debugindex --dir dir2 > after |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
163 $ diff before after |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
164 $ rm before after |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
165 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
166 Merge keeping directory from parent 2 does not create revlog entry. (Note that |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
167 dir2's manifest does change, but only because dir2/a's filelog changes.) |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
168 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
169 $ hg co 'desc("modify dir2/a")' |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
170 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
25119
49c583ca48c4
treemanifest: add --dir option to debug{revlog,data,index}
Martin von Zweigbergk <martinvonz@google.com>
parents:
25091
diff
changeset
|
171 $ hg debugindex --dir dir1 > before |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
172 $ hg merge 'desc("modify dir1/a")' |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
173 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
174 (branch merge, don't forget to commit) |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
175 $ hg revert -r 'desc("modify dir1/a")' . |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
176 reverting dir2/a |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
177 $ hg ci -m 'merge, keeping parent 2' |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
178 created new head |
25119
49c583ca48c4
treemanifest: add --dir option to debug{revlog,data,index}
Martin von Zweigbergk <martinvonz@google.com>
parents:
25091
diff
changeset
|
179 $ hg debugindex --dir dir1 > after |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
180 $ diff before after |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
181 $ rm before after |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
182 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
183 Create flat source repo for tests with mixed flat/tree manifests |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
184 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
185 $ cd .. |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
186 $ hg init repo-flat |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
187 $ cd repo-flat |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
188 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
189 Create a few commits with flat manifest |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
190 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
191 $ echo 0 > a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
192 $ echo 0 > b |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
193 $ echo 0 > e |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
194 $ for d in dir1 dir1/dir1 dir1/dir2 dir2 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
195 > do |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
196 > mkdir $d |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
197 > echo 0 > $d/a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
198 > echo 0 > $d/b |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
199 > done |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
200 $ hg ci -Aqm initial |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
201 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
202 $ echo 1 > a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
203 $ echo 1 > dir1/a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
204 $ echo 1 > dir1/dir1/a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
205 $ hg ci -Aqm 'modify on branch 1' |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
206 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
207 $ hg co 0 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
208 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
209 $ echo 2 > b |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
210 $ echo 2 > dir1/b |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
211 $ echo 2 > dir1/dir1/b |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
212 $ hg ci -Aqm 'modify on branch 2' |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
213 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
214 $ hg merge 1 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
215 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
216 (branch merge, don't forget to commit) |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
217 $ hg ci -m 'merge of flat manifests to new flat manifest' |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
218 |
27953
88609cfa3745
changegroup: fix pulling to treemanifest repo from flat repo (issue5066)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27952
diff
changeset
|
219 $ hg serve -p $HGPORT -d --pid-file=hg.pid --errorlog=errors.log |
88609cfa3745
changegroup: fix pulling to treemanifest repo from flat repo (issue5066)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27952
diff
changeset
|
220 $ cat hg.pid >> $DAEMON_PIDS |
88609cfa3745
changegroup: fix pulling to treemanifest repo from flat repo (issue5066)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27952
diff
changeset
|
221 |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
222 Create clone with tree manifests enabled |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
223 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
224 $ cd .. |
27953
88609cfa3745
changegroup: fix pulling to treemanifest repo from flat repo (issue5066)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27952
diff
changeset
|
225 $ hg clone --config experimental.treemanifest=1 \ |
88609cfa3745
changegroup: fix pulling to treemanifest repo from flat repo (issue5066)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27952
diff
changeset
|
226 > http://localhost:$HGPORT repo-mixed -r 1 |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
227 adding changesets |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
228 adding manifests |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
229 adding file changes |
27953
88609cfa3745
changegroup: fix pulling to treemanifest repo from flat repo (issue5066)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27952
diff
changeset
|
230 added 2 changesets with 14 changes to 11 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34393
diff
changeset
|
231 new changesets 5b02a3e8db7e:581ef6037d8b |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
232 updating to branch default |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
233 11 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
234 $ cd repo-mixed |
27952
c5ffbd4c033b
tests: minor cleanup to treemanifest test
Martin von Zweigbergk <martinvonz@google.com>
parents:
27946
diff
changeset
|
235 $ test -d .hg/store/meta |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
236 [1] |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
237 $ grep treemanifest .hg/requires |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
238 treemanifest |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
239 |
27953
88609cfa3745
changegroup: fix pulling to treemanifest repo from flat repo (issue5066)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27952
diff
changeset
|
240 Should be possible to push updates from flat to tree manifest repo |
88609cfa3745
changegroup: fix pulling to treemanifest repo from flat repo (issue5066)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27952
diff
changeset
|
241 |
88609cfa3745
changegroup: fix pulling to treemanifest repo from flat repo (issue5066)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27952
diff
changeset
|
242 $ hg -R ../repo-flat push ssh://user@dummy/repo-mixed |
88609cfa3745
changegroup: fix pulling to treemanifest repo from flat repo (issue5066)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27952
diff
changeset
|
243 pushing to ssh://user@dummy/repo-mixed |
88609cfa3745
changegroup: fix pulling to treemanifest repo from flat repo (issue5066)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27952
diff
changeset
|
244 searching for changes |
88609cfa3745
changegroup: fix pulling to treemanifest repo from flat repo (issue5066)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27952
diff
changeset
|
245 remote: adding changesets |
88609cfa3745
changegroup: fix pulling to treemanifest repo from flat repo (issue5066)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27952
diff
changeset
|
246 remote: adding manifests |
88609cfa3745
changegroup: fix pulling to treemanifest repo from flat repo (issue5066)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27952
diff
changeset
|
247 remote: adding file changes |
88609cfa3745
changegroup: fix pulling to treemanifest repo from flat repo (issue5066)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27952
diff
changeset
|
248 remote: added 2 changesets with 3 changes to 3 files |
88609cfa3745
changegroup: fix pulling to treemanifest repo from flat repo (issue5066)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27952
diff
changeset
|
249 |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
250 Commit should store revlog per directory |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
251 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
252 $ hg co 1 |
27953
88609cfa3745
changegroup: fix pulling to treemanifest repo from flat repo (issue5066)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27952
diff
changeset
|
253 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
254 $ echo 3 > a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
255 $ echo 3 > dir1/a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
256 $ echo 3 > dir1/dir1/a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
257 $ hg ci -m 'first tree' |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
258 created new head |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
259 $ find .hg/store/meta | sort |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
260 .hg/store/meta |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
261 .hg/store/meta/dir1 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
262 .hg/store/meta/dir1/00manifest.i |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
263 .hg/store/meta/dir1/dir1 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
264 .hg/store/meta/dir1/dir1/00manifest.i |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
265 .hg/store/meta/dir1/dir2 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
266 .hg/store/meta/dir1/dir2/00manifest.i |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
267 .hg/store/meta/dir2 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
268 .hg/store/meta/dir2/00manifest.i |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
269 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
270 Merge of two trees |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
271 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
272 $ hg co 2 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
273 6 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
274 $ hg merge 1 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
275 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
276 (branch merge, don't forget to commit) |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
277 $ hg ci -m 'merge of flat manifests to new tree manifest' |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
278 created new head |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
279 $ hg diff -r 3 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
280 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
281 Parent of tree root manifest should be flat manifest, and two for merge |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
282 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
283 $ hg debugindex -m |
37283
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
284 rev linkrev nodeid p1 p2 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
285 0 0 40536115ed9e 000000000000 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
286 1 1 f3376063c255 40536115ed9e 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
287 2 2 5d9b9da231a2 40536115ed9e 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
288 3 3 d17d663cbd8a 5d9b9da231a2 f3376063c255 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
289 4 4 51e32a8c60ee f3376063c255 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
290 5 5 cc5baa78b230 5d9b9da231a2 f3376063c255 |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
291 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
292 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
293 Status across flat/tree boundary should work |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
294 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
295 $ hg status --rev '.^' --rev . |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
296 M a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
297 M dir1/a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
298 M dir1/dir1/a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
299 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
300 |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
301 Turning off treemanifest config has no effect |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
302 |
27952
c5ffbd4c033b
tests: minor cleanup to treemanifest test
Martin von Zweigbergk <martinvonz@google.com>
parents:
27946
diff
changeset
|
303 $ hg debugindex --dir dir1 |
37283
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
304 rev linkrev nodeid p1 p2 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
305 0 4 064927a0648a 000000000000 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
306 1 5 25ecb8cb8618 000000000000 000000000000 |
25091
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
307 $ echo 2 > dir1/a |
b5052fc73300
treemanifest: store submanifest revlog per directory
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
308 $ hg --config experimental.treemanifest=False ci -qm 'modify dir1/a' |
27952
c5ffbd4c033b
tests: minor cleanup to treemanifest test
Martin von Zweigbergk <martinvonz@google.com>
parents:
27946
diff
changeset
|
309 $ hg debugindex --dir dir1 |
37283
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
310 rev linkrev nodeid p1 p2 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
311 0 4 064927a0648a 000000000000 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
312 1 5 25ecb8cb8618 000000000000 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
313 2 6 5b16163a30c6 25ecb8cb8618 000000000000 |
25231
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
314 |
27930
7cbb3a01fa38
repair: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27752
diff
changeset
|
315 Stripping and recovering changes should work |
7cbb3a01fa38
repair: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27752
diff
changeset
|
316 |
7cbb3a01fa38
repair: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27752
diff
changeset
|
317 $ hg st --change tip |
7cbb3a01fa38
repair: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27752
diff
changeset
|
318 M dir1/a |
7cbb3a01fa38
repair: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27752
diff
changeset
|
319 $ hg --config extensions.strip= strip tip |
7cbb3a01fa38
repair: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27752
diff
changeset
|
320 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
321 saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg |
29464
87c184c9bfef
treemanifests: actually strip directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
29371
diff
changeset
|
322 $ hg debugindex --dir dir1 |
37283
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
323 rev linkrev nodeid p1 p2 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
324 0 4 064927a0648a 000000000000 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
325 1 5 25ecb8cb8618 000000000000 000000000000 |
37346
45a4799174a1
tests: disallow using simple store repo with bundlerepo
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37336
diff
changeset
|
326 |
45a4799174a1
tests: disallow using simple store repo with bundlerepo
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37336
diff
changeset
|
327 #if repobundlerepo |
29715
55d341877316
bundlerepo: add support for treemanifests in cg3 bundles
Augie Fackler <augie@google.com>
parents:
29699
diff
changeset
|
328 $ hg incoming .hg/strip-backup/* |
55d341877316
bundlerepo: add support for treemanifests in cg3 bundles
Augie Fackler <augie@google.com>
parents:
29699
diff
changeset
|
329 comparing with .hg/strip-backup/*-backup.hg (glob) |
55d341877316
bundlerepo: add support for treemanifests in cg3 bundles
Augie Fackler <augie@google.com>
parents:
29699
diff
changeset
|
330 searching for changes |
55d341877316
bundlerepo: add support for treemanifests in cg3 bundles
Augie Fackler <augie@google.com>
parents:
29699
diff
changeset
|
331 changeset: 6:51cfd7b1e13b |
55d341877316
bundlerepo: add support for treemanifests in cg3 bundles
Augie Fackler <augie@google.com>
parents:
29699
diff
changeset
|
332 tag: tip |
55d341877316
bundlerepo: add support for treemanifests in cg3 bundles
Augie Fackler <augie@google.com>
parents:
29699
diff
changeset
|
333 user: test |
55d341877316
bundlerepo: add support for treemanifests in cg3 bundles
Augie Fackler <augie@google.com>
parents:
29699
diff
changeset
|
334 date: Thu Jan 01 00:00:00 1970 +0000 |
55d341877316
bundlerepo: add support for treemanifests in cg3 bundles
Augie Fackler <augie@google.com>
parents:
29699
diff
changeset
|
335 summary: modify dir1/a |
55d341877316
bundlerepo: add support for treemanifests in cg3 bundles
Augie Fackler <augie@google.com>
parents:
29699
diff
changeset
|
336 |
37346
45a4799174a1
tests: disallow using simple store repo with bundlerepo
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37336
diff
changeset
|
337 #endif |
45a4799174a1
tests: disallow using simple store repo with bundlerepo
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37336
diff
changeset
|
338 |
37336
5d10f41ddcc4
tests: use `hg unbundle` instead of `hg pull` in some tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
339 $ hg unbundle .hg/strip-backup/* |
29715
55d341877316
bundlerepo: add support for treemanifests in cg3 bundles
Augie Fackler <augie@google.com>
parents:
29699
diff
changeset
|
340 adding changesets |
55d341877316
bundlerepo: add support for treemanifests in cg3 bundles
Augie Fackler <augie@google.com>
parents:
29699
diff
changeset
|
341 adding manifests |
55d341877316
bundlerepo: add support for treemanifests in cg3 bundles
Augie Fackler <augie@google.com>
parents:
29699
diff
changeset
|
342 adding file changes |
55d341877316
bundlerepo: add support for treemanifests in cg3 bundles
Augie Fackler <augie@google.com>
parents:
29699
diff
changeset
|
343 added 1 changesets with 1 changes to 1 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
37845
diff
changeset
|
344 new changesets 51cfd7b1e13b (1 drafts) |
29715
55d341877316
bundlerepo: add support for treemanifests in cg3 bundles
Augie Fackler <augie@google.com>
parents:
29699
diff
changeset
|
345 (run 'hg update' to get a working copy) |
55d341877316
bundlerepo: add support for treemanifests in cg3 bundles
Augie Fackler <augie@google.com>
parents:
29699
diff
changeset
|
346 $ hg --config extensions.strip= strip tip |
55d341877316
bundlerepo: add support for treemanifests in cg3 bundles
Augie Fackler <augie@google.com>
parents:
29699
diff
changeset
|
347 saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/*-backup.hg (glob) |
27930
7cbb3a01fa38
repair: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27752
diff
changeset
|
348 $ hg unbundle -q .hg/strip-backup/* |
29464
87c184c9bfef
treemanifests: actually strip directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
29371
diff
changeset
|
349 $ hg debugindex --dir dir1 |
37283
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
350 rev linkrev nodeid p1 p2 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
351 0 4 064927a0648a 000000000000 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
352 1 5 25ecb8cb8618 000000000000 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
353 2 6 5b16163a30c6 25ecb8cb8618 000000000000 |
27930
7cbb3a01fa38
repair: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27752
diff
changeset
|
354 $ hg st --change tip |
7cbb3a01fa38
repair: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27752
diff
changeset
|
355 M dir1/a |
7cbb3a01fa38
repair: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27752
diff
changeset
|
356 |
27931
1289a122cf3f
shelve: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27930
diff
changeset
|
357 Shelving and unshelving should work |
1289a122cf3f
shelve: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27930
diff
changeset
|
358 |
1289a122cf3f
shelve: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27930
diff
changeset
|
359 $ echo foo >> dir1/a |
1289a122cf3f
shelve: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27930
diff
changeset
|
360 $ hg --config extensions.shelve= shelve |
1289a122cf3f
shelve: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27930
diff
changeset
|
361 shelved as default |
1289a122cf3f
shelve: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27930
diff
changeset
|
362 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1289a122cf3f
shelve: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27930
diff
changeset
|
363 $ hg --config extensions.shelve= unshelve |
1289a122cf3f
shelve: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27930
diff
changeset
|
364 unshelving change 'default' |
1289a122cf3f
shelve: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27930
diff
changeset
|
365 $ hg diff --nodates |
1289a122cf3f
shelve: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27930
diff
changeset
|
366 diff -r 708a273da119 dir1/a |
1289a122cf3f
shelve: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27930
diff
changeset
|
367 --- a/dir1/a |
1289a122cf3f
shelve: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27930
diff
changeset
|
368 +++ b/dir1/a |
1289a122cf3f
shelve: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27930
diff
changeset
|
369 @@ -1,1 +1,2 @@ |
1289a122cf3f
shelve: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27930
diff
changeset
|
370 1 |
1289a122cf3f
shelve: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27930
diff
changeset
|
371 +foo |
1289a122cf3f
shelve: use cg3 for treemanifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
27930
diff
changeset
|
372 |
27938
cabac7dfc621
exchange: set 'treemanifest' param on pushed changegroups too
Martin von Zweigbergk <martinvonz@google.com>
parents:
27931
diff
changeset
|
373 Pushing from treemanifest repo to an empty repo makes that a treemanifest repo |
cabac7dfc621
exchange: set 'treemanifest' param on pushed changegroups too
Martin von Zweigbergk <martinvonz@google.com>
parents:
27931
diff
changeset
|
374 |
cabac7dfc621
exchange: set 'treemanifest' param on pushed changegroups too
Martin von Zweigbergk <martinvonz@google.com>
parents:
27931
diff
changeset
|
375 $ cd .. |
cabac7dfc621
exchange: set 'treemanifest' param on pushed changegroups too
Martin von Zweigbergk <martinvonz@google.com>
parents:
27931
diff
changeset
|
376 $ hg init empty-repo |
cabac7dfc621
exchange: set 'treemanifest' param on pushed changegroups too
Martin von Zweigbergk <martinvonz@google.com>
parents:
27931
diff
changeset
|
377 $ cat << EOF >> empty-repo/.hg/hgrc |
cabac7dfc621
exchange: set 'treemanifest' param on pushed changegroups too
Martin von Zweigbergk <martinvonz@google.com>
parents:
27931
diff
changeset
|
378 > [experimental] |
cabac7dfc621
exchange: set 'treemanifest' param on pushed changegroups too
Martin von Zweigbergk <martinvonz@google.com>
parents:
27931
diff
changeset
|
379 > changegroup3=yes |
cabac7dfc621
exchange: set 'treemanifest' param on pushed changegroups too
Martin von Zweigbergk <martinvonz@google.com>
parents:
27931
diff
changeset
|
380 > EOF |
cabac7dfc621
exchange: set 'treemanifest' param on pushed changegroups too
Martin von Zweigbergk <martinvonz@google.com>
parents:
27931
diff
changeset
|
381 $ grep treemanifest empty-repo/.hg/requires |
cabac7dfc621
exchange: set 'treemanifest' param on pushed changegroups too
Martin von Zweigbergk <martinvonz@google.com>
parents:
27931
diff
changeset
|
382 [1] |
cabac7dfc621
exchange: set 'treemanifest' param on pushed changegroups too
Martin von Zweigbergk <martinvonz@google.com>
parents:
27931
diff
changeset
|
383 $ hg push -R repo -r 0 empty-repo |
cabac7dfc621
exchange: set 'treemanifest' param on pushed changegroups too
Martin von Zweigbergk <martinvonz@google.com>
parents:
27931
diff
changeset
|
384 pushing to empty-repo |
cabac7dfc621
exchange: set 'treemanifest' param on pushed changegroups too
Martin von Zweigbergk <martinvonz@google.com>
parents:
27931
diff
changeset
|
385 searching for changes |
cabac7dfc621
exchange: set 'treemanifest' param on pushed changegroups too
Martin von Zweigbergk <martinvonz@google.com>
parents:
27931
diff
changeset
|
386 adding changesets |
cabac7dfc621
exchange: set 'treemanifest' param on pushed changegroups too
Martin von Zweigbergk <martinvonz@google.com>
parents:
27931
diff
changeset
|
387 adding manifests |
cabac7dfc621
exchange: set 'treemanifest' param on pushed changegroups too
Martin von Zweigbergk <martinvonz@google.com>
parents:
27931
diff
changeset
|
388 adding file changes |
cabac7dfc621
exchange: set 'treemanifest' param on pushed changegroups too
Martin von Zweigbergk <martinvonz@google.com>
parents:
27931
diff
changeset
|
389 added 1 changesets with 2 changes to 2 files |
cabac7dfc621
exchange: set 'treemanifest' param on pushed changegroups too
Martin von Zweigbergk <martinvonz@google.com>
parents:
27931
diff
changeset
|
390 $ grep treemanifest empty-repo/.hg/requires |
cabac7dfc621
exchange: set 'treemanifest' param on pushed changegroups too
Martin von Zweigbergk <martinvonz@google.com>
parents:
27931
diff
changeset
|
391 treemanifest |
cabac7dfc621
exchange: set 'treemanifest' param on pushed changegroups too
Martin von Zweigbergk <martinvonz@google.com>
parents:
27931
diff
changeset
|
392 |
27946
ca8d2b73155d
changegroup: fix treemanifest exchange code (issue5061)
Augie Fackler <augie@google.com>
parents:
27938
diff
changeset
|
393 Pushing to an empty repo works |
ca8d2b73155d
changegroup: fix treemanifest exchange code (issue5061)
Augie Fackler <augie@google.com>
parents:
27938
diff
changeset
|
394 |
ca8d2b73155d
changegroup: fix treemanifest exchange code (issue5061)
Augie Fackler <augie@google.com>
parents:
27938
diff
changeset
|
395 $ hg --config experimental.treemanifest=1 init clone |
ca8d2b73155d
changegroup: fix treemanifest exchange code (issue5061)
Augie Fackler <augie@google.com>
parents:
27938
diff
changeset
|
396 $ grep treemanifest clone/.hg/requires |
ca8d2b73155d
changegroup: fix treemanifest exchange code (issue5061)
Augie Fackler <augie@google.com>
parents:
27938
diff
changeset
|
397 treemanifest |
ca8d2b73155d
changegroup: fix treemanifest exchange code (issue5061)
Augie Fackler <augie@google.com>
parents:
27938
diff
changeset
|
398 $ hg push -R repo clone |
ca8d2b73155d
changegroup: fix treemanifest exchange code (issue5061)
Augie Fackler <augie@google.com>
parents:
27938
diff
changeset
|
399 pushing to clone |
ca8d2b73155d
changegroup: fix treemanifest exchange code (issue5061)
Augie Fackler <augie@google.com>
parents:
27938
diff
changeset
|
400 searching for changes |
ca8d2b73155d
changegroup: fix treemanifest exchange code (issue5061)
Augie Fackler <augie@google.com>
parents:
27938
diff
changeset
|
401 adding changesets |
ca8d2b73155d
changegroup: fix treemanifest exchange code (issue5061)
Augie Fackler <augie@google.com>
parents:
27938
diff
changeset
|
402 adding manifests |
ca8d2b73155d
changegroup: fix treemanifest exchange code (issue5061)
Augie Fackler <augie@google.com>
parents:
27938
diff
changeset
|
403 adding file changes |
ca8d2b73155d
changegroup: fix treemanifest exchange code (issue5061)
Augie Fackler <augie@google.com>
parents:
27938
diff
changeset
|
404 added 11 changesets with 15 changes to 10 files (+3 heads) |
ca8d2b73155d
changegroup: fix treemanifest exchange code (issue5061)
Augie Fackler <augie@google.com>
parents:
27938
diff
changeset
|
405 $ grep treemanifest clone/.hg/requires |
ca8d2b73155d
changegroup: fix treemanifest exchange code (issue5061)
Augie Fackler <augie@google.com>
parents:
27938
diff
changeset
|
406 treemanifest |
28240
1ac8ce137377
changegroup: fix treemanifests on merges
Martin von Zweigbergk <martinvonz@google.com>
parents:
28214
diff
changeset
|
407 $ hg -R clone verify |
1ac8ce137377
changegroup: fix treemanifests on merges
Martin von Zweigbergk <martinvonz@google.com>
parents:
28214
diff
changeset
|
408 checking changesets |
1ac8ce137377
changegroup: fix treemanifests on merges
Martin von Zweigbergk <martinvonz@google.com>
parents:
28214
diff
changeset
|
409 checking manifests |
1ac8ce137377
changegroup: fix treemanifests on merges
Martin von Zweigbergk <martinvonz@google.com>
parents:
28214
diff
changeset
|
410 checking directory manifests |
1ac8ce137377
changegroup: fix treemanifests on merges
Martin von Zweigbergk <martinvonz@google.com>
parents:
28214
diff
changeset
|
411 crosschecking files in changesets and manifests |
1ac8ce137377
changegroup: fix treemanifests on merges
Martin von Zweigbergk <martinvonz@google.com>
parents:
28214
diff
changeset
|
412 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39480
diff
changeset
|
413 checked 11 changesets with 15 changes to 10 files |
27946
ca8d2b73155d
changegroup: fix treemanifest exchange code (issue5061)
Augie Fackler <augie@google.com>
parents:
27938
diff
changeset
|
414 |
25231
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
415 Create deeper repo with tree manifests. |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
416 |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
417 $ hg --config experimental.treemanifest=True init deeprepo |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
418 $ cd deeprepo |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
419 |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
420 $ mkdir .A |
25231
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
421 $ mkdir b |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
422 $ mkdir b/bar |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
423 $ mkdir b/bar/orange |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
424 $ mkdir b/bar/orange/fly |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
425 $ mkdir b/foo |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
426 $ mkdir b/foo/apple |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
427 $ mkdir b/foo/apple/bees |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
428 |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
429 $ touch .A/one.txt |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
430 $ touch .A/two.txt |
25231
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
431 $ touch b/bar/fruits.txt |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
432 $ touch b/bar/orange/fly/gnat.py |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
433 $ touch b/bar/orange/fly/housefly.txt |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
434 $ touch b/foo/apple/bees/flower.py |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
435 $ touch c.txt |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
436 $ touch d.py |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
437 |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
438 $ hg ci -Aqm 'initial' |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
439 |
31262
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
440 $ echo >> .A/one.txt |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
441 $ echo >> .A/two.txt |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
442 $ echo >> b/bar/fruits.txt |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
443 $ echo >> b/bar/orange/fly/gnat.py |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
444 $ echo >> b/bar/orange/fly/housefly.txt |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
445 $ echo >> b/foo/apple/bees/flower.py |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
446 $ echo >> c.txt |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
447 $ echo >> d.py |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
448 $ hg ci -Aqm 'second' |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
449 |
25231
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
450 We'll see that visitdir works by removing some treemanifest revlogs and running |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
451 the files command with various parameters. |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
452 |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
453 Test files from the root. |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
454 |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
455 $ hg files -r . |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
456 .A/one.txt |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
457 .A/two.txt |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
458 b/bar/fruits.txt |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
459 b/bar/orange/fly/gnat.py |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
460 b/bar/orange/fly/housefly.txt |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
461 b/foo/apple/bees/flower.py |
25231
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
462 c.txt |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
463 d.py |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
464 |
25362
20ad936ac5d2
treemanifest: visit directory 'foo' when given e.g. '-X foo/ba?'
Martin von Zweigbergk <martinvonz@google.com>
parents:
25299
diff
changeset
|
465 Excludes with a glob should not exclude everything from the glob's root |
20ad936ac5d2
treemanifest: visit directory 'foo' when given e.g. '-X foo/ba?'
Martin von Zweigbergk <martinvonz@google.com>
parents:
25299
diff
changeset
|
466 |
20ad936ac5d2
treemanifest: visit directory 'foo' when given e.g. '-X foo/ba?'
Martin von Zweigbergk <martinvonz@google.com>
parents:
25299
diff
changeset
|
467 $ hg files -r . -X 'b/fo?' b |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
468 b/bar/fruits.txt |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
469 b/bar/orange/fly/gnat.py |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
470 b/bar/orange/fly/housefly.txt |
30556
c059286a0f9c
tests: replace "cp -r" with "cp -R"
Jun Wu <quark@fb.com>
parents:
29715
diff
changeset
|
471 $ cp -R .hg/store .hg/store-copy |
25362
20ad936ac5d2
treemanifest: visit directory 'foo' when given e.g. '-X foo/ba?'
Martin von Zweigbergk <martinvonz@google.com>
parents:
25299
diff
changeset
|
472 |
25231
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
473 Test files for a subdirectory. |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
474 |
37432
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
475 #if reporevlogstore |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
476 $ rm -r .hg/store/meta/~2e_a |
37432
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
477 #endif |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
478 #if reposimplestore |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
479 $ rm -r .hg/store/meta/._a |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
480 #endif |
25231
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
481 $ hg files -r . b |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
482 b/bar/fruits.txt |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
483 b/bar/orange/fly/gnat.py |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
484 b/bar/orange/fly/housefly.txt |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
485 b/foo/apple/bees/flower.py |
31262
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
486 $ hg diff -r '.^' -r . --stat b |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
487 b/bar/fruits.txt | 1 + |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
488 b/bar/orange/fly/gnat.py | 1 + |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
489 b/bar/orange/fly/housefly.txt | 1 + |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
490 b/foo/apple/bees/flower.py | 1 + |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
491 4 files changed, 4 insertions(+), 0 deletions(-) |
30556
c059286a0f9c
tests: replace "cp -r" with "cp -R"
Jun Wu <quark@fb.com>
parents:
29715
diff
changeset
|
492 $ cp -R .hg/store-copy/. .hg/store |
25231
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
493 |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
494 Test files with just includes and excludes. |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
495 |
37432
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
496 #if reporevlogstore |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
497 $ rm -r .hg/store/meta/~2e_a |
37432
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
498 #endif |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
499 #if reposimplestore |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
500 $ rm -r .hg/store/meta/._a |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
501 #endif |
28005
ed94b24a3bb2
tests: simplify treemanifest test by backing up entire .hg/store
Martin von Zweigbergk <martinvonz@google.com>
parents:
27953
diff
changeset
|
502 $ rm -r .hg/store/meta/b/bar/orange/fly |
ed94b24a3bb2
tests: simplify treemanifest test by backing up entire .hg/store
Martin von Zweigbergk <martinvonz@google.com>
parents:
27953
diff
changeset
|
503 $ rm -r .hg/store/meta/b/foo/apple/bees |
25362
20ad936ac5d2
treemanifest: visit directory 'foo' when given e.g. '-X foo/ba?'
Martin von Zweigbergk <martinvonz@google.com>
parents:
25299
diff
changeset
|
504 $ hg files -r . -I path:b/bar -X path:b/bar/orange/fly -I path:b/foo -X path:b/foo/apple/bees |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
505 b/bar/fruits.txt |
31262
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
506 $ hg diff -r '.^' -r . --stat -I path:b/bar -X path:b/bar/orange/fly -I path:b/foo -X path:b/foo/apple/bees |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
507 b/bar/fruits.txt | 1 + |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
508 1 files changed, 1 insertions(+), 0 deletions(-) |
30556
c059286a0f9c
tests: replace "cp -r" with "cp -R"
Jun Wu <quark@fb.com>
parents:
29715
diff
changeset
|
509 $ cp -R .hg/store-copy/. .hg/store |
25231
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
510 |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
511 Test files for a subdirectory, excluding a directory within it. |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
512 |
37432
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
513 #if reporevlogstore |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
514 $ rm -r .hg/store/meta/~2e_a |
37432
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
515 #endif |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
516 #if reposimplestore |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
517 $ rm -r .hg/store/meta/._a |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
518 #endif |
28005
ed94b24a3bb2
tests: simplify treemanifest test by backing up entire .hg/store
Martin von Zweigbergk <martinvonz@google.com>
parents:
27953
diff
changeset
|
519 $ rm -r .hg/store/meta/b/foo |
25362
20ad936ac5d2
treemanifest: visit directory 'foo' when given e.g. '-X foo/ba?'
Martin von Zweigbergk <martinvonz@google.com>
parents:
25299
diff
changeset
|
520 $ hg files -r . -X path:b/foo b |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
521 b/bar/fruits.txt |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
522 b/bar/orange/fly/gnat.py |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
523 b/bar/orange/fly/housefly.txt |
31262
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
524 $ hg diff -r '.^' -r . --stat -X path:b/foo b |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
525 b/bar/fruits.txt | 1 + |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
526 b/bar/orange/fly/gnat.py | 1 + |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
527 b/bar/orange/fly/housefly.txt | 1 + |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
528 3 files changed, 3 insertions(+), 0 deletions(-) |
30556
c059286a0f9c
tests: replace "cp -r" with "cp -R"
Jun Wu <quark@fb.com>
parents:
29715
diff
changeset
|
529 $ cp -R .hg/store-copy/. .hg/store |
25231
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
530 |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
531 Test files for a sub directory, including only a directory within it, and |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
532 including an unrelated directory. |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
533 |
37432
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
534 #if reporevlogstore |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
535 $ rm -r .hg/store/meta/~2e_a |
37432
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
536 #endif |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
537 #if reposimplestore |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
538 $ rm -r .hg/store/meta/._a |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
539 #endif |
28005
ed94b24a3bb2
tests: simplify treemanifest test by backing up entire .hg/store
Martin von Zweigbergk <martinvonz@google.com>
parents:
27953
diff
changeset
|
540 $ rm -r .hg/store/meta/b/foo |
25362
20ad936ac5d2
treemanifest: visit directory 'foo' when given e.g. '-X foo/ba?'
Martin von Zweigbergk <martinvonz@google.com>
parents:
25299
diff
changeset
|
541 $ hg files -r . -I path:b/bar/orange -I path:a b |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
542 b/bar/orange/fly/gnat.py |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
543 b/bar/orange/fly/housefly.txt |
31262
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
544 $ hg diff -r '.^' -r . --stat -I path:b/bar/orange -I path:a b |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
545 b/bar/orange/fly/gnat.py | 1 + |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
546 b/bar/orange/fly/housefly.txt | 1 + |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
547 2 files changed, 2 insertions(+), 0 deletions(-) |
30556
c059286a0f9c
tests: replace "cp -r" with "cp -R"
Jun Wu <quark@fb.com>
parents:
29715
diff
changeset
|
548 $ cp -R .hg/store-copy/. .hg/store |
25231
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
549 |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
550 Test files for a pattern, including a directory, and excluding a directory |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
551 within that. |
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
552 |
37432
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
553 #if reporevlogstore |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
554 $ rm -r .hg/store/meta/~2e_a |
37432
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
555 #endif |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
556 #if reposimplestore |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
557 $ rm -r .hg/store/meta/._a |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
558 #endif |
28005
ed94b24a3bb2
tests: simplify treemanifest test by backing up entire .hg/store
Martin von Zweigbergk <martinvonz@google.com>
parents:
27953
diff
changeset
|
559 $ rm -r .hg/store/meta/b/foo |
ed94b24a3bb2
tests: simplify treemanifest test by backing up entire .hg/store
Martin von Zweigbergk <martinvonz@google.com>
parents:
27953
diff
changeset
|
560 $ rm -r .hg/store/meta/b/bar/orange |
25362
20ad936ac5d2
treemanifest: visit directory 'foo' when given e.g. '-X foo/ba?'
Martin von Zweigbergk <martinvonz@google.com>
parents:
25299
diff
changeset
|
561 $ hg files -r . glob:**.txt -I path:b/bar -X path:b/bar/orange |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
562 b/bar/fruits.txt |
31262
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
563 $ hg diff -r '.^' -r . --stat glob:**.txt -I path:b/bar -X path:b/bar/orange |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
564 b/bar/fruits.txt | 1 + |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
565 1 files changed, 1 insertions(+), 0 deletions(-) |
30556
c059286a0f9c
tests: replace "cp -r" with "cp -R"
Jun Wu <quark@fb.com>
parents:
29715
diff
changeset
|
566 $ cp -R .hg/store-copy/. .hg/store |
25231
8545bd381504
match: have visitdir() consider includes and excludes
Drew Gottlieb <drgott@google.com>
parents:
25222
diff
changeset
|
567 |
27432
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
568 Add some more changes to the deep repo |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
569 $ echo narf >> b/bar/fruits.txt |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
570 $ hg ci -m narf |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
571 $ echo troz >> b/bar/orange/fly/gnat.py |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
572 $ hg ci -m troz |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
573 |
28031
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
574 Verify works |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
575 $ hg verify |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
576 checking changesets |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
577 checking manifests |
28203
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
578 checking directory manifests |
28031
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
579 crosschecking files in changesets and manifests |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
580 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39480
diff
changeset
|
581 checked 4 changesets with 18 changes to 8 files |
28031
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
582 |
37415
c2c8962a9465
simplestore: use a custom store for the simple store repo
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37410
diff
changeset
|
583 #if repofncache |
28031
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
584 Dirlogs are included in fncache |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
585 $ grep meta/.A/00manifest.i .hg/store/fncache |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
586 meta/.A/00manifest.i |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
587 |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
588 Rebuilt fncache includes dirlogs |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
589 $ rm .hg/store/fncache |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
590 $ hg debugrebuildfncache |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
591 adding data/.A/one.txt.i |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
592 adding data/.A/two.txt.i |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
593 adding data/b/bar/fruits.txt.i |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
594 adding data/b/bar/orange/fly/gnat.py.i |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
595 adding data/b/bar/orange/fly/housefly.txt.i |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
596 adding data/b/foo/apple/bees/flower.py.i |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
597 adding data/c.txt.i |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
598 adding data/d.py.i |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
599 adding meta/.A/00manifest.i |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
600 adding meta/b/00manifest.i |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
601 adding meta/b/bar/00manifest.i |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
602 adding meta/b/bar/orange/00manifest.i |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
603 adding meta/b/bar/orange/fly/00manifest.i |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
604 adding meta/b/foo/00manifest.i |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
605 adding meta/b/foo/apple/00manifest.i |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
606 adding meta/b/foo/apple/bees/00manifest.i |
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
607 16 items added, 0 removed from fncache |
37415
c2c8962a9465
simplestore: use a custom store for the simple store repo
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37410
diff
changeset
|
608 #endif |
28031
6f248ba85309
treemanifest: fix debugrebuildfncache
Martin von Zweigbergk <martinvonz@google.com>
parents:
28007
diff
changeset
|
609 |
28168
1a943a3a78ea
tests: put test-treemanifest.t on a port diet
timeless <timeless@mozdev.org>
parents:
28063
diff
changeset
|
610 Finish first server |
1a943a3a78ea
tests: put test-treemanifest.t on a port diet
timeless <timeless@mozdev.org>
parents:
28063
diff
changeset
|
611 $ killdaemons.py |
1a943a3a78ea
tests: put test-treemanifest.t on a port diet
timeless <timeless@mozdev.org>
parents:
28063
diff
changeset
|
612 |
28203
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
613 Back up the recently added revlogs |
30556
c059286a0f9c
tests: replace "cp -r" with "cp -R"
Jun Wu <quark@fb.com>
parents:
29715
diff
changeset
|
614 $ cp -R .hg/store .hg/store-newcopy |
28203
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
615 |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
616 Verify reports missing dirlog |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
617 $ rm .hg/store/meta/b/00manifest.* |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
618 $ hg verify |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
619 checking changesets |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
620 checking manifests |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
621 checking directory manifests |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
622 0: empty or missing b/ |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
623 b/@0: parent-directory manifest refers to unknown revision 67688a370455 |
31262
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
624 b/@1: parent-directory manifest refers to unknown revision f065da70369e |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
625 b/@2: parent-directory manifest refers to unknown revision ac0d30948e0b |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
626 b/@3: parent-directory manifest refers to unknown revision 367152e6af28 |
37432
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
627 warning: orphan data file 'meta/b/bar/00manifest.i' (reporevlogstore !) |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
628 warning: orphan data file 'meta/b/bar/orange/00manifest.i' (reporevlogstore !) |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
629 warning: orphan data file 'meta/b/bar/orange/fly/00manifest.i' (reporevlogstore !) |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
630 warning: orphan data file 'meta/b/foo/00manifest.i' (reporevlogstore !) |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
631 warning: orphan data file 'meta/b/foo/apple/00manifest.i' (reporevlogstore !) |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
632 warning: orphan data file 'meta/b/foo/apple/bees/00manifest.i' (reporevlogstore !) |
28203
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
633 crosschecking files in changesets and manifests |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
634 b/bar/fruits.txt@0: in changeset but not in manifest |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
635 b/bar/orange/fly/gnat.py@0: in changeset but not in manifest |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
636 b/bar/orange/fly/housefly.txt@0: in changeset but not in manifest |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
637 b/foo/apple/bees/flower.py@0: in changeset but not in manifest |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
638 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39480
diff
changeset
|
639 checked 4 changesets with 18 changes to 8 files |
37432
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
640 6 warnings encountered! (reporevlogstore !) |
31262
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
641 9 integrity errors encountered! |
28203
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
642 (first damaged changeset appears to be 0) |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
643 [1] |
30556
c059286a0f9c
tests: replace "cp -r" with "cp -R"
Jun Wu <quark@fb.com>
parents:
29715
diff
changeset
|
644 $ cp -R .hg/store-newcopy/. .hg/store |
28203
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
645 |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
646 Verify reports missing dirlog entry |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
647 $ mv -f .hg/store-copy/meta/b/00manifest.* .hg/store/meta/b/ |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
648 $ hg verify |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
649 checking changesets |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
650 checking manifests |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
651 checking directory manifests |
31262
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
652 b/@2: parent-directory manifest refers to unknown revision ac0d30948e0b |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
653 b/@3: parent-directory manifest refers to unknown revision 367152e6af28 |
28203
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
654 b/bar/@?: rev 2 points to unexpected changeset 2 |
31262
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
655 b/bar/@?: 44d7e1146e0d not in parent-directory manifest |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
656 b/bar/@?: rev 3 points to unexpected changeset 3 |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
657 b/bar/@?: 70b10c6b17b7 not in parent-directory manifest |
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
658 b/bar/orange/@?: rev 2 points to unexpected changeset 3 |
28203
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
659 (expected None) |
31262
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
660 b/bar/orange/fly/@?: rev 2 points to unexpected changeset 3 |
28203
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
661 (expected None) |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
662 crosschecking files in changesets and manifests |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
663 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39480
diff
changeset
|
664 checked 4 changesets with 18 changes to 8 files |
28203
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
665 2 warnings encountered! |
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
666 8 integrity errors encountered! |
31262
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
667 (first damaged changeset appears to be 2) |
28203
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
668 [1] |
30556
c059286a0f9c
tests: replace "cp -r" with "cp -R"
Jun Wu <quark@fb.com>
parents:
29715
diff
changeset
|
669 $ cp -R .hg/store-newcopy/. .hg/store |
28203
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
670 |
27432
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
671 Test cloning a treemanifest repo over http. |
28168
1a943a3a78ea
tests: put test-treemanifest.t on a port diet
timeless <timeless@mozdev.org>
parents:
28063
diff
changeset
|
672 $ hg serve -p $HGPORT -d --pid-file=hg.pid --errorlog=errors.log |
27432
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
673 $ cat hg.pid >> $DAEMON_PIDS |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
674 $ cd .. |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
675 We can clone even with the knob turned off and we'll get a treemanifest repo. |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
676 $ hg clone --config experimental.treemanifest=False \ |
27752
29cfc474c5fd
changegroup3: introduce experimental.changegroup3 boolean config
Martin von Zweigbergk <martinvonz@google.com>
parents:
27432
diff
changeset
|
677 > --config experimental.changegroup3=True \ |
28168
1a943a3a78ea
tests: put test-treemanifest.t on a port diet
timeless <timeless@mozdev.org>
parents:
28063
diff
changeset
|
678 > http://localhost:$HGPORT deepclone |
27432
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
679 requesting all changes |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
680 adding changesets |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
681 adding manifests |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
682 adding file changes |
31262
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
683 added 4 changesets with 18 changes to 8 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34393
diff
changeset
|
684 new changesets 775704be6f52:523e5c631710 |
27432
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
685 updating to branch default |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
686 8 files updated, 0 files merged, 0 files removed, 0 files unresolved |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
687 No server errors. |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
688 $ cat deeprepo/errors.log |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
689 requires got updated to include treemanifest |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
690 $ cat deepclone/.hg/requires | grep treemanifest |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
691 treemanifest |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
692 Tree manifest revlogs exist. |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
693 $ find deepclone/.hg/store/meta | sort |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
694 deepclone/.hg/store/meta |
37432
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
695 deepclone/.hg/store/meta/._a (reposimplestore !) |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
696 deepclone/.hg/store/meta/._a/00manifest.i (reposimplestore !) |
27432
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
697 deepclone/.hg/store/meta/b |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
698 deepclone/.hg/store/meta/b/00manifest.i |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
699 deepclone/.hg/store/meta/b/bar |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
700 deepclone/.hg/store/meta/b/bar/00manifest.i |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
701 deepclone/.hg/store/meta/b/bar/orange |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
702 deepclone/.hg/store/meta/b/bar/orange/00manifest.i |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
703 deepclone/.hg/store/meta/b/bar/orange/fly |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
704 deepclone/.hg/store/meta/b/bar/orange/fly/00manifest.i |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
705 deepclone/.hg/store/meta/b/foo |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
706 deepclone/.hg/store/meta/b/foo/00manifest.i |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
707 deepclone/.hg/store/meta/b/foo/apple |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
708 deepclone/.hg/store/meta/b/foo/apple/00manifest.i |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
709 deepclone/.hg/store/meta/b/foo/apple/bees |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
710 deepclone/.hg/store/meta/b/foo/apple/bees/00manifest.i |
37432
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
711 deepclone/.hg/store/meta/~2e_a (reporevlogstore !) |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
712 deepclone/.hg/store/meta/~2e_a/00manifest.i (reporevlogstore !) |
27432
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
713 Verify passes. |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
714 $ cd deepclone |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
715 $ hg verify |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
716 checking changesets |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
717 checking manifests |
28203
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
718 checking directory manifests |
27432
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
719 crosschecking files in changesets and manifests |
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
720 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39480
diff
changeset
|
721 checked 4 changesets with 18 changes to 8 files |
27432
77d25b913f80
changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com>
parents:
27271
diff
changeset
|
722 $ cd .. |
28006
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
723 |
37432
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
724 #if reporevlogstore |
28006
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
725 Create clones using old repo formats to use in later tests |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
726 $ hg clone --config format.usestore=False \ |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
727 > --config experimental.changegroup3=True \ |
28168
1a943a3a78ea
tests: put test-treemanifest.t on a port diet
timeless <timeless@mozdev.org>
parents:
28063
diff
changeset
|
728 > http://localhost:$HGPORT deeprepo-basicstore |
28006
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
729 requesting all changes |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
730 adding changesets |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
731 adding manifests |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
732 adding file changes |
31262
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
733 added 4 changesets with 18 changes to 8 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34393
diff
changeset
|
734 new changesets 775704be6f52:523e5c631710 |
28006
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
735 updating to branch default |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
736 8 files updated, 0 files merged, 0 files removed, 0 files unresolved |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
737 $ cd deeprepo-basicstore |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
738 $ grep store .hg/requires |
28006
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
739 [1] |
28168
1a943a3a78ea
tests: put test-treemanifest.t on a port diet
timeless <timeless@mozdev.org>
parents:
28063
diff
changeset
|
740 $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --errorlog=errors.log |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
741 $ cat hg.pid >> $DAEMON_PIDS |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
742 $ cd .. |
28006
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
743 $ hg clone --config format.usefncache=False \ |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
744 > --config experimental.changegroup3=True \ |
28168
1a943a3a78ea
tests: put test-treemanifest.t on a port diet
timeless <timeless@mozdev.org>
parents:
28063
diff
changeset
|
745 > http://localhost:$HGPORT deeprepo-encodedstore |
28006
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
746 requesting all changes |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
747 adding changesets |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
748 adding manifests |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
749 adding file changes |
31262
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
750 added 4 changesets with 18 changes to 8 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34393
diff
changeset
|
751 new changesets 775704be6f52:523e5c631710 |
28006
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
752 updating to branch default |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
753 8 files updated, 0 files merged, 0 files removed, 0 files unresolved |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
754 $ cd deeprepo-encodedstore |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
755 $ grep fncache .hg/requires |
28006
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
756 [1] |
28168
1a943a3a78ea
tests: put test-treemanifest.t on a port diet
timeless <timeless@mozdev.org>
parents:
28063
diff
changeset
|
757 $ hg serve -p $HGPORT2 -d --pid-file=hg.pid --errorlog=errors.log |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
758 $ cat hg.pid >> $DAEMON_PIDS |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
759 $ cd .. |
28006
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
760 |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
761 Local clone with basicstore |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
762 $ hg clone -U deeprepo-basicstore local-clone-basicstore |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
763 $ hg -R local-clone-basicstore verify |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
764 checking changesets |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
765 checking manifests |
28203
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
766 checking directory manifests |
28006
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
767 crosschecking files in changesets and manifests |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
768 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39480
diff
changeset
|
769 checked 4 changesets with 18 changes to 8 files |
28006
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
770 |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
771 Local clone with encodedstore |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
772 $ hg clone -U deeprepo-encodedstore local-clone-encodedstore |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
773 $ hg -R local-clone-encodedstore verify |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
774 checking changesets |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
775 checking manifests |
28203
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
776 checking directory manifests |
28006
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
777 crosschecking files in changesets and manifests |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
778 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39480
diff
changeset
|
779 checked 4 changesets with 18 changes to 8 files |
28006
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
780 |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
781 Local clone with fncachestore |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
782 $ hg clone -U deeprepo local-clone-fncachestore |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
783 $ hg -R local-clone-fncachestore verify |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
784 checking changesets |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
785 checking manifests |
28203
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
786 checking directory manifests |
28006
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
787 crosschecking files in changesets and manifests |
bb45190a54b7
treemanifests: fix local clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28005
diff
changeset
|
788 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39480
diff
changeset
|
789 checked 4 changesets with 18 changes to 8 files |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
790 |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
791 Stream clone with basicstore |
34393
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34085
diff
changeset
|
792 $ hg clone --config experimental.changegroup3=True --stream -U \ |
28168
1a943a3a78ea
tests: put test-treemanifest.t on a port diet
timeless <timeless@mozdev.org>
parents:
28063
diff
changeset
|
793 > http://localhost:$HGPORT1 stream-clone-basicstore |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
794 streaming all changes |
39722
4bd6e444c76f
bundle2: make server.bundle2.stream default to True
Anton Shestakov <av6@dwimlabs.net>
parents:
39707
diff
changeset
|
795 21 files to transfer, * of data (glob) |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
796 transferred * in * seconds (*) (glob) |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
797 $ hg -R stream-clone-basicstore verify |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
798 checking changesets |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
799 checking manifests |
28203
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
800 checking directory manifests |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
801 crosschecking files in changesets and manifests |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
802 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39480
diff
changeset
|
803 checked 4 changesets with 18 changes to 8 files |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
804 |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
805 Stream clone with encodedstore |
34393
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34085
diff
changeset
|
806 $ hg clone --config experimental.changegroup3=True --stream -U \ |
28168
1a943a3a78ea
tests: put test-treemanifest.t on a port diet
timeless <timeless@mozdev.org>
parents:
28063
diff
changeset
|
807 > http://localhost:$HGPORT2 stream-clone-encodedstore |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
808 streaming all changes |
39722
4bd6e444c76f
bundle2: make server.bundle2.stream default to True
Anton Shestakov <av6@dwimlabs.net>
parents:
39707
diff
changeset
|
809 21 files to transfer, * of data (glob) |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
810 transferred * in * seconds (*) (glob) |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
811 $ hg -R stream-clone-encodedstore verify |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
812 checking changesets |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
813 checking manifests |
28203
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
814 checking directory manifests |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
815 crosschecking files in changesets and manifests |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
816 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39480
diff
changeset
|
817 checked 4 changesets with 18 changes to 8 files |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
818 |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
819 Stream clone with fncachestore |
34393
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34085
diff
changeset
|
820 $ hg clone --config experimental.changegroup3=True --stream -U \ |
28168
1a943a3a78ea
tests: put test-treemanifest.t on a port diet
timeless <timeless@mozdev.org>
parents:
28063
diff
changeset
|
821 > http://localhost:$HGPORT stream-clone-fncachestore |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
822 streaming all changes |
39722
4bd6e444c76f
bundle2: make server.bundle2.stream default to True
Anton Shestakov <av6@dwimlabs.net>
parents:
39707
diff
changeset
|
823 22 files to transfer, * of data (glob) |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
824 transferred * in * seconds (*) (glob) |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
825 $ hg -R stream-clone-fncachestore verify |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
826 checking changesets |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
827 checking manifests |
28203
7297e9e13a8a
verify: check directory manifests
Martin von Zweigbergk <martinvonz@google.com>
parents:
28168
diff
changeset
|
828 checking directory manifests |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
829 crosschecking files in changesets and manifests |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
830 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39480
diff
changeset
|
831 checked 4 changesets with 18 changes to 8 files |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
832 |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
833 Packed bundle |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
834 $ hg -R deeprepo debugcreatestreamclonebundle repo-packed.hg |
31262
1871a1ee64ed
treemanifest: add tests covering hg diff of partial trees
Durham Goode <durham@fb.com>
parents:
30556
diff
changeset
|
835 writing 5330 bytes for 18 files |
28007
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
836 bundle requirements: generaldelta, revlogv1, treemanifest |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
837 $ hg debugbundle --spec repo-packed.hg |
fb92927f9775
treemanifests: fix streaming clone
Martin von Zweigbergk <martinvonz@google.com>
parents:
28006
diff
changeset
|
838 none-packed1;requirements%3Dgeneraldelta%2Crevlogv1%2Ctreemanifest |
28669
c4b727795d6a
bundle: avoid crash when no good changegroup version found
Martin von Zweigbergk <martinvonz@google.com>
parents:
28335
diff
changeset
|
839 |
37432
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
840 #endif |
28ee8b28b213
tests: conditionalize test-treemanifest.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
841 |
28669
c4b727795d6a
bundle: avoid crash when no good changegroup version found
Martin von Zweigbergk <martinvonz@google.com>
parents:
28335
diff
changeset
|
842 Bundle with changegroup2 is not supported |
c4b727795d6a
bundle: avoid crash when no good changegroup version found
Martin von Zweigbergk <martinvonz@google.com>
parents:
28335
diff
changeset
|
843 |
c4b727795d6a
bundle: avoid crash when no good changegroup version found
Martin von Zweigbergk <martinvonz@google.com>
parents:
28335
diff
changeset
|
844 $ hg -R deeprepo bundle --all -t v2 deeprepo.bundle |
c4b727795d6a
bundle: avoid crash when no good changegroup version found
Martin von Zweigbergk <martinvonz@google.com>
parents:
28335
diff
changeset
|
845 abort: repository does not support bundle version 02 |
c4b727795d6a
bundle: avoid crash when no good changegroup version found
Martin von Zweigbergk <martinvonz@google.com>
parents:
28335
diff
changeset
|
846 [255] |
29371
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
847 |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
848 Pull does not include changegroup for manifest the client already has from |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
849 other branch |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
850 |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
851 $ mkdir grafted-dir-repo |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
852 $ cd grafted-dir-repo |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
853 $ hg --config experimental.treemanifest=1 init |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
854 $ mkdir dir |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
855 $ echo a > dir/file |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
856 $ echo a > file |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
857 $ hg ci -Am initial |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
858 adding dir/file |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
859 adding file |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
860 $ echo b > dir/file |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
861 $ hg ci -m updated |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
862 $ hg co '.^' |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
863 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
864 $ hg revert -r tip dir/ |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
865 reverting dir/file |
29371
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
866 $ echo b > file # to make sure root manifest is sent |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
867 $ hg ci -m grafted |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
868 created new head |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
869 $ cd .. |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
870 |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
871 $ hg --config experimental.treemanifest=1 clone --pull -r 1 \ |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
872 > grafted-dir-repo grafted-dir-repo-clone |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
873 adding changesets |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
874 adding manifests |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
875 adding file changes |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
876 added 2 changesets with 3 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34393
diff
changeset
|
877 new changesets d84f4c419457:09ab742f3b0f |
29371
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
878 updating to branch default |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
879 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
880 $ cd grafted-dir-repo-clone |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
881 $ hg pull -r 2 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
882 pulling from $TESTTMP/grafted-dir-repo |
29371
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
883 searching for changes |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
884 adding changesets |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
885 adding manifests |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
886 adding file changes |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
887 added 1 changesets with 1 changes to 1 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34393
diff
changeset
|
888 new changesets 73699489fb7c |
29371
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
889 (run 'hg heads' to see heads, 'hg merge' to merge) |
1b699c7eb2b7
changegroup: don't send empty subdirectory manifest groups
Martin von Zweigbergk <martinvonz@google.com>
parents:
28669
diff
changeset
|
890 |
31294
c134a33b1d73
treemanifest: make node reuse match flat manifest behavior
Durham Goode <durham@fb.com>
parents:
31262
diff
changeset
|
891 Committing a empty commit does not duplicate root treemanifest |
c134a33b1d73
treemanifest: make node reuse match flat manifest behavior
Durham Goode <durham@fb.com>
parents:
31262
diff
changeset
|
892 $ echo z >> z |
c134a33b1d73
treemanifest: make node reuse match flat manifest behavior
Durham Goode <durham@fb.com>
parents:
31262
diff
changeset
|
893 $ hg commit -Aqm 'pre-empty commit' |
c134a33b1d73
treemanifest: make node reuse match flat manifest behavior
Durham Goode <durham@fb.com>
parents:
31262
diff
changeset
|
894 $ hg rm z |
c134a33b1d73
treemanifest: make node reuse match flat manifest behavior
Durham Goode <durham@fb.com>
parents:
31262
diff
changeset
|
895 $ hg commit --amend -m 'empty commit' |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
896 saved backup bundle to $TESTTMP/grafted-dir-repo-clone/.hg/strip-backup/cb99d5717cea-9e3b6b02-amend.hg |
31294
c134a33b1d73
treemanifest: make node reuse match flat manifest behavior
Durham Goode <durham@fb.com>
parents:
31262
diff
changeset
|
897 $ hg log -r 'tip + tip^' -T '{manifest}\n' |
c134a33b1d73
treemanifest: make node reuse match flat manifest behavior
Durham Goode <durham@fb.com>
parents:
31262
diff
changeset
|
898 1:678d3574b88c |
c134a33b1d73
treemanifest: make node reuse match flat manifest behavior
Durham Goode <durham@fb.com>
parents:
31262
diff
changeset
|
899 1:678d3574b88c |
c134a33b1d73
treemanifest: make node reuse match flat manifest behavior
Durham Goode <durham@fb.com>
parents:
31262
diff
changeset
|
900 $ hg --config extensions.strip= strip -r . -q |