comparison tests/test-evolve.t @ 3455:f7ecb11d71bb stable

update: show "use 'hg evolve' to..." hint iff evolve command enabled Before this patch, one had to enable *all* commands (by including "allnewcommands" in the experimental.evolution config) for the hint to be shown.
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 24 Jan 2018 09:55:12 -0800
parents d3a17c67f85c
children d166b3dc5e8a
comparison
equal deleted inserted replaced
3452:8275ef099135 3455:f7ecb11d71bb
1248 update update working directory (or switch revisions) 1248 update update working directory (or switch revisions)
1249 1249
1250 (use 'hg help' for the full list of commands or 'hg -v' for details) 1250 (use 'hg help' for the full list of commands or 'hg -v' for details)
1251 [255] 1251 [255]
1252 1252
1253 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled
1254
1255 $ hg --hidden up 14
1256 updating to a hidden changeset 484fb3cfa7f2
1257 (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272)
1258 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1259 working directory parent is obsolete! (484fb3cfa7f2)
1260 $ cat >> $HGRCPATH <<EOF
1261 > [experimental]
1262 > evolutioncommands=evolve
1263 > EOF
1264 $ hg --hidden up 15
1265 updating to a hidden changeset daa1ff1c7fbd
1266 (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422)
1267 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1268 working directory parent is obsolete! (daa1ff1c7fbd)
1269 (use 'hg evolve' to update to its successor: 0c049e4e5422)
1270
1253 Restore all of the evolution features 1271 Restore all of the evolution features
1254 1272
1255 $ cat >> $HGRCPATH <<EOF 1273 $ cat >> $HGRCPATH <<EOF
1256 > [experimental] 1274 > [experimental]
1257 > evolution=all 1275 > evolution=all
1258 > EOF 1276 > EOF
1259 1277
1260 Check hg evolve --rev on singled out commit 1278 Check hg evolve --rev on singled out commit
1261 $ hg up 98e171e2f272 -C 1279 $ hg up 98e171e2f272 -C
1262 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1280 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1263 $ mkcommit j1 1281 $ mkcommit j1
1264 $ mkcommit j2 1282 $ mkcommit j2
1265 $ mkcommit j3 1283 $ mkcommit j3
1266 $ hg up .^^ 1284 $ hg up .^^
1267 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 1285 0 files updated, 0 files merged, 2 files removed, 0 files unresolved