newt: Add external repos patches support

Now if package that adds external repository contains directory
patches/*external_repo_name*, newt will try to apply patches
inside this directory to the external repo.

newt/downloader/downloader.go

@@ -97,6 +97,10 @@ type Downloader interface {
  // If such a commit exists, it is returned. Otherwise, "" is returned.
  LatestRc(path string, base string) (string, error)
 
+ // Applies patches provided inside "patches" directory.
+ // If no patch is provided function does nothing
+ ApplyPatches(path string, patches []string) error
+
  // Returns the branch that contains the YAML control files; this option
  // allows implementers to override "master" as the main branch.
  MainBranch() string
@@ -451,6 +455,16 @@ func (gd *GenericDownloader) Checkout(repoDir string, commit string) error {
  return err
 }
 
+func (gd *GenericDownloader) ApplyPatches(repoDir string, patches []string) error {
+ cmd := []string{
+ "am",
+ }
+ cmd = append(cmd, patches...)
+
+ _, err := executeGitCommand(repoDir, cmd, true)
+ return err
+}
+
 // Update one submodule tree in a repo (under path)
 func (gd *GenericDownloader) UpdateSubmodule(path string, submodule string) error {
  cmd := []string{

newt/install/install.go

@@ -602,6 +602,13 @@ func (inst *Installer) Upgrade(candidates []*repo.Repo, force bool,
  r.Name(), destVer.String())
  }
 
+ for _, r := range candidates {
+ err = r.ApplyPatches()
+ if err != nil {
+ return err
+ }
+ }
+
  return nil
 }
 

newt/project/project.go

@@ -44,6 +44,7 @@ import (
 var globalProject *Project = nil
 
 const PROJECT_FILE_NAME = "project.yml"
+const PATCHES_DIR = "patches"
 
 var ignoreSearchDirs []string = []string{
  "bin",
@@ -95,7 +96,7 @@ func initProject(dir string, download bool) error {
 
  if download {
  err = globalProject.UpgradeIf(newtutil.NewtForce, newtutil.NewtAsk,
-  func(r *repo.Repo) bool { return !r.IsExternal(r.Path()) })
+ func(r *repo.Repo) bool { return !r.IsExternal(r.Path()) })
  if err != nil {
  return err
  }
@@ -215,6 +216,21 @@ func (proj *Project) GetPkgRepos() error {
  }
  proj.rootRepoReqs[repoName] = verReq
  }
+
+ if _, err := os.Stat(pkg.BasePath() + "/" + PATCHES_DIR + "/" + r.Name()); os.IsNotExist(err) {
+ continue
+ } else {
+ dirEntries, err := os.ReadDir(pkg.BasePath() + "/" + PATCHES_DIR + "/" + r.Name())
+ if err != nil {
+ return err
+ }
+
+ for _, e := range dirEntries {
+ if strings.HasSuffix(e.Name(), ".patch") {
+ r.AddPatch(pkg.BasePath() + "/" + PATCHES_DIR + "/" + r.Name() + "/" + e.Name())
+ }
+ }
+ }
  }
  }
  }

newt/repo/repo.go

@@ -44,6 +44,7 @@ const REPO_DEFAULT_PERMS = 0755
 
 const REPO_FILE_NAME = "repository.yml"
 const REPOS_DIR = "repos"
+const PATCHES_DIR = "patches"
 
 type Repo struct {
  name string
@@ -76,6 +77,10 @@ type Repo struct {
 
  hasSubmodules bool
  submodules []string
+
+ // Used with external repos. If package that adds external repository provides patches for it,
+ // the paths to them are going to be stored here.
+ patches []string
 }
 
 type RepoDependency struct {
@@ -124,6 +129,15 @@ func (r *Repo) Downloader() downloader.Downloader {
  return r.downloader
 }
 
+func (r *Repo) AddPatch(path string) {
+ r.patches = append(r.patches, path)
+}
+
+func (r *Repo) ApplyPatches() error {
+ err := r.Downloader().ApplyPatches(r.Path(), r.patches)
+ return err
+}
+
 func (repo *Repo) FilteredSearchList(
  curPath string, searchedMap map[string]struct{}) ([]string, error) {