view tests/test-rebase-cache @ 11989:f853873fc66d

aliases: provide more flexible ways to work with shell alias arguments This patch changes the functionality of shell aliases to add more powerful options for working with shell alias arguments. First: the alias name + arguments to a shell alias are set as an HG_ARGS environment variable, delimited by spaces. This matches the behavior of hooks. Second: any occurrences of "$@" (without quotes) are replaced with the arguments, separated by spaces. This happens *before* the alias gets to the shell. Third: any positive numeric variables ("$1", "$2", etc) are replaced with the appropriate argument, indexed from 1. "$0" is replaced with the name of the alias. Any "extra" numeric variables are replaced with an empty string. This happens *before* the alias gets to the shell. These changes allow for more flexible shell aliases: [alias] echo = !echo $@ count = !hg log -r "$@" --template='.' | wc -c | sed -e 's/ //g' qqueuemv = !mv "`hg root`/.hg/patches-$1" "`hg root`/.hg/patches-$2" In action: $ hg echo foo foo $ hg count 'branch(default)' 901 $ hg count 'branch(stable) and keyword(fixes)' 102 $ hg qqueuemv myfeature somefeature
author Steve Losh <steve@stevelosh.com>
date Wed, 18 Aug 2010 18:56:44 -0400
parents 2313dc4d9817
children
line wrap: on
line source

#!/bin/sh

. $TESTDIR/helpers.sh

createrepo() {
    rm -rf repo
    hg init repo
    cd repo

    echo "a" > a
    hg commit -d '0 0' -A -m 'A'

    hg branch branch1
    hg commit -d '1 0' -m 'Branch1'

    echo "b" > b
    hg commit -A -d '2 0' -m 'B'

    hg up 0
    hg branch branch2
    hg commit -d '3 0' -m 'Branch2'

    echo "c" > C
    hg commit -A -d '4 0' -m 'C'

    hg up 2
    hg branch -f branch2
    echo "d" > d
    hg commit -A -d '5 0' -m 'D'

    echo "e" > e
    hg commit -A -d '6 0' -m 'E'

    hg update default

    hg branch branch3
    hg commit -d '7 0' -m 'Branch3'

    echo "f" > f
    hg commit -A -d '8 0' -m 'F'
}

echo
createrepo > /dev/null 2>&1
hg --config extensions.hgext.graphlog= glog --template '{rev}:{node|short} {desc} branch: {branches}\n'

echo
echo '% Branches'
hg branches

echo
echo '% Heads'
hg heads --template '{rev}:{node|short} {desc} branch: {branches}\n'

echo
echo '% Rebase part of branch2 (5-6) onto branch3 (8)'
hg --config extensions.hgext.rebase= rebase --detach -s 5 -d 8 | hidebackup

echo
echo '% Branches'
hg branches

echo
echo '% Heads'
hg heads --template '{rev}:{node|short} {desc} branch: {branches}\n'

echo
hg --config extensions.hgext.graphlog= glog --template '{rev}:{node|short} {desc} branch: {branches}\n'

echo
echo '% Rebase head of branch3 (8) onto branch2 (6)'
createrepo > /dev/null 2>&1
hg --config extensions.hgext.graphlog= glog --template '{rev}:{node|short} {desc} branch: {branches}\n'

hg --config extensions.hgext.rebase= rebase --detach -s 8 -d 6 | hidebackup

echo
echo '% Branches'
hg branches

echo
echo '% Heads'
hg heads --template '{rev}:{node|short} {desc} branch: {branches}\n'

echo
hg --config extensions.hgext.graphlog= glog --template '{rev}:{node|short} {desc} branch: {branches}\n'
hg verify -q

echo
echo '% Rebase entire branch3 (7-8) onto branch2 (6)'
createrepo > /dev/null 2>&1
hg --config extensions.hgext.graphlog= glog --template '{rev}:{node|short} {desc} branch: {branches}\n'

hg --config extensions.hgext.rebase= rebase --detach -s 7 -d 6 | hidebackup

echo
echo '% Branches'
hg branches

echo
echo '% Heads'
hg heads --template '{rev}:{node|short} {desc} branch: {branches}\n'

echo
hg --config extensions.hgext.graphlog= glog --template '{rev}:{node|short} {desc} branch: {branches}\n'
hg verify -q