Mercurial > public > mercurial-scm > hg
comparison mercurial/upgrade.py @ 48447:8405c1bffacf
upgrade: issue a message when a revlog type has to be upgraded
This is more explicite and prepare for a smoother transition to smarter picking
of the revlog we will process.
Differential Revision: https://phab.mercurial-scm.org/D11870
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 06 Dec 2021 17:13:26 +0100 |
parents | 1d0978cfe968 |
children | 62e6222cc5b6 |
comparison
equal
deleted
inserted
replaced
48446:1d0978cfe968 | 48447:8405c1bffacf |
---|---|
90 | 90 |
91 # check if we need to touch revlog and if so, which ones | 91 # check if we need to touch revlog and if so, which ones |
92 | 92 |
93 touched_revlogs = set() | 93 touched_revlogs = set() |
94 overwrite_msg = _(b'warning: ignoring %14s, as upgrade is changing: %s\n') | 94 overwrite_msg = _(b'warning: ignoring %14s, as upgrade is changing: %s\n') |
95 msg_issued = False | 95 select_msg = _(b'note: selecting %s for processing to change: %s\n') |
96 msg_issued = 0 | |
96 | 97 |
97 FL = upgrade_engine.UPGRADE_FILELOGS | 98 FL = upgrade_engine.UPGRADE_FILELOGS |
98 MN = upgrade_engine.UPGRADE_MANIFEST | 99 MN = upgrade_engine.UPGRADE_MANIFEST |
99 CL = upgrade_engine.UPGRADE_CHANGELOG | 100 CL = upgrade_engine.UPGRADE_CHANGELOG |
100 | 101 |
106 if action.touches_filelogs and FL not in touched_revlogs: | 107 if action.touches_filelogs and FL not in touched_revlogs: |
107 if FL in specified_revlogs: | 108 if FL in specified_revlogs: |
108 if not specified_revlogs[FL]: | 109 if not specified_revlogs[FL]: |
109 msg = overwrite_msg % (b'--no-filelogs', action.name) | 110 msg = overwrite_msg % (b'--no-filelogs', action.name) |
110 ui.warn(msg) | 111 ui.warn(msg) |
111 msg_issued = True | 112 msg_issued = 2 |
113 else: | |
114 msg = select_msg % (b'all-filelogs', action.name) | |
115 ui.status(msg) | |
116 if not ui.quiet: | |
117 msg_issued = 1 | |
112 touched_revlogs.add(FL) | 118 touched_revlogs.add(FL) |
119 | |
113 if action.touches_manifests and MN not in touched_revlogs: | 120 if action.touches_manifests and MN not in touched_revlogs: |
114 if MN in specified_revlogs: | 121 if MN in specified_revlogs: |
115 if not specified_revlogs[MN]: | 122 if not specified_revlogs[MN]: |
116 msg = overwrite_msg % (b'--no-manifest', action.name) | 123 msg = overwrite_msg % (b'--no-manifest', action.name) |
117 ui.warn(msg) | 124 ui.warn(msg) |
118 msg_issued = True | 125 msg_issued = 2 |
126 else: | |
127 msg = select_msg % (b'all-manifestlogs', action.name) | |
128 ui.status(msg) | |
129 if not ui.quiet: | |
130 msg_issued = 1 | |
119 touched_revlogs.add(MN) | 131 touched_revlogs.add(MN) |
132 | |
120 if action.touches_changelog and CL not in touched_revlogs: | 133 if action.touches_changelog and CL not in touched_revlogs: |
121 if CL in specified_revlogs: | 134 if CL in specified_revlogs: |
122 if not specified_revlogs[CL]: | 135 if not specified_revlogs[CL]: |
123 msg = overwrite_msg % (b'--no-changelog', action.name) | 136 msg = overwrite_msg % (b'--no-changelog', action.name) |
124 ui.warn(msg) | 137 ui.warn(msg) |
125 msg_issued = True | 138 msg_issued = True |
139 else: | |
140 msg = select_msg % (b'changelog', action.name) | |
141 ui.status(msg) | |
142 if not ui.quiet: | |
143 msg_issued = 1 | |
126 touched_revlogs.add(CL) | 144 touched_revlogs.add(CL) |
127 if msg_issued: | 145 if msg_issued >= 2: |
128 ui.warn((b"\n")) | 146 ui.warn((b"\n")) |
147 elif msg_issued >= 1: | |
148 ui.status((b"\n")) | |
129 | 149 |
130 revlogs = set(upgrade_engine.UPGRADE_ALL_REVLOGS) | 150 revlogs = set(upgrade_engine.UPGRADE_ALL_REVLOGS) |
131 if specified_revlogs: | 151 if specified_revlogs: |
132 # we have some limitation on revlogs to be recloned | 152 # we have some limitation on revlogs to be recloned |
133 if any(specified_revlogs.values()): | 153 if any(specified_revlogs.values()): |