view tests/test-template-engine @ 9717:68a1b9d0663e

update: allow branch crossing without -c or -C, with no uncommitted changes

Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches.  Minor change to abort message if
uncommitted changes are found.

Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.

#!/bin/sh

cat > engine.py << EOF

from mercurial import templater

class mytemplater(object):
    def __init__(self, loader, filters, defaults):
        self.loader = loader

    def process(self, t, map):
        tmpl = self.loader(t)
        for k, v in map.iteritems():
            v = templater.stringify(v)
            tmpl = tmpl.replace('{{%s}}' % k, v)
        yield tmpl

templater.engines['my'] = mytemplater
EOF

hg init test
echo '[extensions]' > test/.hg/hgrc
echo "engine = `pwd`/engine.py" >> test/.hg/hgrc

cd test
cat > mymap << EOF
changeset = my:changeset.txt
EOF

cat > changeset.txt << EOF
{{rev}} {{node}} {{author}}
EOF

hg ci -Ama
hg log --style=./mymap