playground
/
gogs
mirror of https://github.com/gogits/gogs.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Fixed bug: has revision but still force to check(which never changes)

pull/103/head
Unknown 11 years ago
parent
41d20aa9a5
commit
61bcb024f6
5 changed files with 125 additions and 105 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      cmd/cmd.go
  2. 10
      cmd/gen.go
  3. 76
      cmd/get.go
  4. 1
      doc/struct.go
  5. 15
      gopm.go

10
cmd/cmd.go
Unescape View File

@ -1,4 +1,4 @@
// Copyright 2013 gopm authors.
// Copyright 2013-2014 gopm authors.
//
// Licensed under the Apache License, Version 2.0 (the "License"): you may
// not use this file except in compliance with the License. You may obtain
@ -57,25 +57,23 @@ func validPath(info string) (string, string) {
l := len(infos)
switch {
case l == 1:
// for local imports
// For local imports.
if com.IsFile(infos[0]) {
return doc.LOCAL, infos[0]
}
return doc.BRANCH, ""
case l == 2:
switch infos[1] {
case doc.TRUNK, doc.MASTER, doc.DEFAULT:
infos[1] = ""
}
return infos[0], infos[1]
default:
}
log.Error("", "Cannot parse dependency version:")
log.Error("", "\t"+info)
log.Help("Try 'gopm help get' to get more information")
return "", ""
}
}
func versionSuffix(value string) string {
if len(value) > 0 {

10
cmd/gen.go
Unescape View File

@ -41,7 +41,6 @@ Make sure you run this command in the root path of a go project.`,
},
}
// scan a directory and gen a gopm file
func runGen(ctx *cli.Context) {
setup(ctx)
@ -55,15 +54,18 @@ func runGen(ctx *cli.Context) {
log.Fatal("", "\t"+err.Error())
}
targetPath := parseTarget(gf.MustValue("target", "path"))
// Get dependencies.
imports := doc.GetAllImports([]string{workDir},
parseTarget(gf.MustValue("target", "path")), ctx.Bool("example"))
imports := doc.GetAllImports([]string{workDir}, targetPath, ctx.Bool("example"))
for _, p := range imports {
p = doc.GetProjectPath(p)
if strings.HasSuffix(workDir, p) {
// Skip subpackage(s) of current project.
if strings.HasSuffix(workDir, p) || strings.HasPrefix(p, targetPath) {
continue
}
// Check if user specified the version.
if value := gf.MustValue("deps", p); len(value) == 0 {
gf.SetValue("deps", p, "")
}

76
cmd/get.go
Unescape View File

@ -1,4 +1,4 @@
// Copyright 2013 gopm authors.
// Copyright 2013-2014 gopm authors.
//
// Licensed under the Apache License, Version 2.0 (the "License"): you may
// not use this file except in compliance with the License. You may obtain
@ -69,7 +69,6 @@ func init() {
func runGet(ctx *cli.Context) {
setup(ctx)
// Check conflicts.
if ctx.Bool("gopath") && ctx.Bool("remote") {
log.Error("get", "Command options have conflicts")
@ -119,11 +118,17 @@ func getByGopmfile(ctx *cli.Context) {
}
gf := doc.NewGopmfile(".")
targetPath := parseTarget(gf.MustValue("target", "path"))
// Get dependencies.
imports := doc.GetAllImports([]string{workDir},
parseTarget(gf.MustValue("target", "path")), ctx.Bool("example"))
imports := doc.GetAllImports([]string{workDir}, targetPath, ctx.Bool("example"))
nodes := make([]*doc.Node, 0, len(imports))
for _, p := range imports {
p = doc.GetProjectPath(p)
// Skip subpackage(s) of current project.
if strings.HasSuffix(workDir, p) || strings.HasPrefix(p, targetPath) {
continue
}
node := doc.NewNode(p, p, doc.BRANCH, "", true)
// Check if user specified the version.
@ -140,6 +145,7 @@ func getByGopmfile(ctx *cli.Context) {
}
func getByPath(ctx *cli.Context) {
return
nodes := make([]*doc.Node, 0, len(ctx.Args()))
for _, info := range ctx.Args() {
pkgPath := info
@ -192,12 +198,26 @@ func downloadPackages(ctx *cli.Context, nodes []*doc.Node) {
if n.Type == doc.LOCAL {
continue
}
// Check if it is a valid remote path.
if doc.IsValidRemotePath(n.ImportPath) {
// Check if it is a valid remote path or C.
if n.ImportPath == "C" {
continue
} else if !doc.IsValidRemotePath(n.ImportPath) {
// Invalid import path.
log.Error("download", "Skipped invalid package: "+fmt.Sprintf("%s@%s:%s",
n.ImportPath, n.Type, doc.CheckNodeValue(n.Value)))
failConut++
continue
}
// Valid import path.
gopathDir := path.Join(installGopath, n.ImportPath)
n.RootPath = doc.GetProjectPath(n.ImportPath)
installPath := path.Join(installRepoPath, n.RootPath) +
versionSuffix(n.Value)
installPath := path.Join(installRepoPath, n.RootPath) + versionSuffix(n.Value)
// Indicates whether need to download package again.
if len(n.Value) > 0 && com.IsExist(installPath) {
n.IsGetDepsOnly = true
}
if !ctx.Bool("update") {
// Check if package has been downloaded.
@ -206,7 +226,9 @@ func downloadPackages(ctx *cli.Context, nodes []*doc.Node) {
log.Trace("Skipped installed package: %s@%s:%s",
n.ImportPath, n.Type, doc.CheckNodeValue(n.Value))
if ctx.Bool("gopath") && com.IsExist(installPath) {
// Only copy when no version control.
if ctx.Bool("gopath") && com.IsExist(installPath) ||
len(getVcsName(gopathDir)) == 0 {
copyToGopath(installPath, gopathDir)
}
continue
@ -215,17 +237,21 @@ func downloadPackages(ctx *cli.Context, nodes []*doc.Node) {
}
}
if !downloadCache[n.RootPath] {
if downloadCache[n.RootPath] {
log.Trace("Skipped downloaded package: %s@%s:%s",
n.ImportPath, n.Type, doc.CheckNodeValue(n.Value))
continue
}
// Download package.
nod, imports := downloadPackage(ctx, n)
if len(imports) > 0 {
var gf *goconfig.ConfigFile
// Check if has gopmfile
// Check if has gopmfile.
if com.IsFile(installPath + "/" + doc.GOPM_FILE_NAME) {
log.Log("Found gopmfile: %s@%s:%s",
n.ImportPath, n.Type, doc.CheckNodeValue(n.Value))
gf = doc.NewGopmfile(installPath)
}
@ -240,8 +266,7 @@ func downloadPackages(ctx *cli.Context, nodes []*doc.Node) {
}
// Check if user specified the version.
if v, err := gf.GetValue("deps", imports[i]); err == nil &&
len(v) > 0 {
if v, err := gf.GetValue("deps", imports[i]); err == nil && len(v) > 0 {
nodes[i].Type, nodes[i].Value = validPath(v)
}
}
@ -249,7 +274,10 @@ func downloadPackages(ctx *cli.Context, nodes []*doc.Node) {
}
// Only save package information with specific commit.
if nod != nil {
if nod == nil {
continue
}
// Save record in local nodes.
log.Success("SUCC", "GET", fmt.Sprintf("%s@%s:%s",
n.ImportPath, n.Type, doc.CheckNodeValue(n.Value)))
@ -265,19 +293,6 @@ func downloadPackages(ctx *cli.Context, nodes []*doc.Node) {
copyToGopath(installPath, gopathDir)
}
}
} else {
log.Trace("Skipped downloaded package: %s@%s:%s",
n.ImportPath, n.Type, doc.CheckNodeValue(n.Value))
}
} else if n.ImportPath == "C" {
continue
} else {
// Invalid import path.
log.Error("download", "Skipped invalid package: "+fmt.Sprintf("%s@%s:%s",
n.ImportPath, n.Type, doc.CheckNodeValue(n.Value)))
failConut++
}
}
}
// downloadPackage downloads package either use version control tools or not.
@ -296,6 +311,11 @@ func downloadPackage(ctx *cli.Context, nod *doc.Node) (*doc.Node, []string) {
err = updateByVcs(vcs, gopathDir)
imports = doc.GetAllImports([]string{gopathDir}, nod.RootPath, false)
} else {
// If package has revision and exist, then just check dependencies.
if nod.IsGetDepsOnly {
return nod, doc.GetAllImports([]string{path.Join(installRepoPath, nod.RootPath) + versionSuffix(nod.Value)},
nod.RootPath, ctx.Bool("example"))
}
nod.Revision = doc.LocalNodes.MustValue(nod.RootPath, "value")
imports, err = doc.PureDownload(nod, installRepoPath, ctx) //CmdGet.Flags)
}

1
doc/struct.go
Unescape View File

@ -62,6 +62,7 @@ type Node struct {
DownloadURL string
Synopsis string
IsGetDeps bool
IsGetDepsOnly bool
Revision string
}

15
gopm.go
Unescape View File

@ -1,4 +1,4 @@
// Copyright 2013 gopm authors.
// Copyright 2013-2014 gopm authors.
//
// Licensed under the Apache License, Version 2.0 (the "License"): you may
// not use this file except in compliance with the License. You may obtain
@ -12,7 +12,7 @@
// License for the specific language governing permissions and limitations
// under the License.
// gopm(Go Package Manager) is a Go package manage tool for search, install, update and share packages in Go.
// gopm(Go Package Manager) is a Go package manage tool for searching, installing, updating and sharing your packages in Go.
package main
import (
@ -29,7 +29,7 @@ import (
// Test that go1.1 tag above is included in builds. main.go refers to this definition.
const go11tag = true
const APP_VER = "0.6.0.1211"
const APP_VER = "0.6.1.0110"
// //cmd.CmdSearch,
// cmdClean,
@ -37,7 +37,6 @@ const APP_VER = "0.6.0.1211"
// cmdEnv,
// cmdFix,
// cmdList,
// cmdTest,
// cmdTool,
// cmdVet,
// }
@ -53,11 +52,11 @@ func main() {
app.Version = APP_VER
app.Commands = []cli.Command{
cmd.CmdGet,
cmd.CmdBin,
//cmd.CmdBin,
cmd.CmdGen,
cmd.CmdRun,
cmd.CmdBuild,
cmd.CmdInstall,
//cmd.CmdRun,
//cmd.CmdBuild,
//cmd.CmdInstall,
//cmd.CmdUpdate,
//cmd.CmdTest,
}

Write Preview
Loading…
Cancel
Save