comparison tests/test-strip.t @ 39916:1857f50a9643

cleanupnodes: drop special casing around prune markers (API) The `cleanupnodes` has logic to skip the creation of "prune" markers if the changeset is already obsolete. This feels strange and gets in the way of code changes to tracks folds. Now that callers no longer request such prune, we can drop this logic. In many cases, pruning through cleanupnodes should be replaced by internal phase usage.
author Boris Feld <boris.feld@octobus.net>
date Wed, 26 Sep 2018 21:28:21 +0200
parents 89630d0b3e23
children 943248e47864
comparison
equal deleted inserted replaced
39915:7198cdbbbde1 39916:1857f50a9643
1244 > with repo.transaction(b'delayedstrip'): 1244 > with repo.transaction(b'delayedstrip'):
1245 > mapping = {node(b'F'): [node(b'F2')], 1245 > mapping = {node(b'F'): [node(b'F2')],
1246 > node(b'D'): [node(b'D2')], 1246 > node(b'D'): [node(b'D2')],
1247 > node(b'G'): [node(b'G2')]} 1247 > node(b'G'): [node(b'G2')]}
1248 > scmutil.cleanupnodes(repo, mapping, b'replace') 1248 > scmutil.cleanupnodes(repo, mapping, b'replace')
1249 > scmutil.cleanupnodes(repo, nodes(b'((B::)+I+Z)-D2'), 1249 > scmutil.cleanupnodes(repo, nodes(b'((B::)+I+Z)-D2-obsolete()'),
1250 > b'replace') 1250 > b'replace')
1251 > EOF 1251 > EOF
1252 $ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py 1252 $ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
1253 warning: orphaned descendants detected, not stripping 112478962961, 1fc8102cda62, 26805aba1e60 1253 warning: orphaned descendants detected, not stripping 112478962961, 1fc8102cda62, 26805aba1e60
1254 saved backup bundle to $TESTTMP/scmutilcleanup/.hg/strip-backup/f585351a92f8-73fb7c03-replace.hg 1254 saved backup bundle to $TESTTMP/scmutilcleanup/.hg/strip-backup/f585351a92f8-73fb7c03-replace.hg