[poky][scarthgap][PATCH 23/23] bitbake: fetch2/git: Add multiple revision support

[Akash Hadke <akash.hadke27@gmail.com>]

In scarthgap single SRC_URI can still have multiple revisions
update the code in order to iterate over these revisions and
do the fetch.

Signed-off-by: Akash Hadke <akash.hadke27@gmail.com>
---
 bitbake/lib/bb/fetch2/git.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 390d9ddafc..88fa119e1d 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -513,12 +513,13 @@ class Git(FetchMethod):
                 raise bb.fetch2.FetchError("Unable to find revision %s even from upstream" % missing_rev)
 
         if self.lfs_need_update(ud, d):
-            self.lfs_fetch(ud, d, ud.clonedir, ud.revision)
+            for name in ud.names:
+                self.lfs_fetch(ud, d, name, ud.clonedir, ud.revisions[name])
 
-    def lfs_fetch(self, ud, d, clonedir, revision, fetchall=False, progresshandler=None):
+    def lfs_fetch(self, ud, d, name, clonedir, revision, fetchall=False, progresshandler=None):
         """Helper method for fetching Git LFS data"""
         try:
-            if self._need_lfs(ud) and self._contains_lfs(ud, d, clonedir) and len(revision):
+            if self._need_lfs(ud) and self._contains_lfs(ud, d, name, clonedir) and len(revision):
                 self._ensure_git_lfs(d, ud)
 
                 # Using worktree with the revision because .lfsconfig may exists
@@ -649,7 +650,7 @@ class Git(FetchMethod):
             runfetchcmd(fetch_cmd, d, workdir=dest)
             runfetchcmd("%s update-ref %s %s" % (ud.basecmd, ref, revision), d, workdir=dest)
             # Fetch Git LFS data
-            self.lfs_fetch(ud, d, dest, ud.revisions[ud.names[0]])
+            self.lfs_fetch(ud, d, name, dest, ud.revisions[ud.names[0]])
 
         # Apply extra ref wildcards
         all_refs_remote = runfetchcmd("%s ls-remote origin 'refs/*'" % ud.basecmd, \
@@ -738,7 +739,7 @@ class Git(FetchMethod):
         repourl = self._get_repo_url(ud)
         runfetchcmd("%s remote set-url origin %s" % (ud.basecmd, shlex.quote(repourl)), d, workdir=destdir)
 
-        if self._contains_lfs(ud, d, destdir):
+        if any(self._contains_lfs(ud, d, name, destdir) for name in ud.names):
             if not need_lfs:
                 bb.note("Repository %s has LFS content but it is not being fetched" % (repourl))
             else:
@@ -806,8 +807,9 @@ class Git(FetchMethod):
         Verifies whether the LFS objects for requested revisions have already been downloaded
         """
         # Bail out early if this repository doesn't use LFS
-        if not self._contains_lfs(ud, d, wd):
-            return True
+        for name in ud.names:
+            if not self._contains_lfs(ud, d, name, wd):
+                return True
 
         self._ensure_git_lfs(d, ud)
 
@@ -835,12 +837,12 @@ class Git(FetchMethod):
     def _need_lfs(self, ud):
         return ud.parm.get("lfs", "1") == "1"
 
-    def _contains_lfs(self, ud, d, wd):
+    def _contains_lfs(self, ud, d, name, wd):
         """
         Check if the repository has 'lfs' (large file) content
         """
         cmd = "%s grep lfs %s:.gitattributes | wc -l" % (
-            ud.basecmd, ud.revision)
+            ud.basecmd, ud.revisions[name])
 
         try:
             output = runfetchcmd(cmd, d, quiet=True, workdir=wd)
-- 
2.25.1