Several fixes when setting revision

repo_resource/common.py

@@ -94,23 +94,41 @@ def getRevision(remote, remoteUrl, project, branch):
     with git ls-remote command for each project
     without downloading the whole repo
     """
-    # v1.0^{} is the commit referring to tag v1.0
-    # git ls-remote returns the tag sha1 if left as is
-    if branch.startswith('refs/tags'):
-        branch += '^{}'
     try:
         with redirect_stdout(sys.stderr):
-            # return tuple (remote/project, revision)
-            print('Fetching revision for {}/{}...'.format(remote, project))
+            # return tuple (remote/project, branch, revision)
+            print('Fetching revision for {}/{} - {}...'.format(
+                remote, project, branch))
             if is_sha1(branch):
-                return (remote + '/' + project, branch)
+                return (remote + '/' + project, branch, branch)
             g = git.cmd.Git()
-            url, revision = (
+
+            headRef = branch
+            # v1.0^{} is the commit referring to tag v1.0
+            # git ls-remote returns the tag sha1 if left as is
+            if branch.startswith('refs/tags'):
+                headRef += '^{}'
+
+            url, revList = (
                 remote + '/' + project,
-                g.ls_remote(remoteUrl+'/'+project, branch).split()[0]
+                g.ls_remote(remoteUrl+'/'+project, headRef).split()
             )
-            print('{}: {}'.format(url, revision))
-            return (url, revision)
+
+            # convert revision list to revision dict:
+            # ['SHA1', 'refs/heads/XXXX', 'SHA1', 'refs/heads/YYYY']
+            # -> {'refs/heads/XXXX': 'SHA1', 'refs/heads/YYYY': 'SHA1'}
+            revDict = dict([(b, a)
+                            for a, b in zip(revList[::2], revList[1::2])])
+
+            if branch.startswith('refs/tags'):
+                rev = headRef
+            else:
+                rev = 'refs/heads/' + branch
+
+            print('{} - {}: {}'.format(url, branch, revDict[rev]))
+
+            # return url, branch (without any suffix) and revision
+            return (url, branch, revDict[rev])
     except Exception as e:
         with redirect_stdout(sys.stderr):
             print('Cannot fetch project {}/{}'.format(remoteUrl, project))
@@ -450,15 +468,21 @@ def update_manifest(self, jobs):
 
                 with Pool(jobs) as pool:
                     revisionList = pool.map(multi_run_wrapper, projects)
-                # Convert (remote/project, revision) tuple list
-                # to hash table dict[remote/project]=revision
-                revisionTable = dict((proj, rev) for proj, rev in revisionList)
 
                 # Update revisions
                 for p in manifest.findall('project'):
                     project = p.get('name')
+                    projectBranch = p.get('revision') or defaultBranch
                     projectRemote = p.get('remote') or defaultRemote
-                    p.set('revision', revisionTable[projectRemote+'/'+project])
+                    # find revision of the project in revisionList
+                    for url, branch, rev in revisionList:
+                        if (
+                            projectRemote + "/" + project == url
+                            and branch == projectBranch
+                        ):
+                            projectRev = rev
+                            break
+                    p.set('revision', projectRev)
 
                 self.__version = Version(
                     ET.canonicalize(

repo_resource/test_check.py

@@ -92,6 +92,20 @@ def setUp(self):
                 'name': 'aosp_include_multiple_projects.xml'
             }
         }
+        self.branch_matching_source = {
+            'source': {
+                'url': 'https://github.com/makohoek/demo-manifests.git',
+                'revision': 'main',
+                'name': 'branch_matching.xml'
+            }
+        }
+        self.one_project_multi_path_source = {
+            'source': {
+                'url': 'https://github.com/makohoek/demo-manifests.git',
+                'revision': 'main',
+                'name': 'one_project_multi_path.xml'
+            }
+        }
 
     def tearDown(self):
         p = common.CACHEDIR
@@ -437,6 +451,26 @@ def test_include_multiple_projects_version(self):
         version = versions[0]['version']
         self.assertEqual(version, expected_version)
 
+    def test_branch_matching(self):
+        data = self.branch_matching_source
+        instream = StringIO(json.dumps(data))
+        versions = check.check(instream)
+
+        expected_version = '<manifest><remote fetch=\"https://github.com/\" name=\"github\"></remote><project name=\"makohoek/demo-manifests.git\" path=\"rev\" remote=\"github\" revision=\"bd2eb4ba9b5581373ff276f619a88e248a2c77e7\"></project></manifest>'  # noqa: E501
+
+        version = versions[0]['version']
+        self.assertEqual(version, expected_version)
+
+    def test_one_project_multi_path(self):
+        data = self.one_project_multi_path_source
+        instream = StringIO(json.dumps(data))
+        versions = check.check(instream)
+
+        expected_version = '<manifest><remote fetch=\"https://github.com/\" name=\"github\"></remote><project name=\"makohoek/demo-manifests.git\" path=\"rev-1\" remote=\"github\" revision=\"0370566f0c65d8d7f03b78071b23a1e7480beac7\"></project><project name=\"makohoek/demo-manifests.git\" path=\"rev-2\" remote=\"github\" revision=\"524a18fc90ba5b4d298c4367fa4af959baf73a5f\"></project></manifest>'  # noqa: E501
+
+        version = versions[0]['version']
+        self.assertEqual(version, expected_version)
+
 
 if __name__ == '__main__':
     unittest.main()