superproject: support a new revision attribute.
Tested:
$ ./run_tests
Verified that a manifest that specified superproject revision would use
the specified revision, and superproject will use the default revision.
Note that this is a slight behavior change from earlier repo versions,
which would always use the branch name of the manifest itself. However,
the new behavior would be more consisitent with regular "project"
element and would allow superproject be used even if it is not enabled
for the particular manifest branch, so we have decided to make the
change as it would provide more flexibility and better matches what
other elements would do.
Bug: [google internal] b/187868160
Change-Id: I35255ee347aff6e65179f7879d52931f168b477e
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/317643
Tested-by: Xin Li <delphij@google.com>
Reviewed-by: Raman Tenneti <rtenneti@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
diff --git a/git_superproject.py b/git_superproject.py
index 935e125..ce68690 100644
--- a/git_superproject.py
+++ b/git_superproject.py
@@ -90,7 +90,7 @@
self._git_event_log = git_event_log
self._quiet = quiet
self._print_messages = print_messages
- self._branch = self._GetBranch()
+ self._branch = manifest.branch
self._repodir = os.path.abspath(repodir)
self._superproject_dir = superproject_dir
self._superproject_path = os.path.join(self._repodir, superproject_dir)
@@ -100,6 +100,7 @@
if self._manifest.superproject:
remote = self._manifest.superproject['remote']
git_name = hashlib.md5(remote.name.encode('utf8')).hexdigest() + '-'
+ self._branch = self._manifest.superproject['revision']
self._remote_url = remote.url
else:
self._remote_url = None
@@ -116,17 +117,6 @@
"""Returns the manifest path if the path exists or None."""
return self._manifest_path if os.path.exists(self._manifest_path) else None
- def _GetBranch(self):
- """Returns the branch name for getting the approved manifest."""
- p = self._manifest.manifestProject
- b = p.GetBranch(p.CurrentBranch)
- if not b:
- return None
- branch = b.merge
- if branch and branch.startswith(R_HEADS):
- branch = branch[len(R_HEADS):]
- return branch
-
def _LogMessage(self, message):
"""Logs message to stderr and _git_event_log."""
if self._print_messages: