all: add LICENSE header

unknwon · unknwon · commit 4a437758e6d5 · 2020-02-14T02:58:38.000+08:00
diff --git a/blob_test.go b/blob_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The Gogs Authors. All rights reserved.
+// Copyright 2019 The Gogs Authors. All rights reserved.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
diff --git a/command_test.go b/command_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
 package git
 
 import (
diff --git a/commit.go b/commit.go
@@ -21,7 +21,7 @@ type Commit struct {
 	committer *Signature
 	message   string
 
-	Tree
+	*Tree
 
 	submodules     Submodules
 	submodulesOnce sync.Once
diff --git a/commit_archive_test.go b/commit_archive_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
 package git
 
 import (
diff --git a/commit_submodule_test.go b/commit_submodule_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
 package git
 
 import (
diff --git a/commit_test.go b/commit_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
 package git
 
 import (
diff --git a/diff_test.go b/diff_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
 package git
 
 import (
diff --git a/git_test.go b/git_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
 package git
 
 import (
diff --git a/hook_test.go b/hook_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
 package git
 
 import (
diff --git a/repo_commit.go b/repo_commit.go
@@ -32,7 +32,7 @@ loop:
 				if err != nil {
 					return nil, err
 				}
-				commit.Tree.id = id
+				commit.Tree = &Tree{id: id}
 			case "parent":
 				// A commit can have one or more parents
 				id, err := NewIDFromString(string(line[spacepos+1:]))
diff --git a/repo_commit_test.go b/repo_commit_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
 package git
 
 import (
diff --git a/repo_diff_test.go b/repo_diff_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
 package git
 
 import (
diff --git a/repo_hook_test.go b/repo_hook_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
 package git
 
 import (
diff --git a/repo_pull_test.go b/repo_pull_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
 package git
 
 import (
diff --git a/repo_reference_test.go b/repo_reference_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
 package git
 
 import (
diff --git a/repo_remote_test.go b/repo_remote_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
 package git
 
 import (
diff --git a/repo_tag_test.go b/repo_tag_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
 package git
 
 import (
diff --git a/repo_test.go b/repo_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
 package git
 
 import (
diff --git a/repo_tree_test.go b/repo_tree_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
 package git
 
 import (
diff --git a/sha1_test.go b/sha1_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
 package git
 
 import (
diff --git a/signature_test.go b/signature_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
 package git
 
 import (
diff --git a/submodule.go b/submodule.go
@@ -4,11 +4,6 @@
 
 package git
 
-import (
-	"strings"
-	"sync"
-)
-
 // Submodule contains information of a Git submodule.
 type Submodule struct {
 	name string
@@ -25,63 +20,15 @@ func (s *Submodule) URL() string {
 	return s.url
 }
 
-// SubmoduleFile is a file with submodule type.
-type SubmoduleFile struct {
-	*Commit
-
-	refID      string
-	refURL     string
-	refURLOnce sync.Once
-}
-
-// RefURL guesses and returns the reference URL.
-func (f *SubmoduleFile) RefURL(urlPrefix, parentPath string) string {
-	f.refURLOnce.Do(func() {
-		f.refURL = strings.TrimSuffix(f.refURL, ".git")
-
-		// git://xxx/user/repo
-		if strings.HasPrefix(f.refURL, "git://") {
-			f.refURL = "http://" + strings.TrimPrefix(f.refURL, "git://")
-			return
-		}
+// SubmoduleEntry is an tree entry in submodule type.
+type SubmoduleEntry struct {
+	id *SHA1
 
-		// http[s]://xxx/user/repo
-		if strings.HasPrefix(f.refURL, "http://") || strings.HasPrefix(f.refURL, "https://") {
-			return
-		}
-
-		// Relative URL prefix check (according to Git submodule documentation)
-		if strings.HasPrefix(f.refURL, "./") || strings.HasPrefix(f.refURL, "../") {
-			// ...construct and return correct submodule URL here.
-			idx := strings.Index(parentPath, "/src/")
-			if idx == -1 {
-				return
-			}
-			f.refURL = strings.TrimSuffix(urlPrefix, "/") + parentPath[:idx] + "/" + f.refURL
-			return
-		}
-
-		// sysuser@xxx:user/repo
-		i := strings.Index(f.refURL, "@")
-		j := strings.LastIndex(f.refURL, ":")
-
-		// Only process when i < j because git+ssh://git@git.forwardbias.in/npploader.git
-		if i > -1 && j > -1 && i < j {
-			// Fix problem with reverse proxy works only with local server
-			if strings.Contains(urlPrefix, f.refURL[i+1:j]) {
-				f.refURL = urlPrefix + f.refURL[j+1:]
-				return
-			}
-
-			f.refURL = "http://" + f.refURL[i+1:j] + "/" + f.refURL[j+1:]
-			return
-		}
-	})
-
-	return f.refURL
+	*Submodule
+	*Commit
 }
 
-// RefID returns the reference ID.
-func (f *SubmoduleFile) RefID() string {
-	return f.refID
+// ID returns the ID of the submodule file.
+func (f *SubmoduleEntry) ID() *SHA1 {
+	return f.id
 }
diff --git a/submodule_test.go b/submodule_test.go
@@ -0,0 +1,18 @@
+// Copyright 2020 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package git
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestSubmoduleEntry_ID(t *testing.T) {
+	e := SubmoduleEntry{
+		id: MustIDFromString(EmptyID),
+	}
+	assert.Equal(t, EmptyID, e.ID().String())
+}
diff --git a/tree_entry.go b/tree_entry.go
@@ -224,11 +224,6 @@ func (es Entries) CommitsInfoWithCustomConcurrency(timeout time.Duration, commit
 				return
 			}
 
-			smURL := ""
-			if sm != nil {
-				smURL = sm.url
-			}
-
 			c, err := commit.CommitByPath(CommitByRevisionOptions{
 				Path:    path.Join(treePath, es[i].Name()),
 				Timeout: timeout,
@@ -238,10 +233,10 @@ func (es Entries) CommitsInfoWithCustomConcurrency(timeout time.Duration, commit
 			} else {
 				cinfo.infos = []interface{}{
 					es[i],
-					&SubmoduleFile{
-						Commit: c,
-						refURL: smURL,
-						refID:  es[i].id.String(),
+					&SubmoduleEntry{
+						id:        es[i].id,
+						Submodule: sm,
+						Commit:    c,
 					},
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright 2015 The Gogs Authors. All rights reserved.`
	`1`	`+// Copyright 2019 The Gogs Authors. All rights reserved.`
`2`	`2`	`// Use of this source code is governed by a MIT-style`
`3`	`3`	`// license that can be found in the LICENSE file.`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ loop:`
`32`	`32`	`if err != nil {`
`33`	`33`	`return nil, err`
`34`	`34`	`}`
`35`		`- commit.Tree.id = id`
	`35`	`+ commit.Tree = &Tree{id: id}`
`36`	`36`	`case "parent":`
`37`	`37`	`// A commit can have one or more parents`
`38`	`38`	`id, err := NewIDFromString(string(line[spacepos+1:]))`