obsolete: unify collapsed revisions markers handling
When collapsing A, B and C into D, amend was registering:
A -> D
B -> D
A -> B
C -> D
A -> C
while the rebase wrapper was doing:
A -> D
B -> D
C -> D
At this point, I have no argument to favor one or another or even a new
one like:
A -> B
B -> C
C -> D
so I am aligning the rebase implementation on the older amend one. At
least we can now change them all at once.
#!/bin/sh
here=`python -c "import os; print os.path.realpath('$0')"`
repo_root=`dirname "$here"`
if !( hg --version -q | grep -qe 'version 2\.[1-9]' ); then
echo 'You need mercurial 2.1 or later' >&2
exit 2
fi
cat << EOF >&2
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXX Add lines below to the [extensions] section of you hgrc XXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
EOF
cat << EOF | sed -e "s#XXXREPOPATHXXX#${repo_root}#"
[extensions]
### experimental extensions for history rewriting
# obsolete relation support (will move in core)
obsolete=XXXREPOPATHXXX/hgext/obsolete.py
# history rewriting UI
# needed by evolve
hgext.rebase=
evolve=XXXREPOPATHXXX/hgext/evolve.py
[alias]
### useful alias to check future amend result
# equivalent to the qdiff command for mq
# diff
pdiff=diff --rev .^
# status
pstatus=status --rev .^
# diff with the previous amend
odiff=diff --rev 'limit(obsparents(.),1)' --rev .
EOF
cat << EOF >&2
### check qsync-enable.sh if your need mq export too.
EOF