Show More
@@ -1,87 +1,91 b'' | |||||
1 | # Base templates. Due to name clashes with existing keywords, we have |
|
1 | # Base templates. Due to name clashes with existing keywords, we have | |
2 | # to replace some keywords with 'lkeyword', for 'labelled keyword' |
|
2 | # to replace some keywords with 'lkeyword', for 'labelled keyword' | |
3 |
|
3 | |||
4 | [templates] |
|
4 | [templates] | |
5 | changeset = '{cset}{branches}{bookmarks}{tags}{parents}{user}{ldate}{ltroubles}{summary}\n' |
|
5 | changeset = '{cset}{branches}{bookmarks}{tags}{parents}{user}{ldate}{ltroubles}{lobsfate}{summary}\n' | |
6 | changeset_quiet = '{lnode}' |
|
6 | changeset_quiet = '{lnode}' | |
7 | changeset_verbose = '{cset}{branches}{bookmarks}{tags}{parents}{user}{ldate}{ltroubles}{lfiles}{lfile_copies_switch}{description}\n' |
|
7 | changeset_verbose = '{cset}{branches}{bookmarks}{tags}{parents}{user}{ldate}{ltroubles}{lobsfate}{lfiles}{lfile_copies_switch}{description}\n' | |
8 | changeset_debug = '{fullcset}{branches}{bookmarks}{tags}{lphase}{parents}{manifest}{user}{ldate}{ltroubles}{lfile_mods}{lfile_adds}{lfile_dels}{lfile_copies_switch}{extras}{description}\n' |
|
8 | changeset_debug = '{fullcset}{branches}{bookmarks}{tags}{lphase}{parents}{manifest}{user}{ldate}{ltroubles}{lobsfate}{lfile_mods}{lfile_adds}{lfile_dels}{lfile_copies_switch}{extras}{description}\n' | |
9 |
|
9 | |||
10 | # File templates |
|
10 | # File templates | |
11 | lfiles = '{if(files, |
|
11 | lfiles = '{if(files, | |
12 | label("ui.note log.files", |
|
12 | label("ui.note log.files", | |
13 | "files: {files}\n"))}' |
|
13 | "files: {files}\n"))}' | |
14 |
|
14 | |||
15 | lfile_mods = '{if(file_mods, |
|
15 | lfile_mods = '{if(file_mods, | |
16 | label("ui.debug log.files", |
|
16 | label("ui.debug log.files", | |
17 | "files: {file_mods}\n"))}' |
|
17 | "files: {file_mods}\n"))}' | |
18 |
|
18 | |||
19 | lfile_adds = '{if(file_adds, |
|
19 | lfile_adds = '{if(file_adds, | |
20 | label("ui.debug log.files", |
|
20 | label("ui.debug log.files", | |
21 | "files+: {file_adds}\n"))}' |
|
21 | "files+: {file_adds}\n"))}' | |
22 |
|
22 | |||
23 | lfile_dels = '{if(file_dels, |
|
23 | lfile_dels = '{if(file_dels, | |
24 | label("ui.debug log.files", |
|
24 | label("ui.debug log.files", | |
25 | "files-: {file_dels}\n"))}' |
|
25 | "files-: {file_dels}\n"))}' | |
26 |
|
26 | |||
27 | lfile_copies_switch = '{if(file_copies_switch, |
|
27 | lfile_copies_switch = '{if(file_copies_switch, | |
28 | label("ui.note log.copies", |
|
28 | label("ui.note log.copies", | |
29 | "copies: {file_copies_switch |
|
29 | "copies: {file_copies_switch | |
30 | % ' {name} ({source})'}\n"))}' |
|
30 | % ' {name} ({source})'}\n"))}' | |
31 |
|
31 | |||
32 | # General templates |
|
32 | # General templates | |
33 | cset = '{labelcset("changeset: {rev}:{node|short}")}\n' |
|
33 | cset = '{labelcset("changeset: {rev}:{node|short}")}\n' | |
34 | fullcset = '{labelcset("changeset: {rev}:{node}")}\n' |
|
34 | fullcset = '{labelcset("changeset: {rev}:{node}")}\n' | |
35 |
|
35 | |||
36 | lphase = '{label("log.phase", |
|
36 | lphase = '{label("log.phase", | |
37 | "phase: {phase}")}\n' |
|
37 | "phase: {phase}")}\n' | |
38 |
|
38 | |||
39 | parent = '{label("log.parent changeset.{phase}", |
|
39 | parent = '{label("log.parent changeset.{phase}", | |
40 | "parent: {rev}:{node|formatnode}")}\n' |
|
40 | "parent: {rev}:{node|formatnode}")}\n' | |
41 |
|
41 | |||
42 | lnode = '{label("log.node", |
|
42 | lnode = '{label("log.node", | |
43 | "{rev}:{node|short}")}\n' |
|
43 | "{rev}:{node|short}")}\n' | |
44 |
|
44 | |||
45 | manifest = '{label("ui.debug log.manifest", |
|
45 | manifest = '{label("ui.debug log.manifest", | |
46 | "manifest: {rev}:{node}")}\n' |
|
46 | "manifest: {rev}:{node}")}\n' | |
47 |
|
47 | |||
48 | branch = '{label("log.branch", |
|
48 | branch = '{label("log.branch", | |
49 | "branch: {branch}")}\n' |
|
49 | "branch: {branch}")}\n' | |
50 |
|
50 | |||
51 | tag = '{label("log.tag", |
|
51 | tag = '{label("log.tag", | |
52 | "tag: {tag}")}\n' |
|
52 | "tag: {tag}")}\n' | |
53 |
|
53 | |||
54 | bookmark = '{label("log.bookmark", |
|
54 | bookmark = '{label("log.bookmark", | |
55 | "bookmark: {bookmark}")}\n' |
|
55 | "bookmark: {bookmark}")}\n' | |
56 |
|
56 | |||
57 | user = '{label("log.user", |
|
57 | user = '{label("log.user", | |
58 | "user: {author}")}\n' |
|
58 | "user: {author}")}\n' | |
59 |
|
59 | |||
60 | summary = '{if(desc|strip, "{label('log.summary', |
|
60 | summary = '{if(desc|strip, "{label('log.summary', | |
61 | 'summary: {desc|firstline}')}\n")}' |
|
61 | 'summary: {desc|firstline}')}\n")}' | |
62 |
|
62 | |||
63 | ldate = '{label("log.date", |
|
63 | ldate = '{label("log.date", | |
64 | "date: {date|date}")}\n' |
|
64 | "date: {date|date}")}\n' | |
65 |
|
65 | |||
66 | ltroubles = '{if(instabilities, "{label('log.instability', |
|
66 | ltroubles = '{if(instabilities, "{label('log.instability', | |
67 | 'instability: {join(instabilities, ", ")}')}\n")}' |
|
67 | 'instability: {join(instabilities, ", ")}')}\n")}' | |
68 |
|
68 | |||
69 | extra = '{label("ui.debug log.extra", |
|
69 | extra = '{label("ui.debug log.extra", | |
70 | "extra: {key}={value|stringescape}")}\n' |
|
70 | "extra: {key}={value|stringescape}")}\n' | |
71 |
|
71 | |||
72 | description = '{if(desc|strip, "{label('ui.note log.description', |
|
72 | description = '{if(desc|strip, "{label('ui.note log.description', | |
73 | 'description:')} |
|
73 | 'description:')} | |
74 | {label('ui.note log.description', |
|
74 | {label('ui.note log.description', | |
75 | '{desc|strip}')}\n\n")}' |
|
75 | '{desc|strip}')}\n\n")}' | |
76 |
|
76 | |||
77 | status = '{status} {path}\n{if(copy, " {copy}\n")}' |
|
77 | status = '{status} {path}\n{if(copy, " {copy}\n")}' | |
78 |
|
78 | |||
|
79 | # Obsfate templates, it would be removed once we introduce the obsfate | |||
|
80 | # template fragment | |||
|
81 | lobsfate = '{if(obsfate, "{label('log.obsfate', '{obsfate % "obsfate: {fate}\n"}')}")}' | |||
|
82 | ||||
79 | [templatealias] |
|
83 | [templatealias] | |
80 | labelcset(expr) = label(separate(" ", |
|
84 | labelcset(expr) = label(separate(" ", | |
81 | "log.changeset", |
|
85 | "log.changeset", | |
82 | "changeset.{phase}", |
|
86 | "changeset.{phase}", | |
83 | if(obsolete, "changeset.obsolete"), |
|
87 | if(obsolete, "changeset.obsolete"), | |
84 | if(instabilities, "changeset.unstable"), |
|
88 | if(instabilities, "changeset.unstable"), | |
85 | join(instabilities |
|
89 | join(instabilities | |
86 | % "instability.{instability}", " ")), |
|
90 | % "instability.{instability}", " ")), | |
87 | expr) |
|
91 | expr) |
@@ -1,2170 +1,2545 b'' | |||||
1 | This test file test the various templates related to obsmarkers. |
|
1 | This test file test the various templates related to obsmarkers. | |
2 |
|
2 | |||
3 | Global setup |
|
3 | Global setup | |
4 | ============ |
|
4 | ============ | |
5 |
|
5 | |||
6 | $ . $TESTDIR/testlib/obsmarker-common.sh |
|
6 | $ . $TESTDIR/testlib/obsmarker-common.sh | |
7 | $ cat >> $HGRCPATH <<EOF |
|
7 | $ cat >> $HGRCPATH <<EOF | |
8 | > [ui] |
|
8 | > [ui] | |
9 | > interactive = true |
|
9 | > interactive = true | |
10 | > [phases] |
|
10 | > [phases] | |
11 | > publish=False |
|
11 | > publish=False | |
12 | > [experimental] |
|
12 | > [experimental] | |
13 | > stabilization=all |
|
13 | > stabilization=all | |
14 | > [templates] |
|
14 | > [templates] | |
15 | > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}" |
|
15 | > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}" | |
16 | > obsfateverb = "{obsfateverb(successors)}" |
|
16 | > obsfateverb = "{obsfateverb(successors)}" | |
17 | > obsfateoperations = "{if(obsfateoperations(markers), " using {join(obsfateoperations(markers), ", ")}")}" |
|
17 | > obsfateoperations = "{if(obsfateoperations(markers), " using {join(obsfateoperations(markers), ", ")}")}" | |
18 | > obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(markers), ", ")}")}" |
|
18 | > obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(markers), ", ")}")}" | |
19 | > obsfatedate = "{if(obsfatedate(markers), "{ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), " (at {min(obsfatedate(markers))|isodate})", " (between {min(obsfatedate(markers))|isodate} and {max(obsfatedate(markers))|isodate})")}")}" |
|
19 | > obsfatedate = "{if(obsfatedate(markers), "{ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), " (at {min(obsfatedate(markers))|isodate})", " (between {min(obsfatedate(markers))|isodate} and {max(obsfatedate(markers))|isodate})")}")}" | |
20 | > obsfatetempl = "{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}; " |
|
20 | > obsfatetempl = "{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}; " | |
21 | > [alias] |
|
21 | > [alias] | |
22 | > tlog = log -G -T '{node|short}\ |
|
22 | > tlog = log -G -T '{node|short}\ | |
23 | > {if(predecessors, "\n Predecessors: {predecessors}")}\ |
|
23 | > {if(predecessors, "\n Predecessors: {predecessors}")}\ | |
24 | > {if(predecessors, "\n semi-colon: {join(predecessors, "; ")}")}\ |
|
24 | > {if(predecessors, "\n semi-colon: {join(predecessors, "; ")}")}\ | |
25 | > {if(predecessors, "\n json: {predecessors|json}")}\ |
|
25 | > {if(predecessors, "\n json: {predecessors|json}")}\ | |
26 | > {if(predecessors, "\n map: {join(predecessors % "{rev}:{node}", " ")}")}\ |
|
26 | > {if(predecessors, "\n map: {join(predecessors % "{rev}:{node}", " ")}")}\ | |
27 | > {if(successorssets, "\n Successors: {successorssets}")}\ |
|
27 | > {if(successorssets, "\n Successors: {successorssets}")}\ | |
28 | > {if(successorssets, "\n multi-line: {join(successorssets, "\n multi-line: ")}")}\ |
|
28 | > {if(successorssets, "\n multi-line: {join(successorssets, "\n multi-line: ")}")}\ | |
29 | > {if(successorssets, "\n json: {successorssets|json}")}\n' |
|
29 | > {if(successorssets, "\n json: {successorssets|json}")}\n' | |
30 | > fatelog = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers % "{obsfatetempl}"} \n" )}' |
|
30 | > fatelog = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers % "{obsfatetempl}"} \n" )}' | |
31 | > fatelogjson = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers|json}\n")}' |
|
31 | > fatelogjson = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers|json}\n")}' | |
32 | > fatelogkw = log -G -T '{node|short}\n{if(obsfate, "{obsfate % " Obsfate: {fate}\n"}")}' |
|
32 | > fatelogkw = log -G -T '{node|short}\n{if(obsfate, "{obsfate % " Obsfate: {fate}\n"}")}' | |
33 | > EOF |
|
33 | > EOF | |
34 |
|
34 | |||
35 | Test templates on amended commit |
|
35 | Test templates on amended commit | |
36 | ================================ |
|
36 | ================================ | |
37 |
|
37 | |||
38 | Test setup |
|
38 | Test setup | |
39 | ---------- |
|
39 | ---------- | |
40 |
|
40 | |||
41 | $ hg init $TESTTMP/templates-local-amend |
|
41 | $ hg init $TESTTMP/templates-local-amend | |
42 | $ cd $TESTTMP/templates-local-amend |
|
42 | $ cd $TESTTMP/templates-local-amend | |
43 | $ mkcommit ROOT |
|
43 | $ mkcommit ROOT | |
44 | $ mkcommit A0 |
|
44 | $ mkcommit A0 | |
45 | $ echo 42 >> A0 |
|
45 | $ echo 42 >> A0 | |
46 | $ hg commit --amend -m "A1" --config devel.default-date="1234567890 0" |
|
46 | $ hg commit --amend -m "A1" --config devel.default-date="1234567890 0" | |
47 | $ hg commit --amend -m "A2" --config devel.default-date="987654321 0" --config devel.user.obsmarker=test2 |
|
47 | $ hg commit --amend -m "A2" --config devel.default-date="987654321 0" --config devel.user.obsmarker=test2 | |
48 |
|
48 | |||
49 | $ hg log --hidden -G |
|
49 | $ hg log --hidden -G | |
50 | @ changeset: 3:d004c8f274b9 |
|
50 | @ changeset: 3:d004c8f274b9 | |
51 | | tag: tip |
|
51 | | tag: tip | |
52 | | parent: 0:ea207398892e |
|
52 | | parent: 0:ea207398892e | |
53 | | user: test |
|
53 | | user: test | |
54 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
54 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
55 | | summary: A2 |
|
55 | | summary: A2 | |
56 | | |
|
56 | | | |
57 | | x changeset: 2:a468dc9b3633 |
|
57 | | x changeset: 2:a468dc9b3633 | |
58 | |/ parent: 0:ea207398892e |
|
58 | |/ parent: 0:ea207398892e | |
59 | | user: test |
|
59 | | user: test | |
60 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
60 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
61 | | obsfate: rewritten using amend as 3:d004c8f274b9 by test2 |
|
61 | | obsfate: rewritten using amend as 3:d004c8f274b9 by test2 | |
62 | | summary: A1 |
|
62 | | summary: A1 | |
63 | | |
|
63 | | | |
64 | | x changeset: 1:471f378eab4c |
|
64 | | x changeset: 1:471f378eab4c | |
65 | |/ user: test |
|
65 | |/ user: test | |
66 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
66 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
67 | | obsfate: rewritten using amend as 2:a468dc9b3633 |
|
67 | | obsfate: rewritten using amend as 2:a468dc9b3633 | |
68 | | summary: A0 |
|
68 | | summary: A0 | |
69 | | |
|
69 | | | |
70 | o changeset: 0:ea207398892e |
|
70 | o changeset: 0:ea207398892e | |
71 | user: test |
|
71 | user: test | |
72 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
72 | date: Thu Jan 01 00:00:00 1970 +0000 | |
73 | summary: ROOT |
|
73 | summary: ROOT | |
74 |
|
74 | |||
75 | Check templates |
|
75 | Check templates | |
76 | --------------- |
|
76 | --------------- | |
77 | $ hg up 'desc(A0)' --hidden |
|
77 | $ hg up 'desc(A0)' --hidden | |
78 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
78 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
79 |
|
79 | |||
80 | Predecessors template should show current revision as it is the working copy |
|
80 | Predecessors template should show current revision as it is the working copy | |
81 | $ hg tlog |
|
81 | $ hg tlog | |
82 | o d004c8f274b9 |
|
82 | o d004c8f274b9 | |
83 | | Predecessors: 1:471f378eab4c |
|
83 | | Predecessors: 1:471f378eab4c | |
84 | | semi-colon: 1:471f378eab4c |
|
84 | | semi-colon: 1:471f378eab4c | |
85 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
85 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
86 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
86 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
87 | | @ 471f378eab4c |
|
87 | | @ 471f378eab4c | |
88 | |/ Successors: 3:d004c8f274b9 |
|
88 | |/ Successors: 3:d004c8f274b9 | |
89 | | multi-line: 3:d004c8f274b9 |
|
89 | | multi-line: 3:d004c8f274b9 | |
90 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
|
90 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] | |
91 | o ea207398892e |
|
91 | o ea207398892e | |
92 |
|
92 | |||
93 | $ hg fatelog |
|
93 | $ hg fatelog | |
94 | o d004c8f274b9 |
|
94 | o d004c8f274b9 | |
95 | | |
|
95 | | | |
96 | | @ 471f378eab4c |
|
96 | | @ 471f378eab4c | |
97 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); |
|
97 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); | |
98 | o ea207398892e |
|
98 | o ea207398892e | |
99 |
|
99 | |||
100 |
|
100 | |||
101 | $ hg fatelogkw |
|
101 | $ hg fatelogkw | |
102 | o d004c8f274b9 |
|
102 | o d004c8f274b9 | |
103 | | |
|
103 | | | |
104 | | @ 471f378eab4c |
|
104 | | @ 471f378eab4c | |
105 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 |
|
105 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 | |
106 | o ea207398892e |
|
106 | o ea207398892e | |
107 |
|
107 | |||
108 |
|
108 | |||
109 | $ hg log -G --config ui.logtemplate= |
|
109 | $ hg log -G --config ui.logtemplate= | |
110 | o changeset: 3:d004c8f274b9 |
|
110 | o changeset: 3:d004c8f274b9 | |
111 | | tag: tip |
|
111 | | tag: tip | |
112 | | parent: 0:ea207398892e |
|
112 | | parent: 0:ea207398892e | |
113 | | user: test |
|
113 | | user: test | |
114 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
114 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
115 | | summary: A2 |
|
115 | | summary: A2 | |
116 | | |
|
116 | | | |
117 | | @ changeset: 1:471f378eab4c |
|
117 | | @ changeset: 1:471f378eab4c | |
118 | |/ user: test |
|
118 | |/ user: test | |
119 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
119 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
120 | | obsfate: rewritten using amend as 3:d004c8f274b9 by test2 |
|
120 | | obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 | |
|
121 | | summary: A0 | |||
|
122 | | | |||
|
123 | o changeset: 0:ea207398892e | |||
|
124 | user: test | |||
|
125 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
126 | summary: ROOT | |||
|
127 | ||||
|
128 | ||||
|
129 | $ hg log -G -T "default" | |||
|
130 | o changeset: 3:d004c8f274b9 | |||
|
131 | | tag: tip | |||
|
132 | | parent: 0:ea207398892e | |||
|
133 | | user: test | |||
|
134 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
135 | | summary: A2 | |||
|
136 | | | |||
|
137 | | @ changeset: 1:471f378eab4c | |||
|
138 | |/ user: test | |||
|
139 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
140 | | obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 | |||
121 | | summary: A0 |
|
141 | | summary: A0 | |
122 | | |
|
142 | | | |
123 | o changeset: 0:ea207398892e |
|
143 | o changeset: 0:ea207398892e | |
124 | user: test |
|
144 | user: test | |
125 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
145 | date: Thu Jan 01 00:00:00 1970 +0000 | |
126 | summary: ROOT |
|
146 | summary: ROOT | |
127 |
|
147 | |||
128 | $ hg up 'desc(A1)' --hidden |
|
148 | $ hg up 'desc(A1)' --hidden | |
129 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
149 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
130 |
|
150 | |||
131 | Predecessors template should show current revision as it is the working copy |
|
151 | Predecessors template should show current revision as it is the working copy | |
132 | $ hg tlog |
|
152 | $ hg tlog | |
133 | o d004c8f274b9 |
|
153 | o d004c8f274b9 | |
134 | | Predecessors: 2:a468dc9b3633 |
|
154 | | Predecessors: 2:a468dc9b3633 | |
135 | | semi-colon: 2:a468dc9b3633 |
|
155 | | semi-colon: 2:a468dc9b3633 | |
136 | | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
|
156 | | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] | |
137 | | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
|
157 | | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad | |
138 | | @ a468dc9b3633 |
|
158 | | @ a468dc9b3633 | |
139 | |/ Successors: 3:d004c8f274b9 |
|
159 | |/ Successors: 3:d004c8f274b9 | |
140 | | multi-line: 3:d004c8f274b9 |
|
160 | | multi-line: 3:d004c8f274b9 | |
141 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
|
161 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] | |
142 | o ea207398892e |
|
162 | o ea207398892e | |
143 |
|
163 | |||
144 | $ hg fatelog |
|
164 | $ hg fatelog | |
145 | o d004c8f274b9 |
|
165 | o d004c8f274b9 | |
146 | | |
|
166 | | | |
147 | | @ a468dc9b3633 |
|
167 | | @ a468dc9b3633 | |
148 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
|
168 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); | |
149 | o ea207398892e |
|
169 | o ea207398892e | |
150 |
|
170 | |||
151 | Predecessors template should show all the predecessors as we force their display |
|
171 | Predecessors template should show all the predecessors as we force their display | |
152 | with --hidden |
|
172 | with --hidden | |
153 | $ hg tlog --hidden |
|
173 | $ hg tlog --hidden | |
154 | o d004c8f274b9 |
|
174 | o d004c8f274b9 | |
155 | | Predecessors: 2:a468dc9b3633 |
|
175 | | Predecessors: 2:a468dc9b3633 | |
156 | | semi-colon: 2:a468dc9b3633 |
|
176 | | semi-colon: 2:a468dc9b3633 | |
157 | | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
|
177 | | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] | |
158 | | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
|
178 | | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad | |
159 | | @ a468dc9b3633 |
|
179 | | @ a468dc9b3633 | |
160 | |/ Predecessors: 1:471f378eab4c |
|
180 | |/ Predecessors: 1:471f378eab4c | |
161 | | semi-colon: 1:471f378eab4c |
|
181 | | semi-colon: 1:471f378eab4c | |
162 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
182 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
163 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
183 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
164 | | Successors: 3:d004c8f274b9 |
|
184 | | Successors: 3:d004c8f274b9 | |
165 | | multi-line: 3:d004c8f274b9 |
|
185 | | multi-line: 3:d004c8f274b9 | |
166 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
|
186 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] | |
167 | | x 471f378eab4c |
|
187 | | x 471f378eab4c | |
168 | |/ Successors: 2:a468dc9b3633 |
|
188 | |/ Successors: 2:a468dc9b3633 | |
169 | | multi-line: 2:a468dc9b3633 |
|
189 | | multi-line: 2:a468dc9b3633 | |
170 | | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] |
|
190 | | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] | |
171 | o ea207398892e |
|
191 | o ea207398892e | |
172 |
|
192 | |||
173 | $ hg fatelog --hidden |
|
193 | $ hg fatelog --hidden | |
174 | o d004c8f274b9 |
|
194 | o d004c8f274b9 | |
175 | | |
|
195 | | | |
176 | | @ a468dc9b3633 |
|
196 | | @ a468dc9b3633 | |
177 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
|
197 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); | |
178 | | x 471f378eab4c |
|
198 | | x 471f378eab4c | |
179 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000); |
|
199 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000); | |
180 | o ea207398892e |
|
200 | o ea207398892e | |
181 |
|
201 | |||
182 |
|
202 | |||
183 | Predecessors template shouldn't show anything as all obsolete commit are not |
|
203 | Predecessors template shouldn't show anything as all obsolete commit are not | |
184 | visible. |
|
204 | visible. | |
185 | $ hg up 'desc(A2)' |
|
205 | $ hg up 'desc(A2)' | |
186 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
206 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
187 | $ hg tlog |
|
207 | $ hg tlog | |
188 | @ d004c8f274b9 |
|
208 | @ d004c8f274b9 | |
189 | | |
|
209 | | | |
190 | o ea207398892e |
|
210 | o ea207398892e | |
191 |
|
211 | |||
192 | $ hg tlog --hidden |
|
212 | $ hg tlog --hidden | |
193 | @ d004c8f274b9 |
|
213 | @ d004c8f274b9 | |
194 | | Predecessors: 2:a468dc9b3633 |
|
214 | | Predecessors: 2:a468dc9b3633 | |
195 | | semi-colon: 2:a468dc9b3633 |
|
215 | | semi-colon: 2:a468dc9b3633 | |
196 | | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
|
216 | | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] | |
197 | | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
|
217 | | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad | |
198 | | x a468dc9b3633 |
|
218 | | x a468dc9b3633 | |
199 | |/ Predecessors: 1:471f378eab4c |
|
219 | |/ Predecessors: 1:471f378eab4c | |
200 | | semi-colon: 1:471f378eab4c |
|
220 | | semi-colon: 1:471f378eab4c | |
201 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
221 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
202 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
222 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
203 | | Successors: 3:d004c8f274b9 |
|
223 | | Successors: 3:d004c8f274b9 | |
204 | | multi-line: 3:d004c8f274b9 |
|
224 | | multi-line: 3:d004c8f274b9 | |
205 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
|
225 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] | |
206 | | x 471f378eab4c |
|
226 | | x 471f378eab4c | |
207 | |/ Successors: 2:a468dc9b3633 |
|
227 | |/ Successors: 2:a468dc9b3633 | |
208 | | multi-line: 2:a468dc9b3633 |
|
228 | | multi-line: 2:a468dc9b3633 | |
209 | | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] |
|
229 | | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] | |
210 | o ea207398892e |
|
230 | o ea207398892e | |
211 |
|
231 | |||
212 | $ hg fatelog |
|
232 | $ hg fatelog | |
213 | @ d004c8f274b9 |
|
233 | @ d004c8f274b9 | |
214 | | |
|
234 | | | |
215 | o ea207398892e |
|
235 | o ea207398892e | |
216 |
|
236 | |||
217 |
|
237 | |||
218 | $ hg fatelog --hidden |
|
238 | $ hg fatelog --hidden | |
219 | @ d004c8f274b9 |
|
239 | @ d004c8f274b9 | |
220 | | |
|
240 | | | |
221 | | x a468dc9b3633 |
|
241 | | x a468dc9b3633 | |
222 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
|
242 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); | |
223 | | x 471f378eab4c |
|
243 | | x 471f378eab4c | |
224 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000); |
|
244 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000); | |
225 | o ea207398892e |
|
245 | o ea207398892e | |
226 |
|
246 | |||
227 | $ hg fatelogjson --hidden |
|
247 | $ hg fatelogjson --hidden | |
228 | @ d004c8f274b9 |
|
248 | @ d004c8f274b9 | |
229 | | |
|
249 | | | |
230 | | x a468dc9b3633 |
|
250 | | x a468dc9b3633 | |
231 | |/ Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}] |
|
251 | |/ Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}] | |
232 | | x 471f378eab4c |
|
252 | | x 471f378eab4c | |
233 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["operation", "amend"], ["user", "test"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}] |
|
253 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["operation", "amend"], ["user", "test"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}] | |
234 | o ea207398892e |
|
254 | o ea207398892e | |
235 |
|
255 | |||
236 |
|
256 | |||
237 | Check other fatelog implementations |
|
257 | Check other fatelog implementations | |
238 | ----------------------------------- |
|
258 | ----------------------------------- | |
239 |
|
259 | |||
240 | $ hg fatelogkw --hidden -q |
|
260 | $ hg fatelogkw --hidden -q | |
241 | @ d004c8f274b9 |
|
261 | @ d004c8f274b9 | |
242 | | |
|
262 | | | |
243 | | x a468dc9b3633 |
|
263 | | x a468dc9b3633 | |
244 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 |
|
264 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 | |
245 | | x 471f378eab4c |
|
265 | | x 471f378eab4c | |
246 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 |
|
266 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 | |
247 | o ea207398892e |
|
267 | o ea207398892e | |
248 |
|
268 | |||
249 | $ hg fatelogkw --hidden |
|
269 | $ hg fatelogkw --hidden | |
250 | @ d004c8f274b9 |
|
270 | @ d004c8f274b9 | |
251 | | |
|
271 | | | |
252 | | x a468dc9b3633 |
|
272 | | x a468dc9b3633 | |
253 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 |
|
273 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 | |
254 | | x 471f378eab4c |
|
274 | | x 471f378eab4c | |
255 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 |
|
275 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 | |
256 | o ea207398892e |
|
276 | o ea207398892e | |
257 |
|
277 | |||
258 | $ hg fatelogkw --hidden -v |
|
278 | $ hg fatelogkw --hidden -v | |
259 | @ d004c8f274b9 |
|
279 | @ d004c8f274b9 | |
260 | | |
|
280 | | | |
261 | | x a468dc9b3633 |
|
281 | | x a468dc9b3633 | |
262 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) |
|
282 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) | |
263 | | x 471f378eab4c |
|
283 | | x 471f378eab4c | |
264 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) |
|
284 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) | |
265 | o ea207398892e |
|
285 | o ea207398892e | |
266 |
|
286 | |||
|
287 | ||||
|
288 | $ hg log -G -T "default" --hidden | |||
|
289 | @ changeset: 3:d004c8f274b9 | |||
|
290 | | tag: tip | |||
|
291 | | parent: 0:ea207398892e | |||
|
292 | | user: test | |||
|
293 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
294 | | summary: A2 | |||
|
295 | | | |||
|
296 | | x changeset: 2:a468dc9b3633 | |||
|
297 | |/ parent: 0:ea207398892e | |||
|
298 | | user: test | |||
|
299 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
300 | | obsfate: rewritten using amend as 3:d004c8f274b9 by test2 | |||
|
301 | | summary: A1 | |||
|
302 | | | |||
|
303 | | x changeset: 1:471f378eab4c | |||
|
304 | |/ user: test | |||
|
305 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
306 | | obsfate: rewritten using amend as 2:a468dc9b3633 | |||
|
307 | | summary: A0 | |||
|
308 | | | |||
|
309 | o changeset: 0:ea207398892e | |||
|
310 | user: test | |||
|
311 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
312 | summary: ROOT | |||
|
313 | ||||
|
314 | $ hg log -G -T "default" --hidden -v | |||
|
315 | @ changeset: 3:d004c8f274b9 | |||
|
316 | | tag: tip | |||
|
317 | | parent: 0:ea207398892e | |||
|
318 | | user: test | |||
|
319 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
320 | | files: A0 | |||
|
321 | | description: | |||
|
322 | | A2 | |||
|
323 | | | |||
|
324 | | | |||
|
325 | | x changeset: 2:a468dc9b3633 | |||
|
326 | |/ parent: 0:ea207398892e | |||
|
327 | | user: test | |||
|
328 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
329 | | obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) | |||
|
330 | | files: A0 | |||
|
331 | | description: | |||
|
332 | | A1 | |||
|
333 | | | |||
|
334 | | | |||
|
335 | | x changeset: 1:471f378eab4c | |||
|
336 | |/ user: test | |||
|
337 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
338 | | obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) | |||
|
339 | | files: A0 | |||
|
340 | | description: | |||
|
341 | | A0 | |||
|
342 | | | |||
|
343 | | | |||
|
344 | o changeset: 0:ea207398892e | |||
|
345 | user: test | |||
|
346 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
347 | files: ROOT | |||
|
348 | description: | |||
|
349 | ROOT | |||
|
350 | ||||
|
351 | ||||
267 | Test templates with splitted commit |
|
352 | Test templates with splitted commit | |
268 | =================================== |
|
353 | =================================== | |
269 |
|
354 | |||
270 | $ hg init $TESTTMP/templates-local-split |
|
355 | $ hg init $TESTTMP/templates-local-split | |
271 | $ cd $TESTTMP/templates-local-split |
|
356 | $ cd $TESTTMP/templates-local-split | |
272 | $ mkcommit ROOT |
|
357 | $ mkcommit ROOT | |
273 | $ echo 42 >> a |
|
358 | $ echo 42 >> a | |
274 | $ echo 43 >> b |
|
359 | $ echo 43 >> b | |
275 | $ hg commit -A -m "A0" |
|
360 | $ hg commit -A -m "A0" | |
276 | adding a |
|
361 | adding a | |
277 | adding b |
|
362 | adding b | |
278 | $ hg log --hidden -G |
|
363 | $ hg log --hidden -G | |
279 | @ changeset: 1:471597cad322 |
|
364 | @ changeset: 1:471597cad322 | |
280 | | tag: tip |
|
365 | | tag: tip | |
281 | | user: test |
|
366 | | user: test | |
282 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
367 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
283 | | summary: A0 |
|
368 | | summary: A0 | |
284 | | |
|
369 | | | |
285 | o changeset: 0:ea207398892e |
|
370 | o changeset: 0:ea207398892e | |
286 | user: test |
|
371 | user: test | |
287 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
372 | date: Thu Jan 01 00:00:00 1970 +0000 | |
288 | summary: ROOT |
|
373 | summary: ROOT | |
289 |
|
374 | |||
290 | # Simulate split |
|
375 | # Simulate split | |
291 | $ hg up -r "desc(ROOT)" |
|
376 | $ hg up -r "desc(ROOT)" | |
292 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
377 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
293 | $ echo 42 >> a |
|
378 | $ echo 42 >> a | |
294 | $ hg commit -A -m "A0" |
|
379 | $ hg commit -A -m "A0" | |
295 | adding a |
|
380 | adding a | |
296 | created new head |
|
381 | created new head | |
297 | $ echo 43 >> b |
|
382 | $ echo 43 >> b | |
298 | $ hg commit -A -m "A0" |
|
383 | $ hg commit -A -m "A0" | |
299 | adding b |
|
384 | adding b | |
300 | $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"` |
|
385 | $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"` | |
301 | obsoleted 1 changesets |
|
386 | obsoleted 1 changesets | |
302 |
|
387 | |||
303 | $ hg log --hidden -G |
|
388 | $ hg log --hidden -G | |
304 | @ changeset: 3:f257fde29c7a |
|
389 | @ changeset: 3:f257fde29c7a | |
305 | | tag: tip |
|
390 | | tag: tip | |
306 | | user: test |
|
391 | | user: test | |
307 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
392 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
308 | | summary: A0 |
|
393 | | summary: A0 | |
309 | | |
|
394 | | | |
310 | o changeset: 2:337fec4d2edc |
|
395 | o changeset: 2:337fec4d2edc | |
311 | | parent: 0:ea207398892e |
|
396 | | parent: 0:ea207398892e | |
312 | | user: test |
|
397 | | user: test | |
313 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
398 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
314 | | summary: A0 |
|
399 | | summary: A0 | |
315 | | |
|
400 | | | |
316 | | x changeset: 1:471597cad322 |
|
401 | | x changeset: 1:471597cad322 | |
317 | |/ user: test |
|
402 | |/ user: test | |
318 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
403 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
319 | | obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a |
|
404 | | obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a | |
320 | | summary: A0 |
|
405 | | summary: A0 | |
321 | | |
|
406 | | | |
322 | o changeset: 0:ea207398892e |
|
407 | o changeset: 0:ea207398892e | |
323 | user: test |
|
408 | user: test | |
324 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
409 | date: Thu Jan 01 00:00:00 1970 +0000 | |
325 | summary: ROOT |
|
410 | summary: ROOT | |
326 |
|
411 | |||
327 | Check templates |
|
412 | Check templates | |
328 | --------------- |
|
413 | --------------- | |
329 |
|
414 | |||
330 | $ hg up 'obsolete()' --hidden |
|
415 | $ hg up 'obsolete()' --hidden | |
331 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
416 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
332 |
|
417 | |||
333 | Predecessors template should show current revision as it is the working copy |
|
418 | Predecessors template should show current revision as it is the working copy | |
334 | $ hg tlog |
|
419 | $ hg tlog | |
335 | o f257fde29c7a |
|
420 | o f257fde29c7a | |
336 | | Predecessors: 1:471597cad322 |
|
421 | | Predecessors: 1:471597cad322 | |
337 | | semi-colon: 1:471597cad322 |
|
422 | | semi-colon: 1:471597cad322 | |
338 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
|
423 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] | |
339 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
|
424 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 | |
340 | o 337fec4d2edc |
|
425 | o 337fec4d2edc | |
341 | | Predecessors: 1:471597cad322 |
|
426 | | Predecessors: 1:471597cad322 | |
342 | | semi-colon: 1:471597cad322 |
|
427 | | semi-colon: 1:471597cad322 | |
343 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
|
428 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] | |
344 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
|
429 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 | |
345 | | @ 471597cad322 |
|
430 | | @ 471597cad322 | |
346 | |/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
|
431 | |/ Successors: 2:337fec4d2edc 3:f257fde29c7a | |
347 | | multi-line: 2:337fec4d2edc 3:f257fde29c7a |
|
432 | | multi-line: 2:337fec4d2edc 3:f257fde29c7a | |
348 | | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]] |
|
433 | | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]] | |
349 | o ea207398892e |
|
434 | o ea207398892e | |
350 |
|
435 | |||
351 |
|
436 | |||
352 | $ hg fatelog |
|
437 | $ hg fatelog | |
353 | o f257fde29c7a |
|
438 | o f257fde29c7a | |
354 | | |
|
439 | | | |
355 | o 337fec4d2edc |
|
440 | o 337fec4d2edc | |
356 | | |
|
441 | | | |
357 | | @ 471597cad322 |
|
442 | | @ 471597cad322 | |
358 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000); |
|
443 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000); | |
359 | o ea207398892e |
|
444 | o ea207398892e | |
360 |
|
445 | |||
361 | $ hg up f257fde29c7a |
|
446 | $ hg up f257fde29c7a | |
362 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
447 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
363 |
|
448 | |||
364 | Predecessors template should not show a predecessor as it's not displayed in |
|
449 | Predecessors template should not show a predecessor as it's not displayed in | |
365 | the log |
|
450 | the log | |
366 | $ hg tlog |
|
451 | $ hg tlog | |
367 | @ f257fde29c7a |
|
452 | @ f257fde29c7a | |
368 | | |
|
453 | | | |
369 | o 337fec4d2edc |
|
454 | o 337fec4d2edc | |
370 | | |
|
455 | | | |
371 | o ea207398892e |
|
456 | o ea207398892e | |
372 |
|
457 | |||
373 | Predecessors template should show both predecessors as we force their display |
|
458 | Predecessors template should show both predecessors as we force their display | |
374 | with --hidden |
|
459 | with --hidden | |
375 | $ hg tlog --hidden |
|
460 | $ hg tlog --hidden | |
376 | @ f257fde29c7a |
|
461 | @ f257fde29c7a | |
377 | | Predecessors: 1:471597cad322 |
|
462 | | Predecessors: 1:471597cad322 | |
378 | | semi-colon: 1:471597cad322 |
|
463 | | semi-colon: 1:471597cad322 | |
379 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
|
464 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] | |
380 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
|
465 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 | |
381 | o 337fec4d2edc |
|
466 | o 337fec4d2edc | |
382 | | Predecessors: 1:471597cad322 |
|
467 | | Predecessors: 1:471597cad322 | |
383 | | semi-colon: 1:471597cad322 |
|
468 | | semi-colon: 1:471597cad322 | |
384 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
|
469 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] | |
385 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
|
470 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 | |
386 | | x 471597cad322 |
|
471 | | x 471597cad322 | |
387 | |/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
|
472 | |/ Successors: 2:337fec4d2edc 3:f257fde29c7a | |
388 | | multi-line: 2:337fec4d2edc 3:f257fde29c7a |
|
473 | | multi-line: 2:337fec4d2edc 3:f257fde29c7a | |
389 | | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]] |
|
474 | | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]] | |
390 | o ea207398892e |
|
475 | o ea207398892e | |
391 |
|
476 | |||
392 |
|
477 | |||
393 | $ hg fatelog --hidden |
|
478 | $ hg fatelog --hidden | |
394 | @ f257fde29c7a |
|
479 | @ f257fde29c7a | |
395 | | |
|
480 | | | |
396 | o 337fec4d2edc |
|
481 | o 337fec4d2edc | |
397 | | |
|
482 | | | |
398 | | x 471597cad322 |
|
483 | | x 471597cad322 | |
399 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000); |
|
484 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000); | |
400 | o ea207398892e |
|
485 | o ea207398892e | |
401 |
|
486 | |||
402 | $ hg fatelogjson --hidden |
|
487 | $ hg fatelogjson --hidden | |
403 | @ f257fde29c7a |
|
488 | @ f257fde29c7a | |
404 | | |
|
489 | | | |
405 | o 337fec4d2edc |
|
490 | o 337fec4d2edc | |
406 | | |
|
491 | | | |
407 | | x 471597cad322 |
|
492 | | x 471597cad322 | |
408 | |/ Obsfate: [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]}] |
|
493 | |/ Obsfate: [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]}] | |
409 | o ea207398892e |
|
494 | o ea207398892e | |
410 |
|
495 | |||
411 | Check other fatelog implementations |
|
496 | Check other fatelog implementations | |
412 | ----------------------------------- |
|
497 | ----------------------------------- | |
413 |
|
498 | |||
414 | $ hg fatelogkw --hidden -q |
|
499 | $ hg fatelogkw --hidden -q | |
415 | @ f257fde29c7a |
|
500 | @ f257fde29c7a | |
416 | | |
|
501 | | | |
417 | o 337fec4d2edc |
|
502 | o 337fec4d2edc | |
418 | | |
|
503 | | | |
419 | | x 471597cad322 |
|
504 | | x 471597cad322 | |
420 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a |
|
505 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a | |
421 | o ea207398892e |
|
506 | o ea207398892e | |
422 |
|
507 | |||
423 | $ hg fatelogkw --hidden |
|
508 | $ hg fatelogkw --hidden | |
424 | @ f257fde29c7a |
|
509 | @ f257fde29c7a | |
425 | | |
|
510 | | | |
426 | o 337fec4d2edc |
|
511 | o 337fec4d2edc | |
427 | | |
|
512 | | | |
428 | | x 471597cad322 |
|
513 | | x 471597cad322 | |
429 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a |
|
514 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a | |
430 | o ea207398892e |
|
515 | o ea207398892e | |
431 |
|
516 | |||
432 | $ hg fatelogkw --hidden -v |
|
517 | $ hg fatelogkw --hidden -v | |
433 | @ f257fde29c7a |
|
518 | @ f257fde29c7a | |
434 | | |
|
519 | | | |
435 | o 337fec4d2edc |
|
520 | o 337fec4d2edc | |
436 | | |
|
521 | | | |
437 | | x 471597cad322 |
|
522 | | x 471597cad322 | |
438 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000) |
|
523 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000) | |
439 | o ea207398892e |
|
524 | o ea207398892e | |
440 |
|
525 | |||
441 |
|
526 | |||
|
527 | $ hg log -G -T "default" --hidden | |||
|
528 | @ changeset: 3:f257fde29c7a | |||
|
529 | | tag: tip | |||
|
530 | | user: test | |||
|
531 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
532 | | summary: A0 | |||
|
533 | | | |||
|
534 | o changeset: 2:337fec4d2edc | |||
|
535 | | parent: 0:ea207398892e | |||
|
536 | | user: test | |||
|
537 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
538 | | summary: A0 | |||
|
539 | | | |||
|
540 | | x changeset: 1:471597cad322 | |||
|
541 | |/ user: test | |||
|
542 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
543 | | obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a | |||
|
544 | | summary: A0 | |||
|
545 | | | |||
|
546 | o changeset: 0:ea207398892e | |||
|
547 | user: test | |||
|
548 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
549 | summary: ROOT | |||
|
550 | ||||
|
551 | ||||
442 | Test templates with folded commit |
|
552 | Test templates with folded commit | |
443 |
================================ |
|
553 | ================================= | |
444 |
|
554 | |||
445 | Test setup |
|
555 | Test setup | |
446 | ---------- |
|
556 | ---------- | |
447 |
|
557 | |||
448 | $ hg init $TESTTMP/templates-local-fold |
|
558 | $ hg init $TESTTMP/templates-local-fold | |
449 | $ cd $TESTTMP/templates-local-fold |
|
559 | $ cd $TESTTMP/templates-local-fold | |
450 | $ mkcommit ROOT |
|
560 | $ mkcommit ROOT | |
451 | $ mkcommit A0 |
|
561 | $ mkcommit A0 | |
452 | $ mkcommit B0 |
|
562 | $ mkcommit B0 | |
453 | $ hg log --hidden -G |
|
563 | $ hg log --hidden -G | |
454 | @ changeset: 2:0dec01379d3b |
|
564 | @ changeset: 2:0dec01379d3b | |
455 | | tag: tip |
|
565 | | tag: tip | |
456 | | user: test |
|
566 | | user: test | |
457 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
567 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
458 | | summary: B0 |
|
568 | | summary: B0 | |
459 | | |
|
569 | | | |
460 | o changeset: 1:471f378eab4c |
|
570 | o changeset: 1:471f378eab4c | |
461 | | user: test |
|
571 | | user: test | |
462 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
572 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
463 | | summary: A0 |
|
573 | | summary: A0 | |
464 | | |
|
574 | | | |
465 | o changeset: 0:ea207398892e |
|
575 | o changeset: 0:ea207398892e | |
466 | user: test |
|
576 | user: test | |
467 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
577 | date: Thu Jan 01 00:00:00 1970 +0000 | |
468 | summary: ROOT |
|
578 | summary: ROOT | |
469 |
|
579 | |||
470 | Simulate a fold |
|
580 | Simulate a fold | |
471 | $ hg up -r "desc(ROOT)" |
|
581 | $ hg up -r "desc(ROOT)" | |
472 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
582 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
473 | $ echo "A0" > A0 |
|
583 | $ echo "A0" > A0 | |
474 | $ echo "B0" > B0 |
|
584 | $ echo "B0" > B0 | |
475 | $ hg commit -A -m "C0" |
|
585 | $ hg commit -A -m "C0" | |
476 | adding A0 |
|
586 | adding A0 | |
477 | adding B0 |
|
587 | adding B0 | |
478 | created new head |
|
588 | created new head | |
479 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` |
|
589 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` | |
480 | obsoleted 1 changesets |
|
590 | obsoleted 1 changesets | |
481 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
|
591 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` | |
482 | obsoleted 1 changesets |
|
592 | obsoleted 1 changesets | |
483 |
|
593 | |||
484 | $ hg log --hidden -G |
|
594 | $ hg log --hidden -G | |
485 | @ changeset: 3:eb5a0daa2192 |
|
595 | @ changeset: 3:eb5a0daa2192 | |
486 | | tag: tip |
|
596 | | tag: tip | |
487 | | parent: 0:ea207398892e |
|
597 | | parent: 0:ea207398892e | |
488 | | user: test |
|
598 | | user: test | |
489 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
599 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
490 | | summary: C0 |
|
600 | | summary: C0 | |
491 | | |
|
601 | | | |
492 | | x changeset: 2:0dec01379d3b |
|
602 | | x changeset: 2:0dec01379d3b | |
493 | | | user: test |
|
603 | | | user: test | |
494 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
604 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
495 | | | obsfate: rewritten as 3:eb5a0daa2192 |
|
605 | | | obsfate: rewritten as 3:eb5a0daa2192 | |
496 | | | summary: B0 |
|
606 | | | summary: B0 | |
497 | | | |
|
607 | | | | |
498 | | x changeset: 1:471f378eab4c |
|
608 | | x changeset: 1:471f378eab4c | |
499 | |/ user: test |
|
609 | |/ user: test | |
500 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
610 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
501 | | obsfate: rewritten as 3:eb5a0daa2192 |
|
611 | | obsfate: rewritten as 3:eb5a0daa2192 | |
502 | | summary: A0 |
|
612 | | summary: A0 | |
503 | | |
|
613 | | | |
504 | o changeset: 0:ea207398892e |
|
614 | o changeset: 0:ea207398892e | |
505 | user: test |
|
615 | user: test | |
506 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
616 | date: Thu Jan 01 00:00:00 1970 +0000 | |
507 | summary: ROOT |
|
617 | summary: ROOT | |
508 |
|
618 | |||
509 | Check templates |
|
619 | Check templates | |
510 | --------------- |
|
620 | --------------- | |
511 |
|
621 | |||
512 | $ hg up 'desc(A0)' --hidden |
|
622 | $ hg up 'desc(A0)' --hidden | |
513 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
623 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
514 |
|
624 | |||
515 | Predecessors template should show current revision as it is the working copy |
|
625 | Predecessors template should show current revision as it is the working copy | |
516 | $ hg tlog |
|
626 | $ hg tlog | |
517 | o eb5a0daa2192 |
|
627 | o eb5a0daa2192 | |
518 | | Predecessors: 1:471f378eab4c |
|
628 | | Predecessors: 1:471f378eab4c | |
519 | | semi-colon: 1:471f378eab4c |
|
629 | | semi-colon: 1:471f378eab4c | |
520 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
630 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
521 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
631 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
522 | | @ 471f378eab4c |
|
632 | | @ 471f378eab4c | |
523 | |/ Successors: 3:eb5a0daa2192 |
|
633 | |/ Successors: 3:eb5a0daa2192 | |
524 | | multi-line: 3:eb5a0daa2192 |
|
634 | | multi-line: 3:eb5a0daa2192 | |
525 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
635 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
526 | o ea207398892e |
|
636 | o ea207398892e | |
527 |
|
637 | |||
528 |
|
638 | |||
529 | $ hg fatelog |
|
639 | $ hg fatelog | |
530 | o eb5a0daa2192 |
|
640 | o eb5a0daa2192 | |
531 | | |
|
641 | | | |
532 | | @ 471f378eab4c |
|
642 | | @ 471f378eab4c | |
533 | |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
643 | |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
534 | o ea207398892e |
|
644 | o ea207398892e | |
535 |
|
645 | |||
536 | $ hg up 'desc(B0)' --hidden |
|
646 | $ hg up 'desc(B0)' --hidden | |
537 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
647 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
538 |
|
648 | |||
539 | Predecessors template should show both predecessors as they should be both |
|
649 | Predecessors template should show both predecessors as they should be both | |
540 | displayed |
|
650 | displayed | |
541 | $ hg tlog |
|
651 | $ hg tlog | |
542 | o eb5a0daa2192 |
|
652 | o eb5a0daa2192 | |
543 | | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
|
653 | | Predecessors: 2:0dec01379d3b 1:471f378eab4c | |
544 | | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
|
654 | | semi-colon: 2:0dec01379d3b; 1:471f378eab4c | |
545 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
655 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] | |
546 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
656 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
547 | | @ 0dec01379d3b |
|
657 | | @ 0dec01379d3b | |
548 | | | Successors: 3:eb5a0daa2192 |
|
658 | | | Successors: 3:eb5a0daa2192 | |
549 | | | multi-line: 3:eb5a0daa2192 |
|
659 | | | multi-line: 3:eb5a0daa2192 | |
550 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
660 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
551 | | x 471f378eab4c |
|
661 | | x 471f378eab4c | |
552 | |/ Successors: 3:eb5a0daa2192 |
|
662 | |/ Successors: 3:eb5a0daa2192 | |
553 | | multi-line: 3:eb5a0daa2192 |
|
663 | | multi-line: 3:eb5a0daa2192 | |
554 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
664 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
555 | o ea207398892e |
|
665 | o ea207398892e | |
556 |
|
666 | |||
557 |
|
667 | |||
558 | $ hg fatelog |
|
668 | $ hg fatelog | |
559 | o eb5a0daa2192 |
|
669 | o eb5a0daa2192 | |
560 | | |
|
670 | | | |
561 | | @ 0dec01379d3b |
|
671 | | @ 0dec01379d3b | |
562 | | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
672 | | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
563 | | x 471f378eab4c |
|
673 | | x 471f378eab4c | |
564 | |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
674 | |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
565 | o ea207398892e |
|
675 | o ea207398892e | |
566 |
|
676 | |||
567 | $ hg up 'desc(C0)' |
|
677 | $ hg up 'desc(C0)' | |
568 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
678 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
569 |
|
679 | |||
570 | Predecessors template should not show predecessors as they are not displayed in |
|
680 | Predecessors template should not show predecessors as they are not displayed in | |
571 | the log |
|
681 | the log | |
572 | $ hg tlog |
|
682 | $ hg tlog | |
573 | @ eb5a0daa2192 |
|
683 | @ eb5a0daa2192 | |
574 | | |
|
684 | | | |
575 | o ea207398892e |
|
685 | o ea207398892e | |
576 |
|
686 | |||
577 | Predecessors template should show both predecessors as we force their display |
|
687 | Predecessors template should show both predecessors as we force their display | |
578 | with --hidden |
|
688 | with --hidden | |
579 | $ hg tlog --hidden |
|
689 | $ hg tlog --hidden | |
580 | @ eb5a0daa2192 |
|
690 | @ eb5a0daa2192 | |
581 | | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
|
691 | | Predecessors: 2:0dec01379d3b 1:471f378eab4c | |
582 | | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
|
692 | | semi-colon: 2:0dec01379d3b; 1:471f378eab4c | |
583 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
693 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] | |
584 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
694 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
585 | | x 0dec01379d3b |
|
695 | | x 0dec01379d3b | |
586 | | | Successors: 3:eb5a0daa2192 |
|
696 | | | Successors: 3:eb5a0daa2192 | |
587 | | | multi-line: 3:eb5a0daa2192 |
|
697 | | | multi-line: 3:eb5a0daa2192 | |
588 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
698 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
589 | | x 471f378eab4c |
|
699 | | x 471f378eab4c | |
590 | |/ Successors: 3:eb5a0daa2192 |
|
700 | |/ Successors: 3:eb5a0daa2192 | |
591 | | multi-line: 3:eb5a0daa2192 |
|
701 | | multi-line: 3:eb5a0daa2192 | |
592 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
702 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
593 | o ea207398892e |
|
703 | o ea207398892e | |
594 |
|
704 | |||
595 |
|
705 | |||
596 | $ hg fatelog --hidden |
|
706 | $ hg fatelog --hidden | |
597 | @ eb5a0daa2192 |
|
707 | @ eb5a0daa2192 | |
598 | | |
|
708 | | | |
599 | | x 0dec01379d3b |
|
709 | | x 0dec01379d3b | |
600 | | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
710 | | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
601 | | x 471f378eab4c |
|
711 | | x 471f378eab4c | |
602 | |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
712 | |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
603 | o ea207398892e |
|
713 | o ea207398892e | |
604 |
|
714 | |||
605 |
|
715 | |||
606 | $ hg fatelogjson --hidden |
|
716 | $ hg fatelogjson --hidden | |
607 | @ eb5a0daa2192 |
|
717 | @ eb5a0daa2192 | |
608 | | |
|
718 | | | |
609 | | x 0dec01379d3b |
|
719 | | x 0dec01379d3b | |
610 | | | Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] |
|
720 | | | Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] | |
611 | | x 471f378eab4c |
|
721 | | x 471f378eab4c | |
612 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] |
|
722 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] | |
613 | o ea207398892e |
|
723 | o ea207398892e | |
614 |
|
724 | |||
615 | Check other fatelog implementations |
|
725 | Check other fatelog implementations | |
616 | ----------------------------------- |
|
726 | ----------------------------------- | |
617 |
|
727 | |||
618 | $ hg fatelogkw --hidden -q |
|
728 | $ hg fatelogkw --hidden -q | |
619 | @ eb5a0daa2192 |
|
729 | @ eb5a0daa2192 | |
620 | | |
|
730 | | | |
621 | | x 0dec01379d3b |
|
731 | | x 0dec01379d3b | |
622 | | | Obsfate: rewritten as 3:eb5a0daa2192 |
|
732 | | | Obsfate: rewritten as 3:eb5a0daa2192 | |
623 | | x 471f378eab4c |
|
733 | | x 471f378eab4c | |
624 | |/ Obsfate: rewritten as 3:eb5a0daa2192 |
|
734 | |/ Obsfate: rewritten as 3:eb5a0daa2192 | |
625 | o ea207398892e |
|
735 | o ea207398892e | |
626 |
|
736 | |||
627 | $ hg fatelogkw --hidden |
|
737 | $ hg fatelogkw --hidden | |
628 | @ eb5a0daa2192 |
|
738 | @ eb5a0daa2192 | |
629 | | |
|
739 | | | |
630 | | x 0dec01379d3b |
|
740 | | x 0dec01379d3b | |
631 | | | Obsfate: rewritten as 3:eb5a0daa2192 |
|
741 | | | Obsfate: rewritten as 3:eb5a0daa2192 | |
632 | | x 471f378eab4c |
|
742 | | x 471f378eab4c | |
633 | |/ Obsfate: rewritten as 3:eb5a0daa2192 |
|
743 | |/ Obsfate: rewritten as 3:eb5a0daa2192 | |
634 | o ea207398892e |
|
744 | o ea207398892e | |
635 |
|
745 | |||
636 | $ hg fatelogkw --hidden -v |
|
746 | $ hg fatelogkw --hidden -v | |
637 | @ eb5a0daa2192 |
|
747 | @ eb5a0daa2192 | |
638 | | |
|
748 | | | |
639 | | x 0dec01379d3b |
|
749 | | x 0dec01379d3b | |
640 | | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) |
|
750 | | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) | |
641 | | x 471f378eab4c |
|
751 | | x 471f378eab4c | |
642 | |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) |
|
752 | |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) | |
643 | o ea207398892e |
|
753 | o ea207398892e | |
644 |
|
754 | |||
|
755 | $ hg log -G -T "default" --hidden | |||
|
756 | @ changeset: 3:eb5a0daa2192 | |||
|
757 | | tag: tip | |||
|
758 | | parent: 0:ea207398892e | |||
|
759 | | user: test | |||
|
760 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
761 | | summary: C0 | |||
|
762 | | | |||
|
763 | | x changeset: 2:0dec01379d3b | |||
|
764 | | | user: test | |||
|
765 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
766 | | | obsfate: rewritten as 3:eb5a0daa2192 | |||
|
767 | | | summary: B0 | |||
|
768 | | | | |||
|
769 | | x changeset: 1:471f378eab4c | |||
|
770 | |/ user: test | |||
|
771 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
772 | | obsfate: rewritten as 3:eb5a0daa2192 | |||
|
773 | | summary: A0 | |||
|
774 | | | |||
|
775 | o changeset: 0:ea207398892e | |||
|
776 | user: test | |||
|
777 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
778 | summary: ROOT | |||
|
779 | ||||
645 |
|
780 | |||
646 | Test templates with divergence |
|
781 | Test templates with divergence | |
647 |
|
|
782 | ============================== | |
648 |
|
783 | |||
649 | Test setup |
|
784 | Test setup | |
650 | ---------- |
|
785 | ---------- | |
651 |
|
786 | |||
652 | $ hg init $TESTTMP/templates-local-divergence |
|
787 | $ hg init $TESTTMP/templates-local-divergence | |
653 | $ cd $TESTTMP/templates-local-divergence |
|
788 | $ cd $TESTTMP/templates-local-divergence | |
654 | $ mkcommit ROOT |
|
789 | $ mkcommit ROOT | |
655 | $ mkcommit A0 |
|
790 | $ mkcommit A0 | |
656 | $ hg commit --amend -m "A1" |
|
791 | $ hg commit --amend -m "A1" | |
657 | $ hg log --hidden -G |
|
792 | $ hg log --hidden -G | |
658 | @ changeset: 2:fdf9bde5129a |
|
793 | @ changeset: 2:fdf9bde5129a | |
659 | | tag: tip |
|
794 | | tag: tip | |
660 | | parent: 0:ea207398892e |
|
795 | | parent: 0:ea207398892e | |
661 | | user: test |
|
796 | | user: test | |
662 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
797 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
663 | | summary: A1 |
|
798 | | summary: A1 | |
664 | | |
|
799 | | | |
665 | | x changeset: 1:471f378eab4c |
|
800 | | x changeset: 1:471f378eab4c | |
666 | |/ user: test |
|
801 | |/ user: test | |
667 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
802 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
668 | | obsfate: rewritten using amend as 2:fdf9bde5129a |
|
803 | | obsfate: rewritten using amend as 2:fdf9bde5129a | |
669 | | summary: A0 |
|
804 | | summary: A0 | |
670 | | |
|
805 | | | |
671 | o changeset: 0:ea207398892e |
|
806 | o changeset: 0:ea207398892e | |
672 | user: test |
|
807 | user: test | |
673 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
808 | date: Thu Jan 01 00:00:00 1970 +0000 | |
674 | summary: ROOT |
|
809 | summary: ROOT | |
675 |
|
810 | |||
676 | $ hg update --hidden 'desc(A0)' |
|
811 | $ hg update --hidden 'desc(A0)' | |
677 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
812 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
678 | $ hg commit --amend -m "A2" |
|
813 | $ hg commit --amend -m "A2" | |
679 | $ hg log --hidden -G |
|
814 | $ hg log --hidden -G | |
680 | @ changeset: 3:65b757b745b9 |
|
815 | @ changeset: 3:65b757b745b9 | |
681 | | tag: tip |
|
816 | | tag: tip | |
682 | | parent: 0:ea207398892e |
|
817 | | parent: 0:ea207398892e | |
683 | | user: test |
|
818 | | user: test | |
684 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
819 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
685 | | instability: content-divergent |
|
820 | | instability: content-divergent | |
686 | | summary: A2 |
|
821 | | summary: A2 | |
687 | | |
|
822 | | | |
688 | | o changeset: 2:fdf9bde5129a |
|
823 | | o changeset: 2:fdf9bde5129a | |
689 | |/ parent: 0:ea207398892e |
|
824 | |/ parent: 0:ea207398892e | |
690 | | user: test |
|
825 | | user: test | |
691 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
826 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
692 | | instability: content-divergent |
|
827 | | instability: content-divergent | |
693 | | summary: A1 |
|
828 | | summary: A1 | |
694 | | |
|
829 | | | |
695 | | x changeset: 1:471f378eab4c |
|
830 | | x changeset: 1:471f378eab4c | |
696 | |/ user: test |
|
831 | |/ user: test | |
697 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
832 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
698 | | obsfate: rewritten using amend as 2:fdf9bde5129a |
|
833 | | obsfate: rewritten using amend as 2:fdf9bde5129a | |
699 | | obsfate: rewritten using amend as 3:65b757b745b9 |
|
834 | | obsfate: rewritten using amend as 3:65b757b745b9 | |
700 | | summary: A0 |
|
835 | | summary: A0 | |
701 | | |
|
836 | | | |
702 | o changeset: 0:ea207398892e |
|
837 | o changeset: 0:ea207398892e | |
703 | user: test |
|
838 | user: test | |
704 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
839 | date: Thu Jan 01 00:00:00 1970 +0000 | |
705 | summary: ROOT |
|
840 | summary: ROOT | |
706 |
|
841 | |||
707 | $ hg commit --amend -m 'A3' |
|
842 | $ hg commit --amend -m 'A3' | |
708 | $ hg log --hidden -G |
|
843 | $ hg log --hidden -G | |
709 | @ changeset: 4:019fadeab383 |
|
844 | @ changeset: 4:019fadeab383 | |
710 | | tag: tip |
|
845 | | tag: tip | |
711 | | parent: 0:ea207398892e |
|
846 | | parent: 0:ea207398892e | |
712 | | user: test |
|
847 | | user: test | |
713 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
848 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
714 | | instability: content-divergent |
|
849 | | instability: content-divergent | |
715 | | summary: A3 |
|
850 | | summary: A3 | |
716 | | |
|
851 | | | |
717 | | x changeset: 3:65b757b745b9 |
|
852 | | x changeset: 3:65b757b745b9 | |
718 | |/ parent: 0:ea207398892e |
|
853 | |/ parent: 0:ea207398892e | |
719 | | user: test |
|
854 | | user: test | |
720 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
855 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
721 | | obsfate: rewritten using amend as 4:019fadeab383 |
|
856 | | obsfate: rewritten using amend as 4:019fadeab383 | |
722 | | summary: A2 |
|
857 | | summary: A2 | |
723 | | |
|
858 | | | |
724 | | o changeset: 2:fdf9bde5129a |
|
859 | | o changeset: 2:fdf9bde5129a | |
725 | |/ parent: 0:ea207398892e |
|
860 | |/ parent: 0:ea207398892e | |
726 | | user: test |
|
861 | | user: test | |
727 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
862 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
728 | | instability: content-divergent |
|
863 | | instability: content-divergent | |
729 | | summary: A1 |
|
864 | | summary: A1 | |
730 | | |
|
865 | | | |
731 | | x changeset: 1:471f378eab4c |
|
866 | | x changeset: 1:471f378eab4c | |
732 | |/ user: test |
|
867 | |/ user: test | |
733 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
868 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
734 | | obsfate: rewritten using amend as 2:fdf9bde5129a |
|
869 | | obsfate: rewritten using amend as 2:fdf9bde5129a | |
735 | | obsfate: rewritten using amend as 3:65b757b745b9 |
|
870 | | obsfate: rewritten using amend as 3:65b757b745b9 | |
736 | | summary: A0 |
|
871 | | summary: A0 | |
737 | | |
|
872 | | | |
738 | o changeset: 0:ea207398892e |
|
873 | o changeset: 0:ea207398892e | |
739 | user: test |
|
874 | user: test | |
740 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
875 | date: Thu Jan 01 00:00:00 1970 +0000 | |
741 | summary: ROOT |
|
876 | summary: ROOT | |
742 |
|
877 | |||
743 |
|
878 | |||
744 | Check templates |
|
879 | Check templates | |
745 | --------------- |
|
880 | --------------- | |
746 |
|
881 | |||
747 | $ hg up 'desc(A0)' --hidden |
|
882 | $ hg up 'desc(A0)' --hidden | |
748 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
883 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
749 |
|
884 | |||
750 | Predecessors template should show current revision as it is the working copy |
|
885 | Predecessors template should show current revision as it is the working copy | |
751 | $ hg tlog |
|
886 | $ hg tlog | |
752 | o 019fadeab383 |
|
887 | o 019fadeab383 | |
753 | | Predecessors: 1:471f378eab4c |
|
888 | | Predecessors: 1:471f378eab4c | |
754 | | semi-colon: 1:471f378eab4c |
|
889 | | semi-colon: 1:471f378eab4c | |
755 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
890 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
756 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
891 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
757 | | o fdf9bde5129a |
|
892 | | o fdf9bde5129a | |
758 | |/ Predecessors: 1:471f378eab4c |
|
893 | |/ Predecessors: 1:471f378eab4c | |
759 | | semi-colon: 1:471f378eab4c |
|
894 | | semi-colon: 1:471f378eab4c | |
760 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
895 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
761 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
896 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
762 | | @ 471f378eab4c |
|
897 | | @ 471f378eab4c | |
763 | |/ Successors: 2:fdf9bde5129a; 4:019fadeab383 |
|
898 | |/ Successors: 2:fdf9bde5129a; 4:019fadeab383 | |
764 | | multi-line: 2:fdf9bde5129a |
|
899 | | multi-line: 2:fdf9bde5129a | |
765 | | multi-line: 4:019fadeab383 |
|
900 | | multi-line: 4:019fadeab383 | |
766 | | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]] |
|
901 | | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]] | |
767 | o ea207398892e |
|
902 | o ea207398892e | |
768 |
|
903 | |||
769 | $ hg fatelog |
|
904 | $ hg fatelog | |
770 | o 019fadeab383 |
|
905 | o 019fadeab383 | |
771 | | |
|
906 | | | |
772 | | o fdf9bde5129a |
|
907 | | o fdf9bde5129a | |
773 | |/ |
|
908 | |/ | |
774 | | @ 471f378eab4c |
|
909 | | @ 471f378eab4c | |
775 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000); |
|
910 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000); | |
776 | o ea207398892e |
|
911 | o ea207398892e | |
777 |
|
912 | |||
778 | $ hg up 'desc(A1)' |
|
913 | $ hg up 'desc(A1)' | |
779 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
914 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
780 |
|
915 | |||
781 | Predecessors template should not show predecessors as they are not displayed in |
|
916 | Predecessors template should not show predecessors as they are not displayed in | |
782 | the log |
|
917 | the log | |
783 | $ hg tlog |
|
918 | $ hg tlog | |
784 | o 019fadeab383 |
|
919 | o 019fadeab383 | |
785 | | |
|
920 | | | |
786 | | @ fdf9bde5129a |
|
921 | | @ fdf9bde5129a | |
787 | |/ |
|
922 | |/ | |
788 | o ea207398892e |
|
923 | o ea207398892e | |
789 |
|
924 | |||
790 |
|
925 | |||
791 | $ hg fatelog |
|
926 | $ hg fatelog | |
792 | o 019fadeab383 |
|
927 | o 019fadeab383 | |
793 | | |
|
928 | | | |
794 | | @ fdf9bde5129a |
|
929 | | @ fdf9bde5129a | |
795 | |/ |
|
930 | |/ | |
796 | o ea207398892e |
|
931 | o ea207398892e | |
797 |
|
932 | |||
798 | Predecessors template should the predecessors as we force their display with |
|
933 | Predecessors template should the predecessors as we force their display with | |
799 | --hidden |
|
934 | --hidden | |
800 | $ hg tlog --hidden |
|
935 | $ hg tlog --hidden | |
801 | o 019fadeab383 |
|
936 | o 019fadeab383 | |
802 | | Predecessors: 3:65b757b745b9 |
|
937 | | Predecessors: 3:65b757b745b9 | |
803 | | semi-colon: 3:65b757b745b9 |
|
938 | | semi-colon: 3:65b757b745b9 | |
804 | | json: ["65b757b745b935093c87a2bccd877521cccffcbd"] |
|
939 | | json: ["65b757b745b935093c87a2bccd877521cccffcbd"] | |
805 | | map: 3:65b757b745b935093c87a2bccd877521cccffcbd |
|
940 | | map: 3:65b757b745b935093c87a2bccd877521cccffcbd | |
806 | | x 65b757b745b9 |
|
941 | | x 65b757b745b9 | |
807 | |/ Predecessors: 1:471f378eab4c |
|
942 | |/ Predecessors: 1:471f378eab4c | |
808 | | semi-colon: 1:471f378eab4c |
|
943 | | semi-colon: 1:471f378eab4c | |
809 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
944 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
810 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
945 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
811 | | Successors: 4:019fadeab383 |
|
946 | | Successors: 4:019fadeab383 | |
812 | | multi-line: 4:019fadeab383 |
|
947 | | multi-line: 4:019fadeab383 | |
813 | | json: [["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]] |
|
948 | | json: [["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]] | |
814 | | @ fdf9bde5129a |
|
949 | | @ fdf9bde5129a | |
815 | |/ Predecessors: 1:471f378eab4c |
|
950 | |/ Predecessors: 1:471f378eab4c | |
816 | | semi-colon: 1:471f378eab4c |
|
951 | | semi-colon: 1:471f378eab4c | |
817 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
952 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
818 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
953 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
819 | | x 471f378eab4c |
|
954 | | x 471f378eab4c | |
820 | |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9 |
|
955 | |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9 | |
821 | | multi-line: 2:fdf9bde5129a |
|
956 | | multi-line: 2:fdf9bde5129a | |
822 | | multi-line: 3:65b757b745b9 |
|
957 | | multi-line: 3:65b757b745b9 | |
823 | | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]] |
|
958 | | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]] | |
824 | o ea207398892e |
|
959 | o ea207398892e | |
825 |
|
960 | |||
826 |
|
961 | |||
827 | $ hg fatelog --hidden |
|
962 | $ hg fatelog --hidden | |
828 | o 019fadeab383 |
|
963 | o 019fadeab383 | |
829 | | |
|
964 | | | |
830 | | x 65b757b745b9 |
|
965 | | x 65b757b745b9 | |
831 | |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000); |
|
966 | |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000); | |
832 | | @ fdf9bde5129a |
|
967 | | @ fdf9bde5129a | |
833 | |/ |
|
968 | |/ | |
834 | | x 471f378eab4c |
|
969 | | x 471f378eab4c | |
835 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000); |
|
970 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000); | |
836 | o ea207398892e |
|
971 | o ea207398892e | |
837 |
|
972 | |||
838 |
|
973 | |||
839 | $ hg fatelogjson --hidden |
|
974 | $ hg fatelogjson --hidden | |
840 | o 019fadeab383 |
|
975 | o 019fadeab383 | |
841 | | |
|
976 | | | |
842 | | x 65b757b745b9 |
|
977 | | x 65b757b745b9 | |
843 | |/ Obsfate: [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]}] |
|
978 | |/ Obsfate: [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]}] | |
844 | | @ fdf9bde5129a |
|
979 | | @ fdf9bde5129a | |
845 | |/ |
|
980 | |/ | |
846 | | x 471f378eab4c |
|
981 | | x 471f378eab4c | |
847 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"]}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"]}] |
|
982 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"]}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"]}] | |
848 | o ea207398892e |
|
983 | o ea207398892e | |
849 |
|
984 | |||
850 |
|
985 | |||
851 | Check other fatelog implementations |
|
986 | Check other fatelog implementations | |
852 | ----------------------------------- |
|
987 | ----------------------------------- | |
853 |
|
988 | |||
854 | $ hg fatelogkw --hidden -q |
|
989 | $ hg fatelogkw --hidden -q | |
855 | o 019fadeab383 |
|
990 | o 019fadeab383 | |
856 | | |
|
991 | | | |
857 | | x 65b757b745b9 |
|
992 | | x 65b757b745b9 | |
858 | |/ Obsfate: rewritten using amend as 4:019fadeab383 |
|
993 | |/ Obsfate: rewritten using amend as 4:019fadeab383 | |
859 | | @ fdf9bde5129a |
|
994 | | @ fdf9bde5129a | |
860 | |/ |
|
995 | |/ | |
861 | | x 471f378eab4c |
|
996 | | x 471f378eab4c | |
862 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a |
|
997 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a | |
863 | | Obsfate: rewritten using amend as 3:65b757b745b9 |
|
998 | | Obsfate: rewritten using amend as 3:65b757b745b9 | |
864 | o ea207398892e |
|
999 | o ea207398892e | |
865 |
|
1000 | |||
866 | $ hg fatelogkw --hidden |
|
1001 | $ hg fatelogkw --hidden | |
867 | o 019fadeab383 |
|
1002 | o 019fadeab383 | |
868 | | |
|
1003 | | | |
869 | | x 65b757b745b9 |
|
1004 | | x 65b757b745b9 | |
870 | |/ Obsfate: rewritten using amend as 4:019fadeab383 |
|
1005 | |/ Obsfate: rewritten using amend as 4:019fadeab383 | |
871 | | @ fdf9bde5129a |
|
1006 | | @ fdf9bde5129a | |
872 | |/ |
|
1007 | |/ | |
873 | | x 471f378eab4c |
|
1008 | | x 471f378eab4c | |
874 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a |
|
1009 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a | |
875 | | Obsfate: rewritten using amend as 3:65b757b745b9 |
|
1010 | | Obsfate: rewritten using amend as 3:65b757b745b9 | |
876 | o ea207398892e |
|
1011 | o ea207398892e | |
877 |
|
1012 | |||
878 | $ hg fatelogkw --hidden -v |
|
1013 | $ hg fatelogkw --hidden -v | |
879 | o 019fadeab383 |
|
1014 | o 019fadeab383 | |
880 | | |
|
1015 | | | |
881 | | x 65b757b745b9 |
|
1016 | | x 65b757b745b9 | |
882 | |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000) |
|
1017 | |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000) | |
883 | | @ fdf9bde5129a |
|
1018 | | @ fdf9bde5129a | |
884 | |/ |
|
1019 | |/ | |
885 | | x 471f378eab4c |
|
1020 | | x 471f378eab4c | |
886 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000) |
|
1021 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000) | |
887 | | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000) |
|
1022 | | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000) | |
888 | o ea207398892e |
|
1023 | o ea207398892e | |
889 |
|
1024 | |||
|
1025 | $ hg log -G -T "default" --hidden | |||
|
1026 | o changeset: 4:019fadeab383 | |||
|
1027 | | tag: tip | |||
|
1028 | | parent: 0:ea207398892e | |||
|
1029 | | user: test | |||
|
1030 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1031 | | instability: content-divergent | |||
|
1032 | | summary: A3 | |||
|
1033 | | | |||
|
1034 | | x changeset: 3:65b757b745b9 | |||
|
1035 | |/ parent: 0:ea207398892e | |||
|
1036 | | user: test | |||
|
1037 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1038 | | obsfate: rewritten using amend as 4:019fadeab383 | |||
|
1039 | | summary: A2 | |||
|
1040 | | | |||
|
1041 | | @ changeset: 2:fdf9bde5129a | |||
|
1042 | |/ parent: 0:ea207398892e | |||
|
1043 | | user: test | |||
|
1044 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1045 | | instability: content-divergent | |||
|
1046 | | summary: A1 | |||
|
1047 | | | |||
|
1048 | | x changeset: 1:471f378eab4c | |||
|
1049 | |/ user: test | |||
|
1050 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1051 | | obsfate: rewritten using amend as 2:fdf9bde5129a | |||
|
1052 | | obsfate: rewritten using amend as 3:65b757b745b9 | |||
|
1053 | | summary: A0 | |||
|
1054 | | | |||
|
1055 | o changeset: 0:ea207398892e | |||
|
1056 | user: test | |||
|
1057 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1058 | summary: ROOT | |||
|
1059 | ||||
890 |
|
1060 | |||
891 | Test templates with amended + folded commit |
|
1061 | Test templates with amended + folded commit | |
892 | =========================================== |
|
1062 | =========================================== | |
893 |
|
1063 | |||
894 | Test setup |
|
1064 | Test setup | |
895 | ---------- |
|
1065 | ---------- | |
896 |
|
1066 | |||
897 | $ hg init $TESTTMP/templates-local-amend-fold |
|
1067 | $ hg init $TESTTMP/templates-local-amend-fold | |
898 | $ cd $TESTTMP/templates-local-amend-fold |
|
1068 | $ cd $TESTTMP/templates-local-amend-fold | |
899 | $ mkcommit ROOT |
|
1069 | $ mkcommit ROOT | |
900 | $ mkcommit A0 |
|
1070 | $ mkcommit A0 | |
901 | $ mkcommit B0 |
|
1071 | $ mkcommit B0 | |
902 | $ hg commit --amend -m "B1" |
|
1072 | $ hg commit --amend -m "B1" | |
903 | $ hg log --hidden -G |
|
1073 | $ hg log --hidden -G | |
904 | @ changeset: 3:b7ea6d14e664 |
|
1074 | @ changeset: 3:b7ea6d14e664 | |
905 | | tag: tip |
|
1075 | | tag: tip | |
906 | | parent: 1:471f378eab4c |
|
1076 | | parent: 1:471f378eab4c | |
907 | | user: test |
|
1077 | | user: test | |
908 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1078 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
909 | | summary: B1 |
|
1079 | | summary: B1 | |
910 | | |
|
1080 | | | |
911 | | x changeset: 2:0dec01379d3b |
|
1081 | | x changeset: 2:0dec01379d3b | |
912 | |/ user: test |
|
1082 | |/ user: test | |
913 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1083 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
914 | | obsfate: rewritten using amend as 3:b7ea6d14e664 |
|
1084 | | obsfate: rewritten using amend as 3:b7ea6d14e664 | |
915 | | summary: B0 |
|
1085 | | summary: B0 | |
916 | | |
|
1086 | | | |
917 | o changeset: 1:471f378eab4c |
|
1087 | o changeset: 1:471f378eab4c | |
918 | | user: test |
|
1088 | | user: test | |
919 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1089 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
920 | | summary: A0 |
|
1090 | | summary: A0 | |
921 | | |
|
1091 | | | |
922 | o changeset: 0:ea207398892e |
|
1092 | o changeset: 0:ea207398892e | |
923 | user: test |
|
1093 | user: test | |
924 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1094 | date: Thu Jan 01 00:00:00 1970 +0000 | |
925 | summary: ROOT |
|
1095 | summary: ROOT | |
926 |
|
1096 | |||
927 | # Simulate a fold |
|
1097 | # Simulate a fold | |
928 | $ hg up -r "desc(ROOT)" |
|
1098 | $ hg up -r "desc(ROOT)" | |
929 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1099 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
930 | $ echo "A0" > A0 |
|
1100 | $ echo "A0" > A0 | |
931 | $ echo "B0" > B0 |
|
1101 | $ echo "B0" > B0 | |
932 | $ hg commit -A -m "C0" |
|
1102 | $ hg commit -A -m "C0" | |
933 | adding A0 |
|
1103 | adding A0 | |
934 | adding B0 |
|
1104 | adding B0 | |
935 | created new head |
|
1105 | created new head | |
936 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` |
|
1106 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` | |
937 | obsoleted 1 changesets |
|
1107 | obsoleted 1 changesets | |
938 | $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"` |
|
1108 | $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"` | |
939 | obsoleted 1 changesets |
|
1109 | obsoleted 1 changesets | |
940 |
|
1110 | |||
941 | $ hg log --hidden -G |
|
1111 | $ hg log --hidden -G | |
942 | @ changeset: 4:eb5a0daa2192 |
|
1112 | @ changeset: 4:eb5a0daa2192 | |
943 | | tag: tip |
|
1113 | | tag: tip | |
944 | | parent: 0:ea207398892e |
|
1114 | | parent: 0:ea207398892e | |
945 | | user: test |
|
1115 | | user: test | |
946 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1116 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
947 | | summary: C0 |
|
1117 | | summary: C0 | |
948 | | |
|
1118 | | | |
949 | | x changeset: 3:b7ea6d14e664 |
|
1119 | | x changeset: 3:b7ea6d14e664 | |
950 | | | parent: 1:471f378eab4c |
|
1120 | | | parent: 1:471f378eab4c | |
951 | | | user: test |
|
1121 | | | user: test | |
952 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1122 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
953 | | | obsfate: rewritten as 4:eb5a0daa2192 |
|
1123 | | | obsfate: rewritten as 4:eb5a0daa2192 | |
954 | | | summary: B1 |
|
1124 | | | summary: B1 | |
955 | | | |
|
1125 | | | | |
956 | | | x changeset: 2:0dec01379d3b |
|
1126 | | | x changeset: 2:0dec01379d3b | |
957 | | |/ user: test |
|
1127 | | |/ user: test | |
958 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1128 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
959 | | | obsfate: rewritten using amend as 3:b7ea6d14e664 |
|
1129 | | | obsfate: rewritten using amend as 3:b7ea6d14e664 | |
960 | | | summary: B0 |
|
1130 | | | summary: B0 | |
961 | | | |
|
1131 | | | | |
962 | | x changeset: 1:471f378eab4c |
|
1132 | | x changeset: 1:471f378eab4c | |
963 | |/ user: test |
|
1133 | |/ user: test | |
964 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1134 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
965 | | obsfate: rewritten as 4:eb5a0daa2192 |
|
1135 | | obsfate: rewritten as 4:eb5a0daa2192 | |
966 | | summary: A0 |
|
1136 | | summary: A0 | |
967 | | |
|
1137 | | | |
968 | o changeset: 0:ea207398892e |
|
1138 | o changeset: 0:ea207398892e | |
969 | user: test |
|
1139 | user: test | |
970 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1140 | date: Thu Jan 01 00:00:00 1970 +0000 | |
971 | summary: ROOT |
|
1141 | summary: ROOT | |
972 |
|
1142 | |||
973 | Check templates |
|
1143 | Check templates | |
974 | --------------- |
|
1144 | --------------- | |
975 |
|
1145 | |||
976 | $ hg up 'desc(A0)' --hidden |
|
1146 | $ hg up 'desc(A0)' --hidden | |
977 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1147 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
978 |
|
1148 | |||
979 | Predecessors template should show current revision as it is the working copy |
|
1149 | Predecessors template should show current revision as it is the working copy | |
980 | $ hg tlog |
|
1150 | $ hg tlog | |
981 | o eb5a0daa2192 |
|
1151 | o eb5a0daa2192 | |
982 | | Predecessors: 1:471f378eab4c |
|
1152 | | Predecessors: 1:471f378eab4c | |
983 | | semi-colon: 1:471f378eab4c |
|
1153 | | semi-colon: 1:471f378eab4c | |
984 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
1154 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
985 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
1155 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
986 | | @ 471f378eab4c |
|
1156 | | @ 471f378eab4c | |
987 | |/ Successors: 4:eb5a0daa2192 |
|
1157 | |/ Successors: 4:eb5a0daa2192 | |
988 | | multi-line: 4:eb5a0daa2192 |
|
1158 | | multi-line: 4:eb5a0daa2192 | |
989 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
1159 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
990 | o ea207398892e |
|
1160 | o ea207398892e | |
991 |
|
1161 | |||
992 |
|
1162 | |||
993 | $ hg fatelog |
|
1163 | $ hg fatelog | |
994 | o eb5a0daa2192 |
|
1164 | o eb5a0daa2192 | |
995 | | |
|
1165 | | | |
996 | | @ 471f378eab4c |
|
1166 | | @ 471f378eab4c | |
997 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
1167 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
998 | o ea207398892e |
|
1168 | o ea207398892e | |
999 |
|
1169 | |||
1000 | $ hg up 'desc(B0)' --hidden |
|
1170 | $ hg up 'desc(B0)' --hidden | |
1001 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1171 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1002 |
|
1172 | |||
1003 | Predecessors template should both predecessors as they are visible |
|
1173 | Predecessors template should both predecessors as they are visible | |
1004 | $ hg tlog |
|
1174 | $ hg tlog | |
1005 | o eb5a0daa2192 |
|
1175 | o eb5a0daa2192 | |
1006 | | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
|
1176 | | Predecessors: 2:0dec01379d3b 1:471f378eab4c | |
1007 | | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
|
1177 | | semi-colon: 2:0dec01379d3b; 1:471f378eab4c | |
1008 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
1178 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] | |
1009 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
1179 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
1010 | | @ 0dec01379d3b |
|
1180 | | @ 0dec01379d3b | |
1011 | | | Successors: 4:eb5a0daa2192 |
|
1181 | | | Successors: 4:eb5a0daa2192 | |
1012 | | | multi-line: 4:eb5a0daa2192 |
|
1182 | | | multi-line: 4:eb5a0daa2192 | |
1013 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
1183 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
1014 | | x 471f378eab4c |
|
1184 | | x 471f378eab4c | |
1015 | |/ Successors: 4:eb5a0daa2192 |
|
1185 | |/ Successors: 4:eb5a0daa2192 | |
1016 | | multi-line: 4:eb5a0daa2192 |
|
1186 | | multi-line: 4:eb5a0daa2192 | |
1017 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
1187 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
1018 | o ea207398892e |
|
1188 | o ea207398892e | |
1019 |
|
1189 | |||
1020 |
|
1190 | |||
1021 | $ hg fatelog |
|
1191 | $ hg fatelog | |
1022 | o eb5a0daa2192 |
|
1192 | o eb5a0daa2192 | |
1023 | | |
|
1193 | | | |
1024 | | @ 0dec01379d3b |
|
1194 | | @ 0dec01379d3b | |
1025 | | | Obsfate: rewritten using amend as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
1195 | | | Obsfate: rewritten using amend as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
1026 | | x 471f378eab4c |
|
1196 | | x 471f378eab4c | |
1027 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
1197 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
1028 | o ea207398892e |
|
1198 | o ea207398892e | |
1029 |
|
1199 | |||
1030 | $ hg up 'desc(B1)' --hidden |
|
1200 | $ hg up 'desc(B1)' --hidden | |
1031 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1201 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1032 |
|
1202 | |||
1033 | Predecessors template should both predecessors as they are visible |
|
1203 | Predecessors template should both predecessors as they are visible | |
1034 | $ hg tlog |
|
1204 | $ hg tlog | |
1035 | o eb5a0daa2192 |
|
1205 | o eb5a0daa2192 | |
1036 | | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 |
|
1206 | | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 | |
1037 | | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
|
1207 | | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 | |
1038 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] |
|
1208 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] | |
1039 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 |
|
1209 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 | |
1040 | | @ b7ea6d14e664 |
|
1210 | | @ b7ea6d14e664 | |
1041 | | | Successors: 4:eb5a0daa2192 |
|
1211 | | | Successors: 4:eb5a0daa2192 | |
1042 | | | multi-line: 4:eb5a0daa2192 |
|
1212 | | | multi-line: 4:eb5a0daa2192 | |
1043 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
1213 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
1044 | | x 471f378eab4c |
|
1214 | | x 471f378eab4c | |
1045 | |/ Successors: 4:eb5a0daa2192 |
|
1215 | |/ Successors: 4:eb5a0daa2192 | |
1046 | | multi-line: 4:eb5a0daa2192 |
|
1216 | | multi-line: 4:eb5a0daa2192 | |
1047 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
1217 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
1048 | o ea207398892e |
|
1218 | o ea207398892e | |
1049 |
|
1219 | |||
1050 |
|
1220 | |||
1051 | $ hg fatelog |
|
1221 | $ hg fatelog | |
1052 | o eb5a0daa2192 |
|
1222 | o eb5a0daa2192 | |
1053 | | |
|
1223 | | | |
1054 | | @ b7ea6d14e664 |
|
1224 | | @ b7ea6d14e664 | |
1055 | | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
1225 | | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
1056 | | x 471f378eab4c |
|
1226 | | x 471f378eab4c | |
1057 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
1227 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
1058 | o ea207398892e |
|
1228 | o ea207398892e | |
1059 |
|
1229 | |||
1060 | $ hg up 'desc(C0)' |
|
1230 | $ hg up 'desc(C0)' | |
1061 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1231 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1062 |
|
1232 | |||
1063 | Predecessors template should show no predecessors as they are both non visible |
|
1233 | Predecessors template should show no predecessors as they are both non visible | |
1064 | $ hg tlog |
|
1234 | $ hg tlog | |
1065 | @ eb5a0daa2192 |
|
1235 | @ eb5a0daa2192 | |
1066 | | |
|
1236 | | | |
1067 | o ea207398892e |
|
1237 | o ea207398892e | |
1068 |
|
1238 | |||
1069 |
|
1239 | |||
1070 | $ hg fatelog |
|
1240 | $ hg fatelog | |
1071 | @ eb5a0daa2192 |
|
1241 | @ eb5a0daa2192 | |
1072 | | |
|
1242 | | | |
1073 | o ea207398892e |
|
1243 | o ea207398892e | |
1074 |
|
1244 | |||
1075 | Predecessors template should show all predecessors as we force their display |
|
1245 | Predecessors template should show all predecessors as we force their display | |
1076 | with --hidden |
|
1246 | with --hidden | |
1077 | $ hg tlog --hidden |
|
1247 | $ hg tlog --hidden | |
1078 | @ eb5a0daa2192 |
|
1248 | @ eb5a0daa2192 | |
1079 | | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 |
|
1249 | | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 | |
1080 | | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
|
1250 | | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 | |
1081 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] |
|
1251 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] | |
1082 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 |
|
1252 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 | |
1083 | | x b7ea6d14e664 |
|
1253 | | x b7ea6d14e664 | |
1084 | | | Predecessors: 2:0dec01379d3b |
|
1254 | | | Predecessors: 2:0dec01379d3b | |
1085 | | | semi-colon: 2:0dec01379d3b |
|
1255 | | | semi-colon: 2:0dec01379d3b | |
1086 | | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
1256 | | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | |
1087 | | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
1257 | | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | |
1088 | | | Successors: 4:eb5a0daa2192 |
|
1258 | | | Successors: 4:eb5a0daa2192 | |
1089 | | | multi-line: 4:eb5a0daa2192 |
|
1259 | | | multi-line: 4:eb5a0daa2192 | |
1090 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
1260 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
1091 | | | x 0dec01379d3b |
|
1261 | | | x 0dec01379d3b | |
1092 | | |/ Successors: 3:b7ea6d14e664 |
|
1262 | | |/ Successors: 3:b7ea6d14e664 | |
1093 | | | multi-line: 3:b7ea6d14e664 |
|
1263 | | | multi-line: 3:b7ea6d14e664 | |
1094 | | | json: [["b7ea6d14e664bdc8922221f7992631b50da3fb07"]] |
|
1264 | | | json: [["b7ea6d14e664bdc8922221f7992631b50da3fb07"]] | |
1095 | | x 471f378eab4c |
|
1265 | | x 471f378eab4c | |
1096 | |/ Successors: 4:eb5a0daa2192 |
|
1266 | |/ Successors: 4:eb5a0daa2192 | |
1097 | | multi-line: 4:eb5a0daa2192 |
|
1267 | | multi-line: 4:eb5a0daa2192 | |
1098 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
1268 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
1099 | o ea207398892e |
|
1269 | o ea207398892e | |
1100 |
|
1270 | |||
1101 |
|
1271 | |||
1102 | $ hg fatelog --hidden |
|
1272 | $ hg fatelog --hidden | |
1103 | @ eb5a0daa2192 |
|
1273 | @ eb5a0daa2192 | |
1104 | | |
|
1274 | | | |
1105 | | x b7ea6d14e664 |
|
1275 | | x b7ea6d14e664 | |
1106 | | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
1276 | | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
1107 | | | x 0dec01379d3b |
|
1277 | | | x 0dec01379d3b | |
1108 | | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000); |
|
1278 | | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000); | |
1109 | | x 471f378eab4c |
|
1279 | | x 471f378eab4c | |
1110 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
1280 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
1111 | o ea207398892e |
|
1281 | o ea207398892e | |
1112 |
|
1282 | |||
1113 |
|
1283 | |||
1114 | $ hg fatelogjson --hidden |
|
1284 | $ hg fatelogjson --hidden | |
1115 | @ eb5a0daa2192 |
|
1285 | @ eb5a0daa2192 | |
1116 | | |
|
1286 | | | |
1117 | | x b7ea6d14e664 |
|
1287 | | x b7ea6d14e664 | |
1118 | | | Obsfate: [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] |
|
1288 | | | Obsfate: [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] | |
1119 | | | x 0dec01379d3b |
|
1289 | | | x 0dec01379d3b | |
1120 | | |/ Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"]}] |
|
1290 | | |/ Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"]}] | |
1121 | | x 471f378eab4c |
|
1291 | | x 471f378eab4c | |
1122 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] |
|
1292 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] | |
1123 | o ea207398892e |
|
1293 | o ea207398892e | |
1124 |
|
1294 | |||
1125 |
|
1295 | |||
1126 | Check other fatelog implementations |
|
1296 | Check other fatelog implementations | |
1127 | ----------------------------------- |
|
1297 | ----------------------------------- | |
1128 |
|
1298 | |||
1129 | $ hg fatelogkw --hidden -q |
|
1299 | $ hg fatelogkw --hidden -q | |
1130 | @ eb5a0daa2192 |
|
1300 | @ eb5a0daa2192 | |
1131 | | |
|
1301 | | | |
1132 | | x b7ea6d14e664 |
|
1302 | | x b7ea6d14e664 | |
1133 | | | Obsfate: rewritten as 4:eb5a0daa2192 |
|
1303 | | | Obsfate: rewritten as 4:eb5a0daa2192 | |
1134 | | | x 0dec01379d3b |
|
1304 | | | x 0dec01379d3b | |
1135 | | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 |
|
1305 | | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 | |
1136 | | x 471f378eab4c |
|
1306 | | x 471f378eab4c | |
1137 | |/ Obsfate: rewritten as 4:eb5a0daa2192 |
|
1307 | |/ Obsfate: rewritten as 4:eb5a0daa2192 | |
1138 | o ea207398892e |
|
1308 | o ea207398892e | |
1139 |
|
1309 | |||
1140 | $ hg fatelogkw --hidden |
|
1310 | $ hg fatelogkw --hidden | |
1141 | @ eb5a0daa2192 |
|
1311 | @ eb5a0daa2192 | |
1142 | | |
|
1312 | | | |
1143 | | x b7ea6d14e664 |
|
1313 | | x b7ea6d14e664 | |
1144 | | | Obsfate: rewritten as 4:eb5a0daa2192 |
|
1314 | | | Obsfate: rewritten as 4:eb5a0daa2192 | |
1145 | | | x 0dec01379d3b |
|
1315 | | | x 0dec01379d3b | |
1146 | | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 |
|
1316 | | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 | |
1147 | | x 471f378eab4c |
|
1317 | | x 471f378eab4c | |
1148 | |/ Obsfate: rewritten as 4:eb5a0daa2192 |
|
1318 | |/ Obsfate: rewritten as 4:eb5a0daa2192 | |
1149 | o ea207398892e |
|
1319 | o ea207398892e | |
1150 |
|
1320 | |||
1151 | $ hg fatelogkw --hidden -v |
|
1321 | $ hg fatelogkw --hidden -v | |
1152 | @ eb5a0daa2192 |
|
1322 | @ eb5a0daa2192 | |
1153 | | |
|
1323 | | | |
1154 | | x b7ea6d14e664 |
|
1324 | | x b7ea6d14e664 | |
1155 | | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) |
|
1325 | | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) | |
1156 | | | x 0dec01379d3b |
|
1326 | | | x 0dec01379d3b | |
1157 | | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000) |
|
1327 | | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000) | |
1158 | | x 471f378eab4c |
|
1328 | | x 471f378eab4c | |
1159 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) |
|
1329 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) | |
1160 | o ea207398892e |
|
1330 | o ea207398892e | |
1161 |
|
1331 | |||
|
1332 | $ hg log -G -T "default" --hidden | |||
|
1333 | @ changeset: 4:eb5a0daa2192 | |||
|
1334 | | tag: tip | |||
|
1335 | | parent: 0:ea207398892e | |||
|
1336 | | user: test | |||
|
1337 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1338 | | summary: C0 | |||
|
1339 | | | |||
|
1340 | | x changeset: 3:b7ea6d14e664 | |||
|
1341 | | | parent: 1:471f378eab4c | |||
|
1342 | | | user: test | |||
|
1343 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1344 | | | obsfate: rewritten as 4:eb5a0daa2192 | |||
|
1345 | | | summary: B1 | |||
|
1346 | | | | |||
|
1347 | | | x changeset: 2:0dec01379d3b | |||
|
1348 | | |/ user: test | |||
|
1349 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1350 | | | obsfate: rewritten using amend as 3:b7ea6d14e664 | |||
|
1351 | | | summary: B0 | |||
|
1352 | | | | |||
|
1353 | | x changeset: 1:471f378eab4c | |||
|
1354 | |/ user: test | |||
|
1355 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1356 | | obsfate: rewritten as 4:eb5a0daa2192 | |||
|
1357 | | summary: A0 | |||
|
1358 | | | |||
|
1359 | o changeset: 0:ea207398892e | |||
|
1360 | user: test | |||
|
1361 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1362 | summary: ROOT | |||
|
1363 | ||||
1162 |
|
1364 | |||
1163 | Test template with pushed and pulled obs markers |
|
1365 | Test template with pushed and pulled obs markers | |
1164 | ================================================ |
|
1366 | ================================================ | |
1165 |
|
1367 | |||
1166 | Test setup |
|
1368 | Test setup | |
1167 | ---------- |
|
1369 | ---------- | |
1168 |
|
1370 | |||
1169 | $ hg init $TESTTMP/templates-local-remote-markers-1 |
|
1371 | $ hg init $TESTTMP/templates-local-remote-markers-1 | |
1170 | $ cd $TESTTMP/templates-local-remote-markers-1 |
|
1372 | $ cd $TESTTMP/templates-local-remote-markers-1 | |
1171 | $ mkcommit ROOT |
|
1373 | $ mkcommit ROOT | |
1172 | $ mkcommit A0 |
|
1374 | $ mkcommit A0 | |
1173 | $ hg clone $TESTTMP/templates-local-remote-markers-1 $TESTTMP/templates-local-remote-markers-2 |
|
1375 | $ hg clone $TESTTMP/templates-local-remote-markers-1 $TESTTMP/templates-local-remote-markers-2 | |
1174 | updating to branch default |
|
1376 | updating to branch default | |
1175 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1377 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1176 | $ cd $TESTTMP/templates-local-remote-markers-2 |
|
1378 | $ cd $TESTTMP/templates-local-remote-markers-2 | |
1177 | $ hg log --hidden -G |
|
1379 | $ hg log --hidden -G | |
1178 | @ changeset: 1:471f378eab4c |
|
1380 | @ changeset: 1:471f378eab4c | |
1179 | | tag: tip |
|
1381 | | tag: tip | |
1180 | | user: test |
|
1382 | | user: test | |
1181 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1383 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1182 | | summary: A0 |
|
1384 | | summary: A0 | |
1183 | | |
|
1385 | | | |
1184 | o changeset: 0:ea207398892e |
|
1386 | o changeset: 0:ea207398892e | |
1185 | user: test |
|
1387 | user: test | |
1186 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1388 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1187 | summary: ROOT |
|
1389 | summary: ROOT | |
1188 |
|
1390 | |||
1189 | $ cd $TESTTMP/templates-local-remote-markers-1 |
|
1391 | $ cd $TESTTMP/templates-local-remote-markers-1 | |
1190 | $ hg commit --amend -m "A1" |
|
1392 | $ hg commit --amend -m "A1" | |
1191 | $ hg commit --amend -m "A2" |
|
1393 | $ hg commit --amend -m "A2" | |
1192 | $ hg log --hidden -G |
|
1394 | $ hg log --hidden -G | |
1193 | @ changeset: 3:7a230b46bf61 |
|
1395 | @ changeset: 3:7a230b46bf61 | |
1194 | | tag: tip |
|
1396 | | tag: tip | |
1195 | | parent: 0:ea207398892e |
|
1397 | | parent: 0:ea207398892e | |
1196 | | user: test |
|
1398 | | user: test | |
1197 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1399 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1198 | | summary: A2 |
|
1400 | | summary: A2 | |
1199 | | |
|
1401 | | | |
1200 | | x changeset: 2:fdf9bde5129a |
|
1402 | | x changeset: 2:fdf9bde5129a | |
1201 | |/ parent: 0:ea207398892e |
|
1403 | |/ parent: 0:ea207398892e | |
1202 | | user: test |
|
1404 | | user: test | |
1203 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1405 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1204 | | obsfate: rewritten using amend as 3:7a230b46bf61 |
|
1406 | | obsfate: rewritten using amend as 3:7a230b46bf61 | |
1205 | | summary: A1 |
|
1407 | | summary: A1 | |
1206 | | |
|
1408 | | | |
1207 | | x changeset: 1:471f378eab4c |
|
1409 | | x changeset: 1:471f378eab4c | |
1208 | |/ user: test |
|
1410 | |/ user: test | |
1209 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1411 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1210 | | obsfate: rewritten using amend as 2:fdf9bde5129a |
|
1412 | | obsfate: rewritten using amend as 2:fdf9bde5129a | |
1211 | | summary: A0 |
|
1413 | | summary: A0 | |
1212 | | |
|
1414 | | | |
1213 | o changeset: 0:ea207398892e |
|
1415 | o changeset: 0:ea207398892e | |
1214 | user: test |
|
1416 | user: test | |
1215 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1417 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1216 | summary: ROOT |
|
1418 | summary: ROOT | |
1217 |
|
1419 | |||
1218 | $ cd $TESTTMP/templates-local-remote-markers-2 |
|
1420 | $ cd $TESTTMP/templates-local-remote-markers-2 | |
1219 | $ hg pull |
|
1421 | $ hg pull | |
1220 | pulling from $TESTTMP/templates-local-remote-markers-1 (glob) |
|
1422 | pulling from $TESTTMP/templates-local-remote-markers-1 (glob) | |
1221 | searching for changes |
|
1423 | searching for changes | |
1222 | adding changesets |
|
1424 | adding changesets | |
1223 | adding manifests |
|
1425 | adding manifests | |
1224 | adding file changes |
|
1426 | adding file changes | |
1225 | added 1 changesets with 0 changes to 1 files (+1 heads) |
|
1427 | added 1 changesets with 0 changes to 1 files (+1 heads) | |
1226 | 2 new obsolescence markers |
|
1428 | 2 new obsolescence markers | |
1227 | obsoleted 1 changesets |
|
1429 | obsoleted 1 changesets | |
1228 | new changesets 7a230b46bf61 |
|
1430 | new changesets 7a230b46bf61 | |
1229 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
1431 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
1230 | $ hg log --hidden -G |
|
1432 | $ hg log --hidden -G | |
1231 | o changeset: 2:7a230b46bf61 |
|
1433 | o changeset: 2:7a230b46bf61 | |
1232 | | tag: tip |
|
1434 | | tag: tip | |
1233 | | parent: 0:ea207398892e |
|
1435 | | parent: 0:ea207398892e | |
1234 | | user: test |
|
1436 | | user: test | |
1235 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1437 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1236 | | summary: A2 |
|
1438 | | summary: A2 | |
1237 | | |
|
1439 | | | |
1238 | | @ changeset: 1:471f378eab4c |
|
1440 | | @ changeset: 1:471f378eab4c | |
1239 | |/ user: test |
|
1441 | |/ user: test | |
1240 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1442 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1241 | | obsfate: rewritten using amend as 2:7a230b46bf61 |
|
1443 | | obsfate: rewritten using amend as 2:7a230b46bf61 | |
1242 | | summary: A0 |
|
1444 | | summary: A0 | |
1243 | | |
|
1445 | | | |
1244 | o changeset: 0:ea207398892e |
|
1446 | o changeset: 0:ea207398892e | |
1245 | user: test |
|
1447 | user: test | |
1246 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1448 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1247 | summary: ROOT |
|
1449 | summary: ROOT | |
1248 |
|
1450 | |||
1249 |
|
1451 | |||
1250 | $ hg debugobsolete |
|
1452 | $ hg debugobsolete | |
1251 | 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
|
1453 | 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} | |
1252 | fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 7a230b46bf61e50b30308c6cfd7bd1269ef54702 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
|
1454 | fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 7a230b46bf61e50b30308c6cfd7bd1269ef54702 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} | |
1253 |
|
1455 | |||
1254 | Check templates |
|
1456 | Check templates | |
1255 | --------------- |
|
1457 | --------------- | |
1256 |
|
1458 | |||
1257 | Predecessors template should show current revision as it is the working copy |
|
1459 | Predecessors template should show current revision as it is the working copy | |
1258 | $ hg tlog |
|
1460 | $ hg tlog | |
1259 | o 7a230b46bf61 |
|
1461 | o 7a230b46bf61 | |
1260 | | Predecessors: 1:471f378eab4c |
|
1462 | | Predecessors: 1:471f378eab4c | |
1261 | | semi-colon: 1:471f378eab4c |
|
1463 | | semi-colon: 1:471f378eab4c | |
1262 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
1464 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
1263 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
1465 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
1264 | | @ 471f378eab4c |
|
1466 | | @ 471f378eab4c | |
1265 | |/ Successors: 2:7a230b46bf61 |
|
1467 | |/ Successors: 2:7a230b46bf61 | |
1266 | | multi-line: 2:7a230b46bf61 |
|
1468 | | multi-line: 2:7a230b46bf61 | |
1267 | | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]] |
|
1469 | | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]] | |
1268 | o ea207398892e |
|
1470 | o ea207398892e | |
1269 |
|
1471 | |||
1270 |
|
1472 | |||
1271 | $ hg fatelog |
|
1473 | $ hg fatelog | |
1272 | o 7a230b46bf61 |
|
1474 | o 7a230b46bf61 | |
1273 | | |
|
1475 | | | |
1274 | | @ 471f378eab4c |
|
1476 | | @ 471f378eab4c | |
1275 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000); |
|
1477 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000); | |
1276 |
|
|
1478 | o ea207398892e | |
1277 |
|
1479 | |||
1278 | $ hg up 'desc(A2)' |
|
1480 | $ hg up 'desc(A2)' | |
1279 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1481 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1280 |
|
1482 | |||
1281 | Predecessors template should show no predecessors as they are non visible |
|
1483 | Predecessors template should show no predecessors as they are non visible | |
1282 | $ hg tlog |
|
1484 | $ hg tlog | |
1283 | @ 7a230b46bf61 |
|
1485 | @ 7a230b46bf61 | |
1284 | | |
|
1486 | | | |
1285 | o ea207398892e |
|
1487 | o ea207398892e | |
1286 |
|
1488 | |||
1287 |
|
1489 | |||
1288 | $ hg fatelog |
|
1490 | $ hg fatelog | |
1289 | @ 7a230b46bf61 |
|
1491 | @ 7a230b46bf61 | |
1290 | | |
|
1492 | | | |
1291 | o ea207398892e |
|
1493 | o ea207398892e | |
1292 |
|
1494 | |||
1293 | Predecessors template should show all predecessors as we force their display |
|
1495 | Predecessors template should show all predecessors as we force their display | |
1294 | with --hidden |
|
1496 | with --hidden | |
1295 | $ hg tlog --hidden |
|
1497 | $ hg tlog --hidden | |
1296 | @ 7a230b46bf61 |
|
1498 | @ 7a230b46bf61 | |
1297 | | Predecessors: 1:471f378eab4c |
|
1499 | | Predecessors: 1:471f378eab4c | |
1298 | | semi-colon: 1:471f378eab4c |
|
1500 | | semi-colon: 1:471f378eab4c | |
1299 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
1501 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
1300 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
1502 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
1301 | | x 471f378eab4c |
|
1503 | | x 471f378eab4c | |
1302 | |/ Successors: 2:7a230b46bf61 |
|
1504 | |/ Successors: 2:7a230b46bf61 | |
1303 | | multi-line: 2:7a230b46bf61 |
|
1505 | | multi-line: 2:7a230b46bf61 | |
1304 | | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]] |
|
1506 | | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]] | |
1305 | o ea207398892e |
|
1507 | o ea207398892e | |
1306 |
|
1508 | |||
1307 |
|
1509 | |||
1308 | $ hg fatelog --hidden |
|
1510 | $ hg fatelog --hidden | |
1309 | @ 7a230b46bf61 |
|
1511 | @ 7a230b46bf61 | |
1310 | | |
|
1512 | | | |
1311 | | x 471f378eab4c |
|
1513 | | x 471f378eab4c | |
1312 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000); |
|
1514 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000); | |
1313 |
|
|
1515 | o ea207398892e | |
1314 |
|
1516 | |||
1315 |
|
1517 | |||
1316 | Check other fatelog implementations |
|
1518 | Check other fatelog implementations | |
1317 | ----------------------------------- |
|
1519 | ----------------------------------- | |
1318 |
|
1520 | |||
1319 | $ hg fatelogkw --hidden -q |
|
1521 | $ hg fatelogkw --hidden -q | |
1320 | @ 7a230b46bf61 |
|
1522 | @ 7a230b46bf61 | |
1321 | | |
|
1523 | | | |
1322 | | x 471f378eab4c |
|
1524 | | x 471f378eab4c | |
1323 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 |
|
1525 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 | |
1324 | o ea207398892e |
|
1526 | o ea207398892e | |
1325 |
|
1527 | |||
1326 | $ hg fatelogkw --hidden |
|
1528 | $ hg fatelogkw --hidden | |
1327 | @ 7a230b46bf61 |
|
1529 | @ 7a230b46bf61 | |
1328 | | |
|
1530 | | | |
1329 | | x 471f378eab4c |
|
1531 | | x 471f378eab4c | |
1330 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 |
|
1532 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 | |
1331 | o ea207398892e |
|
1533 | o ea207398892e | |
1332 |
|
1534 | |||
1333 | $ hg fatelogkw --hidden -v |
|
1535 | $ hg fatelogkw --hidden -v | |
1334 | @ 7a230b46bf61 |
|
1536 | @ 7a230b46bf61 | |
1335 | | |
|
1537 | | | |
1336 | | x 471f378eab4c |
|
1538 | | x 471f378eab4c | |
1337 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000) |
|
1539 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000) | |
1338 | o ea207398892e |
|
1540 | o ea207398892e | |
1339 |
|
1541 | |||
|
1542 | $ hg log -G -T "default" --hidden | |||
|
1543 | @ changeset: 2:7a230b46bf61 | |||
|
1544 | | tag: tip | |||
|
1545 | | parent: 0:ea207398892e | |||
|
1546 | | user: test | |||
|
1547 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1548 | | summary: A2 | |||
|
1549 | | | |||
|
1550 | | x changeset: 1:471f378eab4c | |||
|
1551 | |/ user: test | |||
|
1552 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1553 | | obsfate: rewritten using amend as 2:7a230b46bf61 | |||
|
1554 | | summary: A0 | |||
|
1555 | | | |||
|
1556 | o changeset: 0:ea207398892e | |||
|
1557 | user: test | |||
|
1558 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1559 | summary: ROOT | |||
|
1560 | ||||
1340 |
|
1561 | |||
1341 | Test template with obsmarkers cycle |
|
1562 | Test template with obsmarkers cycle | |
1342 | =================================== |
|
1563 | =================================== | |
1343 |
|
1564 | |||
1344 | Test setup |
|
1565 | Test setup | |
1345 | ---------- |
|
1566 | ---------- | |
1346 |
|
1567 | |||
1347 | $ hg init $TESTTMP/templates-local-cycle |
|
1568 | $ hg init $TESTTMP/templates-local-cycle | |
1348 | $ cd $TESTTMP/templates-local-cycle |
|
1569 | $ cd $TESTTMP/templates-local-cycle | |
1349 | $ mkcommit ROOT |
|
1570 | $ mkcommit ROOT | |
1350 | $ mkcommit A0 |
|
1571 | $ mkcommit A0 | |
1351 | $ mkcommit B0 |
|
1572 | $ mkcommit B0 | |
1352 | $ hg up -r 0 |
|
1573 | $ hg up -r 0 | |
1353 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1574 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
1354 | $ mkcommit C0 |
|
1575 | $ mkcommit C0 | |
1355 | created new head |
|
1576 | created new head | |
1356 |
|
1577 | |||
1357 | Create the cycle |
|
1578 | Create the cycle | |
1358 |
|
1579 | |||
1359 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` |
|
1580 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` | |
1360 | obsoleted 1 changesets |
|
1581 | obsoleted 1 changesets | |
1361 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
|
1582 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` | |
1362 | obsoleted 1 changesets |
|
1583 | obsoleted 1 changesets | |
1363 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` |
|
1584 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` | |
1364 |
|
1585 | |||
1365 | Check templates |
|
1586 | Check templates | |
1366 | --------------- |
|
1587 | --------------- | |
1367 |
|
1588 | |||
1368 | $ hg tlog |
|
1589 | $ hg tlog | |
1369 | @ f897c6137566 |
|
1590 | @ f897c6137566 | |
1370 | | |
|
1591 | | | |
1371 | o ea207398892e |
|
1592 | o ea207398892e | |
1372 |
|
1593 | |||
1373 |
|
1594 | |||
1374 | $ hg fatelog |
|
1595 | $ hg fatelog | |
1375 | @ f897c6137566 |
|
1596 | @ f897c6137566 | |
1376 | | |
|
1597 | | | |
1377 | o ea207398892e |
|
1598 | o ea207398892e | |
1378 |
|
1599 | |||
1379 |
|
1600 | |||
1380 | $ hg up -r "desc(B0)" --hidden |
|
1601 | $ hg up -r "desc(B0)" --hidden | |
1381 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1602 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1382 | $ hg tlog |
|
1603 | $ hg tlog | |
1383 | o f897c6137566 |
|
1604 | o f897c6137566 | |
1384 | | Predecessors: 2:0dec01379d3b |
|
1605 | | Predecessors: 2:0dec01379d3b | |
1385 | | semi-colon: 2:0dec01379d3b |
|
1606 | | semi-colon: 2:0dec01379d3b | |
1386 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
1607 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | |
1387 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
1608 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | |
1388 | | @ 0dec01379d3b |
|
1609 | | @ 0dec01379d3b | |
1389 | | | Predecessors: 1:471f378eab4c |
|
1610 | | | Predecessors: 1:471f378eab4c | |
1390 | | | semi-colon: 1:471f378eab4c |
|
1611 | | | semi-colon: 1:471f378eab4c | |
1391 | | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
1612 | | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
1392 | | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
1613 | | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
1393 |
| | Successors: 3:f897c6137566; |
|
1614 | | | Successors: 3:f897c6137566; 1:471f378eab4c | |
1394 | | | multi-line: 3:f897c6137566 |
|
1615 | | | multi-line: 3:f897c6137566 | |
1395 | | | multi-line: 1:471f378eab4c |
|
1616 | | | multi-line: 1:471f378eab4c | |
1396 | | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] |
|
1617 | | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] | |
1397 | | x 471f378eab4c |
|
1618 | | x 471f378eab4c | |
1398 | |/ Predecessors: 2:0dec01379d3b |
|
1619 | |/ Predecessors: 2:0dec01379d3b | |
1399 | | semi-colon: 2:0dec01379d3b |
|
1620 | | semi-colon: 2:0dec01379d3b | |
1400 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
1621 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | |
1401 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
1622 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | |
1402 | | Successors: 2:0dec01379d3b |
|
1623 | | Successors: 2:0dec01379d3b | |
1403 | | multi-line: 2:0dec01379d3b |
|
1624 | | multi-line: 2:0dec01379d3b | |
1404 | | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
|
1625 | | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] | |
1405 | o ea207398892e |
|
1626 | o ea207398892e | |
1406 |
|
1627 | |||
1407 |
|
1628 | |||
1408 | $ hg fatelog |
|
1629 | $ hg fatelog | |
1409 | o f897c6137566 |
|
1630 | o f897c6137566 | |
1410 | | |
|
1631 | | | |
1411 | | @ 0dec01379d3b |
|
1632 | | @ 0dec01379d3b | |
1412 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000); rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000); |
|
1633 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000); rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000); | |
1413 | | x 471f378eab4c |
|
1634 | | x 471f378eab4c | |
1414 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000); |
|
1635 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000); | |
1415 | o ea207398892e |
|
1636 | o ea207398892e | |
1416 |
|
1637 | |||
1417 |
|
1638 | |||
1418 | $ hg up -r "desc(A0)" --hidden |
|
1639 | $ hg up -r "desc(A0)" --hidden | |
1419 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1640 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1420 | $ hg tlog |
|
1641 | $ hg tlog | |
1421 | o f897c6137566 |
|
1642 | o f897c6137566 | |
1422 | | Predecessors: 1:471f378eab4c |
|
1643 | | Predecessors: 1:471f378eab4c | |
1423 | | semi-colon: 1:471f378eab4c |
|
1644 | | semi-colon: 1:471f378eab4c | |
1424 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
1645 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
1425 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
1646 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
1426 | | @ 471f378eab4c |
|
1647 | | @ 471f378eab4c | |
1427 | |/ |
|
1648 | |/ | |
1428 | o ea207398892e |
|
1649 | o ea207398892e | |
1429 |
|
1650 | |||
1430 |
|
1651 | |||
1431 | $ hg fatelog |
|
1652 | $ hg fatelog | |
1432 | o f897c6137566 |
|
1653 | o f897c6137566 | |
1433 | | |
|
1654 | | | |
1434 | | @ 471f378eab4c |
|
1655 | | @ 471f378eab4c | |
1435 | |/ Obsfate: pruned; |
|
1656 | |/ Obsfate: pruned; | |
1436 | o ea207398892e |
|
1657 | o ea207398892e | |
1437 |
|
1658 | |||
1438 |
|
1659 | |||
1439 | $ hg up -r "desc(ROOT)" --hidden |
|
1660 | $ hg up -r "desc(ROOT)" --hidden | |
1440 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1661 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1441 | $ hg tlog |
|
1662 | $ hg tlog | |
1442 | o f897c6137566 |
|
1663 | o f897c6137566 | |
1443 | | |
|
1664 | | | |
1444 | @ ea207398892e |
|
1665 | @ ea207398892e | |
1445 |
|
1666 | |||
1446 |
|
1667 | |||
1447 | $ hg fatelog |
|
1668 | $ hg fatelog | |
1448 | o f897c6137566 |
|
1669 | o f897c6137566 | |
1449 | | |
|
1670 | | | |
1450 | @ ea207398892e |
|
1671 | @ ea207398892e | |
1451 |
|
1672 | |||
1452 |
|
1673 | |||
1453 | $ hg tlog --hidden |
|
1674 | $ hg tlog --hidden | |
1454 | o f897c6137566 |
|
1675 | o f897c6137566 | |
1455 | | Predecessors: 2:0dec01379d3b |
|
1676 | | Predecessors: 2:0dec01379d3b | |
1456 | | semi-colon: 2:0dec01379d3b |
|
1677 | | semi-colon: 2:0dec01379d3b | |
1457 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
1678 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | |
1458 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
1679 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | |
1459 | | x 0dec01379d3b |
|
1680 | | x 0dec01379d3b | |
1460 | | | Predecessors: 1:471f378eab4c |
|
1681 | | | Predecessors: 1:471f378eab4c | |
1461 | | | semi-colon: 1:471f378eab4c |
|
1682 | | | semi-colon: 1:471f378eab4c | |
1462 | | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
1683 | | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
1463 | | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
1684 | | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
1464 | | | Successors: 3:f897c6137566; 1:471f378eab4c |
|
1685 | | | Successors: 3:f897c6137566; 1:471f378eab4c | |
1465 | | | multi-line: 3:f897c6137566 |
|
1686 | | | multi-line: 3:f897c6137566 | |
1466 | | | multi-line: 1:471f378eab4c |
|
1687 | | | multi-line: 1:471f378eab4c | |
1467 | | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] |
|
1688 | | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] | |
1468 | | x 471f378eab4c |
|
1689 | | x 471f378eab4c | |
1469 | |/ Predecessors: 2:0dec01379d3b |
|
1690 | |/ Predecessors: 2:0dec01379d3b | |
1470 | | semi-colon: 2:0dec01379d3b |
|
1691 | | semi-colon: 2:0dec01379d3b | |
1471 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
1692 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | |
1472 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
1693 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | |
1473 | | Successors: 2:0dec01379d3b |
|
1694 | | Successors: 2:0dec01379d3b | |
1474 | | multi-line: 2:0dec01379d3b |
|
1695 | | multi-line: 2:0dec01379d3b | |
1475 | | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
|
1696 | | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] | |
1476 | @ ea207398892e |
|
1697 | @ ea207398892e | |
1477 |
|
1698 | |||
1478 |
|
1699 | |||
1479 | Check other fatelog implementations |
|
1700 | Check other fatelog implementations | |
1480 | ----------------------------------- |
|
1701 | ----------------------------------- | |
1481 |
|
1702 | |||
1482 | $ hg fatelogkw --hidden -q |
|
1703 | $ hg fatelogkw --hidden -q | |
1483 | o f897c6137566 |
|
1704 | o f897c6137566 | |
1484 | | |
|
1705 | | | |
1485 | | x 0dec01379d3b |
|
1706 | | x 0dec01379d3b | |
1486 | | | Obsfate: rewritten as 3:f897c6137566 |
|
1707 | | | Obsfate: rewritten as 3:f897c6137566 | |
1487 | | | Obsfate: rewritten as 1:471f378eab4c |
|
1708 | | | Obsfate: rewritten as 1:471f378eab4c | |
1488 | | x 471f378eab4c |
|
1709 | | x 471f378eab4c | |
1489 | |/ Obsfate: rewritten as 2:0dec01379d3b |
|
1710 | |/ Obsfate: rewritten as 2:0dec01379d3b | |
1490 | @ ea207398892e |
|
1711 | @ ea207398892e | |
1491 |
|
1712 | |||
1492 | $ hg fatelogkw --hidden |
|
1713 | $ hg fatelogkw --hidden | |
1493 | o f897c6137566 |
|
1714 | o f897c6137566 | |
1494 | | |
|
1715 | | | |
1495 | | x 0dec01379d3b |
|
1716 | | x 0dec01379d3b | |
1496 | | | Obsfate: rewritten as 3:f897c6137566 |
|
1717 | | | Obsfate: rewritten as 3:f897c6137566 | |
1497 | | | Obsfate: rewritten as 1:471f378eab4c |
|
1718 | | | Obsfate: rewritten as 1:471f378eab4c | |
1498 | | x 471f378eab4c |
|
1719 | | x 471f378eab4c | |
1499 | |/ Obsfate: rewritten as 2:0dec01379d3b |
|
1720 | |/ Obsfate: rewritten as 2:0dec01379d3b | |
1500 | @ ea207398892e |
|
1721 | @ ea207398892e | |
1501 |
|
1722 | |||
1502 | $ hg fatelogkw --hidden -v |
|
1723 | $ hg fatelogkw --hidden -v | |
1503 | o f897c6137566 |
|
1724 | o f897c6137566 | |
1504 | | |
|
1725 | | | |
1505 | | x 0dec01379d3b |
|
1726 | | x 0dec01379d3b | |
1506 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000) |
|
1727 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000) | |
1507 | | | Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000) |
|
1728 | | | Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000) | |
1508 | | x 471f378eab4c |
|
1729 | | x 471f378eab4c | |
1509 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000) |
|
1730 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000) | |
1510 | @ ea207398892e |
|
1731 | @ ea207398892e | |
1511 |
|
1732 | |||
|
1733 | $ hg log -G -T "default" --hidden | |||
|
1734 | o changeset: 3:f897c6137566 | |||
|
1735 | | tag: tip | |||
|
1736 | | parent: 0:ea207398892e | |||
|
1737 | | user: test | |||
|
1738 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1739 | | summary: C0 | |||
|
1740 | | | |||
|
1741 | | x changeset: 2:0dec01379d3b | |||
|
1742 | | | user: test | |||
|
1743 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1744 | | | obsfate: rewritten as 3:f897c6137566 | |||
|
1745 | | | obsfate: rewritten as 1:471f378eab4c | |||
|
1746 | | | summary: B0 | |||
|
1747 | | | | |||
|
1748 | | x changeset: 1:471f378eab4c | |||
|
1749 | |/ user: test | |||
|
1750 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1751 | | obsfate: rewritten as 2:0dec01379d3b | |||
|
1752 | | summary: A0 | |||
|
1753 | | | |||
|
1754 | @ changeset: 0:ea207398892e | |||
|
1755 | user: test | |||
|
1756 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1757 | summary: ROOT | |||
|
1758 | ||||
1512 |
|
1759 | |||
1513 | Test template with split + divergence with cycles |
|
1760 | Test template with split + divergence with cycles | |
1514 | ================================================= |
|
1761 | ================================================= | |
1515 |
|
1762 | |||
1516 | $ hg log -G |
|
1763 | $ hg log -G | |
1517 | o changeset: 3:f897c6137566 |
|
1764 | o changeset: 3:f897c6137566 | |
1518 | | tag: tip |
|
1765 | | tag: tip | |
1519 | | parent: 0:ea207398892e |
|
1766 | | parent: 0:ea207398892e | |
1520 | | user: test |
|
1767 | | user: test | |
1521 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1768 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1522 | | summary: C0 |
|
1769 | | summary: C0 | |
1523 | | |
|
1770 | | | |
1524 | @ changeset: 0:ea207398892e |
|
1771 | @ changeset: 0:ea207398892e | |
1525 | user: test |
|
1772 | user: test | |
1526 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1773 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1527 | summary: ROOT |
|
1774 | summary: ROOT | |
1528 |
|
1775 | |||
1529 | $ hg up |
|
1776 | $ hg up | |
1530 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1777 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1531 |
|
1778 | |||
1532 | Create a commit with three files |
|
1779 | Create a commit with three files | |
1533 | $ touch A B C |
|
1780 | $ touch A B C | |
1534 | $ hg commit -A -m "Add A,B,C" A B C |
|
1781 | $ hg commit -A -m "Add A,B,C" A B C | |
1535 |
|
1782 | |||
1536 | Split it |
|
1783 | Split it | |
1537 | $ hg up 3 |
|
1784 | $ hg up 3 | |
1538 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
1785 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
1539 | $ touch A |
|
1786 | $ touch A | |
1540 | $ hg commit -A -m "Add A,B,C" A |
|
1787 | $ hg commit -A -m "Add A,B,C" A | |
1541 | created new head |
|
1788 | created new head | |
1542 |
|
1789 | |||
1543 | $ touch B |
|
1790 | $ touch B | |
1544 | $ hg commit -A -m "Add A,B,C" B |
|
1791 | $ hg commit -A -m "Add A,B,C" B | |
1545 |
|
1792 | |||
1546 | $ touch C |
|
1793 | $ touch C | |
1547 | $ hg commit -A -m "Add A,B,C" C |
|
1794 | $ hg commit -A -m "Add A,B,C" C | |
1548 |
|
1795 | |||
1549 | $ hg log -G |
|
1796 | $ hg log -G | |
1550 | @ changeset: 7:ba2ed02b0c9a |
|
1797 | @ changeset: 7:ba2ed02b0c9a | |
1551 | | tag: tip |
|
1798 | | tag: tip | |
1552 | | user: test |
|
1799 | | user: test | |
1553 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1800 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1554 | | summary: Add A,B,C |
|
1801 | | summary: Add A,B,C | |
1555 | | |
|
1802 | | | |
1556 | o changeset: 6:4a004186e638 |
|
1803 | o changeset: 6:4a004186e638 | |
1557 | | user: test |
|
1804 | | user: test | |
1558 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1805 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1559 | | summary: Add A,B,C |
|
1806 | | summary: Add A,B,C | |
1560 | | |
|
1807 | | | |
1561 | o changeset: 5:dd800401bd8c |
|
1808 | o changeset: 5:dd800401bd8c | |
1562 | | parent: 3:f897c6137566 |
|
1809 | | parent: 3:f897c6137566 | |
1563 | | user: test |
|
1810 | | user: test | |
1564 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1811 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1565 | | summary: Add A,B,C |
|
1812 | | summary: Add A,B,C | |
1566 | | |
|
1813 | | | |
1567 | | o changeset: 4:9bd10a0775e4 |
|
1814 | | o changeset: 4:9bd10a0775e4 | |
1568 | |/ user: test |
|
1815 | |/ user: test | |
1569 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1816 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1570 | | summary: Add A,B,C |
|
1817 | | summary: Add A,B,C | |
1571 | | |
|
1818 | | | |
1572 | o changeset: 3:f897c6137566 |
|
1819 | o changeset: 3:f897c6137566 | |
1573 | | parent: 0:ea207398892e |
|
1820 | | parent: 0:ea207398892e | |
1574 | | user: test |
|
1821 | | user: test | |
1575 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1822 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1576 | | summary: C0 |
|
1823 | | summary: C0 | |
1577 | | |
|
1824 | | | |
1578 | o changeset: 0:ea207398892e |
|
1825 | o changeset: 0:ea207398892e | |
1579 | user: test |
|
1826 | user: test | |
1580 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1827 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1581 | summary: ROOT |
|
1828 | summary: ROOT | |
1582 |
|
1829 | |||
1583 | $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"` |
|
1830 | $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"` | |
1584 | obsoleted 1 changesets |
|
1831 | obsoleted 1 changesets | |
1585 | $ hg log -G |
|
1832 | $ hg log -G | |
1586 | @ changeset: 7:ba2ed02b0c9a |
|
1833 | @ changeset: 7:ba2ed02b0c9a | |
1587 | | tag: tip |
|
1834 | | tag: tip | |
1588 | | user: test |
|
1835 | | user: test | |
1589 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1836 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1590 | | summary: Add A,B,C |
|
1837 | | summary: Add A,B,C | |
1591 | | |
|
1838 | | | |
1592 | o changeset: 6:4a004186e638 |
|
1839 | o changeset: 6:4a004186e638 | |
1593 | | user: test |
|
1840 | | user: test | |
1594 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1841 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1595 | | summary: Add A,B,C |
|
1842 | | summary: Add A,B,C | |
1596 | | |
|
1843 | | | |
1597 | o changeset: 5:dd800401bd8c |
|
1844 | o changeset: 5:dd800401bd8c | |
1598 | | parent: 3:f897c6137566 |
|
1845 | | parent: 3:f897c6137566 | |
1599 | | user: test |
|
1846 | | user: test | |
1600 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1847 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1601 | | summary: Add A,B,C |
|
1848 | | summary: Add A,B,C | |
1602 | | |
|
1849 | | | |
1603 | o changeset: 3:f897c6137566 |
|
1850 | o changeset: 3:f897c6137566 | |
1604 | | parent: 0:ea207398892e |
|
1851 | | parent: 0:ea207398892e | |
1605 | | user: test |
|
1852 | | user: test | |
1606 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1853 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1607 | | summary: C0 |
|
1854 | | summary: C0 | |
1608 | | |
|
1855 | | | |
1609 | o changeset: 0:ea207398892e |
|
1856 | o changeset: 0:ea207398892e | |
1610 | user: test |
|
1857 | user: test | |
1611 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1858 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1612 | summary: ROOT |
|
1859 | summary: ROOT | |
1613 |
|
1860 | |||
1614 | Diverge one of the splitted commit |
|
1861 | Diverge one of the splitted commit | |
1615 |
|
1862 | |||
1616 | $ hg up 6 |
|
1863 | $ hg up 6 | |
1617 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1864 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1618 | $ hg commit --amend -m "Add only B" |
|
1865 | $ hg commit --amend -m "Add only B" | |
1619 |
|
1866 | |||
1620 | $ hg up 6 --hidden |
|
1867 | $ hg up 6 --hidden | |
1621 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1868 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1622 | $ hg commit --amend -m "Add B only" |
|
1869 | $ hg commit --amend -m "Add B only" | |
1623 |
|
1870 | |||
1624 | $ hg log -G |
|
1871 | $ hg log -G | |
1625 | @ changeset: 9:0b997eb7ceee |
|
1872 | @ changeset: 9:0b997eb7ceee | |
1626 | | tag: tip |
|
1873 | | tag: tip | |
1627 | | parent: 5:dd800401bd8c |
|
1874 | | parent: 5:dd800401bd8c | |
1628 | | user: test |
|
1875 | | user: test | |
1629 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1876 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1630 | | instability: content-divergent |
|
1877 | | instability: content-divergent | |
1631 | | summary: Add B only |
|
1878 | | summary: Add B only | |
1632 | | |
|
1879 | | | |
1633 | | o changeset: 8:b18bc8331526 |
|
1880 | | o changeset: 8:b18bc8331526 | |
1634 | |/ parent: 5:dd800401bd8c |
|
1881 | |/ parent: 5:dd800401bd8c | |
1635 | | user: test |
|
1882 | | user: test | |
1636 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1883 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1637 | | instability: content-divergent |
|
1884 | | instability: content-divergent | |
1638 | | summary: Add only B |
|
1885 | | summary: Add only B | |
1639 | | |
|
1886 | | | |
1640 | | o changeset: 7:ba2ed02b0c9a |
|
1887 | | o changeset: 7:ba2ed02b0c9a | |
1641 | | | user: test |
|
1888 | | | user: test | |
1642 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1889 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1643 | | | instability: orphan, content-divergent |
|
1890 | | | instability: orphan, content-divergent | |
1644 | | | summary: Add A,B,C |
|
1891 | | | summary: Add A,B,C | |
1645 | | | |
|
1892 | | | | |
1646 | | x changeset: 6:4a004186e638 |
|
1893 | | x changeset: 6:4a004186e638 | |
1647 | |/ user: test |
|
1894 | |/ user: test | |
1648 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1895 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1649 | | obsfate: rewritten using amend as 8:b18bc8331526 |
|
1896 | | obsfate: rewritten using amend as 8:b18bc8331526 | |
1650 | | obsfate: rewritten using amend as 9:0b997eb7ceee |
|
1897 | | obsfate: rewritten using amend as 9:0b997eb7ceee | |
1651 | | summary: Add A,B,C |
|
1898 | | summary: Add A,B,C | |
1652 | | |
|
1899 | | | |
1653 | o changeset: 5:dd800401bd8c |
|
1900 | o changeset: 5:dd800401bd8c | |
1654 | | parent: 3:f897c6137566 |
|
1901 | | parent: 3:f897c6137566 | |
1655 | | user: test |
|
1902 | | user: test | |
1656 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1903 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1657 | | instability: content-divergent |
|
1904 | | instability: content-divergent | |
1658 | | summary: Add A,B,C |
|
1905 | | summary: Add A,B,C | |
1659 | | |
|
1906 | | | |
1660 | o changeset: 3:f897c6137566 |
|
1907 | o changeset: 3:f897c6137566 | |
1661 | | parent: 0:ea207398892e |
|
1908 | | parent: 0:ea207398892e | |
1662 | | user: test |
|
1909 | | user: test | |
1663 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1910 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1664 | | summary: C0 |
|
1911 | | summary: C0 | |
1665 | | |
|
1912 | | | |
1666 | o changeset: 0:ea207398892e |
|
1913 | o changeset: 0:ea207398892e | |
1667 | user: test |
|
1914 | user: test | |
1668 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1915 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1669 | summary: ROOT |
|
1916 | summary: ROOT | |
1670 |
|
1917 | |||
1671 |
|
1918 | |||
1672 | Check templates |
|
1919 | Check templates | |
1673 | --------------- |
|
1920 | --------------- | |
1674 |
|
1921 | |||
1675 | $ hg tlog |
|
1922 | $ hg tlog | |
1676 | @ 0b997eb7ceee |
|
1923 | @ 0b997eb7ceee | |
1677 | | Predecessors: 6:4a004186e638 |
|
1924 | | Predecessors: 6:4a004186e638 | |
1678 | | semi-colon: 6:4a004186e638 |
|
1925 | | semi-colon: 6:4a004186e638 | |
1679 | | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
|
1926 | | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] | |
1680 | | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
|
1927 | | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace | |
1681 | | o b18bc8331526 |
|
1928 | | o b18bc8331526 | |
1682 | |/ Predecessors: 6:4a004186e638 |
|
1929 | |/ Predecessors: 6:4a004186e638 | |
1683 | | semi-colon: 6:4a004186e638 |
|
1930 | | semi-colon: 6:4a004186e638 | |
1684 | | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
|
1931 | | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] | |
1685 | | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
|
1932 | | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace | |
1686 | | o ba2ed02b0c9a |
|
1933 | | o ba2ed02b0c9a | |
1687 | | | |
|
1934 | | | | |
1688 | | x 4a004186e638 |
|
1935 | | x 4a004186e638 | |
1689 |
|/ Successors: 8:b18bc8331526; |
|
1936 | |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee | |
1690 | | multi-line: 8:b18bc8331526 |
|
1937 | | multi-line: 8:b18bc8331526 | |
1691 | | multi-line: 9:0b997eb7ceee |
|
1938 | | multi-line: 9:0b997eb7ceee | |
1692 | | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]] |
|
1939 | | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]] | |
1693 | o dd800401bd8c |
|
1940 | o dd800401bd8c | |
1694 | | |
|
1941 | | | |
1695 | o f897c6137566 |
|
1942 | o f897c6137566 | |
1696 | | |
|
1943 | | | |
1697 | o ea207398892e |
|
1944 | o ea207398892e | |
1698 |
|
1945 | |||
1699 | $ hg fatelog |
|
1946 | $ hg fatelog | |
1700 | @ 0b997eb7ceee |
|
1947 | @ 0b997eb7ceee | |
1701 | | |
|
1948 | | | |
1702 | | o b18bc8331526 |
|
1949 | | o b18bc8331526 | |
1703 | |/ |
|
1950 | |/ | |
1704 | | o ba2ed02b0c9a |
|
1951 | | o ba2ed02b0c9a | |
1705 | | | |
|
1952 | | | | |
1706 | | x 4a004186e638 |
|
1953 | | x 4a004186e638 | |
1707 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000); |
|
1954 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000); | |
1708 | o dd800401bd8c |
|
1955 | o dd800401bd8c | |
1709 | | |
|
1956 | | | |
1710 | o f897c6137566 |
|
1957 | o f897c6137566 | |
1711 | | |
|
1958 | | | |
1712 | o ea207398892e |
|
1959 | o ea207398892e | |
1713 |
|
1960 | |||
1714 | $ hg tlog --hidden |
|
1961 | $ hg tlog --hidden | |
1715 | @ 0b997eb7ceee |
|
1962 | @ 0b997eb7ceee | |
1716 | | Predecessors: 6:4a004186e638 |
|
1963 | | Predecessors: 6:4a004186e638 | |
1717 | | semi-colon: 6:4a004186e638 |
|
1964 | | semi-colon: 6:4a004186e638 | |
1718 | | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
|
1965 | | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] | |
1719 | | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
|
1966 | | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace | |
1720 | | o b18bc8331526 |
|
1967 | | o b18bc8331526 | |
1721 | |/ Predecessors: 6:4a004186e638 |
|
1968 | |/ Predecessors: 6:4a004186e638 | |
1722 | | semi-colon: 6:4a004186e638 |
|
1969 | | semi-colon: 6:4a004186e638 | |
1723 | | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
|
1970 | | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] | |
1724 | | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
|
1971 | | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace | |
1725 | | o ba2ed02b0c9a |
|
1972 | | o ba2ed02b0c9a | |
1726 | | | Predecessors: 4:9bd10a0775e4 |
|
1973 | | | Predecessors: 4:9bd10a0775e4 | |
1727 | | | semi-colon: 4:9bd10a0775e4 |
|
1974 | | | semi-colon: 4:9bd10a0775e4 | |
1728 | | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
|
1975 | | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] | |
1729 | | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
|
1976 | | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 | |
1730 | | x 4a004186e638 |
|
1977 | | x 4a004186e638 | |
1731 | |/ Predecessors: 4:9bd10a0775e4 |
|
1978 | |/ Predecessors: 4:9bd10a0775e4 | |
1732 | | semi-colon: 4:9bd10a0775e4 |
|
1979 | | semi-colon: 4:9bd10a0775e4 | |
1733 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
|
1980 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] | |
1734 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
|
1981 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 | |
1735 | | Successors: 8:b18bc8331526; 9:0b997eb7ceee |
|
1982 | | Successors: 8:b18bc8331526; 9:0b997eb7ceee | |
1736 | | multi-line: 8:b18bc8331526 |
|
1983 | | multi-line: 8:b18bc8331526 | |
1737 | | multi-line: 9:0b997eb7ceee |
|
1984 | | multi-line: 9:0b997eb7ceee | |
1738 | | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]] |
|
1985 | | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]] | |
1739 | o dd800401bd8c |
|
1986 | o dd800401bd8c | |
1740 | | Predecessors: 4:9bd10a0775e4 |
|
1987 | | Predecessors: 4:9bd10a0775e4 | |
1741 | | semi-colon: 4:9bd10a0775e4 |
|
1988 | | semi-colon: 4:9bd10a0775e4 | |
1742 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
|
1989 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] | |
1743 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
|
1990 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 | |
1744 | | x 9bd10a0775e4 |
|
1991 | | x 9bd10a0775e4 | |
1745 | |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
|
1992 | |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a | |
1746 | | multi-line: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
|
1993 | | multi-line: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a | |
1747 | | json: [["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]] |
|
1994 | | json: [["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]] | |
1748 | o f897c6137566 |
|
1995 | o f897c6137566 | |
1749 | | Predecessors: 2:0dec01379d3b |
|
1996 | | Predecessors: 2:0dec01379d3b | |
1750 | | semi-colon: 2:0dec01379d3b |
|
1997 | | semi-colon: 2:0dec01379d3b | |
1751 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
1998 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | |
1752 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
1999 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | |
1753 | | x 0dec01379d3b |
|
2000 | | x 0dec01379d3b | |
1754 | | | Predecessors: 1:471f378eab4c |
|
2001 | | | Predecessors: 1:471f378eab4c | |
1755 | | | semi-colon: 1:471f378eab4c |
|
2002 | | | semi-colon: 1:471f378eab4c | |
1756 | | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
2003 | | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
1757 | | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
2004 | | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
1758 | | | Successors: 3:f897c6137566; 1:471f378eab4c |
|
2005 | | | Successors: 3:f897c6137566; 1:471f378eab4c | |
1759 | | | multi-line: 3:f897c6137566 |
|
2006 | | | multi-line: 3:f897c6137566 | |
1760 | | | multi-line: 1:471f378eab4c |
|
2007 | | | multi-line: 1:471f378eab4c | |
1761 | | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] |
|
2008 | | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] | |
1762 | | x 471f378eab4c |
|
2009 | | x 471f378eab4c | |
1763 | |/ Predecessors: 2:0dec01379d3b |
|
2010 | |/ Predecessors: 2:0dec01379d3b | |
1764 | | semi-colon: 2:0dec01379d3b |
|
2011 | | semi-colon: 2:0dec01379d3b | |
1765 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
2012 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | |
1766 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
2013 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | |
1767 | | Successors: 2:0dec01379d3b |
|
2014 | | Successors: 2:0dec01379d3b | |
1768 | | multi-line: 2:0dec01379d3b |
|
2015 | | multi-line: 2:0dec01379d3b | |
1769 | | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
|
2016 | | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] | |
1770 | o ea207398892e |
|
2017 | o ea207398892e | |
1771 |
|
2018 | |||
1772 | $ hg fatelog --hidden |
|
2019 | $ hg fatelog --hidden | |
1773 | @ 0b997eb7ceee |
|
2020 | @ 0b997eb7ceee | |
1774 | | |
|
2021 | | | |
1775 | | o b18bc8331526 |
|
2022 | | o b18bc8331526 | |
1776 | |/ |
|
2023 | |/ | |
1777 | | o ba2ed02b0c9a |
|
2024 | | o ba2ed02b0c9a | |
1778 | | | |
|
2025 | | | | |
1779 | | x 4a004186e638 |
|
2026 | | x 4a004186e638 | |
1780 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000); |
|
2027 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000); | |
1781 | o dd800401bd8c |
|
2028 | o dd800401bd8c | |
1782 | | |
|
2029 | | | |
1783 | | x 9bd10a0775e4 |
|
2030 | | x 9bd10a0775e4 | |
1784 | |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000); |
|
2031 | |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000); | |
1785 | o f897c6137566 |
|
2032 | o f897c6137566 | |
1786 | | |
|
2033 | | | |
1787 | | x 0dec01379d3b |
|
2034 | | x 0dec01379d3b | |
1788 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000); rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000); |
|
2035 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000); rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000); | |
1789 | | x 471f378eab4c |
|
2036 | | x 471f378eab4c | |
1790 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000); |
|
2037 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000); | |
1791 | o ea207398892e |
|
2038 | o ea207398892e | |
1792 |
|
2039 | |||
1793 | $ hg fatelogjson --hidden |
|
2040 | $ hg fatelogjson --hidden | |
1794 | @ 0b997eb7ceee |
|
2041 | @ 0b997eb7ceee | |
1795 | | |
|
2042 | | | |
1796 | | o b18bc8331526 |
|
2043 | | o b18bc8331526 | |
1797 | |/ |
|
2044 | |/ | |
1798 | | o ba2ed02b0c9a |
|
2045 | | o ba2ed02b0c9a | |
1799 | | | |
|
2046 | | | | |
1800 | | x 4a004186e638 |
|
2047 | | x 4a004186e638 | |
1801 | |/ Obsfate: [{"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["b18bc8331526a22cbb1801022bd1555bf291c48b"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["b18bc8331526a22cbb1801022bd1555bf291c48b"]}, {"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["0b997eb7ceeee06200a02f8aab185979092d514e"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["0b997eb7ceeee06200a02f8aab185979092d514e"]}] |
|
2048 | |/ Obsfate: [{"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["b18bc8331526a22cbb1801022bd1555bf291c48b"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["b18bc8331526a22cbb1801022bd1555bf291c48b"]}, {"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["0b997eb7ceeee06200a02f8aab185979092d514e"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["0b997eb7ceeee06200a02f8aab185979092d514e"]}] | |
1802 | o dd800401bd8c |
|
2049 | o dd800401bd8c | |
1803 | | |
|
2050 | | | |
1804 | | x 9bd10a0775e4 |
|
2051 | | x 9bd10a0775e4 | |
1805 | |/ Obsfate: [{"markers": [["9bd10a0775e478708cada5f176ec6de654359ce7", ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]}] |
|
2052 | |/ Obsfate: [{"markers": [["9bd10a0775e478708cada5f176ec6de654359ce7", ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]}] | |
1806 | o f897c6137566 |
|
2053 | o f897c6137566 | |
1807 | | |
|
2054 | | | |
1808 | | x 0dec01379d3b |
|
2055 | | x 0dec01379d3b | |
1809 | | | Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["f897c6137566320b081514b4c7227ecc3d384b39"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["f897c6137566320b081514b4c7227ecc3d384b39"]}, {"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["471f378eab4c5e25f6c77f785b27c936efb22874"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["471f378eab4c5e25f6c77f785b27c936efb22874"]}] |
|
2056 | | | Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["f897c6137566320b081514b4c7227ecc3d384b39"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["f897c6137566320b081514b4c7227ecc3d384b39"]}, {"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["471f378eab4c5e25f6c77f785b27c936efb22874"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["471f378eab4c5e25f6c77f785b27c936efb22874"]}] | |
1810 | | x 471f378eab4c |
|
2057 | | x 471f378eab4c | |
1811 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]}] |
|
2058 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]}] | |
1812 | o ea207398892e |
|
2059 | o ea207398892e | |
1813 |
|
2060 | |||
1814 | $ hg up --hidden 4 |
|
2061 | $ hg up --hidden 4 | |
1815 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2062 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1816 | $ hg rebase -r 7 -d 8 --config extensions.rebase= |
|
2063 | $ hg rebase -r 7 -d 8 --config extensions.rebase= | |
1817 | rebasing 7:ba2ed02b0c9a "Add A,B,C" |
|
2064 | rebasing 7:ba2ed02b0c9a "Add A,B,C" | |
1818 | $ hg tlog |
|
2065 | $ hg tlog | |
1819 | o eceed8f98ffc |
|
2066 | o eceed8f98ffc | |
1820 | | Predecessors: 4:9bd10a0775e4 |
|
2067 | | Predecessors: 4:9bd10a0775e4 | |
1821 | | semi-colon: 4:9bd10a0775e4 |
|
2068 | | semi-colon: 4:9bd10a0775e4 | |
1822 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
|
2069 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] | |
1823 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
|
2070 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 | |
1824 | | o 0b997eb7ceee |
|
2071 | | o 0b997eb7ceee | |
1825 | | | Predecessors: 4:9bd10a0775e4 |
|
2072 | | | Predecessors: 4:9bd10a0775e4 | |
1826 | | | semi-colon: 4:9bd10a0775e4 |
|
2073 | | | semi-colon: 4:9bd10a0775e4 | |
1827 | | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
|
2074 | | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] | |
1828 | | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
|
2075 | | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 | |
1829 | o | b18bc8331526 |
|
2076 | o | b18bc8331526 | |
1830 | |/ Predecessors: 4:9bd10a0775e4 |
|
2077 | |/ Predecessors: 4:9bd10a0775e4 | |
1831 | | semi-colon: 4:9bd10a0775e4 |
|
2078 | | semi-colon: 4:9bd10a0775e4 | |
1832 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
|
2079 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] | |
1833 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
|
2080 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 | |
1834 | o dd800401bd8c |
|
2081 | o dd800401bd8c | |
1835 | | Predecessors: 4:9bd10a0775e4 |
|
2082 | | Predecessors: 4:9bd10a0775e4 | |
1836 | | semi-colon: 4:9bd10a0775e4 |
|
2083 | | semi-colon: 4:9bd10a0775e4 | |
1837 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
|
2084 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] | |
1838 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
|
2085 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 | |
1839 | | @ 9bd10a0775e4 |
|
2086 | | @ 9bd10a0775e4 | |
1840 | |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
|
2087 | |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc | |
1841 | | multi-line: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc |
|
2088 | | multi-line: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc | |
1842 | | multi-line: 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
|
2089 | | multi-line: 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc | |
1843 | | json: [["dd800401bd8c79d815329277739e433e883f784e", "0b997eb7ceeee06200a02f8aab185979092d514e", "eceed8f98ffc4186032e29a6542ab98888ebf68d"], ["dd800401bd8c79d815329277739e433e883f784e", "b18bc8331526a22cbb1801022bd1555bf291c48b", "eceed8f98ffc4186032e29a6542ab98888ebf68d"]] |
|
2090 | | json: [["dd800401bd8c79d815329277739e433e883f784e", "0b997eb7ceeee06200a02f8aab185979092d514e", "eceed8f98ffc4186032e29a6542ab98888ebf68d"], ["dd800401bd8c79d815329277739e433e883f784e", "b18bc8331526a22cbb1801022bd1555bf291c48b", "eceed8f98ffc4186032e29a6542ab98888ebf68d"]] | |
1844 | o f897c6137566 |
|
2091 | o f897c6137566 | |
1845 | | |
|
2092 | | | |
1846 | o ea207398892e |
|
2093 | o ea207398892e | |
1847 |
|
2094 | |||
1848 |
|
2095 | |||
1849 | $ hg fatelog |
|
2096 | $ hg fatelog | |
1850 | o eceed8f98ffc |
|
2097 | o eceed8f98ffc | |
1851 | | |
|
2098 | | | |
1852 | | o 0b997eb7ceee |
|
2099 | | o 0b997eb7ceee | |
1853 | | | |
|
2100 | | | | |
1854 | o | b18bc8331526 |
|
2101 | o | b18bc8331526 | |
1855 | |/ |
|
2102 | |/ | |
1856 | o dd800401bd8c |
|
2103 | o dd800401bd8c | |
1857 | | |
|
2104 | | | |
1858 | | @ 9bd10a0775e4 |
|
2105 | | @ 9bd10a0775e4 | |
1859 | |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); |
|
2106 | |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); | |
1860 | o f897c6137566 |
|
2107 | o f897c6137566 | |
1861 | | |
|
2108 | | | |
1862 | o ea207398892e |
|
2109 | o ea207398892e | |
1863 |
|
2110 | |||
1864 | Check other fatelog implementations |
|
2111 | Check other fatelog implementations | |
1865 | ----------------------------------- |
|
2112 | ----------------------------------- | |
1866 |
|
2113 | |||
1867 | $ hg fatelogkw --hidden -q |
|
2114 | $ hg fatelogkw --hidden -q | |
1868 | o eceed8f98ffc |
|
2115 | o eceed8f98ffc | |
1869 | | |
|
2116 | | | |
1870 | | o 0b997eb7ceee |
|
2117 | | o 0b997eb7ceee | |
1871 | | | |
|
2118 | | | | |
1872 | o | b18bc8331526 |
|
2119 | o | b18bc8331526 | |
1873 | |/ |
|
2120 | |/ | |
1874 | | x ba2ed02b0c9a |
|
2121 | | x ba2ed02b0c9a | |
1875 | | | Obsfate: rewritten using rebase as 10:eceed8f98ffc |
|
2122 | | | Obsfate: rewritten using rebase as 10:eceed8f98ffc | |
1876 | | x 4a004186e638 |
|
2123 | | x 4a004186e638 | |
1877 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 |
|
2124 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 | |
1878 | | Obsfate: rewritten using amend as 9:0b997eb7ceee |
|
2125 | | Obsfate: rewritten using amend as 9:0b997eb7ceee | |
1879 | o dd800401bd8c |
|
2126 | o dd800401bd8c | |
1880 | | |
|
2127 | | | |
1881 | | @ 9bd10a0775e4 |
|
2128 | | @ 9bd10a0775e4 | |
1882 | |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a |
|
2129 | |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a | |
1883 | o f897c6137566 |
|
2130 | o f897c6137566 | |
1884 | | |
|
2131 | | | |
1885 | | x 0dec01379d3b |
|
2132 | | x 0dec01379d3b | |
1886 | | | Obsfate: rewritten as 3:f897c6137566 |
|
2133 | | | Obsfate: rewritten as 3:f897c6137566 | |
1887 | | | Obsfate: rewritten as 1:471f378eab4c |
|
2134 | | | Obsfate: rewritten as 1:471f378eab4c | |
1888 | | x 471f378eab4c |
|
2135 | | x 471f378eab4c | |
1889 | |/ Obsfate: rewritten as 2:0dec01379d3b |
|
2136 | |/ Obsfate: rewritten as 2:0dec01379d3b | |
1890 | o ea207398892e |
|
2137 | o ea207398892e | |
1891 |
|
2138 | |||
1892 | $ hg fatelogkw --hidden |
|
2139 | $ hg fatelogkw --hidden | |
1893 | o eceed8f98ffc |
|
2140 | o eceed8f98ffc | |
1894 | | |
|
2141 | | | |
1895 | | o 0b997eb7ceee |
|
2142 | | o 0b997eb7ceee | |
1896 | | | |
|
2143 | | | | |
1897 | o | b18bc8331526 |
|
2144 | o | b18bc8331526 | |
1898 | |/ |
|
2145 | |/ | |
1899 | | x ba2ed02b0c9a |
|
2146 | | x ba2ed02b0c9a | |
1900 | | | Obsfate: rewritten using rebase as 10:eceed8f98ffc |
|
2147 | | | Obsfate: rewritten using rebase as 10:eceed8f98ffc | |
1901 | | x 4a004186e638 |
|
2148 | | x 4a004186e638 | |
1902 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 |
|
2149 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 | |
1903 | | Obsfate: rewritten using amend as 9:0b997eb7ceee |
|
2150 | | Obsfate: rewritten using amend as 9:0b997eb7ceee | |
1904 | o dd800401bd8c |
|
2151 | o dd800401bd8c | |
1905 | | |
|
2152 | | | |
1906 | | @ 9bd10a0775e4 |
|
2153 | | @ 9bd10a0775e4 | |
1907 | |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a |
|
2154 | |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a | |
1908 | o f897c6137566 |
|
2155 | o f897c6137566 | |
1909 | | |
|
2156 | | | |
1910 | | x 0dec01379d3b |
|
2157 | | x 0dec01379d3b | |
1911 | | | Obsfate: rewritten as 3:f897c6137566 |
|
2158 | | | Obsfate: rewritten as 3:f897c6137566 | |
1912 | | | Obsfate: rewritten as 1:471f378eab4c |
|
2159 | | | Obsfate: rewritten as 1:471f378eab4c | |
1913 | | x 471f378eab4c |
|
2160 | | x 471f378eab4c | |
1914 | |/ Obsfate: rewritten as 2:0dec01379d3b |
|
2161 | |/ Obsfate: rewritten as 2:0dec01379d3b | |
1915 | o ea207398892e |
|
2162 | o ea207398892e | |
1916 |
|
2163 | |||
1917 | $ hg fatelogkw --hidden -v |
|
2164 | $ hg fatelogkw --hidden -v | |
1918 | o eceed8f98ffc |
|
2165 | o eceed8f98ffc | |
1919 | | |
|
2166 | | | |
1920 | | o 0b997eb7ceee |
|
2167 | | o 0b997eb7ceee | |
1921 | | | |
|
2168 | | | | |
1922 | o | b18bc8331526 |
|
2169 | o | b18bc8331526 | |
1923 | |/ |
|
2170 | |/ | |
1924 | | x ba2ed02b0c9a |
|
2171 | | x ba2ed02b0c9a | |
1925 | | | Obsfate: rewritten using rebase as 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000) |
|
2172 | | | Obsfate: rewritten using rebase as 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000) | |
1926 | | x 4a004186e638 |
|
2173 | | x 4a004186e638 | |
1927 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000) |
|
2174 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000) | |
1928 | | Obsfate: rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000) |
|
2175 | | Obsfate: rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000) | |
1929 | o dd800401bd8c |
|
2176 | o dd800401bd8c | |
1930 | | |
|
2177 | | | |
1931 | | @ 9bd10a0775e4 |
|
2178 | | @ 9bd10a0775e4 | |
1932 | |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000) |
|
2179 | |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000) | |
1933 | o f897c6137566 |
|
2180 | o f897c6137566 | |
1934 | | |
|
2181 | | | |
1935 | | x 0dec01379d3b |
|
2182 | | x 0dec01379d3b | |
1936 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000) |
|
2183 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000) | |
1937 | | | Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000) |
|
2184 | | | Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000) | |
1938 | | x 471f378eab4c |
|
2185 | | x 471f378eab4c | |
1939 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000) |
|
2186 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000) | |
1940 | o ea207398892e |
|
2187 | o ea207398892e | |
1941 |
|
2188 | |||
|
2189 | $ hg log -G -T "default" --hidden | |||
|
2190 | o changeset: 10:eceed8f98ffc | |||
|
2191 | | tag: tip | |||
|
2192 | | parent: 8:b18bc8331526 | |||
|
2193 | | user: test | |||
|
2194 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
2195 | | instability: content-divergent | |||
|
2196 | | summary: Add A,B,C | |||
|
2197 | | | |||
|
2198 | | o changeset: 9:0b997eb7ceee | |||
|
2199 | | | parent: 5:dd800401bd8c | |||
|
2200 | | | user: test | |||
|
2201 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
2202 | | | instability: content-divergent | |||
|
2203 | | | summary: Add B only | |||
|
2204 | | | | |||
|
2205 | o | changeset: 8:b18bc8331526 | |||
|
2206 | |/ parent: 5:dd800401bd8c | |||
|
2207 | | user: test | |||
|
2208 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
2209 | | instability: content-divergent | |||
|
2210 | | summary: Add only B | |||
|
2211 | | | |||
|
2212 | | x changeset: 7:ba2ed02b0c9a | |||
|
2213 | | | user: test | |||
|
2214 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
2215 | | | obsfate: rewritten using rebase as 10:eceed8f98ffc | |||
|
2216 | | | summary: Add A,B,C | |||
|
2217 | | | | |||
|
2218 | | x changeset: 6:4a004186e638 | |||
|
2219 | |/ user: test | |||
|
2220 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
2221 | | obsfate: rewritten using amend as 8:b18bc8331526 | |||
|
2222 | | obsfate: rewritten using amend as 9:0b997eb7ceee | |||
|
2223 | | summary: Add A,B,C | |||
|
2224 | | | |||
|
2225 | o changeset: 5:dd800401bd8c | |||
|
2226 | | parent: 3:f897c6137566 | |||
|
2227 | | user: test | |||
|
2228 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
2229 | | instability: content-divergent | |||
|
2230 | | summary: Add A,B,C | |||
|
2231 | | | |||
|
2232 | | @ changeset: 4:9bd10a0775e4 | |||
|
2233 | |/ user: test | |||
|
2234 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
2235 | | obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a | |||
|
2236 | | summary: Add A,B,C | |||
|
2237 | | | |||
|
2238 | o changeset: 3:f897c6137566 | |||
|
2239 | | parent: 0:ea207398892e | |||
|
2240 | | user: test | |||
|
2241 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
2242 | | summary: C0 | |||
|
2243 | | | |||
|
2244 | | x changeset: 2:0dec01379d3b | |||
|
2245 | | | user: test | |||
|
2246 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
2247 | | | obsfate: rewritten as 3:f897c6137566 | |||
|
2248 | | | obsfate: rewritten as 1:471f378eab4c | |||
|
2249 | | | summary: B0 | |||
|
2250 | | | | |||
|
2251 | | x changeset: 1:471f378eab4c | |||
|
2252 | |/ user: test | |||
|
2253 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
2254 | | obsfate: rewritten as 2:0dec01379d3b | |||
|
2255 | | summary: A0 | |||
|
2256 | | | |||
|
2257 | o changeset: 0:ea207398892e | |||
|
2258 | user: test | |||
|
2259 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
2260 | summary: ROOT | |||
|
2261 | ||||
|
2262 | ||||
1942 | Test templates with pruned commits |
|
2263 | Test templates with pruned commits | |
1943 |
================================= |
|
2264 | ================================== | |
1944 |
|
2265 | |||
1945 | Test setup |
|
2266 | Test setup | |
1946 | ---------- |
|
2267 | ---------- | |
1947 |
|
2268 | |||
1948 | $ hg init $TESTTMP/templates-local-prune |
|
2269 | $ hg init $TESTTMP/templates-local-prune | |
1949 | $ cd $TESTTMP/templates-local-prune |
|
2270 | $ cd $TESTTMP/templates-local-prune | |
1950 | $ mkcommit ROOT |
|
2271 | $ mkcommit ROOT | |
1951 | $ mkcommit A0 |
|
2272 | $ mkcommit A0 | |
1952 | $ hg debugobsolete --record-parent `getid "."` |
|
2273 | $ hg debugobsolete --record-parent `getid "."` | |
1953 | obsoleted 1 changesets |
|
2274 | obsoleted 1 changesets | |
1954 |
|
2275 | |||
1955 | Check output |
|
2276 | Check output | |
1956 | ------------ |
|
2277 | ------------ | |
1957 |
|
2278 | |||
1958 | $ hg up "desc(A0)" --hidden |
|
2279 | $ hg up "desc(A0)" --hidden | |
1959 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2280 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1960 | $ hg tlog |
|
2281 | $ hg tlog | |
1961 | @ 471f378eab4c |
|
2282 | @ 471f378eab4c | |
1962 | | |
|
2283 | | | |
1963 | o ea207398892e |
|
2284 | o ea207398892e | |
1964 |
|
2285 | |||
1965 | $ hg fatelog |
|
2286 | $ hg fatelog | |
1966 | @ 471f378eab4c |
|
2287 | @ 471f378eab4c | |
1967 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000); |
|
2288 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000); | |
1968 | o ea207398892e |
|
2289 | o ea207398892e | |
1969 |
|
2290 | |||
1970 | Test templates with multiple pruned commits |
|
2291 | Test templates with multiple pruned commits | |
1971 | =========================================== |
|
2292 | =========================================== | |
1972 |
|
2293 | |||
1973 | Test setup |
|
2294 | Test setup | |
1974 | ---------- |
|
2295 | ---------- | |
1975 |
|
2296 | |||
1976 | $ hg init $TESTTMP/multiple-local-prune |
|
2297 | $ hg init $TESTTMP/multiple-local-prune | |
1977 | $ cd $TESTTMP/multiple-local-prune |
|
2298 | $ cd $TESTTMP/multiple-local-prune | |
1978 | $ mkcommit ROOT |
|
2299 | $ mkcommit ROOT | |
1979 | $ mkcommit A0 |
|
2300 | $ mkcommit A0 | |
1980 | $ hg commit --amend -m "A1" |
|
2301 | $ hg commit --amend -m "A1" | |
1981 | $ hg debugobsolete --record-parent `getid "."` |
|
2302 | $ hg debugobsolete --record-parent `getid "."` | |
1982 | obsoleted 1 changesets |
|
2303 | obsoleted 1 changesets | |
1983 |
|
2304 | |||
1984 | $ hg up -r "desc(A0)" --hidden |
|
2305 | $ hg up -r "desc(A0)" --hidden | |
1985 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2306 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1986 | $ hg commit --amend -m "A2" |
|
2307 | $ hg commit --amend -m "A2" | |
1987 | $ hg debugobsolete --record-parent `getid "."` |
|
2308 | $ hg debugobsolete --record-parent `getid "."` | |
1988 | obsoleted 1 changesets |
|
2309 | obsoleted 1 changesets | |
1989 |
|
2310 | |||
1990 | Check output |
|
2311 | Check output | |
1991 | ------------ |
|
2312 | ------------ | |
1992 |
|
2313 | |||
1993 | $ hg up "desc(A0)" --hidden |
|
2314 | $ hg up "desc(A0)" --hidden | |
1994 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2315 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1995 | $ hg tlog |
|
2316 | $ hg tlog | |
1996 | @ 471f378eab4c |
|
2317 | @ 471f378eab4c | |
1997 | | |
|
2318 | | | |
1998 | o ea207398892e |
|
2319 | o ea207398892e | |
1999 |
|
2320 | |||
2000 | # todo: the obsfate output is not ideal |
|
2321 | # todo: the obsfate output is not ideal | |
2001 | $ hg fatelog |
|
2322 | $ hg fatelog | |
2002 | @ 471f378eab4c |
|
2323 | @ 471f378eab4c | |
2003 | | Obsfate: pruned; |
|
2324 | | Obsfate: pruned; | |
2004 | o ea207398892e |
|
2325 | o ea207398892e | |
2005 |
|
2326 | |||
2006 | $ hg fatelog --hidden |
|
2327 | $ hg fatelog --hidden | |
2007 | x 65b757b745b9 |
|
2328 | x 65b757b745b9 | |
2008 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000); |
|
2329 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000); | |
2009 | | x fdf9bde5129a |
|
2330 | | x fdf9bde5129a | |
2010 | |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000); |
|
2331 | |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000); | |
2011 | | @ 471f378eab4c |
|
2332 | | @ 471f378eab4c | |
2012 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000); |
|
2333 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000); | |
2013 | o ea207398892e |
|
2334 | o ea207398892e | |
2014 |
|
2335 | |||
2015 | Check other fatelog implementations |
|
2336 | Check other fatelog implementations | |
2016 | ----------------------------------- |
|
2337 | ----------------------------------- | |
2017 |
|
2338 | |||
2018 | $ hg fatelogkw --hidden -q |
|
2339 | $ hg fatelogkw --hidden -q | |
2019 | x 65b757b745b9 |
|
2340 | x 65b757b745b9 | |
2020 | | Obsfate: pruned |
|
2341 | | Obsfate: pruned | |
2021 | | x fdf9bde5129a |
|
2342 | | x fdf9bde5129a | |
2022 | |/ Obsfate: pruned |
|
2343 | |/ Obsfate: pruned | |
2023 | | @ 471f378eab4c |
|
2344 | | @ 471f378eab4c | |
2024 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a |
|
2345 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a | |
2025 | | Obsfate: rewritten using amend as 3:65b757b745b9 |
|
2346 | | Obsfate: rewritten using amend as 3:65b757b745b9 | |
2026 | o ea207398892e |
|
2347 | o ea207398892e | |
2027 |
|
2348 | |||
2028 | $ hg fatelogkw --hidden |
|
2349 | $ hg fatelogkw --hidden | |
2029 | x 65b757b745b9 |
|
2350 | x 65b757b745b9 | |
2030 | | Obsfate: pruned |
|
2351 | | Obsfate: pruned | |
2031 | | x fdf9bde5129a |
|
2352 | | x fdf9bde5129a | |
2032 | |/ Obsfate: pruned |
|
2353 | |/ Obsfate: pruned | |
2033 | | @ 471f378eab4c |
|
2354 | | @ 471f378eab4c | |
2034 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a |
|
2355 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a | |
2035 | | Obsfate: rewritten using amend as 3:65b757b745b9 |
|
2356 | | Obsfate: rewritten using amend as 3:65b757b745b9 | |
2036 | o ea207398892e |
|
2357 | o ea207398892e | |
2037 |
|
2358 | |||
2038 | $ hg fatelogkw --hidden -v |
|
2359 | $ hg fatelogkw --hidden -v | |
2039 | x 65b757b745b9 |
|
2360 | x 65b757b745b9 | |
2040 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) |
|
2361 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) | |
2041 | | x fdf9bde5129a |
|
2362 | | x fdf9bde5129a | |
2042 | |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000) |
|
2363 | |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000) | |
2043 | | @ 471f378eab4c |
|
2364 | | @ 471f378eab4c | |
2044 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000) |
|
2365 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000) | |
2045 | | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000) |
|
2366 | | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000) | |
2046 | o ea207398892e |
|
2367 | o ea207398892e | |
2047 |
|
2368 | |||
2048 |
|
2369 | |||
|
2370 | $ hg log -G -T "default" --hidden | |||
|
2371 | x changeset: 3:65b757b745b9 | |||
|
2372 | | tag: tip | |||
|
2373 | | parent: 0:ea207398892e | |||
|
2374 | | user: test | |||
|
2375 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
2376 | | obsfate: pruned | |||
|
2377 | | summary: A2 | |||
|
2378 | | | |||
|
2379 | | x changeset: 2:fdf9bde5129a | |||
|
2380 | |/ parent: 0:ea207398892e | |||
|
2381 | | user: test | |||
|
2382 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
2383 | | obsfate: pruned | |||
|
2384 | | summary: A1 | |||
|
2385 | | | |||
|
2386 | | @ changeset: 1:471f378eab4c | |||
|
2387 | |/ user: test | |||
|
2388 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
2389 | | obsfate: rewritten using amend as 2:fdf9bde5129a | |||
|
2390 | | obsfate: rewritten using amend as 3:65b757b745b9 | |||
|
2391 | | summary: A0 | |||
|
2392 | | | |||
|
2393 | o changeset: 0:ea207398892e | |||
|
2394 | user: test | |||
|
2395 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
2396 | summary: ROOT | |||
|
2397 | ||||
|
2398 | ||||
2049 | Test templates with splitted and pruned commit |
|
2399 | Test templates with splitted and pruned commit | |
2050 |
============================================= |
|
2400 | ============================================== | |
2051 |
|
2401 | |||
2052 | $ hg init $TESTTMP/templates-local-split-prune |
|
2402 | $ hg init $TESTTMP/templates-local-split-prune | |
2053 | $ cd $TESTTMP/templates-local-split-prune |
|
2403 | $ cd $TESTTMP/templates-local-split-prune | |
2054 | $ mkcommit ROOT |
|
2404 | $ mkcommit ROOT | |
2055 | $ echo 42 >> a |
|
2405 | $ echo 42 >> a | |
2056 | $ echo 43 >> b |
|
2406 | $ echo 43 >> b | |
2057 | $ hg commit -A -m "A0" |
|
2407 | $ hg commit -A -m "A0" | |
2058 | adding a |
|
2408 | adding a | |
2059 | adding b |
|
2409 | adding b | |
2060 | $ hg log --hidden -G |
|
2410 | $ hg log --hidden -G | |
2061 | @ changeset: 1:471597cad322 |
|
2411 | @ changeset: 1:471597cad322 | |
2062 | | tag: tip |
|
2412 | | tag: tip | |
2063 | | user: test |
|
2413 | | user: test | |
2064 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2414 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2065 | | summary: A0 |
|
2415 | | summary: A0 | |
2066 | | |
|
2416 | | | |
2067 | o changeset: 0:ea207398892e |
|
2417 | o changeset: 0:ea207398892e | |
2068 | user: test |
|
2418 | user: test | |
2069 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2419 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2070 | summary: ROOT |
|
2420 | summary: ROOT | |
2071 |
|
2421 | |||
2072 | # Simulate split |
|
2422 | # Simulate split | |
2073 | $ hg up -r "desc(ROOT)" |
|
2423 | $ hg up -r "desc(ROOT)" | |
2074 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
2424 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
2075 | $ echo 42 >> a |
|
2425 | $ echo 42 >> a | |
2076 | $ hg commit -A -m "A1" |
|
2426 | $ hg commit -A -m "A1" | |
2077 | adding a |
|
2427 | adding a | |
2078 | created new head |
|
2428 | created new head | |
2079 | $ echo 43 >> b |
|
2429 | $ echo 43 >> b | |
2080 | $ hg commit -A -m "A2" |
|
2430 | $ hg commit -A -m "A2" | |
2081 | adding b |
|
2431 | adding b | |
2082 | $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"` |
|
2432 | $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"` | |
2083 | obsoleted 1 changesets |
|
2433 | obsoleted 1 changesets | |
2084 |
|
2434 | |||
2085 | # Simulate prune |
|
2435 | # Simulate prune | |
2086 | $ hg debugobsolete --record-parent `getid "."` |
|
2436 | $ hg debugobsolete --record-parent `getid "."` | |
2087 | obsoleted 1 changesets |
|
2437 | obsoleted 1 changesets | |
2088 |
|
2438 | |||
2089 | $ hg log --hidden -G |
|
2439 | $ hg log --hidden -G | |
2090 | @ changeset: 3:0d0ef4bdf70e |
|
2440 | @ changeset: 3:0d0ef4bdf70e | |
2091 | | tag: tip |
|
2441 | | tag: tip | |
2092 | | user: test |
|
2442 | | user: test | |
2093 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2443 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2094 | | obsfate: pruned |
|
2444 | | obsfate: pruned | |
2095 | | summary: A2 |
|
2445 | | summary: A2 | |
2096 | | |
|
2446 | | | |
2097 | o changeset: 2:617adc3a144c |
|
2447 | o changeset: 2:617adc3a144c | |
2098 | | parent: 0:ea207398892e |
|
2448 | | parent: 0:ea207398892e | |
2099 | | user: test |
|
2449 | | user: test | |
2100 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2450 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2101 | | summary: A1 |
|
2451 | | summary: A1 | |
2102 | | |
|
2452 | | | |
2103 | | x changeset: 1:471597cad322 |
|
2453 | | x changeset: 1:471597cad322 | |
2104 | |/ user: test |
|
2454 | |/ user: test | |
2105 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2455 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2106 | | obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e |
|
2456 | | obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e | |
2107 | | summary: A0 |
|
2457 | | summary: A0 | |
2108 | | |
|
2458 | | | |
2109 | o changeset: 0:ea207398892e |
|
2459 | o changeset: 0:ea207398892e | |
2110 | user: test |
|
2460 | user: test | |
2111 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2461 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2112 | summary: ROOT |
|
2462 | summary: ROOT | |
2113 |
|
2463 | |||
2114 | Check templates |
|
2464 | Check templates | |
2115 | --------------- |
|
2465 | --------------- | |
2116 |
|
2466 | |||
2117 | $ hg up 'desc("A0")' --hidden |
|
2467 | $ hg up 'desc("A0")' --hidden | |
2118 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2468 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2119 |
|
2469 | |||
2120 | # todo: the obsfate output is not ideal |
|
2470 | # todo: the obsfate output is not ideal | |
2121 | $ hg fatelog |
|
2471 | $ hg fatelog | |
2122 | o 617adc3a144c |
|
2472 | o 617adc3a144c | |
2123 | | |
|
2473 | | | |
2124 | | @ 471597cad322 |
|
2474 | | @ 471597cad322 | |
2125 | |/ Obsfate: pruned; |
|
2475 | |/ Obsfate: pruned; | |
2126 | o ea207398892e |
|
2476 | o ea207398892e | |
2127 |
|
2477 | |||
2128 | $ hg up -r 'desc("A2")' --hidden |
|
2478 | $ hg up -r 'desc("A2")' --hidden | |
2129 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2479 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2130 |
|
2480 | |||
2131 | $ hg fatelog --hidden |
|
2481 | $ hg fatelog --hidden | |
2132 | @ 0d0ef4bdf70e |
|
2482 | @ 0d0ef4bdf70e | |
2133 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000); |
|
2483 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000); | |
2134 | o 617adc3a144c |
|
2484 | o 617adc3a144c | |
2135 | | |
|
2485 | | | |
2136 | | x 471597cad322 |
|
2486 | | x 471597cad322 | |
2137 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000); |
|
2487 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000); | |
2138 | o ea207398892e |
|
2488 | o ea207398892e | |
2139 |
|
2489 | |||
2140 |
|
2490 | |||
2141 | Check other fatelog implementations |
|
2491 | Check other fatelog implementations | |
2142 | ----------------------------------- |
|
2492 | ----------------------------------- | |
2143 |
|
2493 | |||
2144 | $ hg fatelogkw --hidden -q |
|
2494 | $ hg fatelogkw --hidden -q | |
2145 | @ 0d0ef4bdf70e |
|
2495 | @ 0d0ef4bdf70e | |
2146 | | Obsfate: pruned |
|
2496 | | Obsfate: pruned | |
2147 | o 617adc3a144c |
|
2497 | o 617adc3a144c | |
2148 | | |
|
2498 | | | |
2149 | | x 471597cad322 |
|
2499 | | x 471597cad322 | |
2150 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e |
|
2500 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e | |
2151 | o ea207398892e |
|
2501 | o ea207398892e | |
2152 |
|
2502 | |||
2153 | $ hg fatelogkw --hidden |
|
2503 | $ hg fatelogkw --hidden | |
2154 | @ 0d0ef4bdf70e |
|
2504 | @ 0d0ef4bdf70e | |
2155 | | Obsfate: pruned |
|
2505 | | Obsfate: pruned | |
2156 | o 617adc3a144c |
|
2506 | o 617adc3a144c | |
2157 | | |
|
2507 | | | |
2158 | | x 471597cad322 |
|
2508 | | x 471597cad322 | |
2159 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e |
|
2509 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e | |
2160 | o ea207398892e |
|
2510 | o ea207398892e | |
2161 |
|
2511 | |||
2162 | $ hg fatelogkw --hidden -v |
|
2512 | $ hg fatelogkw --hidden -v | |
2163 | @ 0d0ef4bdf70e |
|
2513 | @ 0d0ef4bdf70e | |
2164 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) |
|
2514 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) | |
2165 | o 617adc3a144c |
|
2515 | o 617adc3a144c | |
2166 | | |
|
2516 | | | |
2167 | | x 471597cad322 |
|
2517 | | x 471597cad322 | |
2168 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000) |
|
2518 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000) | |
2169 | o ea207398892e |
|
2519 | o ea207398892e | |
2170 |
|
2520 | |||
|
2521 | $ hg log -G -T "default" --hidden | |||
|
2522 | @ changeset: 3:0d0ef4bdf70e | |||
|
2523 | | tag: tip | |||
|
2524 | | user: test | |||
|
2525 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
2526 | | obsfate: pruned | |||
|
2527 | | summary: A2 | |||
|
2528 | | | |||
|
2529 | o changeset: 2:617adc3a144c | |||
|
2530 | | parent: 0:ea207398892e | |||
|
2531 | | user: test | |||
|
2532 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
2533 | | summary: A1 | |||
|
2534 | | | |||
|
2535 | | x changeset: 1:471597cad322 | |||
|
2536 | |/ user: test | |||
|
2537 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
2538 | | obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e | |||
|
2539 | | summary: A0 | |||
|
2540 | | | |||
|
2541 | o changeset: 0:ea207398892e | |||
|
2542 | user: test | |||
|
2543 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
2544 | summary: ROOT | |||
|
2545 |
@@ -1,1509 +1,1511 b'' | |||||
1 | $ cat >> $HGRCPATH << EOF |
|
1 | $ cat >> $HGRCPATH << EOF | |
2 | > [phases] |
|
2 | > [phases] | |
3 | > # public changeset are not obsolete |
|
3 | > # public changeset are not obsolete | |
4 | > publish=false |
|
4 | > publish=false | |
5 | > [ui] |
|
5 | > [ui] | |
6 | > logtemplate="{rev}:{node|short} ({phase}{if(obsolete, ' *{obsolete}*')}{if(instabilities, ' {instabilities}')}) [{tags} {bookmarks}] {desc|firstline}{if(obsfate, " [{join(obsfate, "; ")}]")}\n" |
|
6 | > logtemplate="{rev}:{node|short} ({phase}{if(obsolete, ' *{obsolete}*')}{if(instabilities, ' {instabilities}')}) [{tags} {bookmarks}] {desc|firstline}{if(obsfate, " [{join(obsfate, "; ")}]")}\n" | |
7 | > EOF |
|
7 | > EOF | |
8 | $ mkcommit() { |
|
8 | $ mkcommit() { | |
9 | > echo "$1" > "$1" |
|
9 | > echo "$1" > "$1" | |
10 | > hg add "$1" |
|
10 | > hg add "$1" | |
11 | > hg ci -m "add $1" |
|
11 | > hg ci -m "add $1" | |
12 | > } |
|
12 | > } | |
13 | $ getid() { |
|
13 | $ getid() { | |
14 | > hg log -T "{node}\n" --hidden -r "desc('$1')" |
|
14 | > hg log -T "{node}\n" --hidden -r "desc('$1')" | |
15 | > } |
|
15 | > } | |
16 |
|
16 | |||
17 | $ cat > debugkeys.py <<EOF |
|
17 | $ cat > debugkeys.py <<EOF | |
18 | > def reposetup(ui, repo): |
|
18 | > def reposetup(ui, repo): | |
19 | > class debugkeysrepo(repo.__class__): |
|
19 | > class debugkeysrepo(repo.__class__): | |
20 | > def listkeys(self, namespace): |
|
20 | > def listkeys(self, namespace): | |
21 | > ui.write('listkeys %s\n' % (namespace,)) |
|
21 | > ui.write('listkeys %s\n' % (namespace,)) | |
22 | > return super(debugkeysrepo, self).listkeys(namespace) |
|
22 | > return super(debugkeysrepo, self).listkeys(namespace) | |
23 | > |
|
23 | > | |
24 | > if repo.local(): |
|
24 | > if repo.local(): | |
25 | > repo.__class__ = debugkeysrepo |
|
25 | > repo.__class__ = debugkeysrepo | |
26 | > EOF |
|
26 | > EOF | |
27 |
|
27 | |||
28 | $ hg init tmpa |
|
28 | $ hg init tmpa | |
29 | $ cd tmpa |
|
29 | $ cd tmpa | |
30 | $ mkcommit kill_me |
|
30 | $ mkcommit kill_me | |
31 |
|
31 | |||
32 | Checking that the feature is properly disabled |
|
32 | Checking that the feature is properly disabled | |
33 |
|
33 | |||
34 | $ hg debugobsolete -d '0 0' `getid kill_me` -u babar |
|
34 | $ hg debugobsolete -d '0 0' `getid kill_me` -u babar | |
35 | abort: creating obsolete markers is not enabled on this repo |
|
35 | abort: creating obsolete markers is not enabled on this repo | |
36 | [255] |
|
36 | [255] | |
37 |
|
37 | |||
38 | Enabling it |
|
38 | Enabling it | |
39 |
|
39 | |||
40 | $ cat >> $HGRCPATH << EOF |
|
40 | $ cat >> $HGRCPATH << EOF | |
41 | > [experimental] |
|
41 | > [experimental] | |
42 | > stabilization=createmarkers,exchange |
|
42 | > stabilization=createmarkers,exchange | |
43 | > EOF |
|
43 | > EOF | |
44 |
|
44 | |||
45 | Killing a single changeset without replacement |
|
45 | Killing a single changeset without replacement | |
46 |
|
46 | |||
47 | $ hg debugobsolete 0 |
|
47 | $ hg debugobsolete 0 | |
48 | abort: changeset references must be full hexadecimal node identifiers |
|
48 | abort: changeset references must be full hexadecimal node identifiers | |
49 | [255] |
|
49 | [255] | |
50 | $ hg debugobsolete '00' |
|
50 | $ hg debugobsolete '00' | |
51 | abort: changeset references must be full hexadecimal node identifiers |
|
51 | abort: changeset references must be full hexadecimal node identifiers | |
52 | [255] |
|
52 | [255] | |
53 | $ hg debugobsolete -d '0 0' `getid kill_me` -u babar |
|
53 | $ hg debugobsolete -d '0 0' `getid kill_me` -u babar | |
54 | obsoleted 1 changesets |
|
54 | obsoleted 1 changesets | |
55 | $ hg debugobsolete |
|
55 | $ hg debugobsolete | |
56 | 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'} |
|
56 | 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'} | |
57 |
|
57 | |||
58 | (test that mercurial is not confused) |
|
58 | (test that mercurial is not confused) | |
59 |
|
59 | |||
60 | $ hg up null --quiet # having 0 as parent prevents it to be hidden |
|
60 | $ hg up null --quiet # having 0 as parent prevents it to be hidden | |
61 | $ hg tip |
|
61 | $ hg tip | |
62 | -1:000000000000 (public) [tip ] |
|
62 | -1:000000000000 (public) [tip ] | |
63 | $ hg up --hidden tip --quiet |
|
63 | $ hg up --hidden tip --quiet | |
64 |
|
64 | |||
65 | Killing a single changeset with itself should fail |
|
65 | Killing a single changeset with itself should fail | |
66 | (simple local safeguard) |
|
66 | (simple local safeguard) | |
67 |
|
67 | |||
68 | $ hg debugobsolete `getid kill_me` `getid kill_me` |
|
68 | $ hg debugobsolete `getid kill_me` `getid kill_me` | |
69 | abort: bad obsmarker input: in-marker cycle with 97b7c2d76b1845ed3eb988cd612611e72406cef0 |
|
69 | abort: bad obsmarker input: in-marker cycle with 97b7c2d76b1845ed3eb988cd612611e72406cef0 | |
70 | [255] |
|
70 | [255] | |
71 |
|
71 | |||
72 | $ cd .. |
|
72 | $ cd .. | |
73 |
|
73 | |||
74 | Killing a single changeset with replacement |
|
74 | Killing a single changeset with replacement | |
75 | (and testing the format option) |
|
75 | (and testing the format option) | |
76 |
|
76 | |||
77 | $ hg init tmpb |
|
77 | $ hg init tmpb | |
78 | $ cd tmpb |
|
78 | $ cd tmpb | |
79 | $ mkcommit a |
|
79 | $ mkcommit a | |
80 | $ mkcommit b |
|
80 | $ mkcommit b | |
81 | $ mkcommit original_c |
|
81 | $ mkcommit original_c | |
82 | $ hg up "desc('b')" |
|
82 | $ hg up "desc('b')" | |
83 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
83 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
84 | $ mkcommit new_c |
|
84 | $ mkcommit new_c | |
85 | created new head |
|
85 | created new head | |
86 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden |
|
86 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden | |
87 | $ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c` `getid new_c` -d '121 120' |
|
87 | $ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c` `getid new_c` -d '121 120' | |
88 | obsoleted 1 changesets |
|
88 | obsoleted 1 changesets | |
89 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden |
|
89 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden | |
90 | 2:245bde4270cd add original_c |
|
90 | 2:245bde4270cd add original_c | |
91 | $ hg debugrevlog -cd |
|
91 | $ hg debugrevlog -cd | |
92 | # rev p1rev p2rev start end deltastart base p1 p2 rawsize totalsize compression heads chainlen |
|
92 | # rev p1rev p2rev start end deltastart base p1 p2 rawsize totalsize compression heads chainlen | |
93 | 0 -1 -1 0 59 0 0 0 0 58 58 0 1 0 |
|
93 | 0 -1 -1 0 59 0 0 0 0 58 58 0 1 0 | |
94 | 1 0 -1 59 118 59 59 0 0 58 116 0 1 0 |
|
94 | 1 0 -1 59 118 59 59 0 0 58 116 0 1 0 | |
95 | 2 1 -1 118 193 118 118 59 0 76 192 0 1 0 |
|
95 | 2 1 -1 118 193 118 118 59 0 76 192 0 1 0 | |
96 | 3 1 -1 193 260 193 193 59 0 66 258 0 2 0 |
|
96 | 3 1 -1 193 260 193 193 59 0 66 258 0 2 0 | |
97 | $ hg debugobsolete |
|
97 | $ hg debugobsolete | |
98 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
98 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
99 |
|
99 | |||
100 | (check for version number of the obsstore) |
|
100 | (check for version number of the obsstore) | |
101 |
|
101 | |||
102 | $ dd bs=1 count=1 if=.hg/store/obsstore 2>/dev/null |
|
102 | $ dd bs=1 count=1 if=.hg/store/obsstore 2>/dev/null | |
103 | \x00 (no-eol) (esc) |
|
103 | \x00 (no-eol) (esc) | |
104 |
|
104 | |||
105 | do it again (it read the obsstore before adding new changeset) |
|
105 | do it again (it read the obsstore before adding new changeset) | |
106 |
|
106 | |||
107 | $ hg up '.^' |
|
107 | $ hg up '.^' | |
108 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
108 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
109 | $ mkcommit new_2_c |
|
109 | $ mkcommit new_2_c | |
110 | created new head |
|
110 | created new head | |
111 | $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c` |
|
111 | $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c` | |
112 | obsoleted 1 changesets |
|
112 | obsoleted 1 changesets | |
113 | $ hg debugobsolete |
|
113 | $ hg debugobsolete | |
114 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
114 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
115 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
115 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
116 |
|
116 | |||
117 | Register two markers with a missing node |
|
117 | Register two markers with a missing node | |
118 |
|
118 | |||
119 | $ hg up '.^' |
|
119 | $ hg up '.^' | |
120 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
120 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
121 | $ mkcommit new_3_c |
|
121 | $ mkcommit new_3_c | |
122 | created new head |
|
122 | created new head | |
123 | $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337 |
|
123 | $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337 | |
124 | obsoleted 1 changesets |
|
124 | obsoleted 1 changesets | |
125 | $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c` |
|
125 | $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c` | |
126 | $ hg debugobsolete |
|
126 | $ hg debugobsolete | |
127 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
127 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
128 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
128 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
129 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
129 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
130 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
130 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
131 |
|
131 | |||
132 | Test the --index option of debugobsolete command |
|
132 | Test the --index option of debugobsolete command | |
133 | $ hg debugobsolete --index |
|
133 | $ hg debugobsolete --index | |
134 | 0 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
134 | 0 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
135 | 1 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
135 | 1 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
136 | 2 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
136 | 2 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
137 | 3 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
137 | 3 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
138 |
|
138 | |||
139 | Refuse pathological nullid successors |
|
139 | Refuse pathological nullid successors | |
140 | $ hg debugobsolete -d '9001 0' 1337133713371337133713371337133713371337 0000000000000000000000000000000000000000 |
|
140 | $ hg debugobsolete -d '9001 0' 1337133713371337133713371337133713371337 0000000000000000000000000000000000000000 | |
141 | transaction abort! |
|
141 | transaction abort! | |
142 | rollback completed |
|
142 | rollback completed | |
143 | abort: bad obsolescence marker detected: invalid successors nullid |
|
143 | abort: bad obsolescence marker detected: invalid successors nullid | |
144 | [255] |
|
144 | [255] | |
145 |
|
145 | |||
146 | Check that graphlog detect that a changeset is obsolete: |
|
146 | Check that graphlog detect that a changeset is obsolete: | |
147 |
|
147 | |||
148 | $ hg log -G |
|
148 | $ hg log -G | |
149 | @ 5:5601fb93a350 (draft) [tip ] add new_3_c |
|
149 | @ 5:5601fb93a350 (draft) [tip ] add new_3_c | |
150 | | |
|
150 | | | |
151 | o 1:7c3bad9141dc (draft) [ ] add b |
|
151 | o 1:7c3bad9141dc (draft) [ ] add b | |
152 | | |
|
152 | | | |
153 | o 0:1f0dee641bb7 (draft) [ ] add a |
|
153 | o 0:1f0dee641bb7 (draft) [ ] add a | |
154 |
|
154 | |||
155 |
|
155 | |||
156 | check that heads does not report them |
|
156 | check that heads does not report them | |
157 |
|
157 | |||
158 | $ hg heads |
|
158 | $ hg heads | |
159 | 5:5601fb93a350 (draft) [tip ] add new_3_c |
|
159 | 5:5601fb93a350 (draft) [tip ] add new_3_c | |
160 | $ hg heads --hidden |
|
160 | $ hg heads --hidden | |
161 | 5:5601fb93a350 (draft) [tip ] add new_3_c |
|
161 | 5:5601fb93a350 (draft) [tip ] add new_3_c | |
162 | 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350] |
|
162 | 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350] | |
163 | 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9] |
|
163 | 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9] | |
164 | 2:245bde4270cd (draft *obsolete*) [ ] add original_c [rewritten as 3:cdbce2fbb163] |
|
164 | 2:245bde4270cd (draft *obsolete*) [ ] add original_c [rewritten as 3:cdbce2fbb163] | |
165 |
|
165 | |||
166 |
|
166 | |||
167 | check that summary does not report them |
|
167 | check that summary does not report them | |
168 |
|
168 | |||
169 | $ hg init ../sink |
|
169 | $ hg init ../sink | |
170 | $ echo '[paths]' >> .hg/hgrc |
|
170 | $ echo '[paths]' >> .hg/hgrc | |
171 | $ echo 'default=../sink' >> .hg/hgrc |
|
171 | $ echo 'default=../sink' >> .hg/hgrc | |
172 | $ hg summary --remote |
|
172 | $ hg summary --remote | |
173 | parent: 5:5601fb93a350 tip |
|
173 | parent: 5:5601fb93a350 tip | |
174 | add new_3_c |
|
174 | add new_3_c | |
175 | branch: default |
|
175 | branch: default | |
176 | commit: (clean) |
|
176 | commit: (clean) | |
177 | update: (current) |
|
177 | update: (current) | |
178 | phases: 3 draft |
|
178 | phases: 3 draft | |
179 | remote: 3 outgoing |
|
179 | remote: 3 outgoing | |
180 |
|
180 | |||
181 | $ hg summary --remote --hidden |
|
181 | $ hg summary --remote --hidden | |
182 | parent: 5:5601fb93a350 tip |
|
182 | parent: 5:5601fb93a350 tip | |
183 | add new_3_c |
|
183 | add new_3_c | |
184 | branch: default |
|
184 | branch: default | |
185 | commit: (clean) |
|
185 | commit: (clean) | |
186 | update: 3 new changesets, 4 branch heads (merge) |
|
186 | update: 3 new changesets, 4 branch heads (merge) | |
187 | phases: 6 draft |
|
187 | phases: 6 draft | |
188 | remote: 3 outgoing |
|
188 | remote: 3 outgoing | |
189 |
|
189 | |||
190 | check that various commands work well with filtering |
|
190 | check that various commands work well with filtering | |
191 |
|
191 | |||
192 | $ hg tip |
|
192 | $ hg tip | |
193 | 5:5601fb93a350 (draft) [tip ] add new_3_c |
|
193 | 5:5601fb93a350 (draft) [tip ] add new_3_c | |
194 | $ hg log -r 6 |
|
194 | $ hg log -r 6 | |
195 | abort: unknown revision '6'! |
|
195 | abort: unknown revision '6'! | |
196 | [255] |
|
196 | [255] | |
197 | $ hg log -r 4 |
|
197 | $ hg log -r 4 | |
198 | abort: hidden revision '4'! |
|
198 | abort: hidden revision '4'! | |
199 | (use --hidden to access hidden revisions) |
|
199 | (use --hidden to access hidden revisions) | |
200 | [255] |
|
200 | [255] | |
201 | $ hg debugrevspec 'rev(6)' |
|
201 | $ hg debugrevspec 'rev(6)' | |
202 | $ hg debugrevspec 'rev(4)' |
|
202 | $ hg debugrevspec 'rev(4)' | |
203 | $ hg debugrevspec 'null' |
|
203 | $ hg debugrevspec 'null' | |
204 | -1 |
|
204 | -1 | |
205 |
|
205 | |||
206 | Check that public changeset are not accounted as obsolete: |
|
206 | Check that public changeset are not accounted as obsolete: | |
207 |
|
207 | |||
208 | $ hg --hidden phase --public 2 |
|
208 | $ hg --hidden phase --public 2 | |
209 | $ hg log -G |
|
209 | $ hg log -G | |
210 | @ 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c |
|
210 | @ 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c | |
211 | | |
|
211 | | | |
212 | | o 2:245bde4270cd (public) [ ] add original_c |
|
212 | | o 2:245bde4270cd (public) [ ] add original_c | |
213 | |/ |
|
213 | |/ | |
214 | o 1:7c3bad9141dc (public) [ ] add b |
|
214 | o 1:7c3bad9141dc (public) [ ] add b | |
215 | | |
|
215 | | | |
216 | o 0:1f0dee641bb7 (public) [ ] add a |
|
216 | o 0:1f0dee641bb7 (public) [ ] add a | |
217 |
|
217 | |||
218 |
|
218 | |||
219 | And that bumped changeset are detected |
|
219 | And that bumped changeset are detected | |
220 | -------------------------------------- |
|
220 | -------------------------------------- | |
221 |
|
221 | |||
222 | If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also |
|
222 | If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also | |
223 | note that the bumped changeset (5:5601fb93a350) is not a direct successor of |
|
223 | note that the bumped changeset (5:5601fb93a350) is not a direct successor of | |
224 | the public changeset |
|
224 | the public changeset | |
225 |
|
225 | |||
226 | $ hg log --hidden -r 'phasedivergent()' |
|
226 | $ hg log --hidden -r 'phasedivergent()' | |
227 | 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c |
|
227 | 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c | |
228 |
|
228 | |||
229 | And that we can't push bumped changeset |
|
229 | And that we can't push bumped changeset | |
230 |
|
230 | |||
231 | $ hg push ../tmpa -r 0 --force #(make repo related) |
|
231 | $ hg push ../tmpa -r 0 --force #(make repo related) | |
232 | pushing to ../tmpa |
|
232 | pushing to ../tmpa | |
233 | searching for changes |
|
233 | searching for changes | |
234 | warning: repository is unrelated |
|
234 | warning: repository is unrelated | |
235 | adding changesets |
|
235 | adding changesets | |
236 | adding manifests |
|
236 | adding manifests | |
237 | adding file changes |
|
237 | adding file changes | |
238 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
238 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
239 | $ hg push ../tmpa |
|
239 | $ hg push ../tmpa | |
240 | pushing to ../tmpa |
|
240 | pushing to ../tmpa | |
241 | searching for changes |
|
241 | searching for changes | |
242 | abort: push includes phase-divergent changeset: 5601fb93a350! |
|
242 | abort: push includes phase-divergent changeset: 5601fb93a350! | |
243 | [255] |
|
243 | [255] | |
244 |
|
244 | |||
245 | Fixing "bumped" situation |
|
245 | Fixing "bumped" situation | |
246 | We need to create a clone of 5 and add a special marker with a flag |
|
246 | We need to create a clone of 5 and add a special marker with a flag | |
247 |
|
247 | |||
248 | $ hg summary |
|
248 | $ hg summary | |
249 | parent: 5:5601fb93a350 tip (phase-divergent) |
|
249 | parent: 5:5601fb93a350 tip (phase-divergent) | |
250 | add new_3_c |
|
250 | add new_3_c | |
251 | branch: default |
|
251 | branch: default | |
252 | commit: (clean) |
|
252 | commit: (clean) | |
253 | update: 1 new changesets, 2 branch heads (merge) |
|
253 | update: 1 new changesets, 2 branch heads (merge) | |
254 | phases: 1 draft |
|
254 | phases: 1 draft | |
255 | phase-divergent: 1 changesets |
|
255 | phase-divergent: 1 changesets | |
256 | $ hg up '5^' |
|
256 | $ hg up '5^' | |
257 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
257 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
258 | $ hg revert -ar 5 |
|
258 | $ hg revert -ar 5 | |
259 | adding new_3_c |
|
259 | adding new_3_c | |
260 | $ hg ci -m 'add n3w_3_c' |
|
260 | $ hg ci -m 'add n3w_3_c' | |
261 | created new head |
|
261 | created new head | |
262 | $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c` |
|
262 | $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c` | |
263 | obsoleted 1 changesets |
|
263 | obsoleted 1 changesets | |
264 | $ hg log -r 'phasedivergent()' |
|
264 | $ hg log -r 'phasedivergent()' | |
265 | $ hg log -G |
|
265 | $ hg log -G | |
266 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c |
|
266 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c | |
267 | | |
|
267 | | | |
268 | | o 2:245bde4270cd (public) [ ] add original_c |
|
268 | | o 2:245bde4270cd (public) [ ] add original_c | |
269 | |/ |
|
269 | |/ | |
270 | o 1:7c3bad9141dc (public) [ ] add b |
|
270 | o 1:7c3bad9141dc (public) [ ] add b | |
271 | | |
|
271 | | | |
272 | o 0:1f0dee641bb7 (public) [ ] add a |
|
272 | o 0:1f0dee641bb7 (public) [ ] add a | |
273 |
|
273 | |||
274 |
|
274 | |||
275 | Basic exclusive testing |
|
275 | Basic exclusive testing | |
276 |
|
276 | |||
277 | $ hg log -G --hidden |
|
277 | $ hg log -G --hidden | |
278 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c |
|
278 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c | |
279 | | |
|
279 | | | |
280 | | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072] |
|
280 | | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072] | |
281 | |/ |
|
281 | |/ | |
282 | | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350] |
|
282 | | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350] | |
283 | |/ |
|
283 | |/ | |
284 | | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9] |
|
284 | | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9] | |
285 | |/ |
|
285 | |/ | |
286 | | o 2:245bde4270cd (public) [ ] add original_c |
|
286 | | o 2:245bde4270cd (public) [ ] add original_c | |
287 | |/ |
|
287 | |/ | |
288 | o 1:7c3bad9141dc (public) [ ] add b |
|
288 | o 1:7c3bad9141dc (public) [ ] add b | |
289 | | |
|
289 | | | |
290 | o 0:1f0dee641bb7 (public) [ ] add a |
|
290 | o 0:1f0dee641bb7 (public) [ ] add a | |
291 |
|
291 | |||
292 | $ hg debugobsolete --rev 6f9641995072 |
|
292 | $ hg debugobsolete --rev 6f9641995072 | |
293 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
293 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
294 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
294 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
295 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
295 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
296 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
296 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
297 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
297 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
298 | $ hg debugobsolete --rev 6f9641995072 --exclusive |
|
298 | $ hg debugobsolete --rev 6f9641995072 --exclusive | |
299 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
299 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
300 | $ hg debugobsolete --rev 5601fb93a350 --hidden |
|
300 | $ hg debugobsolete --rev 5601fb93a350 --hidden | |
301 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
301 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
302 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
302 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
303 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
303 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
304 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
304 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
305 | $ hg debugobsolete --rev 5601fb93a350 --hidden --exclusive |
|
305 | $ hg debugobsolete --rev 5601fb93a350 --hidden --exclusive | |
306 | $ hg debugobsolete --rev 5601fb93a350+6f9641995072 --hidden --exclusive |
|
306 | $ hg debugobsolete --rev 5601fb93a350+6f9641995072 --hidden --exclusive | |
307 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
307 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
308 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
308 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
309 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
309 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
310 |
|
310 | |||
311 | $ cd .. |
|
311 | $ cd .. | |
312 |
|
312 | |||
313 | Revision 0 is hidden |
|
313 | Revision 0 is hidden | |
314 | -------------------- |
|
314 | -------------------- | |
315 |
|
315 | |||
316 | $ hg init rev0hidden |
|
316 | $ hg init rev0hidden | |
317 | $ cd rev0hidden |
|
317 | $ cd rev0hidden | |
318 |
|
318 | |||
319 | $ mkcommit kill0 |
|
319 | $ mkcommit kill0 | |
320 | $ hg up -q null |
|
320 | $ hg up -q null | |
321 | $ hg debugobsolete `getid kill0` |
|
321 | $ hg debugobsolete `getid kill0` | |
322 | obsoleted 1 changesets |
|
322 | obsoleted 1 changesets | |
323 | $ mkcommit a |
|
323 | $ mkcommit a | |
324 | $ mkcommit b |
|
324 | $ mkcommit b | |
325 |
|
325 | |||
326 | Should pick the first visible revision as "repo" node |
|
326 | Should pick the first visible revision as "repo" node | |
327 |
|
327 | |||
328 | $ hg archive ../archive-null |
|
328 | $ hg archive ../archive-null | |
329 | $ cat ../archive-null/.hg_archival.txt |
|
329 | $ cat ../archive-null/.hg_archival.txt | |
330 | repo: 1f0dee641bb7258c56bd60e93edfa2405381c41e |
|
330 | repo: 1f0dee641bb7258c56bd60e93edfa2405381c41e | |
331 | node: 7c3bad9141dcb46ff89abf5f61856facd56e476c |
|
331 | node: 7c3bad9141dcb46ff89abf5f61856facd56e476c | |
332 | branch: default |
|
332 | branch: default | |
333 | latesttag: null |
|
333 | latesttag: null | |
334 | latesttagdistance: 2 |
|
334 | latesttagdistance: 2 | |
335 | changessincelatesttag: 2 |
|
335 | changessincelatesttag: 2 | |
336 |
|
336 | |||
337 |
|
337 | |||
338 | $ cd .. |
|
338 | $ cd .. | |
339 |
|
339 | |||
340 | Exchange Test |
|
340 | Exchange Test | |
341 | ============================ |
|
341 | ============================ | |
342 |
|
342 | |||
343 | Destination repo does not have any data |
|
343 | Destination repo does not have any data | |
344 | --------------------------------------- |
|
344 | --------------------------------------- | |
345 |
|
345 | |||
346 | Simple incoming test |
|
346 | Simple incoming test | |
347 |
|
347 | |||
348 | $ hg init tmpc |
|
348 | $ hg init tmpc | |
349 | $ cd tmpc |
|
349 | $ cd tmpc | |
350 | $ hg incoming ../tmpb |
|
350 | $ hg incoming ../tmpb | |
351 | comparing with ../tmpb |
|
351 | comparing with ../tmpb | |
352 | 0:1f0dee641bb7 (public) [ ] add a |
|
352 | 0:1f0dee641bb7 (public) [ ] add a | |
353 | 1:7c3bad9141dc (public) [ ] add b |
|
353 | 1:7c3bad9141dc (public) [ ] add b | |
354 | 2:245bde4270cd (public) [ ] add original_c |
|
354 | 2:245bde4270cd (public) [ ] add original_c | |
355 | 6:6f9641995072 (draft) [tip ] add n3w_3_c |
|
355 | 6:6f9641995072 (draft) [tip ] add n3w_3_c | |
356 |
|
356 | |||
357 | Try to pull markers |
|
357 | Try to pull markers | |
358 | (extinct changeset are excluded but marker are pushed) |
|
358 | (extinct changeset are excluded but marker are pushed) | |
359 |
|
359 | |||
360 | $ hg pull ../tmpb |
|
360 | $ hg pull ../tmpb | |
361 | pulling from ../tmpb |
|
361 | pulling from ../tmpb | |
362 | requesting all changes |
|
362 | requesting all changes | |
363 | adding changesets |
|
363 | adding changesets | |
364 | adding manifests |
|
364 | adding manifests | |
365 | adding file changes |
|
365 | adding file changes | |
366 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
366 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
367 | 5 new obsolescence markers |
|
367 | 5 new obsolescence markers | |
368 | new changesets 1f0dee641bb7:6f9641995072 |
|
368 | new changesets 1f0dee641bb7:6f9641995072 | |
369 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
369 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
370 | $ hg debugobsolete |
|
370 | $ hg debugobsolete | |
371 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
371 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
372 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
372 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
373 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
373 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
374 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
374 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
375 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
375 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
376 |
|
376 | |||
377 | Rollback//Transaction support |
|
377 | Rollback//Transaction support | |
378 |
|
378 | |||
379 | $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
|
379 | $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | |
380 | $ hg debugobsolete |
|
380 | $ hg debugobsolete | |
381 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
381 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
382 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
382 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
383 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
383 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
384 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
384 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
385 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
385 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
386 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:22:20 1970 +0000) {'user': 'test'} |
|
386 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:22:20 1970 +0000) {'user': 'test'} | |
387 | $ hg rollback -n |
|
387 | $ hg rollback -n | |
388 | repository tip rolled back to revision 3 (undo debugobsolete) |
|
388 | repository tip rolled back to revision 3 (undo debugobsolete) | |
389 | $ hg rollback |
|
389 | $ hg rollback | |
390 | repository tip rolled back to revision 3 (undo debugobsolete) |
|
390 | repository tip rolled back to revision 3 (undo debugobsolete) | |
391 | $ hg debugobsolete |
|
391 | $ hg debugobsolete | |
392 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
392 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
393 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
393 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
394 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
394 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
395 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
395 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
396 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
396 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
397 |
|
397 | |||
398 | $ cd .. |
|
398 | $ cd .. | |
399 |
|
399 | |||
400 | Try to push markers |
|
400 | Try to push markers | |
401 |
|
401 | |||
402 | $ hg init tmpd |
|
402 | $ hg init tmpd | |
403 | $ hg -R tmpb push tmpd |
|
403 | $ hg -R tmpb push tmpd | |
404 | pushing to tmpd |
|
404 | pushing to tmpd | |
405 | searching for changes |
|
405 | searching for changes | |
406 | adding changesets |
|
406 | adding changesets | |
407 | adding manifests |
|
407 | adding manifests | |
408 | adding file changes |
|
408 | adding file changes | |
409 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
409 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
410 | 5 new obsolescence markers |
|
410 | 5 new obsolescence markers | |
411 | $ hg -R tmpd debugobsolete | sort |
|
411 | $ hg -R tmpd debugobsolete | sort | |
412 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
412 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
413 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
413 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
414 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
414 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
415 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
415 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
416 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
416 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
417 |
|
417 | |||
418 | Check obsolete keys are exchanged only if source has an obsolete store |
|
418 | Check obsolete keys are exchanged only if source has an obsolete store | |
419 |
|
419 | |||
420 | $ hg init empty |
|
420 | $ hg init empty | |
421 | $ hg --config extensions.debugkeys=debugkeys.py -R empty push tmpd |
|
421 | $ hg --config extensions.debugkeys=debugkeys.py -R empty push tmpd | |
422 | pushing to tmpd |
|
422 | pushing to tmpd | |
423 | listkeys phases |
|
423 | listkeys phases | |
424 | listkeys bookmarks |
|
424 | listkeys bookmarks | |
425 | no changes found |
|
425 | no changes found | |
426 | listkeys phases |
|
426 | listkeys phases | |
427 | [1] |
|
427 | [1] | |
428 |
|
428 | |||
429 | clone support |
|
429 | clone support | |
430 | (markers are copied and extinct changesets are included to allow hardlinks) |
|
430 | (markers are copied and extinct changesets are included to allow hardlinks) | |
431 |
|
431 | |||
432 | $ hg clone tmpb clone-dest |
|
432 | $ hg clone tmpb clone-dest | |
433 | updating to branch default |
|
433 | updating to branch default | |
434 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
434 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
435 | $ hg -R clone-dest log -G --hidden |
|
435 | $ hg -R clone-dest log -G --hidden | |
436 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c |
|
436 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c | |
437 | | |
|
437 | | | |
438 | | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072] |
|
438 | | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072] | |
439 | |/ |
|
439 | |/ | |
440 | | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350] |
|
440 | | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350] | |
441 | |/ |
|
441 | |/ | |
442 | | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9] |
|
442 | | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9] | |
443 | |/ |
|
443 | |/ | |
444 | | o 2:245bde4270cd (public) [ ] add original_c |
|
444 | | o 2:245bde4270cd (public) [ ] add original_c | |
445 | |/ |
|
445 | |/ | |
446 | o 1:7c3bad9141dc (public) [ ] add b |
|
446 | o 1:7c3bad9141dc (public) [ ] add b | |
447 | | |
|
447 | | | |
448 | o 0:1f0dee641bb7 (public) [ ] add a |
|
448 | o 0:1f0dee641bb7 (public) [ ] add a | |
449 |
|
449 | |||
450 | $ hg -R clone-dest debugobsolete |
|
450 | $ hg -R clone-dest debugobsolete | |
451 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
451 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
452 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
452 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
453 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
453 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
454 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
454 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
455 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
455 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
456 |
|
456 | |||
457 |
|
457 | |||
458 | Destination repo have existing data |
|
458 | Destination repo have existing data | |
459 | --------------------------------------- |
|
459 | --------------------------------------- | |
460 |
|
460 | |||
461 | On pull |
|
461 | On pull | |
462 |
|
462 | |||
463 | $ hg init tmpe |
|
463 | $ hg init tmpe | |
464 | $ cd tmpe |
|
464 | $ cd tmpe | |
465 | $ hg debugobsolete -d '1339 0' 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 |
|
465 | $ hg debugobsolete -d '1339 0' 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 | |
466 | $ hg pull ../tmpb |
|
466 | $ hg pull ../tmpb | |
467 | pulling from ../tmpb |
|
467 | pulling from ../tmpb | |
468 | requesting all changes |
|
468 | requesting all changes | |
469 | adding changesets |
|
469 | adding changesets | |
470 | adding manifests |
|
470 | adding manifests | |
471 | adding file changes |
|
471 | adding file changes | |
472 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
472 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
473 | 5 new obsolescence markers |
|
473 | 5 new obsolescence markers | |
474 | new changesets 1f0dee641bb7:6f9641995072 |
|
474 | new changesets 1f0dee641bb7:6f9641995072 | |
475 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
475 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
476 | $ hg debugobsolete |
|
476 | $ hg debugobsolete | |
477 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
477 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
478 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
478 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
479 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
479 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
480 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
480 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
481 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
481 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
482 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
482 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
483 |
|
483 | |||
484 |
|
484 | |||
485 | On push |
|
485 | On push | |
486 |
|
486 | |||
487 | $ hg push ../tmpc |
|
487 | $ hg push ../tmpc | |
488 | pushing to ../tmpc |
|
488 | pushing to ../tmpc | |
489 | searching for changes |
|
489 | searching for changes | |
490 | no changes found |
|
490 | no changes found | |
491 | 1 new obsolescence markers |
|
491 | 1 new obsolescence markers | |
492 | [1] |
|
492 | [1] | |
493 | $ hg -R ../tmpc debugobsolete |
|
493 | $ hg -R ../tmpc debugobsolete | |
494 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
494 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
495 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
495 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
496 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
496 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
497 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
497 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
498 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
498 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
499 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
499 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
500 |
|
500 | |||
501 | detect outgoing obsolete and unstable |
|
501 | detect outgoing obsolete and unstable | |
502 | --------------------------------------- |
|
502 | --------------------------------------- | |
503 |
|
503 | |||
504 |
|
504 | |||
505 | $ hg log -G |
|
505 | $ hg log -G | |
506 | o 3:6f9641995072 (draft) [tip ] add n3w_3_c |
|
506 | o 3:6f9641995072 (draft) [tip ] add n3w_3_c | |
507 | | |
|
507 | | | |
508 | | o 2:245bde4270cd (public) [ ] add original_c |
|
508 | | o 2:245bde4270cd (public) [ ] add original_c | |
509 | |/ |
|
509 | |/ | |
510 | o 1:7c3bad9141dc (public) [ ] add b |
|
510 | o 1:7c3bad9141dc (public) [ ] add b | |
511 | | |
|
511 | | | |
512 | o 0:1f0dee641bb7 (public) [ ] add a |
|
512 | o 0:1f0dee641bb7 (public) [ ] add a | |
513 |
|
513 | |||
514 | $ hg up 'desc("n3w_3_c")' |
|
514 | $ hg up 'desc("n3w_3_c")' | |
515 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
515 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
516 | $ mkcommit original_d |
|
516 | $ mkcommit original_d | |
517 | $ mkcommit original_e |
|
517 | $ mkcommit original_e | |
518 | $ hg debugobsolete --record-parents `getid original_d` -d '0 0' |
|
518 | $ hg debugobsolete --record-parents `getid original_d` -d '0 0' | |
519 | obsoleted 1 changesets |
|
519 | obsoleted 1 changesets | |
520 | $ hg debugobsolete | grep `getid original_d` |
|
520 | $ hg debugobsolete | grep `getid original_d` | |
521 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
521 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
522 | $ hg log -r 'obsolete()' |
|
522 | $ hg log -r 'obsolete()' | |
523 | 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] |
|
523 | 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] | |
524 | $ hg summary |
|
524 | $ hg summary | |
525 | parent: 5:cda648ca50f5 tip (orphan) |
|
525 | parent: 5:cda648ca50f5 tip (orphan) | |
526 | add original_e |
|
526 | add original_e | |
527 | branch: default |
|
527 | branch: default | |
528 | commit: (clean) |
|
528 | commit: (clean) | |
529 | update: 1 new changesets, 2 branch heads (merge) |
|
529 | update: 1 new changesets, 2 branch heads (merge) | |
530 | phases: 3 draft |
|
530 | phases: 3 draft | |
531 | orphan: 1 changesets |
|
531 | orphan: 1 changesets | |
532 | $ hg log -G -r '::orphan()' |
|
532 | $ hg log -G -r '::orphan()' | |
533 | @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e |
|
533 | @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e | |
534 | | |
|
534 | | | |
535 | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] |
|
535 | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] | |
536 | | |
|
536 | | | |
537 | o 3:6f9641995072 (draft) [ ] add n3w_3_c |
|
537 | o 3:6f9641995072 (draft) [ ] add n3w_3_c | |
538 | | |
|
538 | | | |
539 | o 1:7c3bad9141dc (public) [ ] add b |
|
539 | o 1:7c3bad9141dc (public) [ ] add b | |
540 | | |
|
540 | | | |
541 | o 0:1f0dee641bb7 (public) [ ] add a |
|
541 | o 0:1f0dee641bb7 (public) [ ] add a | |
542 |
|
542 | |||
543 |
|
543 | |||
544 | refuse to push obsolete changeset |
|
544 | refuse to push obsolete changeset | |
545 |
|
545 | |||
546 | $ hg push ../tmpc/ -r 'desc("original_d")' |
|
546 | $ hg push ../tmpc/ -r 'desc("original_d")' | |
547 | pushing to ../tmpc/ |
|
547 | pushing to ../tmpc/ | |
548 | searching for changes |
|
548 | searching for changes | |
549 | abort: push includes obsolete changeset: 94b33453f93b! |
|
549 | abort: push includes obsolete changeset: 94b33453f93b! | |
550 | [255] |
|
550 | [255] | |
551 |
|
551 | |||
552 | refuse to push unstable changeset |
|
552 | refuse to push unstable changeset | |
553 |
|
553 | |||
554 | $ hg push ../tmpc/ |
|
554 | $ hg push ../tmpc/ | |
555 | pushing to ../tmpc/ |
|
555 | pushing to ../tmpc/ | |
556 | searching for changes |
|
556 | searching for changes | |
557 | abort: push includes orphan changeset: cda648ca50f5! |
|
557 | abort: push includes orphan changeset: cda648ca50f5! | |
558 | [255] |
|
558 | [255] | |
559 |
|
559 | |||
560 | Test that extinct changeset are properly detected |
|
560 | Test that extinct changeset are properly detected | |
561 |
|
561 | |||
562 | $ hg log -r 'extinct()' |
|
562 | $ hg log -r 'extinct()' | |
563 |
|
563 | |||
564 | Don't try to push extinct changeset |
|
564 | Don't try to push extinct changeset | |
565 |
|
565 | |||
566 | $ hg init ../tmpf |
|
566 | $ hg init ../tmpf | |
567 | $ hg out ../tmpf |
|
567 | $ hg out ../tmpf | |
568 | comparing with ../tmpf |
|
568 | comparing with ../tmpf | |
569 | searching for changes |
|
569 | searching for changes | |
570 | 0:1f0dee641bb7 (public) [ ] add a |
|
570 | 0:1f0dee641bb7 (public) [ ] add a | |
571 | 1:7c3bad9141dc (public) [ ] add b |
|
571 | 1:7c3bad9141dc (public) [ ] add b | |
572 | 2:245bde4270cd (public) [ ] add original_c |
|
572 | 2:245bde4270cd (public) [ ] add original_c | |
573 | 3:6f9641995072 (draft) [ ] add n3w_3_c |
|
573 | 3:6f9641995072 (draft) [ ] add n3w_3_c | |
574 | 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] |
|
574 | 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] | |
575 | 5:cda648ca50f5 (draft orphan) [tip ] add original_e |
|
575 | 5:cda648ca50f5 (draft orphan) [tip ] add original_e | |
576 | $ hg push ../tmpf -f # -f because be push unstable too |
|
576 | $ hg push ../tmpf -f # -f because be push unstable too | |
577 | pushing to ../tmpf |
|
577 | pushing to ../tmpf | |
578 | searching for changes |
|
578 | searching for changes | |
579 | adding changesets |
|
579 | adding changesets | |
580 | adding manifests |
|
580 | adding manifests | |
581 | adding file changes |
|
581 | adding file changes | |
582 | added 6 changesets with 6 changes to 6 files (+1 heads) |
|
582 | added 6 changesets with 6 changes to 6 files (+1 heads) | |
583 | 7 new obsolescence markers |
|
583 | 7 new obsolescence markers | |
584 |
|
584 | |||
585 | no warning displayed |
|
585 | no warning displayed | |
586 |
|
586 | |||
587 | $ hg push ../tmpf |
|
587 | $ hg push ../tmpf | |
588 | pushing to ../tmpf |
|
588 | pushing to ../tmpf | |
589 | searching for changes |
|
589 | searching for changes | |
590 | no changes found |
|
590 | no changes found | |
591 | [1] |
|
591 | [1] | |
592 |
|
592 | |||
593 | Do not warn about new head when the new head is a successors of a remote one |
|
593 | Do not warn about new head when the new head is a successors of a remote one | |
594 |
|
594 | |||
595 | $ hg log -G |
|
595 | $ hg log -G | |
596 | @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e |
|
596 | @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e | |
597 | | |
|
597 | | | |
598 | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] |
|
598 | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] | |
599 | | |
|
599 | | | |
600 | o 3:6f9641995072 (draft) [ ] add n3w_3_c |
|
600 | o 3:6f9641995072 (draft) [ ] add n3w_3_c | |
601 | | |
|
601 | | | |
602 | | o 2:245bde4270cd (public) [ ] add original_c |
|
602 | | o 2:245bde4270cd (public) [ ] add original_c | |
603 | |/ |
|
603 | |/ | |
604 | o 1:7c3bad9141dc (public) [ ] add b |
|
604 | o 1:7c3bad9141dc (public) [ ] add b | |
605 | | |
|
605 | | | |
606 | o 0:1f0dee641bb7 (public) [ ] add a |
|
606 | o 0:1f0dee641bb7 (public) [ ] add a | |
607 |
|
607 | |||
608 | $ hg up -q 'desc(n3w_3_c)' |
|
608 | $ hg up -q 'desc(n3w_3_c)' | |
609 | $ mkcommit obsolete_e |
|
609 | $ mkcommit obsolete_e | |
610 | created new head |
|
610 | created new head | |
611 | $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` \ |
|
611 | $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` \ | |
612 | > -u 'test <test@example.net>' |
|
612 | > -u 'test <test@example.net>' | |
613 | obsoleted 1 changesets |
|
613 | obsoleted 1 changesets | |
614 | $ hg outgoing ../tmpf # parasite hg outgoing testin |
|
614 | $ hg outgoing ../tmpf # parasite hg outgoing testin | |
615 | comparing with ../tmpf |
|
615 | comparing with ../tmpf | |
616 | searching for changes |
|
616 | searching for changes | |
617 | 6:3de5eca88c00 (draft) [tip ] add obsolete_e |
|
617 | 6:3de5eca88c00 (draft) [tip ] add obsolete_e | |
618 | $ hg push ../tmpf |
|
618 | $ hg push ../tmpf | |
619 | pushing to ../tmpf |
|
619 | pushing to ../tmpf | |
620 | searching for changes |
|
620 | searching for changes | |
621 | adding changesets |
|
621 | adding changesets | |
622 | adding manifests |
|
622 | adding manifests | |
623 | adding file changes |
|
623 | adding file changes | |
624 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
624 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
625 | 1 new obsolescence markers |
|
625 | 1 new obsolescence markers | |
626 | obsoleted 1 changesets |
|
626 | obsoleted 1 changesets | |
627 |
|
627 | |||
628 | test relevance computation |
|
628 | test relevance computation | |
629 | --------------------------------------- |
|
629 | --------------------------------------- | |
630 |
|
630 | |||
631 | Checking simple case of "marker relevance". |
|
631 | Checking simple case of "marker relevance". | |
632 |
|
632 | |||
633 |
|
633 | |||
634 | Reminder of the repo situation |
|
634 | Reminder of the repo situation | |
635 |
|
635 | |||
636 | $ hg log --hidden --graph |
|
636 | $ hg log --hidden --graph | |
637 | @ 6:3de5eca88c00 (draft) [tip ] add obsolete_e |
|
637 | @ 6:3de5eca88c00 (draft) [tip ] add obsolete_e | |
638 | | |
|
638 | | | |
639 | | x 5:cda648ca50f5 (draft *obsolete*) [ ] add original_e [rewritten as 6:3de5eca88c00 by test <test@example.net>] |
|
639 | | x 5:cda648ca50f5 (draft *obsolete*) [ ] add original_e [rewritten as 6:3de5eca88c00 by test <test@example.net>] | |
640 | | | |
|
640 | | | | |
641 | | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] |
|
641 | | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] | |
642 | |/ |
|
642 | |/ | |
643 | o 3:6f9641995072 (draft) [ ] add n3w_3_c |
|
643 | o 3:6f9641995072 (draft) [ ] add n3w_3_c | |
644 | | |
|
644 | | | |
645 | | o 2:245bde4270cd (public) [ ] add original_c |
|
645 | | o 2:245bde4270cd (public) [ ] add original_c | |
646 | |/ |
|
646 | |/ | |
647 | o 1:7c3bad9141dc (public) [ ] add b |
|
647 | o 1:7c3bad9141dc (public) [ ] add b | |
648 | | |
|
648 | | | |
649 | o 0:1f0dee641bb7 (public) [ ] add a |
|
649 | o 0:1f0dee641bb7 (public) [ ] add a | |
650 |
|
650 | |||
651 |
|
651 | |||
652 | List of all markers |
|
652 | List of all markers | |
653 |
|
653 | |||
654 | $ hg debugobsolete |
|
654 | $ hg debugobsolete | |
655 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
655 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
656 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
656 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
657 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
657 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
658 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
658 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
659 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
659 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
660 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
660 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
661 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
661 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
662 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob) |
|
662 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob) | |
663 |
|
663 | |||
664 | List of changesets with no chain |
|
664 | List of changesets with no chain | |
665 |
|
665 | |||
666 | $ hg debugobsolete --hidden --rev ::2 |
|
666 | $ hg debugobsolete --hidden --rev ::2 | |
667 |
|
667 | |||
668 | List of changesets that are included on marker chain |
|
668 | List of changesets that are included on marker chain | |
669 |
|
669 | |||
670 | $ hg debugobsolete --hidden --rev 6 |
|
670 | $ hg debugobsolete --hidden --rev 6 | |
671 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob) |
|
671 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob) | |
672 |
|
672 | |||
673 | List of changesets with a longer chain, (including a pruned children) |
|
673 | List of changesets with a longer chain, (including a pruned children) | |
674 |
|
674 | |||
675 | $ hg debugobsolete --hidden --rev 3 |
|
675 | $ hg debugobsolete --hidden --rev 3 | |
676 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
676 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
677 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
677 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
678 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
678 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
679 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
679 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
680 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
680 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
681 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
681 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
682 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
682 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
683 |
|
683 | |||
684 | List of both |
|
684 | List of both | |
685 |
|
685 | |||
686 | $ hg debugobsolete --hidden --rev 3::6 |
|
686 | $ hg debugobsolete --hidden --rev 3::6 | |
687 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
687 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
688 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
688 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
689 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
689 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
690 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
690 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
691 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
691 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
692 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
692 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
693 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob) |
|
693 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob) | |
694 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
694 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
695 |
|
695 | |||
696 | List of all markers in JSON |
|
696 | List of all markers in JSON | |
697 |
|
697 | |||
698 | $ hg debugobsolete -Tjson |
|
698 | $ hg debugobsolete -Tjson | |
699 | [ |
|
699 | [ | |
700 | { |
|
700 | { | |
701 | "date": [1339.0, 0], |
|
701 | "date": [1339.0, 0], | |
702 | "flag": 0, |
|
702 | "flag": 0, | |
703 | "metadata": {"user": "test"}, |
|
703 | "metadata": {"user": "test"}, | |
704 | "prednode": "1339133913391339133913391339133913391339", |
|
704 | "prednode": "1339133913391339133913391339133913391339", | |
705 | "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"] |
|
705 | "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"] | |
706 | }, |
|
706 | }, | |
707 | { |
|
707 | { | |
708 | "date": [1339.0, 0], |
|
708 | "date": [1339.0, 0], | |
709 | "flag": 0, |
|
709 | "flag": 0, | |
710 | "metadata": {"user": "test"}, |
|
710 | "metadata": {"user": "test"}, | |
711 | "prednode": "1337133713371337133713371337133713371337", |
|
711 | "prednode": "1337133713371337133713371337133713371337", | |
712 | "succnodes": ["5601fb93a350734d935195fee37f4054c529ff39"] |
|
712 | "succnodes": ["5601fb93a350734d935195fee37f4054c529ff39"] | |
713 | }, |
|
713 | }, | |
714 | { |
|
714 | { | |
715 | "date": [121.0, 120], |
|
715 | "date": [121.0, 120], | |
716 | "flag": 12, |
|
716 | "flag": 12, | |
717 | "metadata": {"user": "test"}, |
|
717 | "metadata": {"user": "test"}, | |
718 | "prednode": "245bde4270cd1072a27757984f9cda8ba26f08ca", |
|
718 | "prednode": "245bde4270cd1072a27757984f9cda8ba26f08ca", | |
719 | "succnodes": ["cdbce2fbb16313928851e97e0d85413f3f7eb77f"] |
|
719 | "succnodes": ["cdbce2fbb16313928851e97e0d85413f3f7eb77f"] | |
720 | }, |
|
720 | }, | |
721 | { |
|
721 | { | |
722 | "date": [1338.0, 0], |
|
722 | "date": [1338.0, 0], | |
723 | "flag": 1, |
|
723 | "flag": 1, | |
724 | "metadata": {"user": "test"}, |
|
724 | "metadata": {"user": "test"}, | |
725 | "prednode": "5601fb93a350734d935195fee37f4054c529ff39", |
|
725 | "prednode": "5601fb93a350734d935195fee37f4054c529ff39", | |
726 | "succnodes": ["6f96419950729f3671185b847352890f074f7557"] |
|
726 | "succnodes": ["6f96419950729f3671185b847352890f074f7557"] | |
727 | }, |
|
727 | }, | |
728 | { |
|
728 | { | |
729 | "date": [1338.0, 0], |
|
729 | "date": [1338.0, 0], | |
730 | "flag": 0, |
|
730 | "flag": 0, | |
731 | "metadata": {"user": "test"}, |
|
731 | "metadata": {"user": "test"}, | |
732 | "prednode": "ca819180edb99ed25ceafb3e9584ac287e240b00", |
|
732 | "prednode": "ca819180edb99ed25ceafb3e9584ac287e240b00", | |
733 | "succnodes": ["1337133713371337133713371337133713371337"] |
|
733 | "succnodes": ["1337133713371337133713371337133713371337"] | |
734 | }, |
|
734 | }, | |
735 | { |
|
735 | { | |
736 | "date": [1337.0, 0], |
|
736 | "date": [1337.0, 0], | |
737 | "flag": 0, |
|
737 | "flag": 0, | |
738 | "metadata": {"user": "test"}, |
|
738 | "metadata": {"user": "test"}, | |
739 | "prednode": "cdbce2fbb16313928851e97e0d85413f3f7eb77f", |
|
739 | "prednode": "cdbce2fbb16313928851e97e0d85413f3f7eb77f", | |
740 | "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"] |
|
740 | "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"] | |
741 | }, |
|
741 | }, | |
742 | { |
|
742 | { | |
743 | "date": [0.0, 0], |
|
743 | "date": [0.0, 0], | |
744 | "flag": 0, |
|
744 | "flag": 0, | |
745 | "metadata": {"user": "test"}, |
|
745 | "metadata": {"user": "test"}, | |
746 | "parentnodes": ["6f96419950729f3671185b847352890f074f7557"], |
|
746 | "parentnodes": ["6f96419950729f3671185b847352890f074f7557"], | |
747 | "prednode": "94b33453f93bdb8d457ef9b770851a618bf413e1", |
|
747 | "prednode": "94b33453f93bdb8d457ef9b770851a618bf413e1", | |
748 | "succnodes": [] |
|
748 | "succnodes": [] | |
749 | }, |
|
749 | }, | |
750 | { |
|
750 | { | |
751 | "date": *, (glob) |
|
751 | "date": *, (glob) | |
752 | "flag": 0, |
|
752 | "flag": 0, | |
753 | "metadata": {"user": "test <test@example.net>"}, |
|
753 | "metadata": {"user": "test <test@example.net>"}, | |
754 | "prednode": "cda648ca50f50482b7055c0b0c4c117bba6733d9", |
|
754 | "prednode": "cda648ca50f50482b7055c0b0c4c117bba6733d9", | |
755 | "succnodes": ["3de5eca88c00aa039da7399a220f4a5221faa585"] |
|
755 | "succnodes": ["3de5eca88c00aa039da7399a220f4a5221faa585"] | |
756 | } |
|
756 | } | |
757 | ] |
|
757 | ] | |
758 |
|
758 | |||
759 | Template keywords |
|
759 | Template keywords | |
760 |
|
760 | |||
761 | $ hg debugobsolete -r6 -T '{succnodes % "{node|short}"} {date|shortdate}\n' |
|
761 | $ hg debugobsolete -r6 -T '{succnodes % "{node|short}"} {date|shortdate}\n' | |
762 | 3de5eca88c00 ????-??-?? (glob) |
|
762 | 3de5eca88c00 ????-??-?? (glob) | |
763 | $ hg debugobsolete -r6 -T '{join(metadata % "{key}={value}", " ")}\n' |
|
763 | $ hg debugobsolete -r6 -T '{join(metadata % "{key}={value}", " ")}\n' | |
764 | user=test <test@example.net> |
|
764 | user=test <test@example.net> | |
765 | $ hg debugobsolete -r6 -T '{metadata}\n{metadata}\n' |
|
765 | $ hg debugobsolete -r6 -T '{metadata}\n{metadata}\n' | |
766 | 'user': 'test <test@example.net>' |
|
766 | 'user': 'test <test@example.net>' | |
767 | 'user': 'test <test@example.net>' |
|
767 | 'user': 'test <test@example.net>' | |
768 | $ hg debugobsolete -r6 -T '{succnodes}\n{succnodes}\n' |
|
768 | $ hg debugobsolete -r6 -T '{succnodes}\n{succnodes}\n' | |
769 | 3de5eca88c00aa039da7399a220f4a5221faa585 |
|
769 | 3de5eca88c00aa039da7399a220f4a5221faa585 | |
770 | 3de5eca88c00aa039da7399a220f4a5221faa585 |
|
770 | 3de5eca88c00aa039da7399a220f4a5221faa585 | |
771 | $ hg debugobsolete -r6 -T '{flag} {get(metadata, "user")}\n' |
|
771 | $ hg debugobsolete -r6 -T '{flag} {get(metadata, "user")}\n' | |
772 | 0 test <test@example.net> |
|
772 | 0 test <test@example.net> | |
773 |
|
773 | |||
774 | Test the debug output for exchange |
|
774 | Test the debug output for exchange | |
775 | ---------------------------------- |
|
775 | ---------------------------------- | |
776 |
|
776 | |||
777 | $ hg pull ../tmpb --config 'experimental.obsmarkers-exchange-debug=True' # bundle2 |
|
777 | $ hg pull ../tmpb --config 'experimental.obsmarkers-exchange-debug=True' # bundle2 | |
778 | pulling from ../tmpb |
|
778 | pulling from ../tmpb | |
779 | searching for changes |
|
779 | searching for changes | |
780 | no changes found |
|
780 | no changes found | |
781 | obsmarker-exchange: 346 bytes received |
|
781 | obsmarker-exchange: 346 bytes received | |
782 |
|
782 | |||
783 | check hgweb does not explode |
|
783 | check hgweb does not explode | |
784 | ==================================== |
|
784 | ==================================== | |
785 |
|
785 | |||
786 | $ hg unbundle $TESTDIR/bundles/hgweb+obs.hg |
|
786 | $ hg unbundle $TESTDIR/bundles/hgweb+obs.hg | |
787 | adding changesets |
|
787 | adding changesets | |
788 | adding manifests |
|
788 | adding manifests | |
789 | adding file changes |
|
789 | adding file changes | |
790 | added 62 changesets with 63 changes to 9 files (+60 heads) |
|
790 | added 62 changesets with 63 changes to 9 files (+60 heads) | |
791 | new changesets 50c51b361e60:c15e9edfca13 |
|
791 | new changesets 50c51b361e60:c15e9edfca13 | |
792 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
792 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
793 | $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`; |
|
793 | $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`; | |
794 | > do |
|
794 | > do | |
795 | > hg debugobsolete $node |
|
795 | > hg debugobsolete $node | |
796 | > done |
|
796 | > done | |
797 | obsoleted 1 changesets |
|
797 | obsoleted 1 changesets | |
798 | obsoleted 1 changesets |
|
798 | obsoleted 1 changesets | |
799 | obsoleted 1 changesets |
|
799 | obsoleted 1 changesets | |
800 | obsoleted 1 changesets |
|
800 | obsoleted 1 changesets | |
801 | obsoleted 1 changesets |
|
801 | obsoleted 1 changesets | |
802 | obsoleted 1 changesets |
|
802 | obsoleted 1 changesets | |
803 | obsoleted 1 changesets |
|
803 | obsoleted 1 changesets | |
804 | obsoleted 1 changesets |
|
804 | obsoleted 1 changesets | |
805 | obsoleted 1 changesets |
|
805 | obsoleted 1 changesets | |
806 | obsoleted 1 changesets |
|
806 | obsoleted 1 changesets | |
807 | obsoleted 1 changesets |
|
807 | obsoleted 1 changesets | |
808 | obsoleted 1 changesets |
|
808 | obsoleted 1 changesets | |
809 | obsoleted 1 changesets |
|
809 | obsoleted 1 changesets | |
810 | obsoleted 1 changesets |
|
810 | obsoleted 1 changesets | |
811 | obsoleted 1 changesets |
|
811 | obsoleted 1 changesets | |
812 | obsoleted 1 changesets |
|
812 | obsoleted 1 changesets | |
813 | obsoleted 1 changesets |
|
813 | obsoleted 1 changesets | |
814 | obsoleted 1 changesets |
|
814 | obsoleted 1 changesets | |
815 | obsoleted 1 changesets |
|
815 | obsoleted 1 changesets | |
816 | obsoleted 1 changesets |
|
816 | obsoleted 1 changesets | |
817 | obsoleted 1 changesets |
|
817 | obsoleted 1 changesets | |
818 | obsoleted 1 changesets |
|
818 | obsoleted 1 changesets | |
819 | obsoleted 1 changesets |
|
819 | obsoleted 1 changesets | |
820 | obsoleted 1 changesets |
|
820 | obsoleted 1 changesets | |
821 | obsoleted 1 changesets |
|
821 | obsoleted 1 changesets | |
822 | obsoleted 1 changesets |
|
822 | obsoleted 1 changesets | |
823 | obsoleted 1 changesets |
|
823 | obsoleted 1 changesets | |
824 | obsoleted 1 changesets |
|
824 | obsoleted 1 changesets | |
825 | obsoleted 1 changesets |
|
825 | obsoleted 1 changesets | |
826 | obsoleted 1 changesets |
|
826 | obsoleted 1 changesets | |
827 | obsoleted 1 changesets |
|
827 | obsoleted 1 changesets | |
828 | obsoleted 1 changesets |
|
828 | obsoleted 1 changesets | |
829 | obsoleted 1 changesets |
|
829 | obsoleted 1 changesets | |
830 | obsoleted 1 changesets |
|
830 | obsoleted 1 changesets | |
831 | obsoleted 1 changesets |
|
831 | obsoleted 1 changesets | |
832 | obsoleted 1 changesets |
|
832 | obsoleted 1 changesets | |
833 | obsoleted 1 changesets |
|
833 | obsoleted 1 changesets | |
834 | obsoleted 1 changesets |
|
834 | obsoleted 1 changesets | |
835 | obsoleted 1 changesets |
|
835 | obsoleted 1 changesets | |
836 | obsoleted 1 changesets |
|
836 | obsoleted 1 changesets | |
837 | obsoleted 1 changesets |
|
837 | obsoleted 1 changesets | |
838 | obsoleted 1 changesets |
|
838 | obsoleted 1 changesets | |
839 | obsoleted 1 changesets |
|
839 | obsoleted 1 changesets | |
840 | obsoleted 1 changesets |
|
840 | obsoleted 1 changesets | |
841 | obsoleted 1 changesets |
|
841 | obsoleted 1 changesets | |
842 | obsoleted 1 changesets |
|
842 | obsoleted 1 changesets | |
843 | obsoleted 1 changesets |
|
843 | obsoleted 1 changesets | |
844 | obsoleted 1 changesets |
|
844 | obsoleted 1 changesets | |
845 | obsoleted 1 changesets |
|
845 | obsoleted 1 changesets | |
846 | obsoleted 1 changesets |
|
846 | obsoleted 1 changesets | |
847 | obsoleted 1 changesets |
|
847 | obsoleted 1 changesets | |
848 | obsoleted 1 changesets |
|
848 | obsoleted 1 changesets | |
849 | obsoleted 1 changesets |
|
849 | obsoleted 1 changesets | |
850 | obsoleted 1 changesets |
|
850 | obsoleted 1 changesets | |
851 | obsoleted 1 changesets |
|
851 | obsoleted 1 changesets | |
852 | obsoleted 1 changesets |
|
852 | obsoleted 1 changesets | |
853 | obsoleted 1 changesets |
|
853 | obsoleted 1 changesets | |
854 | obsoleted 1 changesets |
|
854 | obsoleted 1 changesets | |
855 | obsoleted 1 changesets |
|
855 | obsoleted 1 changesets | |
856 | obsoleted 1 changesets |
|
856 | obsoleted 1 changesets | |
857 | $ hg up tip |
|
857 | $ hg up tip | |
858 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
858 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
859 |
|
859 | |||
860 | #if serve |
|
860 | #if serve | |
861 |
|
861 | |||
862 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
862 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | |
863 | $ cat hg.pid >> $DAEMON_PIDS |
|
863 | $ cat hg.pid >> $DAEMON_PIDS | |
864 |
|
864 | |||
865 | check changelog view |
|
865 | check changelog view | |
866 |
|
866 | |||
867 | $ get-with-headers.py --headeronly localhost:$HGPORT 'shortlog/' |
|
867 | $ get-with-headers.py --headeronly localhost:$HGPORT 'shortlog/' | |
868 | 200 Script output follows |
|
868 | 200 Script output follows | |
869 |
|
869 | |||
870 | check graph view |
|
870 | check graph view | |
871 |
|
871 | |||
872 | $ get-with-headers.py --headeronly localhost:$HGPORT 'graph' |
|
872 | $ get-with-headers.py --headeronly localhost:$HGPORT 'graph' | |
873 | 200 Script output follows |
|
873 | 200 Script output follows | |
874 |
|
874 | |||
875 | check filelog view |
|
875 | check filelog view | |
876 |
|
876 | |||
877 | $ get-with-headers.py --headeronly localhost:$HGPORT 'log/'`hg log -r . -T "{node}"`/'babar' |
|
877 | $ get-with-headers.py --headeronly localhost:$HGPORT 'log/'`hg log -r . -T "{node}"`/'babar' | |
878 | 200 Script output follows |
|
878 | 200 Script output follows | |
879 |
|
879 | |||
880 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/68' |
|
880 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/68' | |
881 | 200 Script output follows |
|
881 | 200 Script output follows | |
882 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67' |
|
882 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67' | |
883 | 404 Not Found |
|
883 | 404 Not Found | |
884 | [1] |
|
884 | [1] | |
885 |
|
885 | |||
886 | check that web.view config option: |
|
886 | check that web.view config option: | |
887 |
|
887 | |||
888 | $ killdaemons.py hg.pid |
|
888 | $ killdaemons.py hg.pid | |
889 | $ cat >> .hg/hgrc << EOF |
|
889 | $ cat >> .hg/hgrc << EOF | |
890 | > [web] |
|
890 | > [web] | |
891 | > view=all |
|
891 | > view=all | |
892 | > EOF |
|
892 | > EOF | |
893 | $ wait |
|
893 | $ wait | |
894 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
894 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | |
895 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67' |
|
895 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67' | |
896 | 200 Script output follows |
|
896 | 200 Script output follows | |
897 | $ killdaemons.py hg.pid |
|
897 | $ killdaemons.py hg.pid | |
898 |
|
898 | |||
899 | Checking _enable=False warning if obsolete marker exists |
|
899 | Checking _enable=False warning if obsolete marker exists | |
900 |
|
900 | |||
901 | $ echo '[experimental]' >> $HGRCPATH |
|
901 | $ echo '[experimental]' >> $HGRCPATH | |
902 | $ echo "stabilization=" >> $HGRCPATH |
|
902 | $ echo "stabilization=" >> $HGRCPATH | |
903 | $ hg log -r tip |
|
903 | $ hg log -r tip | |
904 | obsolete feature not enabled but 68 markers found! |
|
904 | obsolete feature not enabled but 68 markers found! | |
905 | 68:c15e9edfca13 (draft) [tip ] add celestine |
|
905 | 68:c15e9edfca13 (draft) [tip ] add celestine | |
906 |
|
906 | |||
907 | reenable for later test |
|
907 | reenable for later test | |
908 |
|
908 | |||
909 | $ echo '[experimental]' >> $HGRCPATH |
|
909 | $ echo '[experimental]' >> $HGRCPATH | |
910 | $ echo "stabilization=createmarkers,exchange" >> $HGRCPATH |
|
910 | $ echo "stabilization=createmarkers,exchange" >> $HGRCPATH | |
911 |
|
911 | |||
912 | $ rm hg.pid access.log errors.log |
|
912 | $ rm hg.pid access.log errors.log | |
913 | #endif |
|
913 | #endif | |
914 |
|
914 | |||
915 | Several troubles on the same changeset (create an unstable and bumped changeset) |
|
915 | Several troubles on the same changeset (create an unstable and bumped changeset) | |
916 |
|
916 | |||
917 | $ hg debugobsolete `getid obsolete_e` |
|
917 | $ hg debugobsolete `getid obsolete_e` | |
918 | obsoleted 1 changesets |
|
918 | obsoleted 1 changesets | |
919 | $ hg debugobsolete `getid original_c` `getid babar` |
|
919 | $ hg debugobsolete `getid original_c` `getid babar` | |
920 | $ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan()' |
|
920 | $ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan()' | |
921 | changeset: 7:50c51b361e60 |
|
921 | changeset: 7:50c51b361e60 | |
922 | user: test |
|
922 | user: test | |
923 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
923 | date: Thu Jan 01 00:00:00 1970 +0000 | |
924 | instability: orphan, phase-divergent |
|
924 | instability: orphan, phase-divergent | |
925 | summary: add babar |
|
925 | summary: add babar | |
926 |
|
926 | |||
927 |
|
927 | |||
928 | test the "obsolete" templatekw |
|
928 | test the "obsolete" templatekw | |
929 |
|
929 | |||
930 | $ hg log -r 'obsolete()' |
|
930 | $ hg log -r 'obsolete()' | |
931 | 6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e [pruned] |
|
931 | 6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e [pruned] | |
932 |
|
932 | |||
933 | test the "troubles" templatekw |
|
933 | test the "troubles" templatekw | |
934 |
|
934 | |||
935 | $ hg log -r 'phasedivergent() and orphan()' |
|
935 | $ hg log -r 'phasedivergent() and orphan()' | |
936 | 7:50c51b361e60 (draft orphan phase-divergent) [ ] add babar |
|
936 | 7:50c51b361e60 (draft orphan phase-divergent) [ ] add babar | |
937 |
|
937 | |||
938 | test the default cmdline template |
|
938 | test the default cmdline template | |
939 |
|
939 | |||
940 | $ hg log -T default -r 'phasedivergent()' |
|
940 | $ hg log -T default -r 'phasedivergent()' | |
941 | changeset: 7:50c51b361e60 |
|
941 | changeset: 7:50c51b361e60 | |
942 | user: test |
|
942 | user: test | |
943 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
943 | date: Thu Jan 01 00:00:00 1970 +0000 | |
944 | instability: orphan, phase-divergent |
|
944 | instability: orphan, phase-divergent | |
945 | summary: add babar |
|
945 | summary: add babar | |
946 |
|
946 | |||
947 | $ hg log -T default -r 'obsolete()' |
|
947 | $ hg log -T default -r 'obsolete()' | |
948 | changeset: 6:3de5eca88c00 |
|
948 | changeset: 6:3de5eca88c00 | |
949 | parent: 3:6f9641995072 |
|
949 | parent: 3:6f9641995072 | |
950 | user: test |
|
950 | user: test | |
951 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
951 | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
952 | obsfate: pruned | |||
952 | summary: add obsolete_e |
|
953 | summary: add obsolete_e | |
953 |
|
954 | |||
954 |
|
955 | |||
955 | test the obsolete labels |
|
956 | test the obsolete labels | |
956 |
|
957 | |||
957 | $ hg log --config ui.logtemplate= --color=debug -r 'phasedivergent()' |
|
958 | $ hg log --config ui.logtemplate= --color=debug -r 'phasedivergent()' | |
958 | [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset: 7:50c51b361e60] |
|
959 | [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset: 7:50c51b361e60] | |
959 | [log.user|user: test] |
|
960 | [log.user|user: test] | |
960 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
|
961 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] | |
961 | [log.instability|instability: orphan, phase-divergent] |
|
962 | [log.instability|instability: orphan, phase-divergent] | |
962 | [log.summary|summary: add babar] |
|
963 | [log.summary|summary: add babar] | |
963 |
|
964 | |||
964 |
|
965 | |||
965 | $ hg log -T default -r 'phasedivergent()' --color=debug |
|
966 | $ hg log -T default -r 'phasedivergent()' --color=debug | |
966 | [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset: 7:50c51b361e60] |
|
967 | [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset: 7:50c51b361e60] | |
967 | [log.user|user: test] |
|
968 | [log.user|user: test] | |
968 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
|
969 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] | |
969 | [log.instability|instability: orphan, phase-divergent] |
|
970 | [log.instability|instability: orphan, phase-divergent] | |
970 | [log.summary|summary: add babar] |
|
971 | [log.summary|summary: add babar] | |
971 |
|
972 | |||
972 |
|
973 | |||
973 | $ hg log --config ui.logtemplate= --color=debug -r "obsolete()" |
|
974 | $ hg log --config ui.logtemplate= --color=debug -r "obsolete()" | |
974 | [log.changeset changeset.draft changeset.obsolete|changeset: 6:3de5eca88c00] |
|
975 | [log.changeset changeset.draft changeset.obsolete|changeset: 6:3de5eca88c00] | |
975 | [log.parent changeset.draft|parent: 3:6f9641995072] |
|
976 | [log.parent changeset.draft|parent: 3:6f9641995072] | |
976 | [log.user|user: test] |
|
977 | [log.user|user: test] | |
977 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
|
978 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] | |
978 | [log.obsfate|obsfate: pruned] |
|
979 | [log.obsfate|obsfate: pruned] | |
979 | [log.summary|summary: add obsolete_e] |
|
980 | [log.summary|summary: add obsolete_e] | |
980 |
|
981 | |||
981 |
|
982 | |||
982 | $ hg log -T default -r 'obsolete()' --color=debug |
|
983 | $ hg log -T default -r 'obsolete()' --color=debug | |
983 | [log.changeset changeset.draft changeset.obsolete|changeset: 6:3de5eca88c00] |
|
984 | [log.changeset changeset.draft changeset.obsolete|changeset: 6:3de5eca88c00] | |
984 | [log.parent changeset.draft|parent: 3:6f9641995072] |
|
985 | [log.parent changeset.draft|parent: 3:6f9641995072] | |
985 | [log.user|user: test] |
|
986 | [log.user|user: test] | |
986 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
|
987 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] | |
|
988 | [log.obsfate|obsfate: pruned] | |||
987 | [log.summary|summary: add obsolete_e] |
|
989 | [log.summary|summary: add obsolete_e] | |
988 |
|
990 | |||
989 |
|
991 | |||
990 | test summary output |
|
992 | test summary output | |
991 |
|
993 | |||
992 | $ hg up -r 'phasedivergent() and orphan()' |
|
994 | $ hg up -r 'phasedivergent() and orphan()' | |
993 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
995 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
994 | $ hg summary |
|
996 | $ hg summary | |
995 | parent: 7:50c51b361e60 (orphan, phase-divergent) |
|
997 | parent: 7:50c51b361e60 (orphan, phase-divergent) | |
996 | add babar |
|
998 | add babar | |
997 | branch: default |
|
999 | branch: default | |
998 | commit: (clean) |
|
1000 | commit: (clean) | |
999 | update: 2 new changesets (update) |
|
1001 | update: 2 new changesets (update) | |
1000 | phases: 4 draft |
|
1002 | phases: 4 draft | |
1001 | orphan: 2 changesets |
|
1003 | orphan: 2 changesets | |
1002 | phase-divergent: 1 changesets |
|
1004 | phase-divergent: 1 changesets | |
1003 | $ hg up -r 'obsolete()' |
|
1005 | $ hg up -r 'obsolete()' | |
1004 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1006 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1005 | $ hg summary |
|
1007 | $ hg summary | |
1006 | parent: 6:3de5eca88c00 (obsolete) |
|
1008 | parent: 6:3de5eca88c00 (obsolete) | |
1007 | add obsolete_e |
|
1009 | add obsolete_e | |
1008 | branch: default |
|
1010 | branch: default | |
1009 | commit: (clean) |
|
1011 | commit: (clean) | |
1010 | update: 3 new changesets (update) |
|
1012 | update: 3 new changesets (update) | |
1011 | phases: 4 draft |
|
1013 | phases: 4 draft | |
1012 | orphan: 2 changesets |
|
1014 | orphan: 2 changesets | |
1013 | phase-divergent: 1 changesets |
|
1015 | phase-divergent: 1 changesets | |
1014 |
|
1016 | |||
1015 | Test incoming/outcoming with changesets obsoleted remotely, known locally |
|
1017 | Test incoming/outcoming with changesets obsoleted remotely, known locally | |
1016 | =============================================================================== |
|
1018 | =============================================================================== | |
1017 |
|
1019 | |||
1018 | This test issue 3805 |
|
1020 | This test issue 3805 | |
1019 |
|
1021 | |||
1020 | $ hg init repo-issue3805 |
|
1022 | $ hg init repo-issue3805 | |
1021 | $ cd repo-issue3805 |
|
1023 | $ cd repo-issue3805 | |
1022 | $ echo "base" > base |
|
1024 | $ echo "base" > base | |
1023 | $ hg ci -Am "base" |
|
1025 | $ hg ci -Am "base" | |
1024 | adding base |
|
1026 | adding base | |
1025 | $ echo "foo" > foo |
|
1027 | $ echo "foo" > foo | |
1026 | $ hg ci -Am "A" |
|
1028 | $ hg ci -Am "A" | |
1027 | adding foo |
|
1029 | adding foo | |
1028 | $ hg clone . ../other-issue3805 |
|
1030 | $ hg clone . ../other-issue3805 | |
1029 | updating to branch default |
|
1031 | updating to branch default | |
1030 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1032 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1031 | $ echo "bar" >> foo |
|
1033 | $ echo "bar" >> foo | |
1032 | $ hg ci --amend |
|
1034 | $ hg ci --amend | |
1033 | $ cd ../other-issue3805 |
|
1035 | $ cd ../other-issue3805 | |
1034 | $ hg log -G |
|
1036 | $ hg log -G | |
1035 | @ 1:29f0c6921ddd (draft) [tip ] A |
|
1037 | @ 1:29f0c6921ddd (draft) [tip ] A | |
1036 | | |
|
1038 | | | |
1037 | o 0:d20a80d4def3 (draft) [ ] base |
|
1039 | o 0:d20a80d4def3 (draft) [ ] base | |
1038 |
|
1040 | |||
1039 | $ hg log -G -R ../repo-issue3805 |
|
1041 | $ hg log -G -R ../repo-issue3805 | |
1040 | @ 2:323a9c3ddd91 (draft) [tip ] A |
|
1042 | @ 2:323a9c3ddd91 (draft) [tip ] A | |
1041 | | |
|
1043 | | | |
1042 | o 0:d20a80d4def3 (draft) [ ] base |
|
1044 | o 0:d20a80d4def3 (draft) [ ] base | |
1043 |
|
1045 | |||
1044 | $ hg incoming |
|
1046 | $ hg incoming | |
1045 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) |
|
1047 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) | |
1046 | searching for changes |
|
1048 | searching for changes | |
1047 | 2:323a9c3ddd91 (draft) [tip ] A |
|
1049 | 2:323a9c3ddd91 (draft) [tip ] A | |
1048 | $ hg incoming --bundle ../issue3805.hg |
|
1050 | $ hg incoming --bundle ../issue3805.hg | |
1049 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) |
|
1051 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) | |
1050 | searching for changes |
|
1052 | searching for changes | |
1051 | 2:323a9c3ddd91 (draft) [tip ] A |
|
1053 | 2:323a9c3ddd91 (draft) [tip ] A | |
1052 | $ hg outgoing |
|
1054 | $ hg outgoing | |
1053 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) |
|
1055 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) | |
1054 | searching for changes |
|
1056 | searching for changes | |
1055 | 1:29f0c6921ddd (draft) [tip ] A |
|
1057 | 1:29f0c6921ddd (draft) [tip ] A | |
1056 |
|
1058 | |||
1057 | #if serve |
|
1059 | #if serve | |
1058 |
|
1060 | |||
1059 | $ hg serve -R ../repo-issue3805 -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
1061 | $ hg serve -R ../repo-issue3805 -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | |
1060 | $ cat hg.pid >> $DAEMON_PIDS |
|
1062 | $ cat hg.pid >> $DAEMON_PIDS | |
1061 |
|
1063 | |||
1062 | $ hg incoming http://localhost:$HGPORT |
|
1064 | $ hg incoming http://localhost:$HGPORT | |
1063 | comparing with http://localhost:$HGPORT/ |
|
1065 | comparing with http://localhost:$HGPORT/ | |
1064 | searching for changes |
|
1066 | searching for changes | |
1065 | 2:323a9c3ddd91 (draft) [tip ] A |
|
1067 | 2:323a9c3ddd91 (draft) [tip ] A | |
1066 | $ hg outgoing http://localhost:$HGPORT |
|
1068 | $ hg outgoing http://localhost:$HGPORT | |
1067 | comparing with http://localhost:$HGPORT/ |
|
1069 | comparing with http://localhost:$HGPORT/ | |
1068 | searching for changes |
|
1070 | searching for changes | |
1069 | 1:29f0c6921ddd (draft) [tip ] A |
|
1071 | 1:29f0c6921ddd (draft) [tip ] A | |
1070 |
|
1072 | |||
1071 | $ killdaemons.py |
|
1073 | $ killdaemons.py | |
1072 |
|
1074 | |||
1073 | #endif |
|
1075 | #endif | |
1074 |
|
1076 | |||
1075 | This test issue 3814 |
|
1077 | This test issue 3814 | |
1076 |
|
1078 | |||
1077 | (nothing to push but locally hidden changeset) |
|
1079 | (nothing to push but locally hidden changeset) | |
1078 |
|
1080 | |||
1079 | $ cd .. |
|
1081 | $ cd .. | |
1080 | $ hg init repo-issue3814 |
|
1082 | $ hg init repo-issue3814 | |
1081 | $ cd repo-issue3805 |
|
1083 | $ cd repo-issue3805 | |
1082 | $ hg push -r 323a9c3ddd91 ../repo-issue3814 |
|
1084 | $ hg push -r 323a9c3ddd91 ../repo-issue3814 | |
1083 | pushing to ../repo-issue3814 |
|
1085 | pushing to ../repo-issue3814 | |
1084 | searching for changes |
|
1086 | searching for changes | |
1085 | adding changesets |
|
1087 | adding changesets | |
1086 | adding manifests |
|
1088 | adding manifests | |
1087 | adding file changes |
|
1089 | adding file changes | |
1088 | added 2 changesets with 2 changes to 2 files |
|
1090 | added 2 changesets with 2 changes to 2 files | |
1089 | 1 new obsolescence markers |
|
1091 | 1 new obsolescence markers | |
1090 | $ hg out ../repo-issue3814 |
|
1092 | $ hg out ../repo-issue3814 | |
1091 | comparing with ../repo-issue3814 |
|
1093 | comparing with ../repo-issue3814 | |
1092 | searching for changes |
|
1094 | searching for changes | |
1093 | no changes found |
|
1095 | no changes found | |
1094 | [1] |
|
1096 | [1] | |
1095 |
|
1097 | |||
1096 | Test that a local tag blocks a changeset from being hidden |
|
1098 | Test that a local tag blocks a changeset from being hidden | |
1097 |
|
1099 | |||
1098 | $ hg tag -l visible -r 1 --hidden |
|
1100 | $ hg tag -l visible -r 1 --hidden | |
1099 | $ hg log -G |
|
1101 | $ hg log -G | |
1100 | @ 2:323a9c3ddd91 (draft) [tip ] A |
|
1102 | @ 2:323a9c3ddd91 (draft) [tip ] A | |
1101 | | |
|
1103 | | | |
1102 | | x 1:29f0c6921ddd (draft *obsolete*) [visible ] A [rewritten using amend as 2:323a9c3ddd91] |
|
1104 | | x 1:29f0c6921ddd (draft *obsolete*) [visible ] A [rewritten using amend as 2:323a9c3ddd91] | |
1103 | |/ |
|
1105 | |/ | |
1104 | o 0:d20a80d4def3 (draft) [ ] base |
|
1106 | o 0:d20a80d4def3 (draft) [ ] base | |
1105 |
|
1107 | |||
1106 | Test that removing a local tag does not cause some commands to fail |
|
1108 | Test that removing a local tag does not cause some commands to fail | |
1107 |
|
1109 | |||
1108 | $ hg tag -l -r tip tiptag |
|
1110 | $ hg tag -l -r tip tiptag | |
1109 | $ hg tags |
|
1111 | $ hg tags | |
1110 | tiptag 2:323a9c3ddd91 |
|
1112 | tiptag 2:323a9c3ddd91 | |
1111 | tip 2:323a9c3ddd91 |
|
1113 | tip 2:323a9c3ddd91 | |
1112 | visible 1:29f0c6921ddd |
|
1114 | visible 1:29f0c6921ddd | |
1113 | $ hg --config extensions.strip= strip -r tip --no-backup |
|
1115 | $ hg --config extensions.strip= strip -r tip --no-backup | |
1114 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1116 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1115 | $ hg tags |
|
1117 | $ hg tags | |
1116 | visible 1:29f0c6921ddd |
|
1118 | visible 1:29f0c6921ddd | |
1117 | tip 1:29f0c6921ddd |
|
1119 | tip 1:29f0c6921ddd | |
1118 |
|
1120 | |||
1119 | Test bundle overlay onto hidden revision |
|
1121 | Test bundle overlay onto hidden revision | |
1120 |
|
1122 | |||
1121 | $ cd .. |
|
1123 | $ cd .. | |
1122 | $ hg init repo-bundleoverlay |
|
1124 | $ hg init repo-bundleoverlay | |
1123 | $ cd repo-bundleoverlay |
|
1125 | $ cd repo-bundleoverlay | |
1124 | $ echo "A" > foo |
|
1126 | $ echo "A" > foo | |
1125 | $ hg ci -Am "A" |
|
1127 | $ hg ci -Am "A" | |
1126 | adding foo |
|
1128 | adding foo | |
1127 | $ echo "B" >> foo |
|
1129 | $ echo "B" >> foo | |
1128 | $ hg ci -m "B" |
|
1130 | $ hg ci -m "B" | |
1129 | $ hg up 0 |
|
1131 | $ hg up 0 | |
1130 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1132 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1131 | $ echo "C" >> foo |
|
1133 | $ echo "C" >> foo | |
1132 | $ hg ci -m "C" |
|
1134 | $ hg ci -m "C" | |
1133 | created new head |
|
1135 | created new head | |
1134 | $ hg log -G |
|
1136 | $ hg log -G | |
1135 | @ 2:c186d7714947 (draft) [tip ] C |
|
1137 | @ 2:c186d7714947 (draft) [tip ] C | |
1136 | | |
|
1138 | | | |
1137 | | o 1:44526ebb0f98 (draft) [ ] B |
|
1139 | | o 1:44526ebb0f98 (draft) [ ] B | |
1138 | |/ |
|
1140 | |/ | |
1139 | o 0:4b34ecfb0d56 (draft) [ ] A |
|
1141 | o 0:4b34ecfb0d56 (draft) [ ] A | |
1140 |
|
1142 | |||
1141 |
|
1143 | |||
1142 | $ hg clone -r1 . ../other-bundleoverlay |
|
1144 | $ hg clone -r1 . ../other-bundleoverlay | |
1143 | adding changesets |
|
1145 | adding changesets | |
1144 | adding manifests |
|
1146 | adding manifests | |
1145 | adding file changes |
|
1147 | adding file changes | |
1146 | added 2 changesets with 2 changes to 1 files |
|
1148 | added 2 changesets with 2 changes to 1 files | |
1147 | new changesets 4b34ecfb0d56:44526ebb0f98 |
|
1149 | new changesets 4b34ecfb0d56:44526ebb0f98 | |
1148 | updating to branch default |
|
1150 | updating to branch default | |
1149 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1151 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1150 | $ cd ../other-bundleoverlay |
|
1152 | $ cd ../other-bundleoverlay | |
1151 | $ echo "B+" >> foo |
|
1153 | $ echo "B+" >> foo | |
1152 | $ hg ci --amend -m "B+" |
|
1154 | $ hg ci --amend -m "B+" | |
1153 | $ hg log -G --hidden |
|
1155 | $ hg log -G --hidden | |
1154 | @ 2:b7d587542d40 (draft) [tip ] B+ |
|
1156 | @ 2:b7d587542d40 (draft) [tip ] B+ | |
1155 | | |
|
1157 | | | |
1156 | | x 1:44526ebb0f98 (draft *obsolete*) [ ] B [rewritten using amend as 2:b7d587542d40] |
|
1158 | | x 1:44526ebb0f98 (draft *obsolete*) [ ] B [rewritten using amend as 2:b7d587542d40] | |
1157 | |/ |
|
1159 | |/ | |
1158 | o 0:4b34ecfb0d56 (draft) [ ] A |
|
1160 | o 0:4b34ecfb0d56 (draft) [ ] A | |
1159 |
|
1161 | |||
1160 |
|
1162 | |||
1161 | $ hg incoming ../repo-bundleoverlay --bundle ../bundleoverlay.hg |
|
1163 | $ hg incoming ../repo-bundleoverlay --bundle ../bundleoverlay.hg | |
1162 | comparing with ../repo-bundleoverlay |
|
1164 | comparing with ../repo-bundleoverlay | |
1163 | searching for changes |
|
1165 | searching for changes | |
1164 | 1:44526ebb0f98 (draft) [ ] B |
|
1166 | 1:44526ebb0f98 (draft) [ ] B | |
1165 | 2:c186d7714947 (draft) [tip ] C |
|
1167 | 2:c186d7714947 (draft) [tip ] C | |
1166 | $ hg log -G -R ../bundleoverlay.hg |
|
1168 | $ hg log -G -R ../bundleoverlay.hg | |
1167 | o 3:c186d7714947 (draft) [tip ] C |
|
1169 | o 3:c186d7714947 (draft) [tip ] C | |
1168 | | |
|
1170 | | | |
1169 | | @ 2:b7d587542d40 (draft) [ ] B+ |
|
1171 | | @ 2:b7d587542d40 (draft) [ ] B+ | |
1170 | |/ |
|
1172 | |/ | |
1171 | o 0:4b34ecfb0d56 (draft) [ ] A |
|
1173 | o 0:4b34ecfb0d56 (draft) [ ] A | |
1172 |
|
1174 | |||
1173 |
|
1175 | |||
1174 | #if serve |
|
1176 | #if serve | |
1175 |
|
1177 | |||
1176 | Test issue 4506 |
|
1178 | Test issue 4506 | |
1177 |
|
1179 | |||
1178 | $ cd .. |
|
1180 | $ cd .. | |
1179 | $ hg init repo-issue4506 |
|
1181 | $ hg init repo-issue4506 | |
1180 | $ cd repo-issue4506 |
|
1182 | $ cd repo-issue4506 | |
1181 | $ echo "0" > foo |
|
1183 | $ echo "0" > foo | |
1182 | $ hg add foo |
|
1184 | $ hg add foo | |
1183 | $ hg ci -m "content-0" |
|
1185 | $ hg ci -m "content-0" | |
1184 |
|
1186 | |||
1185 | $ hg up null |
|
1187 | $ hg up null | |
1186 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1188 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1187 | $ echo "1" > bar |
|
1189 | $ echo "1" > bar | |
1188 | $ hg add bar |
|
1190 | $ hg add bar | |
1189 | $ hg ci -m "content-1" |
|
1191 | $ hg ci -m "content-1" | |
1190 | created new head |
|
1192 | created new head | |
1191 | $ hg up 0 |
|
1193 | $ hg up 0 | |
1192 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1194 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1193 | $ hg graft 1 |
|
1195 | $ hg graft 1 | |
1194 | grafting 1:1c9eddb02162 "content-1" (tip) |
|
1196 | grafting 1:1c9eddb02162 "content-1" (tip) | |
1195 |
|
1197 | |||
1196 | $ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'` |
|
1198 | $ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'` | |
1197 | obsoleted 1 changesets |
|
1199 | obsoleted 1 changesets | |
1198 |
|
1200 | |||
1199 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
1201 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | |
1200 | $ cat hg.pid >> $DAEMON_PIDS |
|
1202 | $ cat hg.pid >> $DAEMON_PIDS | |
1201 |
|
1203 | |||
1202 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/1' |
|
1204 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/1' | |
1203 | 404 Not Found |
|
1205 | 404 Not Found | |
1204 | [1] |
|
1206 | [1] | |
1205 | $ get-with-headers.py --headeronly localhost:$HGPORT 'file/tip/bar' |
|
1207 | $ get-with-headers.py --headeronly localhost:$HGPORT 'file/tip/bar' | |
1206 | 200 Script output follows |
|
1208 | 200 Script output follows | |
1207 | $ get-with-headers.py --headeronly localhost:$HGPORT 'annotate/tip/bar' |
|
1209 | $ get-with-headers.py --headeronly localhost:$HGPORT 'annotate/tip/bar' | |
1208 | 200 Script output follows |
|
1210 | 200 Script output follows | |
1209 |
|
1211 | |||
1210 | $ killdaemons.py |
|
1212 | $ killdaemons.py | |
1211 |
|
1213 | |||
1212 | #endif |
|
1214 | #endif | |
1213 |
|
1215 | |||
1214 | Test heads computation on pending index changes with obsolescence markers |
|
1216 | Test heads computation on pending index changes with obsolescence markers | |
1215 | $ cd .. |
|
1217 | $ cd .. | |
1216 | $ cat >$TESTTMP/test_extension.py << EOF |
|
1218 | $ cat >$TESTTMP/test_extension.py << EOF | |
1217 | > from __future__ import absolute_import |
|
1219 | > from __future__ import absolute_import | |
1218 | > from mercurial.i18n import _ |
|
1220 | > from mercurial.i18n import _ | |
1219 | > from mercurial import cmdutil, registrar |
|
1221 | > from mercurial import cmdutil, registrar | |
1220 | > |
|
1222 | > | |
1221 | > cmdtable = {} |
|
1223 | > cmdtable = {} | |
1222 | > command = registrar.command(cmdtable) |
|
1224 | > command = registrar.command(cmdtable) | |
1223 | > @command(b"amendtransient",[], _('hg amendtransient [rev]')) |
|
1225 | > @command(b"amendtransient",[], _('hg amendtransient [rev]')) | |
1224 | > def amend(ui, repo, *pats, **opts): |
|
1226 | > def amend(ui, repo, *pats, **opts): | |
1225 | > opts['message'] = 'Test' |
|
1227 | > opts['message'] = 'Test' | |
1226 | > opts['logfile'] = None |
|
1228 | > opts['logfile'] = None | |
1227 | > cmdutil.amend(ui, repo, repo['.'], {}, pats, opts) |
|
1229 | > cmdutil.amend(ui, repo, repo['.'], {}, pats, opts) | |
1228 | > ui.write('%s\n' % repo.changelog.headrevs()) |
|
1230 | > ui.write('%s\n' % repo.changelog.headrevs()) | |
1229 | > EOF |
|
1231 | > EOF | |
1230 | $ cat >> $HGRCPATH << EOF |
|
1232 | $ cat >> $HGRCPATH << EOF | |
1231 | > [extensions] |
|
1233 | > [extensions] | |
1232 | > testextension=$TESTTMP/test_extension.py |
|
1234 | > testextension=$TESTTMP/test_extension.py | |
1233 | > EOF |
|
1235 | > EOF | |
1234 | $ hg init repo-issue-nativerevs-pending-changes |
|
1236 | $ hg init repo-issue-nativerevs-pending-changes | |
1235 | $ cd repo-issue-nativerevs-pending-changes |
|
1237 | $ cd repo-issue-nativerevs-pending-changes | |
1236 | $ mkcommit a |
|
1238 | $ mkcommit a | |
1237 | $ mkcommit b |
|
1239 | $ mkcommit b | |
1238 | $ hg up ".^" |
|
1240 | $ hg up ".^" | |
1239 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1241 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1240 | $ echo aa > a |
|
1242 | $ echo aa > a | |
1241 | $ hg amendtransient |
|
1243 | $ hg amendtransient | |
1242 | [1, 2] |
|
1244 | [1, 2] | |
1243 |
|
1245 | |||
1244 | Test cache consistency for the visible filter |
|
1246 | Test cache consistency for the visible filter | |
1245 | 1) We want to make sure that the cached filtered revs are invalidated when |
|
1247 | 1) We want to make sure that the cached filtered revs are invalidated when | |
1246 | bookmarks change |
|
1248 | bookmarks change | |
1247 | $ cd .. |
|
1249 | $ cd .. | |
1248 | $ cat >$TESTTMP/test_extension.py << EOF |
|
1250 | $ cat >$TESTTMP/test_extension.py << EOF | |
1249 | > from __future__ import absolute_import, print_function |
|
1251 | > from __future__ import absolute_import, print_function | |
1250 | > import weakref |
|
1252 | > import weakref | |
1251 | > from mercurial import ( |
|
1253 | > from mercurial import ( | |
1252 | > bookmarks, |
|
1254 | > bookmarks, | |
1253 | > cmdutil, |
|
1255 | > cmdutil, | |
1254 | > extensions, |
|
1256 | > extensions, | |
1255 | > repoview, |
|
1257 | > repoview, | |
1256 | > ) |
|
1258 | > ) | |
1257 | > def _bookmarkchanged(orig, bkmstoreinst, *args, **kwargs): |
|
1259 | > def _bookmarkchanged(orig, bkmstoreinst, *args, **kwargs): | |
1258 | > reporef = weakref.ref(bkmstoreinst._repo) |
|
1260 | > reporef = weakref.ref(bkmstoreinst._repo) | |
1259 | > def trhook(tr): |
|
1261 | > def trhook(tr): | |
1260 | > repo = reporef() |
|
1262 | > repo = reporef() | |
1261 | > hidden1 = repoview.computehidden(repo) |
|
1263 | > hidden1 = repoview.computehidden(repo) | |
1262 | > hidden = repoview.filterrevs(repo, 'visible') |
|
1264 | > hidden = repoview.filterrevs(repo, 'visible') | |
1263 | > if sorted(hidden1) != sorted(hidden): |
|
1265 | > if sorted(hidden1) != sorted(hidden): | |
1264 | > print("cache inconsistency") |
|
1266 | > print("cache inconsistency") | |
1265 | > bkmstoreinst._repo.currenttransaction().addpostclose('test_extension', trhook) |
|
1267 | > bkmstoreinst._repo.currenttransaction().addpostclose('test_extension', trhook) | |
1266 | > orig(bkmstoreinst, *args, **kwargs) |
|
1268 | > orig(bkmstoreinst, *args, **kwargs) | |
1267 | > def extsetup(ui): |
|
1269 | > def extsetup(ui): | |
1268 | > extensions.wrapfunction(bookmarks.bmstore, '_recordchange', |
|
1270 | > extensions.wrapfunction(bookmarks.bmstore, '_recordchange', | |
1269 | > _bookmarkchanged) |
|
1271 | > _bookmarkchanged) | |
1270 | > EOF |
|
1272 | > EOF | |
1271 |
|
1273 | |||
1272 | $ hg init repo-cache-inconsistency |
|
1274 | $ hg init repo-cache-inconsistency | |
1273 | $ cd repo-issue-nativerevs-pending-changes |
|
1275 | $ cd repo-issue-nativerevs-pending-changes | |
1274 | $ mkcommit a |
|
1276 | $ mkcommit a | |
1275 | a already tracked! |
|
1277 | a already tracked! | |
1276 | $ mkcommit b |
|
1278 | $ mkcommit b | |
1277 | $ hg id |
|
1279 | $ hg id | |
1278 | 13bedc178fce tip |
|
1280 | 13bedc178fce tip | |
1279 | $ echo "hello" > b |
|
1281 | $ echo "hello" > b | |
1280 | $ hg commit --amend -m "message" |
|
1282 | $ hg commit --amend -m "message" | |
1281 | $ hg book bookb -r 13bedc178fce --hidden |
|
1283 | $ hg book bookb -r 13bedc178fce --hidden | |
1282 | $ hg log -r 13bedc178fce |
|
1284 | $ hg log -r 13bedc178fce | |
1283 | 4:13bedc178fce (draft *obsolete*) [ bookb] add b [rewritten using amend as 5:a9b1f8652753] |
|
1285 | 4:13bedc178fce (draft *obsolete*) [ bookb] add b [rewritten using amend as 5:a9b1f8652753] | |
1284 | $ hg book -d bookb |
|
1286 | $ hg book -d bookb | |
1285 | $ hg log -r 13bedc178fce |
|
1287 | $ hg log -r 13bedc178fce | |
1286 | abort: hidden revision '13bedc178fce'! |
|
1288 | abort: hidden revision '13bedc178fce'! | |
1287 | (use --hidden to access hidden revisions) |
|
1289 | (use --hidden to access hidden revisions) | |
1288 | [255] |
|
1290 | [255] | |
1289 |
|
1291 | |||
1290 | Empty out the test extension, as it isn't compatible with later parts |
|
1292 | Empty out the test extension, as it isn't compatible with later parts | |
1291 | of the test. |
|
1293 | of the test. | |
1292 | $ echo > $TESTTMP/test_extension.py |
|
1294 | $ echo > $TESTTMP/test_extension.py | |
1293 |
|
1295 | |||
1294 | Test ability to pull changeset with locally applying obsolescence markers |
|
1296 | Test ability to pull changeset with locally applying obsolescence markers | |
1295 | (issue4945) |
|
1297 | (issue4945) | |
1296 |
|
1298 | |||
1297 | $ cd .. |
|
1299 | $ cd .. | |
1298 | $ hg init issue4845 |
|
1300 | $ hg init issue4845 | |
1299 | $ cd issue4845 |
|
1301 | $ cd issue4845 | |
1300 |
|
1302 | |||
1301 | $ echo foo > f0 |
|
1303 | $ echo foo > f0 | |
1302 | $ hg add f0 |
|
1304 | $ hg add f0 | |
1303 | $ hg ci -m '0' |
|
1305 | $ hg ci -m '0' | |
1304 | $ echo foo > f1 |
|
1306 | $ echo foo > f1 | |
1305 | $ hg add f1 |
|
1307 | $ hg add f1 | |
1306 | $ hg ci -m '1' |
|
1308 | $ hg ci -m '1' | |
1307 | $ echo foo > f2 |
|
1309 | $ echo foo > f2 | |
1308 | $ hg add f2 |
|
1310 | $ hg add f2 | |
1309 | $ hg ci -m '2' |
|
1311 | $ hg ci -m '2' | |
1310 |
|
1312 | |||
1311 | $ echo bar > f2 |
|
1313 | $ echo bar > f2 | |
1312 | $ hg commit --amend --config experimetnal.stabilization=createmarkers |
|
1314 | $ hg commit --amend --config experimetnal.stabilization=createmarkers | |
1313 | $ hg log -G |
|
1315 | $ hg log -G | |
1314 | @ 3:b0551702f918 (draft) [tip ] 2 |
|
1316 | @ 3:b0551702f918 (draft) [tip ] 2 | |
1315 | | |
|
1317 | | | |
1316 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1318 | o 1:e016b03fd86f (draft) [ ] 1 | |
1317 | | |
|
1319 | | | |
1318 | o 0:a78f55e5508c (draft) [ ] 0 |
|
1320 | o 0:a78f55e5508c (draft) [ ] 0 | |
1319 |
|
1321 | |||
1320 | $ hg log -G --hidden |
|
1322 | $ hg log -G --hidden | |
1321 | @ 3:b0551702f918 (draft) [tip ] 2 |
|
1323 | @ 3:b0551702f918 (draft) [tip ] 2 | |
1322 | | |
|
1324 | | | |
1323 | | x 2:e008cf283490 (draft *obsolete*) [ ] 2 [rewritten using amend as 3:b0551702f918] |
|
1325 | | x 2:e008cf283490 (draft *obsolete*) [ ] 2 [rewritten using amend as 3:b0551702f918] | |
1324 | |/ |
|
1326 | |/ | |
1325 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1327 | o 1:e016b03fd86f (draft) [ ] 1 | |
1326 | | |
|
1328 | | | |
1327 | o 0:a78f55e5508c (draft) [ ] 0 |
|
1329 | o 0:a78f55e5508c (draft) [ ] 0 | |
1328 |
|
1330 | |||
1329 |
|
1331 | |||
1330 | $ hg strip --hidden -r 2 --config extensions.strip= --config devel.strip-obsmarkers=no |
|
1332 | $ hg strip --hidden -r 2 --config extensions.strip= --config devel.strip-obsmarkers=no | |
1331 | saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e008cf283490-ede36964-backup.hg (glob) |
|
1333 | saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e008cf283490-ede36964-backup.hg (glob) | |
1332 | $ hg debugobsolete |
|
1334 | $ hg debugobsolete | |
1333 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
|
1335 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} | |
1334 | $ hg log -G |
|
1336 | $ hg log -G | |
1335 | @ 2:b0551702f918 (draft) [tip ] 2 |
|
1337 | @ 2:b0551702f918 (draft) [tip ] 2 | |
1336 | | |
|
1338 | | | |
1337 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1339 | o 1:e016b03fd86f (draft) [ ] 1 | |
1338 | | |
|
1340 | | | |
1339 | o 0:a78f55e5508c (draft) [ ] 0 |
|
1341 | o 0:a78f55e5508c (draft) [ ] 0 | |
1340 |
|
1342 | |||
1341 | $ hg log -G --hidden |
|
1343 | $ hg log -G --hidden | |
1342 | @ 2:b0551702f918 (draft) [tip ] 2 |
|
1344 | @ 2:b0551702f918 (draft) [tip ] 2 | |
1343 | | |
|
1345 | | | |
1344 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1346 | o 1:e016b03fd86f (draft) [ ] 1 | |
1345 | | |
|
1347 | | | |
1346 | o 0:a78f55e5508c (draft) [ ] 0 |
|
1348 | o 0:a78f55e5508c (draft) [ ] 0 | |
1347 |
|
1349 | |||
1348 | $ hg debugbundle .hg/strip-backup/e008cf283490-*-backup.hg |
|
1350 | $ hg debugbundle .hg/strip-backup/e008cf283490-*-backup.hg | |
1349 | Stream params: {Compression: BZ} |
|
1351 | Stream params: {Compression: BZ} | |
1350 | changegroup -- {nbchanges: 1, version: 02} |
|
1352 | changegroup -- {nbchanges: 1, version: 02} | |
1351 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 |
|
1353 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 | |
1352 | phase-heads -- {} |
|
1354 | phase-heads -- {} | |
1353 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 draft |
|
1355 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 draft | |
1354 |
|
1356 | |||
1355 | $ hg pull .hg/strip-backup/e008cf283490-*-backup.hg |
|
1357 | $ hg pull .hg/strip-backup/e008cf283490-*-backup.hg | |
1356 | pulling from .hg/strip-backup/e008cf283490-ede36964-backup.hg |
|
1358 | pulling from .hg/strip-backup/e008cf283490-ede36964-backup.hg | |
1357 | searching for changes |
|
1359 | searching for changes | |
1358 | no changes found |
|
1360 | no changes found | |
1359 | $ hg debugobsolete |
|
1361 | $ hg debugobsolete | |
1360 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
|
1362 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} | |
1361 | $ hg log -G |
|
1363 | $ hg log -G | |
1362 | @ 2:b0551702f918 (draft) [tip ] 2 |
|
1364 | @ 2:b0551702f918 (draft) [tip ] 2 | |
1363 | | |
|
1365 | | | |
1364 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1366 | o 1:e016b03fd86f (draft) [ ] 1 | |
1365 | | |
|
1367 | | | |
1366 | o 0:a78f55e5508c (draft) [ ] 0 |
|
1368 | o 0:a78f55e5508c (draft) [ ] 0 | |
1367 |
|
1369 | |||
1368 | $ hg log -G --hidden |
|
1370 | $ hg log -G --hidden | |
1369 | @ 2:b0551702f918 (draft) [tip ] 2 |
|
1371 | @ 2:b0551702f918 (draft) [tip ] 2 | |
1370 | | |
|
1372 | | | |
1371 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1373 | o 1:e016b03fd86f (draft) [ ] 1 | |
1372 | | |
|
1374 | | | |
1373 | o 0:a78f55e5508c (draft) [ ] 0 |
|
1375 | o 0:a78f55e5508c (draft) [ ] 0 | |
1374 |
|
1376 | |||
1375 |
|
1377 | |||
1376 | Testing that strip remove markers: |
|
1378 | Testing that strip remove markers: | |
1377 |
|
1379 | |||
1378 | $ hg strip -r 1 --config extensions.strip= |
|
1380 | $ hg strip -r 1 --config extensions.strip= | |
1379 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1381 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
1380 | saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e016b03fd86f-65ede734-backup.hg (glob) |
|
1382 | saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e016b03fd86f-65ede734-backup.hg (glob) | |
1381 | $ hg debugobsolete |
|
1383 | $ hg debugobsolete | |
1382 | $ hg log -G |
|
1384 | $ hg log -G | |
1383 | @ 0:a78f55e5508c (draft) [tip ] 0 |
|
1385 | @ 0:a78f55e5508c (draft) [tip ] 0 | |
1384 |
|
1386 | |||
1385 | $ hg log -G --hidden |
|
1387 | $ hg log -G --hidden | |
1386 | @ 0:a78f55e5508c (draft) [tip ] 0 |
|
1388 | @ 0:a78f55e5508c (draft) [tip ] 0 | |
1387 |
|
1389 | |||
1388 | $ hg debugbundle .hg/strip-backup/e016b03fd86f-*-backup.hg |
|
1390 | $ hg debugbundle .hg/strip-backup/e016b03fd86f-*-backup.hg | |
1389 | Stream params: {Compression: BZ} |
|
1391 | Stream params: {Compression: BZ} | |
1390 | changegroup -- {nbchanges: 2, version: 02} |
|
1392 | changegroup -- {nbchanges: 2, version: 02} | |
1391 | e016b03fd86fcccc54817d120b90b751aaf367d6 |
|
1393 | e016b03fd86fcccc54817d120b90b751aaf367d6 | |
1392 | b0551702f918510f01ae838ab03a463054c67b46 |
|
1394 | b0551702f918510f01ae838ab03a463054c67b46 | |
1393 | obsmarkers -- {} |
|
1395 | obsmarkers -- {} | |
1394 | version: 1 (86 bytes) |
|
1396 | version: 1 (86 bytes) | |
1395 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
|
1397 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} | |
1396 | phase-heads -- {} |
|
1398 | phase-heads -- {} | |
1397 | b0551702f918510f01ae838ab03a463054c67b46 draft |
|
1399 | b0551702f918510f01ae838ab03a463054c67b46 draft | |
1398 |
|
1400 | |||
1399 | $ hg unbundle .hg/strip-backup/e016b03fd86f-*-backup.hg |
|
1401 | $ hg unbundle .hg/strip-backup/e016b03fd86f-*-backup.hg | |
1400 | adding changesets |
|
1402 | adding changesets | |
1401 | adding manifests |
|
1403 | adding manifests | |
1402 | adding file changes |
|
1404 | adding file changes | |
1403 | added 2 changesets with 2 changes to 2 files |
|
1405 | added 2 changesets with 2 changes to 2 files | |
1404 | 1 new obsolescence markers |
|
1406 | 1 new obsolescence markers | |
1405 | new changesets e016b03fd86f:b0551702f918 |
|
1407 | new changesets e016b03fd86f:b0551702f918 | |
1406 | (run 'hg update' to get a working copy) |
|
1408 | (run 'hg update' to get a working copy) | |
1407 | $ hg debugobsolete | sort |
|
1409 | $ hg debugobsolete | sort | |
1408 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
|
1410 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} | |
1409 | $ hg log -G |
|
1411 | $ hg log -G | |
1410 | o 2:b0551702f918 (draft) [tip ] 2 |
|
1412 | o 2:b0551702f918 (draft) [tip ] 2 | |
1411 | | |
|
1413 | | | |
1412 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1414 | o 1:e016b03fd86f (draft) [ ] 1 | |
1413 | | |
|
1415 | | | |
1414 | @ 0:a78f55e5508c (draft) [ ] 0 |
|
1416 | @ 0:a78f55e5508c (draft) [ ] 0 | |
1415 |
|
1417 | |||
1416 | $ hg log -G --hidden |
|
1418 | $ hg log -G --hidden | |
1417 | o 2:b0551702f918 (draft) [tip ] 2 |
|
1419 | o 2:b0551702f918 (draft) [tip ] 2 | |
1418 | | |
|
1420 | | | |
1419 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1421 | o 1:e016b03fd86f (draft) [ ] 1 | |
1420 | | |
|
1422 | | | |
1421 | @ 0:a78f55e5508c (draft) [ ] 0 |
|
1423 | @ 0:a78f55e5508c (draft) [ ] 0 | |
1422 |
|
1424 | |||
1423 | Test that 'hg debugobsolete --index --rev' can show indices of obsmarkers when |
|
1425 | Test that 'hg debugobsolete --index --rev' can show indices of obsmarkers when | |
1424 | only a subset of those are displayed (because of --rev option) |
|
1426 | only a subset of those are displayed (because of --rev option) | |
1425 | $ hg init doindexrev |
|
1427 | $ hg init doindexrev | |
1426 | $ cd doindexrev |
|
1428 | $ cd doindexrev | |
1427 | $ echo a > a |
|
1429 | $ echo a > a | |
1428 | $ hg ci -Am a |
|
1430 | $ hg ci -Am a | |
1429 | adding a |
|
1431 | adding a | |
1430 | $ hg ci --amend -m aa |
|
1432 | $ hg ci --amend -m aa | |
1431 | $ echo b > b |
|
1433 | $ echo b > b | |
1432 | $ hg ci -Am b |
|
1434 | $ hg ci -Am b | |
1433 | adding b |
|
1435 | adding b | |
1434 | $ hg ci --amend -m bb |
|
1436 | $ hg ci --amend -m bb | |
1435 | $ echo c > c |
|
1437 | $ echo c > c | |
1436 | $ hg ci -Am c |
|
1438 | $ hg ci -Am c | |
1437 | adding c |
|
1439 | adding c | |
1438 | $ hg ci --amend -m cc |
|
1440 | $ hg ci --amend -m cc | |
1439 | $ echo d > d |
|
1441 | $ echo d > d | |
1440 | $ hg ci -Am d |
|
1442 | $ hg ci -Am d | |
1441 | adding d |
|
1443 | adding d | |
1442 | $ hg ci --amend -m dd --config experimental.stabilization.track-operation=1 |
|
1444 | $ hg ci --amend -m dd --config experimental.stabilization.track-operation=1 | |
1443 | $ hg debugobsolete --index --rev "3+7" |
|
1445 | $ hg debugobsolete --index --rev "3+7" | |
1444 | 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
|
1446 | 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} | |
1445 | 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re) |
|
1447 | 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re) | |
1446 | $ hg debugobsolete --index --rev "3+7" -Tjson |
|
1448 | $ hg debugobsolete --index --rev "3+7" -Tjson | |
1447 | [ |
|
1449 | [ | |
1448 | { |
|
1450 | { | |
1449 | "date": [0.0, 0], |
|
1451 | "date": [0.0, 0], | |
1450 | "flag": 0, |
|
1452 | "flag": 0, | |
1451 | "index": 1, |
|
1453 | "index": 1, | |
1452 | "metadata": {"operation": "amend", "user": "test"}, |
|
1454 | "metadata": {"operation": "amend", "user": "test"}, | |
1453 | "prednode": "6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1", |
|
1455 | "prednode": "6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1", | |
1454 | "succnodes": ["d27fb9b066076fd921277a4b9e8b9cb48c95bc6a"] |
|
1456 | "succnodes": ["d27fb9b066076fd921277a4b9e8b9cb48c95bc6a"] | |
1455 | }, |
|
1457 | }, | |
1456 | { |
|
1458 | { | |
1457 | "date": [0.0, 0], |
|
1459 | "date": [0.0, 0], | |
1458 | "flag": 0, |
|
1460 | "flag": 0, | |
1459 | "index": 3, |
|
1461 | "index": 3, | |
1460 | "metadata": {"operation": "amend", "user": "test"}, |
|
1462 | "metadata": {"operation": "amend", "user": "test"}, | |
1461 | "prednode": "4715cf767440ed891755448016c2b8cf70760c30", |
|
1463 | "prednode": "4715cf767440ed891755448016c2b8cf70760c30", | |
1462 | "succnodes": ["7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d"] |
|
1464 | "succnodes": ["7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d"] | |
1463 | } |
|
1465 | } | |
1464 | ] |
|
1466 | ] | |
1465 |
|
1467 | |||
1466 | Test the --delete option of debugobsolete command |
|
1468 | Test the --delete option of debugobsolete command | |
1467 | $ hg debugobsolete --index |
|
1469 | $ hg debugobsolete --index | |
1468 | 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
|
1470 | 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} | |
1469 | 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
|
1471 | 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} | |
1470 | 2 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
|
1472 | 2 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} | |
1471 | 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
|
1473 | 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} | |
1472 | $ hg debugobsolete --delete 1 --delete 3 |
|
1474 | $ hg debugobsolete --delete 1 --delete 3 | |
1473 | deleted 2 obsolescence markers |
|
1475 | deleted 2 obsolescence markers | |
1474 | $ hg debugobsolete |
|
1476 | $ hg debugobsolete | |
1475 | cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
|
1477 | cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} | |
1476 | 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
|
1478 | 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} | |
1477 |
|
1479 | |||
1478 | Test adding changeset after obsmarkers affecting it |
|
1480 | Test adding changeset after obsmarkers affecting it | |
1479 | (eg: during pull, or unbundle) |
|
1481 | (eg: during pull, or unbundle) | |
1480 |
|
1482 | |||
1481 | $ mkcommit e |
|
1483 | $ mkcommit e | |
1482 | $ hg bundle -r . --base .~1 ../bundle-2.hg |
|
1484 | $ hg bundle -r . --base .~1 ../bundle-2.hg | |
1483 | 1 changesets found |
|
1485 | 1 changesets found | |
1484 | $ getid . |
|
1486 | $ getid . | |
1485 | $ hg --config extensions.strip= strip -r . |
|
1487 | $ hg --config extensions.strip= strip -r . | |
1486 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1488 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1487 | saved backup bundle to $TESTTMP/tmpe/issue4845/doindexrev/.hg/strip-backup/9bc153528424-ee80edd4-backup.hg (glob) |
|
1489 | saved backup bundle to $TESTTMP/tmpe/issue4845/doindexrev/.hg/strip-backup/9bc153528424-ee80edd4-backup.hg (glob) | |
1488 | $ hg debugobsolete 9bc153528424ea266d13e57f9ff0d799dfe61e4b |
|
1490 | $ hg debugobsolete 9bc153528424ea266d13e57f9ff0d799dfe61e4b | |
1489 | $ hg unbundle ../bundle-2.hg |
|
1491 | $ hg unbundle ../bundle-2.hg | |
1490 | adding changesets |
|
1492 | adding changesets | |
1491 | adding manifests |
|
1493 | adding manifests | |
1492 | adding file changes |
|
1494 | adding file changes | |
1493 | added 1 changesets with 1 changes to 1 files |
|
1495 | added 1 changesets with 1 changes to 1 files | |
1494 | (run 'hg update' to get a working copy) |
|
1496 | (run 'hg update' to get a working copy) | |
1495 | $ hg log -G |
|
1497 | $ hg log -G | |
1496 | @ 7:7ae79c5d60f0 (draft) [tip ] dd |
|
1498 | @ 7:7ae79c5d60f0 (draft) [tip ] dd | |
1497 | | |
|
1499 | | | |
1498 | | o 6:4715cf767440 (draft) [ ] d |
|
1500 | | o 6:4715cf767440 (draft) [ ] d | |
1499 | |/ |
|
1501 | |/ | |
1500 | o 5:29346082e4a9 (draft) [ ] cc |
|
1502 | o 5:29346082e4a9 (draft) [ ] cc | |
1501 | | |
|
1503 | | | |
1502 | o 3:d27fb9b06607 (draft) [ ] bb |
|
1504 | o 3:d27fb9b06607 (draft) [ ] bb | |
1503 | | |
|
1505 | | | |
1504 | | o 2:6fdef60fcbab (draft) [ ] b |
|
1506 | | o 2:6fdef60fcbab (draft) [ ] b | |
1505 | |/ |
|
1507 | |/ | |
1506 | o 1:f9bd49731b0b (draft) [ ] aa |
|
1508 | o 1:f9bd49731b0b (draft) [ ] aa | |
1507 |
|
1509 | |||
1508 |
|
1510 | |||
1509 | $ cd .. |
|
1511 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now