view tests/test-convert-authormap @ 12039:18e1e7520b67 stable

alias: make shadowing behavior more consistent (issue2054)

Currently, given an alias like the following:

    [alias]
    summary = summary --remote

The alias might be executed - or it might not - depending on the order
of the cmdtable dict.

This happens because cmdalias gets assigned back to the cmdtable like so:

    cmdtable['summary'] = ...

Yet '^summary|sum' is still in the table, so which one cmdutil.findcmd()
chooses isn't deterministic.

This patch makes cmdalias assign back to '^summary|sum'. It uses the same
cmdtable key lookup that extensions.wrapcommand() does.

#!/bin/sh

cat >> $HGRCPATH <<EOF
[extensions]
convert=
EOF

# Prepare orig repo
hg init orig
cd orig
echo foo > foo
HGUSER='user name' hg ci -qAm 'foo'
cd ..

# Explicit --authors
cat > authormap.txt <<EOF
user name = Long User Name

# comment
this line is ignored
EOF

hg convert --authors authormap.txt orig new
echo $?
cat new/.hg/authormap

hg -Rnew log
rm -rf new

# Implicit .hg/authormap
hg init new
mv authormap.txt new/.hg/authormap

hg convert orig new
echo $?

hg -Rnew log