view tests/test-eol-hook @ 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
[diff]
git = True
EOF

hg init main
cat > main/.hg/hgrc <<EOF
[extensions]
eol =

[hooks]
pretxnchangegroup = python:hgext.eol.hook
EOF

hg clone main fork

cd fork
cat > .hgeol <<EOF
[patterns]
mixed.txt = BIN
**.txt = native
EOF

hg add .hgeol
hg commit -m 'Commit .hgeol'

printf "first\nsecond\nthird\n" > a.txt
hg add a.txt
echo "% hg commit (LF a.txt)"
hg commit -m 'LF a.txt'
echo "% hg push"
hg push ../main

printf "first\r\nsecond\r\nthird\n" > a.txt
echo "% hg commit (CRLF a.txt)"
hg commit -m 'CRLF a.txt'
echo "% hg push"
hg push ../main


echo "% hg commit (LF a.txt)"
printf "first\nsecond\nthird\n" > a.txt
hg commit -m 'LF a.txt (fixed)'
echo "% hg push"
hg push ../main