Update DOM Distiller roll script DEPS in out/package.

third_party/dom_distiller_js/update_domdistiller_js.sh

 #!/bin/bash
 #
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 
 # Clones the dom-distiller repo, compiles and extracts its javascript Then
 # copies that js into the Chromium tree.
 # This script should be run from the src/ directory and requires that ant is
 # installed. It takes an optional parameter for which SHA1 to roll to. If left
 # unspecified the script rolls to HEAD.
 
 (
   set -e
 
   dom_distiller_js_path=third_party/dom_distiller_js
   dom_distiller_js_package=$dom_distiller_js_path/package
   readme_chromium=$dom_distiller_js_path/README.chromium
   tmpdir=/tmp/domdistiller-$$
   changes=$tmpdir/domdistiller.changes
   bugs=$tmpdir/domdistiller.bugs
   curr_gitsha=$(grep 'Version:' $readme_chromium | awk '{print $2}')
 
   rm -rf $tmpdir
   mkdir $tmpdir
+  pushd $tmpdir
 
-  pushd $tmpdir
-  git clone https://github.com/chromium/dom-distiller/ .
+  git clone https://github.com/chromium/dom-distiller.git
+  pushd dom-distiller
 
   # The new git SHA1 is HEAD or the first command line parameter.
   [[ -z "$1" ]] && gitsha_target="HEAD" || gitsha_target="$1"
   new_gitsha=$(git rev-parse --short=10 ${gitsha_target})
   git reset --hard ${new_gitsha}
   git log --oneline ${curr_gitsha}..${new_gitsha} > $changes
 
   echo -n BUG= > $bugs
 
   # This extracts BUG= lines from the log, extracts the numbers part, removes
   # whitespace and deletes empty lines. Then, split on ',', sort, uniquify and
   # rejoin. Finally, remove the trailing ',' and concat to $bugs.
   git log ${curr_gitsha}..${new_gitsha} \
     | grep BUG= \
     | sed -e 's/.*BUG=\(.*\)/\1/' -e 's/\s*//g' -e '/^$/d' \
     | tr ',' '\n' \
     | sort \
     | uniq \
     | tr '\n' ',' \
     | head --bytes=-1 \
     >> $bugs
 
   echo >> $bugs  # add a newline
 
   ant package
-  popd
+  popd # dom-distiller
 
-  rm -rf $dom_distiller_js_package
-  mkdir $dom_distiller_js_package
-  cp -rf $tmpdir/out/package/* $dom_distiller_js_package
-  git add $dom_distiller_js_package
-  cp $tmpdir/LICENSE $dom_distiller_js_path/
+  git clone https://github.com/chromium/dom-distiller-package.git $tmpdir/dom-distiller-package
+  rm -rf $tmpdir/dom-distiller-package/*
+  pushd dom-distiller-package
+  cp -r $tmpdir/dom-distiller/out/package/* .
+  git add .
+  if [[ $(git status --short | wc -l) -ne 0 ]]; then
+    git commit -a -m "Package for ${new_gitsha}"
+    git push origin master
+  fi

[cjhopman, 2015/03/12 02:12:22]

Is there a case where i hit the else clause here and this script still does what
I expected?

[nyquist, 2015/03/17 00:46:21]

There used to be when only tests where checked out this way, since they might've
not been updated.

Now I have realized that the external repository might be up to date, but maybe
the roll into Chromium has failed (i.e. the DEPS is still not pointing at the
right place). So, leaving this as is, with a warning message, and then bailing
out later after checking the current DEPS.

+  package_gitsha=$(git rev-parse HEAD)
+  popd # dom-distiller-package
+
+  popd # tmpdir
+
+  cp $tmpdir/dom-distiller/LICENSE $dom_distiller_js_path/
   sed -i "s/Version: [0-9a-f]*/Version: $new_gitsha/" $readme_chromium
+  sed -i -e "s/\('\/external\/github.com\/chromium\/dom-distiller-package.git' + '@' + '\)\([0-9a-f]\+\)'/\1$package_gitsha'/" DEPS
 
   gen_message () {
     echo "Roll DomDistillerJS"
     echo
     echo "Picked up changes:"

[cjhopman, 2015/03/12 02:12:22]

Can this include a link to somewhere that I can view the diff?

[nyquist, 2015/03/17 00:46:22]

Done.

[nyquist, 2015/03/17 00:47:30]

By the way, here's an example:
https://github.com/chromium/dom-distiller/compare/a3a07ce7c2...7a29e21334

     cat $changes
     echo
     cat $bugs
   }
 
   message=$tmpdir/message
   gen_message > $message
 
   # Run checklicenses.py on the pulled files, but only print the output on
   # failures.
   tools/checklicenses/checklicenses.py $dom_distiller_js_path > $tmpdir/checklicenses.out || cat $tmpdir/checklicenses.out
 
   git commit -a -F $message
 
   rm -rf $tmpdir
 )