system/yay
system/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay synced 2024-10-14 20:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

change ref used in git to compute diff to AURUTILS_SEEN

Browse source 
Introduce a global constant in download.go to avoid re-typing the string
everytime.
Change the string form YAY_DIFF_SEEN to AURUTILS_SEEN.
This commit is contained in:
Loic Reyreaud 2019-10-14 10:56:33 +02:00
parent 7ee206f36e
commit de48604633
No known key found for this signature in database
GPG key ID: 9A0DA198DEC5C3FA
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
download.go
View file

@ -14,6 +14,10 @@ import (
"github.com/Jguer/yay/v9/pkg/types"
)
const (
gitDiffRefName = "AURUTILS_SEEN"
)
// Decide what download method to use:
// Use the config option when the destination does not already exits
// If .git exists in the destination use git
@ -51,7 +55,7 @@ func downloadFile(path string, url string) (err error) {
// Update the YAY_DIFF_REVIEW ref to HEAD. We use this ref to determine which diff were
// reviewed by the user
func gitUpdateSeenRef(path string, name string) error {
_, stderr, err := capture(passToGit(filepath.Join(path, name), "update-ref", "YAY_DIFF_REVIEW", "HEAD"))
_, stderr, err := capture(passToGit(filepath.Join(path, name), "update-ref", gitDiffRefName, "HEAD"))
if err != nil {
return fmt.Errorf("%s%s", stderr, err)
}
@ -61,7 +65,7 @@ func gitUpdateSeenRef(path string, name string) error {
// Return wether or not we have reviewed a diff yet. It checks for the existence of
// YAY_DIFF_REVIEW in the git ref-list
func gitHasLastSeenRef(path string, name string) bool {
_, _, err := capture(passToGit(filepath.Join(path, name), "rev-parse", "--quiet", "--verify", "YAY_DIFF_REVIEW"))
_, _, err := capture(passToGit(filepath.Join(path, name), "rev-parse", "--quiet", "--verify", gitDiffRefName))
return err == nil
}
@ -69,7 +73,7 @@ func gitHasLastSeenRef(path string, name string) bool {
// If it does not it will return empty tree as no diff have been reviewed yet.
func getLastSeenHash(path string, name string) (string, error) {
if gitHasLastSeenRef(path, name) {
stdout, stderr, err := capture(passToGit(filepath.Join(path, name), "rev-parse", "YAY_DIFF_REVIEW"))
stdout, stderr, err := capture(passToGit(filepath.Join(path, name), "rev-parse", gitDiffRefName))
if err != nil {
return "", fmt.Errorf("%s%s", stderr, err)
}
@ -84,7 +88,7 @@ func getLastSeenHash(path string, name string) (string, error) {
// HEAD@{upstream}
func gitHasDiff(path string, name string) (bool, error) {
if gitHasLastSeenRef(path, name) {
stdout, stderr, err := capture(passToGit(filepath.Join(path, name), "rev-parse", "YAY_DIFF_REVIEW", "HEAD@{upstream}"))
stdout, stderr, err := capture(passToGit(filepath.Join(path, name), "rev-parse", gitDiffRefName, "HEAD@{upstream}"))
if err != nil {
return false, fmt.Errorf("%s%s", stderr, err)
}