##// END OF EJS Templates
bdiff: normalize the diff (issue1295)...
bdiff: normalize the diff (issue1295) When the common part of a diff can be moved forward, move it forward. Otherwise we don't get deterministic results (it would depends on the way we split for the recursion). That way we get identical hunks when doing the same change, it helps to solve issue1295 (inconsistent diffs on different side during a merge).

File last commit:

r6359:25e74cd3 default
r7104:9514cbb6 default
Show More
test-notify
72 lines | 1.6 KiB | text/plain | TextLexer
Matt Mackall
add test for the notify extension
r3740 #!/bin/sh
cat <<EOF >> $HGRCPATH
[extensions]
notify=
[hooks]
incoming.notify = python:hgext.notify.hook
[notify]
sources = pull
Thomas Arendsen Hein
Fix test-notify for systems without or with a different version of diffstat....
r3747 diffstat = False
Matt Mackall
add test for the notify extension
r3740
[usersubs]
foo@bar = *
Alexis S. L. Carvalho
notify: don't try to fix addresses if notify.domain is not set
r4094
[reposubs]
* = baz
Matt Mackall
add test for the notify extension
r3740 EOF
Benoit Boissinot
fix hg help <ext> for extension that do not define any command...
r4009 hg help notify
Matt Mackall
add test for the notify extension
r3740 hg init a
echo a > a/a
echo % commit
hg --traceback --cwd a commit -Ama -d '0 0'
echo % clone
hg --traceback clone a b
echo a >> a/a
echo % commit
hg --traceback --cwd a commit -Amb -d '1 0'
Florent Guillaume
test-notify: make it pass on Mac OS X 10.5
r6359 # on Mac OS X 10.5 the tmp path is very long so would get stripped in the subject line
cat <<EOF >> $HGRCPATH
[notify]
maxsubject = 200
EOF
# the python call below wraps continuation lines, which appear on Mac OS X 10.5 because
# of the very long subject line
Alexis S. L. Carvalho
notify: don't try to fix addresses if notify.domain is not set
r4094 echo '% pull (minimal config)'
Florent Guillaume
test-notify: make it pass on Mac OS X 10.5
r6359 hg --traceback --cwd b pull ../a 2>&1 |
python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
sed -e 's/\(Message-Id:\).*/\1/' \
Thomas Arendsen Hein
Fix sed expression in test-notify to be more portable.
r4157 -e 's/changeset \([0-9a-f]* *\)in .*test-notif/changeset \1in test-notif/' \
Mathieu Clabaut
Add sending date to notify message....
r4479 -e 's/^details: .*test-notify/details: test-notify/' \
-e 's/^Date:.*/Date:/'
Alexis S. L. Carvalho
notify: don't try to fix addresses if notify.domain is not set
r4094
cat <<EOF >> $HGRCPATH
[notify]
config = $HGTMP/.notify.conf
domain = test.com
strip = 3
template = Subject: {desc|firstline|strip}\nFrom: {author}\n\nchangeset {node|short} in {webroot}\ndescription:\n\t{desc|tabindent|strip}
[web]
baseurl = http://test/
EOF
Patrick Mezard
ui: make readsections() abort when configuration cannot be read.
r4517 echo % fail for config file is missing
hg --cwd b rollback
hg --cwd b pull ../a 2>&1 | grep 'unable to open.*\.notify\.conf' > /dev/null && echo pull failed
touch "$HGTMP/.notify.conf"
Matt Mackall
add test for the notify extension
r3740 echo % pull
Alexis S. L. Carvalho
notify: don't try to fix addresses if notify.domain is not set
r4094 hg --cwd b rollback
Matt Mackall
add test for the notify extension
r3740 hg --traceback --cwd b pull ../a 2>&1 | sed -e 's/\(Message-Id:\).*/\1/' \
Mathieu Clabaut
Add sending date to notify message....
r4479 -e 's/changeset \([0-9a-f]*\) in .*/changeset \1/' \
-e 's/^Date:.*/Date:/'
Alexis S. L. Carvalho
notify: don't try to fix addresses if notify.domain is not set
r4094