This is an archive of the discontinued Mercurial Phabricator instance.

Differential D414

obsmarker: precnode was renamed into prednode
ClosedPublic

Authored by lothiraldan on Aug 16 2017, 4:27 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGeae63a9e59da: obsmarker: precnode was renamed into prednode
Summary

Update all calls to formatter.write first arguments to remove references to
precnode and use prednode consistently everywhere.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

lothiraldan created this revision.Aug 16 2017, 4:27 AM
lothiraldan updated this revision to Diff 986.Aug 16 2017, 10:55 AM
durin42 accepted this revision.Aug 16 2017, 2:40 PM
This revision is now accepted and ready to land.Aug 16 2017, 2:40 PM
Closed by commit rHGeae63a9e59da: obsmarker: precnode was renamed into prednode (authored by lothiraldan). · Explain WhyAug 16 2017, 2:58 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (2 lines)
Mtests/test-obsolete.t (20 lines)

Diff 1007

mercurial/cmdutil.py

return changeset_templater(ui, repo, spec, matchfn, opts, buffered) return changeset_templater(ui, repo, spec, matchfn, opts, buffered)
def showmarker(fm, marker, index=None): def showmarker(fm, marker, index=None):
"""utility function to display obsolescence marker in a readable way """utility function to display obsolescence marker in a readable way
To be used by debug function.""" To be used by debug function."""
if index is not None: if index is not None:
fm.write('index', '%i ', index) fm.write('index', '%i ', index)
fm.write('precnode', '%s ', hex(marker.prednode())) fm.write('prednode', '%s ', hex(marker.prednode()))
succs = marker.succnodes() succs = marker.succnodes()
fm.condwrite(succs, 'succnodes', '%s ', fm.condwrite(succs, 'succnodes', '%s ',
fm.formatlist(map(hex, succs), name='node')) fm.formatlist(map(hex, succs), name='node'))
fm.write('flag', '%X ', marker.flags()) fm.write('flag', '%X ', marker.flags())
parents = marker.parentnodes() parents = marker.parentnodes()
if parents is not None: if parents is not None:
fm.write('parentnodes', '{%s} ', fm.write('parentnodes', '{%s} ',
fm.formatlist(map(hex, parents), name='node', sep=', ')) fm.formatlist(map(hex, parents), name='node', sep=', '))

tests/test-obsolete.t

