Have depot_tools manpage generation pin asciidoc version too.

docs/src/make_docs.sh

 #!/bin/bash -e
 shopt -s nullglob
 
 cd $(dirname "$0")
 
 # Script which takes all the asciidoc git-*.txt files in this directory, renders
 # them to html + manpage format using git 1.9's doc toolchain, then puts
 # them in depot_tools to be committed.
 
 ensure_in_path() {
   local CMD=$1
   local PTH=$(which "$CMD")
   if [[ ! $PTH ]]
   then
     echo Must have "$CMD" on your PATH!
     exit 1
   else
     echo Using \'$PTH\' for ${CMD}.
   fi
 }
 
 ensure_in_path xmlto
-ensure_in_path asciidoc
 
 DFLT_CATALOG_PATH="/usr/local/etc/xml/catalog"
 if [[ ! $XML_CATALOG_FILES && -f "$DFLT_CATALOG_PATH" ]]
 then
   # Default if you install doctools with homebrew on mac
   export XML_CATALOG_FILES="$DFLT_CATALOG_PATH"
   echo Using \'$DFLT_CATALOG_PATH\' for \$XML_CATALOG_FILES.
 fi
 
+# We pull asciidoc to get the right version
+BRANCH=8.6.9
+HASH=7fed0aff1b30

[ghost stip (do not use), 2014/04/02 23:04:50]

ASCIIDOC_HASH?

+if [[ ! -d asciidoc || $(cd asciidoc && hg id -i) != $HASH ]]
+then
+  echo Cloning asciidoc
+  rm -rf asciidoc
+  hg clone -r $BRANCH https://asciidoc.googlecode.com/hg/ asciidoc
+  (cd asciidoc && ln -s asciidoc.py asciidoc)
+fi
+echo Asciidoc up to date at $HASH \($BRANCH\)
+
+export PATH=`pwd`/asciidoc:$PATH
+
 # We pull git to get its documentation toolchain
 BRANCH=v1.9.0
-GITHASH=5f95c9f850b19b368c43ae399cc831b17a26a5ac

[ghost stip (do not use), 2014/04/02 23:04:50]

why not leave this at GITHASH

-if [[ ! -d git || $(git -C git rev-parse HEAD) != $GITHASH ]]
+HASH=5f95c9f850b19b368c43ae399cc831b17a26a5ac
+if [[ ! -d git || $(git -C git rev-parse HEAD) != $HASH ]]
 then
   echo Cloning git
   rm -rf git
   git clone --single-branch --branch $BRANCH --depth 1 \
     https://kernel.googlesource.com/pub/scm/git/git.git  2> /dev/null
 
   # Replace the 'source' and 'package' strings.
   ed git/Documentation/asciidoc.conf <<EOF
 H
 81
@@ skipping 39 matching lines @@
 /^\$(MAN_HTML):
 a
  asciidoc-override.css
 .
 -1
 j
 wq
 EOF
 
 fi
-echo Git up to date at $GITHASH \($BRANCH\)
+echo Git up to date at $HASH \($BRANCH\)
 
 # build directory files for 'essential' and 'helper' sections of the depot_tools
 # manpage.
 for category in helper essential
 do
   {
     PRINTED_BANNER=0
     for x in *.${category}.txt
     do
       # If we actually have tools in the category, print the banner first.
@@ skipping 77 matching lines @@
 do
   echo Copying ../man1/$x
   cp "git/Documentation/$x" ../man1
 done
 
 for x in "${MAN7_TARGETS[@]}"
 do
   echo Copying ../man7/$x
   cp "git/Documentation/$x" ../man7
 done