Skip to contentSkip to conversation

git.py: skip smudging if lfs=0 is set

PATCH Superseded Mauro Queirós 2 participants 7 messages May 29, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 git.py: skip smudging if lfs=0 is set

Git-LFS objects were being fetched even when lfs=0 was not set. This patch disables LFS smudging when lfs=0. That way, only the LFS pointers are downloaded during checkout.

---
 lib/bb/fetch2/git.py | 3 +++
 1 file changed, 3 insertions(+)
lib/bb/fetch2/git.py +3 -0
index 5b3793a7..4c7d388e 100644
@@ -475,6 +475,9 @@ class Git(FetchMethod):
 
         need_lfs = ud.parm.get("lfs", "1") == "1"
 
+        if not need_lfs:
+            ud.basecmd = "GIT_LFS_SKIP_SMUDGE=1 " + ud.basecmd
+
         source_found = False
         source_error = []
 
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 2/3 git.py: LFS bitbake note should not be printed if need_lfs is not set.

The message "Repository %s has LFS content but it is not being fetched" was being printed, even when Git-LFS was available and "lfs=1" was set. In those situations, we want to fetch LFS content, so that message would not make sense.

---
 lib/bb/fetch2/git.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/bb/fetch2/git.py +1 -1
index 4c7d388e..eab76a10 100644
@@ -509,7 +509,7 @@ class Git(FetchMethod):
         if self._contains_lfs(ud, d, destdir):
             if need_lfs and not self._find_git_lfs(d):
                 raise bb.fetch2.FetchError("Repository %s has LFS content, install git-lfs on host to download (or set lfs=0 to ignore it)" % (repourl))
-            else:
+            elif not need_lfs:
                 bb.note("Repository %s has LFS content but it is not being fetched" % (repourl))
 
         if not ud.nocheckout:
Signature · 1 line
2.17.1
#2 lore raw

Re: [PATCH v2 2/3] git.py: LFS bitbake note should not be printed if need_lfs is not set.

Please ignore. This was meant to bitbake-devel mailing list.

Mauro Queiros <[email protected]> escreveu no dia sexta, 29/05/2020 à(s) 11:02:

Quoted 31 lines

The message "Repository %s has LFS content but it is not being fetched" was being printed, even when Git-LFS was available and "lfs=1" was set. In those
situations, we want to fetch LFS content, so that message would not make sense.

---
 lib/bb/fetch2/git.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/bb/fetch2/git.py +0 -0
index 4c7d388e..eab76a10 100644
@@ -509,7 +509,7 @@ class Git(FetchMethod):
         if self._contains_lfs(ud, d, destdir):
             if need_lfs and not self._find_git_lfs(d):
                 raise bb.fetch2.FetchError("Repository %s has LFS

content, install git-lfs on host to download (or set lfs=0 to ignore it)" % (repourl))

lib/bb/fetch2/git.py +1 -1
-            else:
+            elif not need_lfs:
                 bb.note("Repository %s has LFS content but it is not

being fetched" % (repourl))

if not ud.nocheckout:
--
2.17.1

#3 lore raw

PATCH v2 3/3 git.py: Use the correct branch to check if the repository has LFS objects.

In reply to Mauro Queirós

Function "contains_lfs" was only looking at the master branch when searching for LFS content. LFS may be configured in specific branches only, so we need to use the correct branch.

---
 lib/bb/fetch2/git.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
lib/bb/fetch2/git.py +9 -2
index eab76a10..dbf87156 100644
@@ -566,8 +566,15 @@ class Git(FetchMethod):
         """
         Check if the repository has 'lfs' (large file) content
         """
-        cmd = "%s grep lfs HEAD:.gitattributes | wc -l" % (
-                ud.basecmd)
+
+        if not ud.nobranch:
+            branchname = ud.branches[ud.names[0]]
+        else:
+            branchname = "master"
+
+        cmd = "%s grep lfs origin/%s:.gitattributes | wc -l" % (
+            ud.basecmd, ud.branches[ud.names[0]])
+
         try:
             output = runfetchcmd(cmd, d, quiet=True, workdir=wd)
             if int(output) > 0:
Signature · 1 line
2.17.1
#4 lore raw

Re: [PATCH v2 3/3] git.py: Use the correct branch to check if the repository has LFS objects.

Please ignore. This was meant to bitbake-devel mailing list.

Mauro Queiros <[email protected]> escreveu no dia sexta, 29/05/2020 à(s) 11:02:

Quoted 37 lines

Function "contains_lfs" was only looking at the master branch when searching for LFS
content. LFS may be configured in specific branches only, so we need to use the
correct branch.

---
 lib/bb/fetch2/git.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
lib/bb/fetch2/git.py +9 -3
index eab76a10..dbf87156 100644
@@ -566,8 +566,15 @@ class Git(FetchMethod):
         """
         Check if the repository has 'lfs' (large file) content
         """
-        cmd = "%s grep lfs HEAD:.gitattributes | wc -l" % (
-                ud.basecmd)
+
+        if not ud.nobranch:
+            branchname = ud.branches[ud.names[0]]
+        else:
+            branchname = "master"
+
+        cmd = "%s grep lfs origin/%s:.gitattributes | wc -l" % (
+            ud.basecmd, ud.branches[ud.names[0]])
+
         try:
             output = runfetchcmd(cmd, d, quiet=True, workdir=wd)
             if int(output) > 0:
--

2.17.1

#5 lore raw
In reply to Mauro Queirós

Please ignore. This was meant to bitbake-devel mailing list.

Mauro Queiros <[email protected]> escreveu no dia sexta, 29/05/2020 à(s) 11:02:

Quoted 28 lines

Git-LFS objects were being fetched even when lfs=0 was not set. This patch disables LFS smudging when lfs=0. That way, only the LFS pointers
are downloaded during checkout.

---
 lib/bb/fetch2/git.py | 3 +++
 1 file changed, 3 insertions(+)
lib/bb/fetch2/git.py +3 -1
index 5b3793a7..4c7d388e 100644
@@ -475,6 +475,9 @@ class Git(FetchMethod):
 
         need_lfs = ud.parm.get("lfs", "1") == "1"
 
+        if not need_lfs:
+            ud.basecmd = "GIT_LFS_SKIP_SMUDGE=1 " + ud.basecmd
+
         source_found = False
         source_error = []
 
--

2.17.1

#6 lore raw

✗ patchtest: failure for "[v2] git.py: skip smudging if ..." and 2 more

In reply to Mauro Queirós

== Series Details ==

Series: "[v2] git.py: skip smudging if ..." and 2 more
Revision: 1
URL : https://patchwork.openembedded.org/series/24383/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at 662c688e63)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe