Fail sync when encountering "N commits behind."
This is almost always something the user needs to address
before continuing work, so promoting it to a failure (rather
than simply an informational message) seems the right way to
go. As a side-effect, repo will now exit with a non-zero
status code in this situation, so pipelines of the form
`repo sync && make` will fail if there are branches that
are stalled due to uploaded but unmerged patches.
diff --git a/project.py b/project.py
index 902a2b4..3d1783f 100644
--- a/project.py
+++ b/project.py
@@ -706,10 +706,9 @@
# commits are not yet merged upstream. We do not want
# to rewrite the published commits so we punt.
#
- syncbuf.info(self,
- "branch %s is published but is now %d commits behind",
- branch.name,
- len(upstream_gain))
+ syncbuf.fail(self,
+ "branch %s is published (but not merged) and is now %d commits behind"
+ % (branch.name, len(upstream_gain)))
return
elif pub == head:
# All published commits are merged, and thus we are a
