[git] Rename IsRepo() to Checkwd()

achilleas-k · achilleas-k · commit 4d705dc8f014 · 2019-08-13T17:53:17.000+02:00
The function will also be responsible for checking the annex version and
upgrading if necessary.
diff --git a/ginclient/repos.go b/ginclient/repos.go
@@ -454,7 +454,7 @@ func (gincl *Client) CloneRepo(repopath string, clonechan chan<- git.RepoFileSta
 // If a new commit is created and a default remote exists, the new commit is pushed to initialise the remote as well.
 // Returns 'true' if (and only if) a commit was created.
 func CommitIfNew() (bool, error) {
-	if !git.IsRepo() {
+	if !git.Checkwd() {
 		return false, fmt.Errorf("not a repository")
 	}
 	_, err := git.RevParse("HEAD")
@@ -635,7 +635,7 @@ func CheckoutFileCopies(commithash string, paths []string, outpath string, suffi
 // Optionally initialised as a bare repository (for annex directory remotes).
 func (gincl *Client) InitDir(bare bool) error {
 	initerr := ginerror{Origin: "InitDir", Description: "Error initialising local directory"}
-	if !git.IsRepo() {
+	if !git.Checkwd() {
 		err := git.Init(bare)
 		if err != nil {
 			initerr.UError = err.Error()
diff --git a/gincmd/addremotecmd.go b/gincmd/addremotecmd.go
@@ -152,7 +152,7 @@ func defaultRemoteIfUnset(name string) {
 }
 
 func addRemote(cmd *cobra.Command, args []string) {
-	if !git.IsRepo() {
+	if !git.Checkwd() {
 		Die(ginerrors.NotInRepo)
 	}
 	flags := cmd.Flags()
diff --git a/gincmd/commitcmd.go b/gincmd/commitcmd.go
@@ -14,7 +14,7 @@ import (
 
 func commit(cmd *cobra.Command, args []string) {
 	prStyle := determinePrintStyle(cmd)
-	if !git.IsRepo() {
+	if !git.Checkwd() {
 		Die(ginerrors.NotInRepo)
 	}
 
diff --git a/gincmd/downloadcmd.go b/gincmd/downloadcmd.go
@@ -17,7 +17,7 @@ func download(cmd *cobra.Command, args []string) {
 	// TODO: no client necessary? Just use remotes
 	conf := config.Read()
 	gincl := ginclient.New(conf.DefaultServer)
-	if !git.IsRepo() {
+	if !git.Checkwd() {
 		Die(ginerrors.NotInRepo)
 	}
 	remote, err := ginclient.DefaultRemote()
diff --git a/gincmd/getcontentcmd.go b/gincmd/getcontentcmd.go
@@ -16,7 +16,7 @@ func getContent(cmd *cobra.Command, args []string) {
 	// TODO: no need for client; use remotes (and all keys?)
 	gincl := ginclient.New(conf.DefaultServer)
 	requirelogin(cmd, gincl, prStyle != psJSON)
-	if !git.IsRepo() {
+	if !git.Checkwd() {
 		Die(ginerrors.NotInRepo)
 	}
 
diff --git a/gincmd/lockcmd.go b/gincmd/lockcmd.go
@@ -12,7 +12,7 @@ import (
 
 func lock(cmd *cobra.Command, args []string) {
 	prStyle := determinePrintStyle(cmd)
-	if !git.IsRepo() {
+	if !git.Checkwd() {
 		Die(ginerrors.NotInRepo)
 	}
 	if prStyle != psJSON {
diff --git a/gincmd/lscmd.go b/gincmd/lscmd.go
@@ -15,7 +15,7 @@ import (
 )
 
 func lsRepo(cmd *cobra.Command, args []string) {
-	if !git.IsRepo() {
+	if !git.Checkwd() {
 		Die(ginerrors.NotInRepo)
 	}
 
diff --git a/gincmd/remotescmd.go b/gincmd/remotescmd.go
@@ -15,7 +15,7 @@ func printremotes(cmd *cobra.Command, args []string) {
 	flags := cmd.Flags()
 	jsonout, _ := flags.GetBool("json")
 
-	if !git.IsRepo() {
+	if !git.Checkwd() {
 		Die(ginerrors.NotInRepo)
 	}
 
diff --git a/gincmd/removecontentcmd.go b/gincmd/removecontentcmd.go
@@ -24,7 +24,7 @@ func remove(cmd *cobra.Command, args []string) {
 	conf := config.Read()
 	gincl := ginclient.New(conf.DefaultServer)
 	requirelogin(cmd, gincl, prStyle != psJSON)
-	if !git.IsRepo() {
+	if !git.Checkwd() {
 		Die(ginerrors.NotInRepo)
 	}
 	nitems := countItemsRemove(args)
diff --git a/gincmd/removeremotecmd.go b/gincmd/removeremotecmd.go
@@ -10,7 +10,7 @@ import (
 )
 
 func rmRemote(cmd *cobra.Command, args []string) {
-	if !git.IsRepo() {
+	if !git.Checkwd() {
 		Die(ginerrors.NotInRepo)
 	}
 	name := args[0]
diff --git a/gincmd/synccmd.go b/gincmd/synccmd.go
@@ -16,7 +16,7 @@ func sync(cmd *cobra.Command, args []string) {
 	// TODO: no client necessary? Just use remotes
 	conf := config.Read()
 	gincl := ginclient.New(conf.DefaultServer)
-	if !git.IsRepo() {
+	if !git.Checkwd() {
 		Die(ginerrors.NotInRepo)
 	}
 
diff --git a/gincmd/unlockcmd.go b/gincmd/unlockcmd.go
@@ -22,7 +22,7 @@ func countItemsLockChange(paths []string) (count int) {
 
 func unlock(cmd *cobra.Command, args []string) {
 	prStyle := determinePrintStyle(cmd)
-	if !git.IsRepo() {
+	if !git.Checkwd() {
 		Die(ginerrors.NotInRepo)
 	}
 
diff --git a/gincmd/uploadcmd.go b/gincmd/uploadcmd.go
@@ -13,7 +13,7 @@ func upload(cmd *cobra.Command, args []string) {
 	prStyle := determinePrintStyle(cmd)
 	remotes, _ := cmd.Flags().GetStringSlice("to")
 	gincl := ginclient.New("gin") // TODO: probably doesn't need a client
-	if !git.IsRepo() {
+	if !git.Checkwd() {
 		Die(ginerrors.NotInRepo)
 	}
 
diff --git a/gincmd/useremotecmd.go b/gincmd/useremotecmd.go
@@ -10,7 +10,7 @@ import (
 )
 
 func useRemote(cmd *cobra.Command, args []string) {
-	if !git.IsRepo() {
+	if !git.Checkwd() {
 		Die(ginerrors.NotInRepo)
 	}
 	if len(args) > 0 {
diff --git a/gincmd/versioncmd.go b/gincmd/versioncmd.go
@@ -13,7 +13,7 @@ import (
 )
 
 func repoversion(cmd *cobra.Command, args []string) {
-	if !git.IsRepo() {
+	if !git.Checkwd() {
 		Die("This command must be run from inside a gin repository.")
 	}
 	count, _ := cmd.Flags().GetUint("max-count")
diff --git a/git/annex.go b/git/annex.go
@@ -150,6 +150,12 @@ func AnnexInit(description string) error {
 	return nil
 }
 
+// AnnexUpgrade upgrades a repository to the current (newest) layout.
+// Use this to upgrade v5 repositories to v7.
+func AnnexUpgrade() error {
+	return nil
+}
+
 // AnnexPull downloads all annexed files. Optionally also downloads all file content.
 // (git annex sync --no-push [--content])
 func AnnexPull(remote string) error {
diff --git a/git/git.go b/git/git.go
@@ -336,7 +336,7 @@ func Add(filepaths []string, addchan chan<- RepoFileStatus) {
 
 // SetGitUser sets the user.name and user.email configuration values for the local git repository.
 func SetGitUser(name, email string) error {
-	if !IsRepo() {
+	if !Checkwd() {
 		return fmt.Errorf("not a repository")
 	}
 	err := ConfigSet("user.name", name)
@@ -519,11 +519,10 @@ func RevParse(rev string) (string, error) {
 	return string(stdout), nil
 }
 
-// IsRepo checks whether the current working directory is in a git repository.
+// Checkwd checks whether the current working directory is in a git repository.
 // This function will also return true for bare repositories that use git annex (direct mode).
-func IsRepo() bool {
+func Checkwd() bool {
 	path, _ := filepath.Abs(".")
-	log.Write("IsRepo '%s'?", path)
 	_, err := FindRepoRoot(path)
 	yes := err == nil
 	log.Write("%v", yes)

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ func defaultRemoteIfUnset(name string) {`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`func addRemote(cmd *cobra.Command, args []string) {`
`155`		`- if !git.IsRepo() {`
	`155`	`+ if !git.Checkwd() {`
`156`	`156`	`Die(ginerrors.NotInRepo)`
`157`	`157`	`}`
`158`	`158`	`flags := cmd.Flags()`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`
`15`	`15`	`func commit(cmd *cobra.Command, args []string) {`
`16`	`16`	`prStyle := determinePrintStyle(cmd)`
`17`		`- if !git.IsRepo() {`
	`17`	`+ if !git.Checkwd() {`
`18`	`18`	`Die(ginerrors.NotInRepo)`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ func download(cmd *cobra.Command, args []string) {`
`17`	`17`	`// TODO: no client necessary? Just use remotes`
`18`	`18`	`conf := config.Read()`
`19`	`19`	`gincl := ginclient.New(conf.DefaultServer)`
`20`		`- if !git.IsRepo() {`
	`20`	`+ if !git.Checkwd() {`
`21`	`21`	`Die(ginerrors.NotInRepo)`
`22`	`22`	`}`
`23`	`23`	`remote, err := ginclient.DefaultRemote()`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ func getContent(cmd *cobra.Command, args []string) {`
`16`	`16`	`// TODO: no need for client; use remotes (and all keys?)`
`17`	`17`	`gincl := ginclient.New(conf.DefaultServer)`
`18`	`18`	`requirelogin(cmd, gincl, prStyle != psJSON)`
`19`		`- if !git.IsRepo() {`
	`19`	`+ if !git.Checkwd() {`
`20`	`20`	`Die(ginerrors.NotInRepo)`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`
`13`	`13`	`func lock(cmd *cobra.Command, args []string) {`
`14`	`14`	`prStyle := determinePrintStyle(cmd)`
`15`		`- if !git.IsRepo() {`
	`15`	`+ if !git.Checkwd() {`
`16`	`16`	`Die(ginerrors.NotInRepo)`
`17`	`17`	`}`
`18`	`18`	`if prStyle != psJSON {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`func lsRepo(cmd *cobra.Command, args []string) {`
`18`		`- if !git.IsRepo() {`
	`18`	`+ if !git.Checkwd() {`
`19`	`19`	`Die(ginerrors.NotInRepo)`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ func printremotes(cmd *cobra.Command, args []string) {`
`15`	`15`	`flags := cmd.Flags()`
`16`	`16`	`jsonout, _ := flags.GetBool("json")`
`17`	`17`
`18`		`- if !git.IsRepo() {`
	`18`	`+ if !git.Checkwd() {`
`19`	`19`	`Die(ginerrors.NotInRepo)`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ func remove(cmd *cobra.Command, args []string) {`
`24`	`24`	`conf := config.Read()`
`25`	`25`	`gincl := ginclient.New(conf.DefaultServer)`
`26`	`26`	`requirelogin(cmd, gincl, prStyle != psJSON)`
`27`		`- if !git.IsRepo() {`
	`27`	`+ if !git.Checkwd() {`
`28`	`28`	`Die(ginerrors.NotInRepo)`
`29`	`29`	`}`
`30`	`30`	`nitems := countItemsRemove(args)`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func rmRemote(cmd *cobra.Command, args []string) {`
`13`		`- if !git.IsRepo() {`
	`13`	`+ if !git.Checkwd() {`
`14`	`14`	`Die(ginerrors.NotInRepo)`
`15`	`15`	`}`
`16`	`16`	`name := args[0]`