List of all markers in JSON List of all markers in JSON
$ hg debugobsolete -Tjson $ hg debugobsolete -Tjson
[ [
{ {
"date": [1339.0, 0], "date": [1339.0, 0],
"flag": 0, "flag": 0,
"metadata": {"user": "test"}, "metadata": {"user": "test"},
"precnode": "1339133913391339133913391339133913391339", "prednode": "1339133913391339133913391339133913391339",
"succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"] "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"]
}, },
{ {
"date": [1339.0, 0], "date": [1339.0, 0],
"flag": 0, "flag": 0,
"metadata": {"user": "test"}, "metadata": {"user": "test"},
"precnode": "1337133713371337133713371337133713371337", "prednode": "1337133713371337133713371337133713371337",
"succnodes": ["5601fb93a350734d935195fee37f4054c529ff39"] "succnodes": ["5601fb93a350734d935195fee37f4054c529ff39"]
}, },
{ {
"date": [121.0, 120], "date": [121.0, 120],
"flag": 12, "flag": 12,
"metadata": {"user": "test"}, "metadata": {"user": "test"},
"precnode": "245bde4270cd1072a27757984f9cda8ba26f08ca", "prednode": "245bde4270cd1072a27757984f9cda8ba26f08ca",
"succnodes": ["cdbce2fbb16313928851e97e0d85413f3f7eb77f"] "succnodes": ["cdbce2fbb16313928851e97e0d85413f3f7eb77f"]
}, },
{ {
"date": [1338.0, 0], "date": [1338.0, 0],
"flag": 1, "flag": 1,
"metadata": {"user": "test"}, "metadata": {"user": "test"},
"precnode": "5601fb93a350734d935195fee37f4054c529ff39", "prednode": "5601fb93a350734d935195fee37f4054c529ff39",
"succnodes": ["6f96419950729f3671185b847352890f074f7557"] "succnodes": ["6f96419950729f3671185b847352890f074f7557"]
}, },
{ {
"date": [1338.0, 0], "date": [1338.0, 0],
"flag": 0, "flag": 0,
"metadata": {"user": "test"}, "metadata": {"user": "test"},
"precnode": "ca819180edb99ed25ceafb3e9584ac287e240b00", "prednode": "ca819180edb99ed25ceafb3e9584ac287e240b00",
"succnodes": ["1337133713371337133713371337133713371337"] "succnodes": ["1337133713371337133713371337133713371337"]
}, },
{ {
"date": [1337.0, 0], "date": [1337.0, 0],
"flag": 0, "flag": 0,
"metadata": {"user": "test"}, "metadata": {"user": "test"},
"precnode": "cdbce2fbb16313928851e97e0d85413f3f7eb77f", "prednode": "cdbce2fbb16313928851e97e0d85413f3f7eb77f",
"succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"] "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"]
}, },
{ {
"date": [0.0, 0], "date": [0.0, 0],
"flag": 0, "flag": 0,
"metadata": {"user": "test"}, "metadata": {"user": "test"},
"parentnodes": ["6f96419950729f3671185b847352890f074f7557"], "parentnodes": ["6f96419950729f3671185b847352890f074f7557"],
"precnode": "94b33453f93bdb8d457ef9b770851a618bf413e1", "prednode": "94b33453f93bdb8d457ef9b770851a618bf413e1",
"succnodes": [] "succnodes": []
}, },
{ {
"date": *, (glob) "date": *, (glob)
"flag": 0, "flag": 0,
"metadata": {"user": "test <test@example.net>"}, "metadata": {"user": "test <test@example.net>"},
"precnode": "cda648ca50f50482b7055c0b0c4c117bba6733d9", "prednode": "cda648ca50f50482b7055c0b0c4c117bba6733d9",
"succnodes": ["3de5eca88c00aa039da7399a220f4a5221faa585"] "succnodes": ["3de5eca88c00aa039da7399a220f4a5221faa585"]
} }
] ]
Template keywords Template keywords
$ hg debugobsolete -r6 -T '{succnodes % "{node|short}"} {date|shortdate}\n' $ hg debugobsolete -r6 -T '{succnodes % "{node|short}"} {date|shortdate}\n'
3de5eca88c00 ????-??-?? (glob) 3de5eca88c00 ????-??-?? (glob)
3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re) 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re)
$ hg debugobsolete --index --rev "3+7" -Tjson $ hg debugobsolete --index --rev "3+7" -Tjson
[ [
{ {
"date": [0.0, 0], "date": [0.0, 0],
"flag": 0, "flag": 0,
"index": 1, "index": 1,
"metadata": {"user": "test"}, "metadata": {"user": "test"},
"precnode": "6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1", "prednode": "6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1",
"succnodes": ["d27fb9b066076fd921277a4b9e8b9cb48c95bc6a"] "succnodes": ["d27fb9b066076fd921277a4b9e8b9cb48c95bc6a"]
}, },
{ {
"date": [0.0, 0], "date": [0.0, 0],
"flag": 0, "flag": 0,
"index": 3, "index": 3,
"metadata": {"operation": "amend", "user": "test"}, "metadata": {"operation": "amend", "user": "test"},
"precnode": "4715cf767440ed891755448016c2b8cf70760c30", "prednode": "4715cf767440ed891755448016c2b8cf70760c30",
"succnodes": ["7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d"] "succnodes": ["7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d"]
} }
] ]
Test the --delete option of debugobsolete command Test the --delete option of debugobsolete command
$ hg debugobsolete --index $ hg debugobsolete --index
0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}