Revert "Revert "Revert "Fancy --sub_dir and --keep_hash (#1262)"""

New, this time real alarm. Reverting.

This reverts commit 0efe2bc.

Author: nik9000

README.asciidoc

@@ -231,21 +231,13 @@ To check links before you merge your changes:
   into the master branch of the `elasticsearch` repo, run:
 +
 ----------------------------
-./docs/build_docs --all --target_repo [email protected]:elastic/built-docs.git \
-                  --open --keep_hash --sub_dir elasticsearch:master:./elasticsearch
+./docs/build_docs --all --target_repo [email protected]:elastic/built-docs.git --open --sub_dir elasticsearch:master:./elasticsearch 
 ----------------------------
 
-NOTE: If there are no outstanding changes in the `../elasticsearch` directory
-      then this will build against the result of merging the last successful
-      docs build and the contents of `../elasticsearch`. If there *are*
-      outstanding changes then it'll just build against the contents of
-      `../elasticsearch`.
-
-To run a full build to mimic the website build, omit the `--sub_dir` and
-`--keep_hash` options:
+To run a full build to mimic the website build, omit the `--sub_dir` option:
 
 ----------------------------
-./build_docs --all --target_repo [email protected]:elastic/built-docs.git --open
+build_docs --all --target_repo [email protected]:elastic/built-docs.git --open
 ----------------------------
 
 The first time you run a full build is slow as it needs to:

build_docs.pl

@@ -607,7 +607,7 @@ sub init_repos {
             tracker   => $tracker,
             url       => $url,
             reference => $reference_dir,
-            keep_hash => $Opts->{keep_hash} || 0,
+            keep_hash => $Opts->{keep_hash},
         );
         delete $child_dirs{ $repo->git_dir->absolute };
 
@@ -644,7 +644,7 @@ sub init_repos {
     ES::DocsRepo->new( 
         tracker => $tracker,
         dir => $conf->{docs} || '/docs_build',
-        keep_hash => $Opts->{keep_hash} || 0
+        keep_hash => $Opts->{keep_hash}
     );
 
     return $tracker;

integtest/spec/all_books_change_detection_spec.rb

@@ -401,7 +401,6 @@ def chapter(index)
             before_second_build: lambda do |src, config|
               repo = src.repo 'repo'
               repo.write 'dummy', 'dummy'
-              repo.commit 'dummy'
 
               config.extra do |conversion|
                 conversion.keep_hash.sub_dir(repo, 'master')
@@ -620,9 +619,7 @@ def chapter(index)
               book = src.book 'Test'
               book.source repo2, 'not_used_actually'
               repo = src.repo 'repo'
-              repo.switch_to_new_branch 'subbed'
               repo.write 'index.asciidoc', TWO_CHAPTERS + "\nmore words"
-              repo.commit 'sub'
               config.extra do |conversion|
                 conversion.keep_hash.sub_dir(repo, 'master')
               end
@@ -725,9 +722,9 @@ def self.add_branch(src)
           context 'the second build' do
             let(:out) { outputs[1] }
             include_examples 'commits changes'
-            it "doesn't print that it is building any branch" do
+            it "doesn't print that it is building the original branch" do
               # The original book hasn't changed so we don't rebuild it
-              expect(out).not_to include('Test: Building')
+              expect(out).not_to include('Test: Building master...')
             end
           end
         end

integtest/spec/all_books_sub_dir_spec.rb

@@ -93,7 +93,6 @@ def switch_to_new_branch(new_branch)
   ##
   # Checks out a branch.
   def switch_to_branch(branch)
-    # TODO: rename to checkout?
     Dir.chdir @root do
       sh "git checkout #{branch}"
     end
@@ -140,12 +139,6 @@ def push_to(dest)
     end
   end
 
-  def merge(ref)
-    Dir.chdir @root do
-      sh "git merge #{ref}"
-    end
-  end
-
   def copy_shared_conf
     FileUtils.mkdir_p @root
     sh "cp -r /docs_build/shared #{@root}"

integtest/spec/helper/repo.rb

@@ -141,19 +141,6 @@ sub _reference_args {
     return ();
 }
 
-#===================================
-# Write a sparse checkout config for the repo.
-#===================================
-sub _write_sparse_config {
-#===================================
-    my ( $self, $root, $config ) = @_;
-
-    my $dest = $root->subdir( '.git' )->subdir( 'info' )->file( 'sparse-checkout' );
-    open(my $sparse, '>', $dest) or dir("Couldn't write sparse config");
-    print $sparse $config;
-    close $sparse;
-}
-
 #===================================
 sub name          { shift->{name} }
 sub git_dir       { shift->{git_dir} }