Mercurial > hg

comparison tests/test-obsolete.t @ 32327:3546a771e376

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obsolete: add operation metadata to rebase/amend/histedit obsmarkers By recording what operation created the obsmarker, we can show very intuitive messages to the user in various UIs. For instance, log output could have messages like "Amended as XXX" to show why a commit is old and has an 'x' on it. @ ac28e3 durham / First commit | | o d4afe7 durham | | Second commit | | | x 8e9a5d (Amended as ac28e3) durham |/ First commit |
author Durham Goode <durham@fb.com>
date Tue, 09 May 2017 16:29:31 -0700
parents cda83a1bfb3a
children 46ba2cdda476
comparison
equal deleted inserted replaced
32325:763d72925691 32327:3546a771e376
1245 $ echo d > d 1245 $ echo d > d
1246 $ hg ci -Am d 1246 $ hg ci -Am d
1247 adding d 1247 adding d
1248 $ hg ci --amend -m dd 1248 $ hg ci --amend -m dd
1249 $ hg debugobsolete --index --rev "3+7" 1249 $ hg debugobsolete --index --rev "3+7"
1250 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 \(.*\) {'user': 'test'} (re) 1250 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re)
1251 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'user': 'test'} (re) 1251 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re)
1252 $ hg debugobsolete --index --rev "3+7" -Tjson 1252 $ hg debugobsolete --index --rev "3+7" -Tjson
1253 [ 1253 [
1254 { 1254 {
1255 "date": *, (glob) 1255 "date": *, (glob)
1256 "flag": 0, 1256 "flag": 0,
1257 "index": 1, 1257 "index": 1,
1258 "metadata": {"user": "test"}, 1258 "metadata": {"operation": "amend", "user": "test"},
1259 "precnode": "6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1", 1259 "precnode": "6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1",
1260 "succnodes": ["d27fb9b066076fd921277a4b9e8b9cb48c95bc6a"] 1260 "succnodes": ["d27fb9b066076fd921277a4b9e8b9cb48c95bc6a"]
1261 }, 1261 },
1262 { 1262 {
1263 "date": *, (glob) 1263 "date": *, (glob)
1264 "flag": 0, 1264 "flag": 0,
1265 "index": 3, 1265 "index": 3,
1266 "metadata": {"user": "test"}, 1266 "metadata": {"operation": "amend", "user": "test"},
1267 "precnode": "4715cf767440ed891755448016c2b8cf70760c30", 1267 "precnode": "4715cf767440ed891755448016c2b8cf70760c30",
1268 "succnodes": ["7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d"] 1268 "succnodes": ["7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d"]
1269 } 1269 }
1270 ] 1270 ]
1271 1271
1272 Test the --delete option of debugobsolete command 1272 Test the --delete option of debugobsolete command
1273 $ hg debugobsolete --index 1273 $ hg debugobsolete --index
1274 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 \(.*\) {'user': 'test'} (re) 1274 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re)
1275 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 \(.*\) {'user': 'test'} (re) 1275 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re)
1276 2 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 \(.*\) {'user': 'test'} (re) 1276 2 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re)
1277 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'user': 'test'} (re) 1277 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re)
1278 $ hg debugobsolete --delete 1 --delete 3 1278 $ hg debugobsolete --delete 1 --delete 3
1279 deleted 2 obsolescence markers 1279 deleted 2 obsolescence markers
1280 $ hg debugobsolete 1280 $ hg debugobsolete
1281 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 \(.*\) {'user': 'test'} (re) 1281 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re)
1282 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 \(.*\) {'user': 'test'} (re) 1282 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re)
1283 $ cd .. 1283 $ cd ..
1284 1284