2018-08-06 17:37:20 +00:00
|
|
|
#!/bin/sh
|
2018-08-21 19:23:22 +00:00
|
|
|
#
|
|
|
|
# Build two documentation trees and diff the resulting formatted output.
|
|
|
|
# Compared to a source diff, this can reveal mistakes in the formatting.
|
|
|
|
# For example:
|
|
|
|
#
|
|
|
|
# ./doc-diff origin/master HEAD
|
|
|
|
#
|
|
|
|
# would show the differences introduced by a branch based on master.
|
2018-08-06 17:37:20 +00:00
|
|
|
|
|
|
|
OPTIONS_SPEC="\
|
|
|
|
doc-diff [options] <from> <to> [-- <diff-options>]
|
2018-08-31 06:33:17 +00:00
|
|
|
doc-diff (-c|--clean)
|
2018-08-06 17:37:20 +00:00
|
|
|
--
|
|
|
|
j=n parallel argument to pass to make
|
|
|
|
f force rebuild; do not rely on cached results
|
2018-08-31 06:33:17 +00:00
|
|
|
c,clean cleanup temporary working files
|
2018-08-06 17:37:20 +00:00
|
|
|
"
|
|
|
|
SUBDIRECTORY_OK=1
|
|
|
|
. "$(git --exec-path)/git-sh-setup"
|
|
|
|
|
|
|
|
parallel=
|
|
|
|
force=
|
2018-08-31 06:33:17 +00:00
|
|
|
clean=
|
2018-08-06 17:37:20 +00:00
|
|
|
while test $# -gt 0
|
|
|
|
do
|
|
|
|
case "$1" in
|
|
|
|
-j)
|
|
|
|
parallel=$2; shift ;;
|
2018-08-31 06:33:17 +00:00
|
|
|
-c|--clean)
|
|
|
|
clean=t ;;
|
2018-08-06 17:37:20 +00:00
|
|
|
-f)
|
|
|
|
force=t ;;
|
|
|
|
--)
|
|
|
|
shift; break ;;
|
|
|
|
*)
|
|
|
|
usage ;;
|
|
|
|
esac
|
|
|
|
shift
|
|
|
|
done
|
|
|
|
|
2019-02-04 20:50:37 +00:00
|
|
|
tmp="$(git rev-parse --show-toplevel)/Documentation/tmp-doc-diff" || exit 1
|
2018-08-31 06:33:17 +00:00
|
|
|
|
|
|
|
if test -n "$clean"
|
|
|
|
then
|
|
|
|
test $# -eq 0 || usage
|
|
|
|
git worktree remove --force "$tmp/worktree" 2>/dev/null
|
|
|
|
rm -rf "$tmp"
|
|
|
|
exit 0
|
|
|
|
fi
|
|
|
|
|
2018-08-06 17:37:20 +00:00
|
|
|
if test -z "$parallel"
|
|
|
|
then
|
|
|
|
parallel=$(getconf _NPROCESSORS_ONLN 2>/dev/null)
|
|
|
|
if test $? != 0 || test -z "$parallel"
|
|
|
|
then
|
|
|
|
parallel=1
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
test $# -gt 1 || usage
|
|
|
|
from=$1; shift
|
|
|
|
to=$1; shift
|
|
|
|
|
|
|
|
from_oid=$(git rev-parse --verify "$from") || exit 1
|
|
|
|
to_oid=$(git rev-parse --verify "$to") || exit 1
|
|
|
|
|
|
|
|
if test -n "$force"
|
|
|
|
then
|
|
|
|
rm -rf "$tmp"
|
|
|
|
fi
|
|
|
|
|
|
|
|
# We'll do both builds in a single worktree, which lets "make" reuse
|
|
|
|
# results that don't differ between the two trees.
|
|
|
|
if ! test -d "$tmp/worktree"
|
|
|
|
then
|
2018-08-30 07:54:31 +00:00
|
|
|
git worktree add -f --detach "$tmp/worktree" "$from" &&
|
2018-08-06 17:37:20 +00:00
|
|
|
dots=$(echo "$tmp/worktree" | sed 's#[^/]*#..#g') &&
|
|
|
|
ln -s "$dots/config.mak" "$tmp/worktree/config.mak"
|
|
|
|
fi
|
|
|
|
|
|
|
|
# generate_render_makefile <srcdir> <dstdir>
|
|
|
|
generate_render_makefile () {
|
|
|
|
find "$1" -type f |
|
|
|
|
while read src
|
|
|
|
do
|
|
|
|
dst=$2/${src#$1/}
|
|
|
|
printf 'all:: %s\n' "$dst"
|
|
|
|
printf '%s: %s\n' "$dst" "$src"
|
|
|
|
printf '\t@echo >&2 " RENDER $(notdir $@)" && \\\n'
|
|
|
|
printf '\tmkdir -p $(dir $@) && \\\n'
|
doc-diff: fix non-portable 'man' invocation
doc-diff invokes 'man' with the -l option to force "local" mode,
however, neither MacOS nor FreeBSD recognize this option. On those
platforms, if the argument to 'man' contains a slash, it is
automatically interpreted as a file specification, so a "local"-like
mode is not needed. And, it turns out, 'man' which does support -l
falls back to enabling -l automatically if it can't otherwise find a
manual entry corresponding to the argument. Since doc-diff always
passes an absolute path of the nroff source file to 'man', the -l
option kicks in anyhow, despite not being specified explicitly.
Therefore, make the invocation portable to the various platforms by
simply dropping -l.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-31 06:33:16 +00:00
|
|
|
printf '\tMANWIDTH=80 man $< >$@+ && \\\n'
|
2018-08-06 17:37:20 +00:00
|
|
|
printf '\tmv $@+ $@\n'
|
|
|
|
done
|
|
|
|
}
|
|
|
|
|
doc-diff: always use oids inside worktree
The doc-diff script immediately resolves its two endpoints
to actual object ids, so that we can reuse cached results
even if they appear under a different name. But we still use
the original name the user fed us when running "git
checkout" in our temporary worktree. This can lead to
confusing results:
- the namespace inside the worktree is different than the
one outside. In particular, "./doc-diff origin HEAD"
will resolve HEAD inside the worktree, whose detached
HEAD will be pointing at origin! As a result, such a
diff would always be empty.
- worse, we will store this result under the oid we got by
resolving HEAD in the main worktree, thus polluting our
cache
- we didn't pass --detach, which meant that using a branch
name would cause us to actually check out that branch,
making it unavailable to other worktrees.
We can solve this by feeding the already-resolved object id
to git-checkout. That naturally forces a detached HEAD, but
just to make clear our expectation, let's explicitly pass
--detach.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-30 08:12:03 +00:00
|
|
|
# render_tree <committish_oid>
|
2018-08-06 17:37:20 +00:00
|
|
|
render_tree () {
|
|
|
|
# Skip install-man entirely if we already have an installed directory.
|
|
|
|
# We can't rely on make here, since "install-man" unconditionally
|
|
|
|
# copies the files (spending effort, but also updating timestamps that
|
|
|
|
# we then can't rely on during the render step). We use "mv" to make
|
|
|
|
# sure we don't get confused by a previous run that failed partway
|
|
|
|
# through.
|
|
|
|
if ! test -d "$tmp/installed/$1"
|
|
|
|
then
|
doc-diff: always use oids inside worktree
The doc-diff script immediately resolves its two endpoints
to actual object ids, so that we can reuse cached results
even if they appear under a different name. But we still use
the original name the user fed us when running "git
checkout" in our temporary worktree. This can lead to
confusing results:
- the namespace inside the worktree is different than the
one outside. In particular, "./doc-diff origin HEAD"
will resolve HEAD inside the worktree, whose detached
HEAD will be pointing at origin! As a result, such a
diff would always be empty.
- worse, we will store this result under the oid we got by
resolving HEAD in the main worktree, thus polluting our
cache
- we didn't pass --detach, which meant that using a branch
name would cause us to actually check out that branch,
making it unavailable to other worktrees.
We can solve this by feeding the already-resolved object id
to git-checkout. That naturally forces a detached HEAD, but
just to make clear our expectation, let's explicitly pass
--detach.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-30 08:12:03 +00:00
|
|
|
git -C "$tmp/worktree" checkout --detach "$1" &&
|
2018-08-06 17:37:20 +00:00
|
|
|
make -j$parallel -C "$tmp/worktree" \
|
|
|
|
GIT_VERSION=omitted \
|
|
|
|
SOURCE_DATE_EPOCH=0 \
|
2019-02-04 20:50:37 +00:00
|
|
|
DESTDIR="$tmp/installed/$1+" \
|
2018-08-06 17:37:20 +00:00
|
|
|
install-man &&
|
|
|
|
mv "$tmp/installed/$1+" "$tmp/installed/$1"
|
|
|
|
fi &&
|
|
|
|
|
|
|
|
# As with "installed" above, we skip the render if it's already been
|
|
|
|
# done. So using make here is primarily just about running in
|
|
|
|
# parallel.
|
|
|
|
if ! test -d "$tmp/rendered/$1"
|
|
|
|
then
|
|
|
|
generate_render_makefile "$tmp/installed/$1" "$tmp/rendered/$1+" |
|
|
|
|
make -j$parallel -f - &&
|
|
|
|
mv "$tmp/rendered/$1+" "$tmp/rendered/$1"
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
doc-diff: always use oids inside worktree
The doc-diff script immediately resolves its two endpoints
to actual object ids, so that we can reuse cached results
even if they appear under a different name. But we still use
the original name the user fed us when running "git
checkout" in our temporary worktree. This can lead to
confusing results:
- the namespace inside the worktree is different than the
one outside. In particular, "./doc-diff origin HEAD"
will resolve HEAD inside the worktree, whose detached
HEAD will be pointing at origin! As a result, such a
diff would always be empty.
- worse, we will store this result under the oid we got by
resolving HEAD in the main worktree, thus polluting our
cache
- we didn't pass --detach, which meant that using a branch
name would cause us to actually check out that branch,
making it unavailable to other worktrees.
We can solve this by feeding the already-resolved object id
to git-checkout. That naturally forces a detached HEAD, but
just to make clear our expectation, let's explicitly pass
--detach.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-30 08:12:03 +00:00
|
|
|
render_tree $from_oid &&
|
|
|
|
render_tree $to_oid &&
|
2018-08-06 17:37:20 +00:00
|
|
|
git -C $tmp/rendered diff --no-index "$@" $from_oid $to_oid
|