Mercurial > evolve

comparison tests/test-evolve-effectflags.t @ 2492:c9f1118b33d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
effectflag: split effect flag meta Split effect flag meta into 3 separate flags: - USERCHANGED - DATECHANGED - BRANCHCHANGED Also display them separately for the moment, they could be grouped back together if we want later.
author Boris Feld <boris.feld@octobus.net>
date Fri, 26 May 2017 18:27:59 +0200
parents ad08aedf25ac
children 86f97e7c5aa5
comparison
equal deleted inserted replaced
2491:e2b6b978f38f 2492:c9f1118b33d6
35 | 35 |
36 x 471f378eab4c (1) A0 36 x 471f378eab4c (1) A0
37 rewritten(description) by test (*) as fdf9bde5129a (glob) 37 rewritten(description) by test (*) as fdf9bde5129a (glob)
38 38
39 39
40 amend touching the metadata only 40 amend touching the user only
41 -------------------------------- 41 ----------------------------
42 42
43 $ mkcommit B0 43 $ mkcommit B0
44 $ hg amend -u "bob <bob@bob.com>" 44 $ hg amend -u "bob <bob@bob.com>"
45 45
46 check result 46 check result
47 47
48 $ hg debugobsolete --rev . 48 $ hg debugobsolete --rev .
49 ef4a313b1e0ade55718395d80e6b88c5ccd875eb 5485c92d34330dac9d7a63dc07e1e3373835b964 0 (*) {'ef1': '2', 'user': 'test'} (glob) 49 ef4a313b1e0ade55718395d80e6b88c5ccd875eb 5485c92d34330dac9d7a63dc07e1e3373835b964 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '16', 'user': 'test'}
50 $ hg obslog . 50 $ hg obslog .
51 @ 5485c92d3433 (4) B0 51 @ 5485c92d3433 (4) B0
52 | 52 |
53 x ef4a313b1e0a (3) B0 53 x ef4a313b1e0a (3) B0
54 rewritten(meta) by test (*) as 5485c92d3433 (glob) 54 rewritten(user) by test (Thu Jan 01 00:00:00 1970 +0000) as 5485c92d3433
55 55
56
57 amend touching the date only
58 ----------------------------
59
60 $ mkcommit B1
61 $ hg amend -d "42 0"
62
63 check result
64
65 $ hg debugobsolete --rev .
66 2ef0680ff45038ac28c9f1ff3644341f54487280 4dd84345082e9e5291c2e6b3f335bbf8bf389378 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '32', 'user': 'test'}
67 $ hg obslog .
68 @ 4dd84345082e (6) B1
69 |
70 x 2ef0680ff450 (5) B1
71 rewritten(date) by test (Thu Jan 01 00:00:00 1970 +0000) as 4dd84345082e
72
73
74 amend touching the branch only
75 ----------------------------
76
77 $ mkcommit B2
78 $ hg branch my-branch
79 marked working directory as branch my-branch
80 (branches are permanent and global, did you want a bookmark?)
81 $ hg amend
82
83 check result
84
85 $ hg debugobsolete --rev .
86 4d1430a201c1ffbd8465dec75edd4a691a2d97ec 0 {bd3db8264ceebf1966319f5df3be7aac6acd1a8e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
87 bd3db8264ceebf1966319f5df3be7aac6acd1a8e 14a01456e0574f0e0a0b15b2345486a6364a8d79 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '64', 'user': 'test'}
88 $ hg obslog .
89 @ 14a01456e057 (9) B2
90 |
91 x bd3db8264cee (7) B2
92 rewritten(branch) by test (Thu Jan 01 00:00:00 1970 +0000) as 14a01456e057
93
94
95 $ hg up default
96 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
56 97
57 rebase (parents change) 98 rebase (parents change)
58 ----------------------- 99 -----------------------
59 100
60 $ mkcommit C0 101 $ mkcommit C0
61 $ mkcommit D0 102 $ mkcommit D0
62 $ hg rebase -r . -d 'desc(B0)' 103 $ hg rebase -r . -d 'desc(B0)'
63 rebasing 6:2ee0a31bd600 "D0" (tip) 104 rebasing 11:c85eff83a034 "D0" (tip)
64 105
65 check result 106 check result
66 107
67 $ hg debugobsolete --rev . 108 $ hg debugobsolete --rev .
68 2ee0a31bd600ca999a5e6e69bfdfde3f9c78a6f9 131ac3eecd92fb2dfd2fc59bb5e0b8efbe9e9201 0 (*) {'ef1': '4', 'user': 'test'} (glob) 109 c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'}
69 $ hg obslog . 110 $ hg obslog .
70 @ 131ac3eecd92 (7) D0 111 @ da86aa2f19a3 (12) D0
71 | 112 |
72 x 2ee0a31bd600 (6) D0 113 x c85eff83a034 (11) D0
73 rewritten(parent) by test (*) as 131ac3eecd92 (glob) 114 rewritten(parent) by test (Thu Jan 01 00:00:00 1970 +0000) as da86aa2f19a3
74 115
75 116
76 amend touching the diff 117 amend touching the diff
77 ----------------------- 118 -----------------------
78 119
81 $ hg amend 122 $ hg amend
82 123
83 check result 124 check result
84 125
85 $ hg debugobsolete --rev . 126 $ hg debugobsolete --rev .
86 5734caf1004261ffc2ed05763b82bf9d75ba3788 0 {f75604747b4fd2dfebe7f48c6e629aea15e3b237} (*) {'ef1': '0', 'user': 'test'} (glob) 127 d6f4d8b8d3c8cde990f13915bced7f92ce1cc54f 0 {ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
87 f75604747b4fd2dfebe7f48c6e629aea15e3b237 bed7e49faeb8ae06649b547a755d50f5bb0be220 0 (*) {'ef1': '8', 'user': 'test'} (glob) 128 ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f 75781fdbdbf58a987516b00c980bccda1e9ae588 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'}
88 $ hg obslog . 129 $ hg obslog .
89 @ bed7e49faeb8 (10) E0 130 @ 75781fdbdbf5 (15) E0
90 | 131 |
91 x f75604747b4f (8) E0 132 x ebfe0333e0d9 (13) E0
92 rewritten(content) by test (*) as bed7e49faeb8 (glob) 133 rewritten(content) by test (Thu Jan 01 00:00:00 1970 +0000) as 75781fdbdbf5
93 134
94 135
95 amend with multiple effect (desc and meta) 136 amend with multiple effect (desc and meta)
96 ------------------------------------------- 137 -------------------------------------------
97 138
98 $ mkcommit F0 139 $ mkcommit F0
99 $ hg amend -m F1 -u "bob <bob@bob.com>" 140 $ hg branch my-other-branch
141 marked working directory as branch my-other-branch
142 $ hg amend -m F1 -u "bob <bob@bob.com>" -d "42 0"
100 143
101 check result 144 check result
102 145
103 $ hg debugobsolete --rev . 146 $ hg debugobsolete --rev .
104 713ccc39944e10bd35b7f6eaed3eef0eab60e50b 7d0186621c5ba1b0f7c5c99668d43273cb44c2fe 0 (*) {'ef1': '3', 'user': 'test'} (glob) 147 3b12912003b4e7aa6df6cded86255006c3c29d27 0 {fad47e5bd78e6aa4db1b5a0a1751bc12563655ff} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
148 fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '113', 'user': 'test'}
105 $ hg obslog . 149 $ hg obslog .
106 @ 7d0186621c5b (12) F1 150 @ a94e0fd5f1c8 (18) F1
107 | 151 |
108 x 713ccc39944e (11) F0 152 x fad47e5bd78e (16) F0
109 rewritten(description, meta) by test (*) as 7d0186621c5b (glob) 153 rewritten(description, user, date, branch) by test (Thu Jan 01 00:00:00 1970 +0000) as a94e0fd5f1c8
110 154