git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
ecd88b05243caaca68634a43fc1b548a6d2d5d43 blob 4642 bytes (raw)

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
 
#!/bin/sh
#
# 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.

OPTIONS_SPEC="\
doc-diff [options] <from> <to> [-- <diff-options>]
doc-diff (-c|--clean)
--
j=n			parallel argument to pass to make
f			force rebuild; do not rely on cached results
c,clean			cleanup temporary working files
from-asciidoc		use asciidoc with the 'from'-commit
from-asciidoctor	use asciidoctor with the 'from'-commit
asciidoc		use asciidoc with both commits
to-asciidoc		use asciidoc with the 'to'-commit
to-asciidoctor		use asciidoctor with the 'to'-commit
asciidoctor		use asciidoctor with both commits
cut-footer		cut away footer
"
SUBDIRECTORY_OK=1
. "$(git --exec-path)/git-sh-setup"

parallel=
force=
clean=
from_program=
to_program=
cut_footer=
while test $# -gt 0
do
	case "$1" in
	-j)
		parallel=$2; shift ;;
	-c|--clean)
		clean=t ;;
	-f)
		force=t ;;
	--from-asciidoctor)
		from_program=-asciidoctor ;;
	--to-asciidoctor)
		to_program=-asciidoctor ;;
	--asciidoctor)
		from_program=-asciidoctor
		to_program=-asciidoctor ;;
	--from-asciidoc)
		from_program=-asciidoc ;;
	--to-asciidoc)
		to_program=-asciidoc ;;
	--asciidoc)
		from_program=-asciidoc
		to_program=-asciidoc ;;
	--cut-footer)
		cut_footer=-cut-footer ;;
	--)
		shift; break ;;
	*)
		usage ;;
	esac
	shift
done

tmp="$(git rev-parse --show-toplevel)/Documentation/tmp-doc-diff" || exit 1

if test -n "$clean"
then
	test $# -eq 0 || usage
	git worktree remove --force "$tmp/worktree" 2>/dev/null
	rm -rf "$tmp"
	exit 0
fi

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
	git worktree add -f --detach "$tmp/worktree" "$from" &&
	dots=$(echo "$tmp/worktree" | sed 's#[^/]*#..#g') &&
	ln -s "$dots/config.mak" "$tmp/worktree/config.mak"
fi

construct_makemanflags () {
	if test "$1" = "-asciidoc"
	then
		echo USE_ASCIIDOCTOR=
	elif test "$1" = "-asciidoctor"
	then
		echo USE_ASCIIDOCTOR=YesPlease
	fi
}

from_makemanflags=$(construct_makemanflags "$from_program") &&
to_makemanflags=$(construct_makemanflags "$to_program") &&

from_dir=$from_oid$from_program$cut_footer &&
to_dir=$to_oid$to_program$cut_footer &&

# 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'
		printf '\tMANWIDTH=80 man $< >$@+ && \\\n'
		printf '\tmv $@+ $@\n'
	done
}

# render_tree <committish_oid> <directory_name> <makemanflags>
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.
	oid=$1 &&
	dname=$2 &&
	makemanflags="$3" &&
	if ! test -d "$tmp/installed/$dname"
	then
		git -C "$tmp/worktree" checkout --detach "$oid" &&
		make -j$parallel -C "$tmp/worktree" \
			$makemanflags \
			GIT_VERSION=omitted \
			SOURCE_DATE_EPOCH=0 \
			DESTDIR="$tmp/installed/$dname+" \
			install-man &&
		mv "$tmp/installed/$dname+" "$tmp/installed/$dname"
	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/$dname"
	then
		generate_render_makefile "$tmp/installed/$dname" \
			"$tmp/rendered/$dname+" |
		make -j$parallel -f - &&
		mv "$tmp/rendered/$dname+" "$tmp/rendered/$dname"

		if test "$cut_footer" = "-cut-footer"
		then
			for f in $(find "$tmp/rendered/$dname" -type f)
			do
				head -n -2 "$f" | sed -e '${/^$/d}' >"$f+" &&
				mv "$f+" "$f" ||
				return 1
			done
		fi
	fi
}

render_tree $from_oid $from_dir "$from_makemanflags" &&
render_tree $to_oid $to_dir "$to_makemanflags" &&
git -C $tmp/rendered diff --no-index "$@" $from_dir $to_dir
debug log:

solving ecd88b0524 ...
`ecd88b0524' ambiguous in git.git.git
3324229025300f7d7de600753c03af3ac22e2152 blob

found ecd88b0524 in https://public-inbox.org/git/20210514121435.504423-3-felipe.contreras@gmail.com/
found 1694300e50 in git.git.git
preparing index
index prepared:
100755 1694300e50bfcfa58cc7798614a254fec2e219a5	Documentation/doc-diff

applying [1/1] https://public-inbox.org/git/20210514121435.504423-3-felipe.contreras@gmail.com/
diff --git a/Documentation/doc-diff b/Documentation/doc-diff
index 1694300e50..ecd88b0524 100755

Checking patch Documentation/doc-diff...
Applied patch Documentation/doc-diff cleanly.

index at:
100755 ecd88b05243caaca68634a43fc1b548a6d2d5d43	Documentation/doc-diff

git@vger.kernel.org list mirror (unofficial, one of many)

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 git git/ https://public-inbox.org/git \
		git@vger.kernel.org
	public-inbox-index git

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.version-control.git
	nntp://ie5yzdi7fg72h7s4sdcztq5evakq23rdt33mfyfcddc5u3ndnw24ogqd.onion/inbox.comp.version-control.git
	nntp://4uok3hntl7oi7b4uf4rtfwefqeexfzil2w6kgk2jn5z2f764irre7byd.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git
 note: .onion URLs require Tor: https://www.torproject.org/

code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git