Skip to content
Snippets Groups Projects
Commit 3e73bf87 authored by Thomas Arendsen Hein's avatar Thomas Arendsen Hein
Browse files

Fixes and cleanups to hgeditor:

- "HG: merge resolve" isn't supported for a long time now.
- detection of unchanged commit message if signing is turned off.
- don't add manifest hash to commit message if not signing.
parent 8760d0c8
No related branches found
No related tags found
No related merge requests found
......@@ -23,12 +23,13 @@
;;
esac
if grep -q "^HG: merge resolve" "$1" ; then
# we don't sign merges
exec $EDITOR "$1"
else
# Remove temporary files even if we get interrupted
trap "cleanup_exit 255" TERM KILL INT QUIT ABRT
T1=`mktemp`; T2=`mktemp`
MANIFEST=`grep '^HG: manifest hash' "$1" | cut -b 19-`
# Remove temporary files even if we get interrupted
trap "cleanup_exit 255" TERM KILL INT QUIT ABRT
T1=`mktemp`; T2=`mktemp`
(
cd "`hg root`"
grep '^HG: changed' "$1" | cut -b 13- | while read changed; do
hg diff "$changed" >> "$T2"
done
)
......@@ -34,13 +35,8 @@
echo -e "\n\nmanifest hash: $MANIFEST" >> "$T1"
grep -vE '^(HG: manifest hash .*)?$' "$1" >> "$T1"
(
cd "`hg root`"
grep '^HG: changed' "$1" | cut -b 13- | while read changed; do
hg diff "$changed" >> "$T2"
done
)
CHECKSUM=`md5sum "$T1"`
$EDITOR "$T1" "$T2" || cleanup_exit $?
echo > "$T1"
if [ "$SIGN" == "1" ]; then
MANIFEST=`grep '^HG: manifest hash' "$1" | cut -b 19-`
echo -e "\nmanifest hash: $MANIFEST" >> "$T1"
fi
grep -vE '^(HG: manifest hash .*)?$' "$1" >> "$T1"
......@@ -46,14 +42,15 @@
if [ "$SIGN" == "1" ] ; then
echo "$CHECKSUM" | md5sum -c 2>/dev/null && cleanup_exit 13
{
head -n 1 "$T1"
echo
grep -v "^HG:" "$T1" | gpg -t -a -u "${HGUSER}" --clearsign
} > "$T2" && mv "$T2" "$1"
else
mv "$T1" "$1"
fi
cleanup_exit $?
CHECKSUM=`md5sum "$T1"`
$EDITOR "$T1" "$T2" || cleanup_exit $?
echo "$CHECKSUM" | md5sum -c 2>/dev/null && cleanup_exit 13
if [ "$SIGN" == "1" ]; then
{
head -n 1 "$T1"
echo
grep -v "^HG:" "$T1" | gpg -t -a -u "${HGUSER}" --clearsign
} > "$T2" && mv "$T2" "$1"
else
mv "$T1" "$1"
fi
......@@ -58,2 +55,3 @@
fi
cleanup_exit $?
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment