Merge lp:~robru/bileto/persevere-bzr-missing into lp:bileto

[Robert Bruce Park]

bzr missing seems to suffer from flaky connection issues, so retry it a few times for extra fault tolerance.

=== modified file 'scripts/vcs.sh'
--- scripts/vcs.sh	2016-07-28 03:21:24 +0000
+++ scripts/vcs.sh	2016-07-28 16:27:10 +0000
@@ -63,7 +63,7 @@
 stdout() {
     # Echo a command before running it, but keep it on stdout for processing
     echo + "$@" 1>&2
-    "$@" 2>&1
+    "$@"
 }
 
 parsechangelog() {
@@ -273,11 +273,11 @@
 }
 
 bzr_do_fill_local_cache() {
-    message="Failed to update local $BRANCH cache."
+    failure="Failed to update local $BRANCH cache."
     if ! persevere loudly bzr pull --directory "$CACHE" --overwrite; then
-        loudly bzr branch "$BRANCH" "$CACHE.$$.tmp" || die "$message"
-        loudly rm --recursive --force "$CACHE" || die "$message"
-        loudly mv --verbose "$CACHE.$$.tmp" "$CACHE" || die "$message"
+        loudly bzr branch "$BRANCH" "$CACHE.$$.tmp" || die "$failure"
+        loudly rm --recursive --force "$CACHE" || die "$failure"
+        loudly mv --verbose "$CACHE.$$.tmp" "$CACHE" || die "$failure"
     fi
     touch --no-create "$CACHE"
 }
@@ -346,14 +346,14 @@
     target_has="$WORKPARENT/$$-bzr.target.has"
     missing="$WORKPARENT/$$-bzr.missing"
     # Step 1: Identify commits that the target trunk has that the input branch doesn't (these will be ignored)
-    stdout bzr missing --show-ids --directory "$target_cache" "$BRANCH" --mine-only | tee "$target_has.tmp" 1>&2
+    persevere stdout bzr missing --show-ids --directory "$target_cache" "$BRANCH" --mine-only | tee "$target_has.tmp" 1>&2
     ignore_translators <"$target_has.tmp" >"$target_has"
     # Step 2: Identify new commits that require building.
-    stdout bzr missing --show-ids --directory "$our_cache" "$BRANCH" --theirs-only | tee "$missing" 1>&2
+    persevere stdout bzr missing --show-ids --directory "$our_cache" "$BRANCH" --theirs-only | tee "$missing" 1>&2
     ignore_translators <"$missing"
     # Step 3: Identify commits that have been deleted from the input branch
     # (commits missing from input branch that aren't already on target trunk, or committed by me)
-    stdout bzr missing --show-ids --directory "$our_cache" "$BRANCH" --mine-only | tee "$missing.tmp" 1>&2
+    persevere stdout bzr missing --show-ids --directory "$our_cache" "$BRANCH" --mine-only | tee "$missing.tmp" 1>&2
     ignore_translators <"$missing.tmp" | egrep --invert-match "$me" >"$missing"
     loudly cat "$missing"
     loudly cat "$target_has"