commit 97836cf09f20e229524aff167c205d89edda3d52
author Conley Owens <cco3@android.com> Mon Jul 13 16:36:27 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 13 16:36:28 2015 +0000
tree 28265ea07277872db38ebcdf5bbc248c12ac9018
parent 80e3a37ab546984bd8494a12204ea10d734e6958
parent 551dfecea9667c8ae68e51a327f1ad9712573e27

Merge "Always output upstream if specified"

manifest_xml.py

diff --git a/manifest_xml.py b/manifest_xml.py
index cfbd9ef..130e17c 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -253,11 +253,13 @@
         else:
           value = p.work_git.rev_parse(HEAD + '^0')
         e.setAttribute('revision', value)
-        if peg_rev_upstream and value != p.revisionExpr:
-          # Only save the origin if the origin is not a sha1, and the default
-          # isn't our value, and the if the default doesn't already have that
-          # covered.
-          e.setAttribute('upstream', p.revisionExpr)
+        if peg_rev_upstream:
+          if p.upstream:
+            e.setAttribute('upstream', p.upstream)
+          elif value != p.revisionExpr:
+            # Only save the origin if the origin is not a sha1, and the default
+            # isn't our value
+            e.setAttribute('upstream', p.revisionExpr)
       else:
         revision = self.remotes[remoteName].revision or d.revisionExpr
         if not revision or revision != p.revisionExpr: