export LC_ALL
# The newest revision that should not appear in the generated ChangeLog.
-gen_origin=0700eb152da4c57419a391161107b48d81abdeb2
+gen_origin=
+
force=
output=ChangeLog
nmax=2
exit 1
fi
+# If not specified in the command line, get gen_origin from the existing
+# ChangeLog file.
+[ "$gen_origin" ] || {
+ gen_origin_line=`
+ grep -E '^commit [0-9a-f]+ [(]inclusive[)]' ChangeLog.$nmax
+ ` || {
+ echo "ChangeLog.$nmax lacks a 'commit ... (inclusive)' line" >&2
+ exit 1
+ }
+ set $gen_origin_line
+ gen_origin=$2
+}
+
+# Get the new value for gen_origin from the latest version in the repository.
+new_origin=`git log --pretty=format:%H 'HEAD^!'` || exit
+
if [ -f "$output" ]; then
[ ! "$force" ] && echo "$output exists" >&2 && exit 1
rm -f "$output" || exit 1
}
# Use Gnulib's packaged ChangeLog generator.
-./build-aux/gitlog-to-changelog --ignore-matching='^; ' \
+# Maybe we should skip all "Merge branch 'master'" messages.
+# See eg the cairo-related ones.
+./build-aux/gitlog-to-changelog \
+ --ignore-matching="^; |^Merge branch 'master' of git\.(savannah|sv)\.gnu\.org:/srv/git/emacs$" \
--ignore-line='^; ' --format='%B' \
- "$gen_origin.." >"ChangeLog.tmp" || exit
+ "$gen_origin..$new_origin" >"ChangeLog.tmp" || exit
if test -s "ChangeLog.tmp"; then
year_range=$start_year-$end_year
fi
- # Append a proper copyright notice.
+ # Update gen_origin and append a proper copyright notice.
sed -n '
1i\
+ /^This file records repository revisions/p
+ s/^commit [0-9a-f]* (exclusive)/commit '"$gen_origin"' (exclusive)/p
+ s/^commit [0-9a-f]* (inclusive)/commit '"$new_origin"' (inclusive)/p
/^See ChangeLog.[0-9]* for earlier/,${
s/ChangeLog\.[0-9]*/ChangeLog.'$nmax'/
s/\(Copyright[ (C)]*\)[0-9]*-[0-9]*/\1'"$year_range"'/