##// END OF EJS Templates
auto-upgrade: add an option to silence the tracked-hint message...
marmoute -
r50237:67b210bb default
parent child Browse files
Show More
@@ -1313,6 +1313,12 b' coreconfigitem('
1313 )
1313 )
1314 coreconfigitem(
1314 coreconfigitem(
1315 b'format',
1315 b'format',
1316 b'use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories:quiet',
1317 default=False,
1318 experimental=True,
1319 )
1320 coreconfigitem(
1321 b'format',
1316 b'dotencode',
1322 b'dotencode',
1317 default=True,
1323 default=True,
1318 )
1324 )
@@ -1024,6 +1024,10 b' https://www.mercurial-scm.org/wiki/Missi'
1024 value and `format.use-dirstate-tracked-hint` at the same time.
1024 value and `format.use-dirstate-tracked-hint` at the same time.
1025
1025
1026
1026
1027 ``use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories:quiet``
1028 Hide message when performing such automatic upgrade.
1029
1030
1027 ``use-persistent-nodemap``
1031 ``use-persistent-nodemap``
1028 Enable or disable the "persistent-nodemap" feature which improves
1032 Enable or disable the "persistent-nodemap" feature which improves
1029 performance if the Rust extensions are available.
1033 performance if the Rust extensions are available.
@@ -101,6 +101,10 b' def get_tracked_hint_action(repo):'
101 b'format',
101 b'format',
102 b'use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories',
102 b'use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories',
103 )
103 )
104 auto_upgrade_quiet = ui.configbool(
105 b'format',
106 b'use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories:quiet',
107 )
104
108
105 action = None
109 action = None
106
110
@@ -115,7 +119,7 b' def get_tracked_hint_action(repo):'
115 hint = b"(see `hg help config.format.use-dirstate-tracked-hint` for details)\n"
119 hint = b"(see `hg help config.format.use-dirstate-tracked-hint` for details)\n"
116
120
117 def action():
121 def action():
118 if not ui.quiet:
122 if not (ui.quiet or auto_upgrade_quiet):
119 ui.write_err(msg)
123 ui.write_err(msg)
120 ui.write_err(hint)
124 ui.write_err(hint)
121 requirements.add(requirementsmod.DIRSTATE_TRACKED_HINT_V1)
125 requirements.add(requirementsmod.DIRSTATE_TRACKED_HINT_V1)
@@ -130,7 +134,7 b' def get_tracked_hint_action(repo):'
130 hint = b"(see `hg help config.format.use-dirstate-tracked-hint` for details)\n"
134 hint = b"(see `hg help config.format.use-dirstate-tracked-hint` for details)\n"
131
135
132 def action():
136 def action():
133 if not ui.quiet:
137 if not (ui.quiet or auto_upgrade_quiet):
134 ui.write_err(msg)
138 ui.write_err(msg)
135 ui.write_err(hint)
139 ui.write_err(hint)
136 requirements.discard(requirementsmod.DIRSTATE_TRACKED_HINT_V1)
140 requirements.discard(requirementsmod.DIRSTATE_TRACKED_HINT_V1)
@@ -1611,6 +1611,8 b' Separate sections from subsections'
1611
1611
1612 "use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories"
1612 "use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories"
1613
1613
1614 "use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories:quiet"
1615
1614 "use-persistent-nodemap"
1616 "use-persistent-nodemap"
1615
1617
1616 "use-share-safe"
1618 "use-share-safe"
@@ -2074,12 +2074,11 b' Quiet upgrade and downgrade'
2074 > --config format.use-dirstate-v2.automatic-upgrade-of-mismatching-repositories:quiet=yes \
2074 > --config format.use-dirstate-v2.automatic-upgrade-of-mismatching-repositories:quiet=yes \
2075 > --config format.use-dirstate-v2=no \
2075 > --config format.use-dirstate-v2=no \
2076 > --config format.use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories=yes \
2076 > --config format.use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories=yes \
2077 > --config format.use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories:quiet=yes \
2077 > --config format.use-dirstate-tracked-hint=yes \
2078 > --config format.use-dirstate-tracked-hint=yes \
2078 > --config format.use-share-safe.automatic-upgrade-of-mismatching-repositories=yes \
2079 > --config format.use-share-safe.automatic-upgrade-of-mismatching-repositories=yes \
2079 > --config format.use-share-safe.automatic-upgrade-of-mismatching-repositories:quiet=yes \
2080 > --config format.use-share-safe.automatic-upgrade-of-mismatching-repositories:quiet=yes \
2080 > --config format.use-share-safe=no
2081 > --config format.use-share-safe=no
2081 automatically upgrading repository to the `tracked-hint` feature
2082 (see `hg help config.format.use-dirstate-tracked-hint` for details)
2083
2082
2084 $ hg debugformat -R auto-upgrade | egrep '(dirstate-v2|tracked|share-safe)'
2083 $ hg debugformat -R auto-upgrade | egrep '(dirstate-v2|tracked|share-safe)'
2085 dirstate-v2: no
2084 dirstate-v2: no
@@ -2091,12 +2090,11 b' Quiet upgrade and downgrade'
2091 > --config format.use-dirstate-v2.automatic-upgrade-of-mismatching-repositories:quiet=yes \
2090 > --config format.use-dirstate-v2.automatic-upgrade-of-mismatching-repositories:quiet=yes \
2092 > --config format.use-dirstate-v2=yes \
2091 > --config format.use-dirstate-v2=yes \
2093 > --config format.use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories=yes \
2092 > --config format.use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories=yes \
2093 > --config format.use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories:quiet=yes \
2094 > --config format.use-dirstate-tracked-hint=no\
2094 > --config format.use-dirstate-tracked-hint=no\
2095 > --config format.use-share-safe.automatic-upgrade-of-mismatching-repositories=yes \
2095 > --config format.use-share-safe.automatic-upgrade-of-mismatching-repositories=yes \
2096 > --config format.use-share-safe.automatic-upgrade-of-mismatching-repositories:quiet=yes \
2096 > --config format.use-share-safe.automatic-upgrade-of-mismatching-repositories:quiet=yes \
2097 > --config format.use-share-safe=yes
2097 > --config format.use-share-safe=yes
2098 automatically downgrading repository from the `tracked-hint` feature
2099 (see `hg help config.format.use-dirstate-tracked-hint` for details)
2100 $ hg debugformat -R auto-upgrade | egrep '(dirstate-v2|tracked|share-safe)'
2098 $ hg debugformat -R auto-upgrade | egrep '(dirstate-v2|tracked|share-safe)'
2101 dirstate-v2: yes
2099 dirstate-v2: yes
2102 tracked-hint: no
2100 tracked-hint: no
General Comments 0
You need to be logged in to leave comments. Login now