[Updater] Merge by SHA instead of branch
aosp/upstream-master may be old. In that case, the version name written
to METADATA file will be wrong.
Test: local run
Change-Id: Icd87299e4d3f656c66f9e99daa6d11d1888eea82
diff --git a/git_updater.py b/git_updater.py
index 81ee93d..eee64f1 100644
--- a/git_updater.py
+++ b/git_updater.py
@@ -34,7 +34,6 @@
self.upstream_remote_name = None
self.android_remote_name = None
self.new_version = None
- self.merge_from = None
def _setup_remote(self):
remotes = git_utils.list_remotes(self.proj_path)
@@ -79,7 +78,6 @@
current_ver = self.get_current_version()
self.new_version = updater_utils.get_latest_version(
current_ver, tags)
- self.merge_from = self.new_version
print('Current version: {}. Latest version: {}'.format(
current_ver, self.new_version), end='')
@@ -94,17 +92,6 @@
self.new_version = commits[0]
- # See whether we have a local upstream.
- branches = git_utils.list_remote_branches(
- self.proj_path, self.android_remote_name)
- upstreams = [
- branch for branch in branches if branch.startswith('upstream-')]
- if upstreams:
- self.merge_from = '{}/{}'.format(
- self.android_remote_name, upstreams[0])
- else:
- self.merge_from = 'update_origin/master'
-
commit_time = git_utils.get_commit_time(self.proj_path, commits[-1])
time_behind = datetime.datetime.now() - commit_time
print('{} commits ({} days) behind.'.format(
@@ -123,20 +110,8 @@
"""
upstream_branch = self.upstream_remote_name + '/master'
- commits = git_utils.get_commits_ahead(
- self.proj_path, self.merge_from, upstream_branch)
- if commits:
- print('{} is {} commits ahead of {}. {}'.format(
- self.merge_from, len(commits), upstream_branch, commits))
-
- commits = git_utils.get_commits_ahead(
- self.proj_path, upstream_branch, self.merge_from)
- if commits:
- print('{} is {} commits behind of {}.'.format(
- self.merge_from, len(commits), upstream_branch))
-
print("Running `git merge {merge_branch}`..."
- .format(merge_branch=self.merge_from))
- git_utils.merge(self.proj_path, self.merge_from)
+ .format(merge_branch=self.new_version))
+ git_utils.merge(self.proj_path, self.new_version)
self._write_metadata(self.proj_path)
git_utils.add_file(self.proj_path, 'METADATA')
