Browse Source
Update to go-git v5.1.0 (#11936)
Update to go-git v5.1.0 (#11936)
Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>mj-v1.14.3
zeripath
3 years ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
76 changed files with 3133 additions and 555 deletions
-
8go.mod
-
18go.sum
-
2vendor/github.com/go-git/go-git/v5/COMPATIBILITY.md
-
8vendor/github.com/go-git/go-git/v5/README.md
-
157vendor/github.com/go-git/go-git/v5/config/config.go
-
9vendor/github.com/go-git/go-git/v5/config/refspec.go
-
1vendor/github.com/go-git/go-git/v5/go.mod
-
2vendor/github.com/go-git/go-git/v5/go.sum
-
49vendor/github.com/go-git/go-git/v5/options.go
-
38vendor/github.com/go-git/go-git/v5/plumbing/color/color.go
-
97vendor/github.com/go-git/go-git/v5/plumbing/format/diff/colorconfig.go
-
397vendor/github.com/go-git/go-git/v5/plumbing/format/diff/unified_encoder.go
-
10vendor/github.com/go-git/go-git/v5/plumbing/format/packfile/diff_delta.go
-
10vendor/github.com/go-git/go-git/v5/plumbing/format/packfile/encoder.go
-
5vendor/github.com/go-git/go-git/v5/plumbing/format/packfile/packfile.go
-
15vendor/github.com/go-git/go-git/v5/plumbing/format/packfile/parser.go
-
7vendor/github.com/go-git/go-git/v5/plumbing/format/packfile/patch_delta.go
-
10vendor/github.com/go-git/go-git/v5/plumbing/hash.go
-
4vendor/github.com/go-git/go-git/v5/plumbing/object/change.go
-
15vendor/github.com/go-git/go-git/v5/plumbing/object/commit.go
-
67vendor/github.com/go-git/go-git/v5/plumbing/object/difftree.go
-
2vendor/github.com/go-git/go-git/v5/plumbing/object/patch.go
-
813vendor/github.com/go-git/go-git/v5/plumbing/object/rename.go
-
35vendor/github.com/go-git/go-git/v5/plumbing/object/tree.go
-
8vendor/github.com/go-git/go-git/v5/plumbing/protocol/packp/advrefs.go
-
7vendor/github.com/go-git/go-git/v5/plumbing/transport/internal/common/common.go
-
12vendor/github.com/go-git/go-git/v5/plumbing/transport/server/server.go
-
42vendor/github.com/go-git/go-git/v5/remote.go
-
69vendor/github.com/go-git/go-git/v5/repository.go
-
17vendor/github.com/go-git/go-git/v5/storage/filesystem/config.go
-
11vendor/github.com/go-git/go-git/v5/storage/filesystem/dotgit/dotgit.go
-
2vendor/github.com/go-git/go-git/v5/storage/filesystem/object.go
-
2vendor/github.com/go-git/go-git/v5/submodule.go
-
12vendor/github.com/go-git/go-git/v5/utils/merkletrie/difftree.go
-
12vendor/github.com/imdario/mergo/.deepsource.toml
-
33vendor/github.com/imdario/mergo/.gitignore
-
9vendor/github.com/imdario/mergo/.travis.yml
-
46vendor/github.com/imdario/mergo/CODE_OF_CONDUCT.md
-
28vendor/github.com/imdario/mergo/LICENSE
-
238vendor/github.com/imdario/mergo/README.md
-
44vendor/github.com/imdario/mergo/doc.go
-
176vendor/github.com/imdario/mergo/map.go
-
338vendor/github.com/imdario/mergo/merge.go
-
97vendor/github.com/imdario/mergo/mergo.go
-
23vendor/golang.org/x/crypto/ssh/mux.go
-
11vendor/golang.org/x/sys/cpu/byteorder.go
-
2vendor/golang.org/x/sys/cpu/cpu_aix.go
-
8vendor/golang.org/x/sys/cpu/cpu_arm64.go
-
27vendor/golang.org/x/sys/cpu/syscall_aix_gccgo.go
-
12vendor/golang.org/x/sys/unix/syscall_linux.go
-
66vendor/golang.org/x/sys/unix/zerrors_linux.go
-
1vendor/golang.org/x/sys/unix/zerrors_linux_386.go
-
1vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
-
1vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
-
1vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
-
1vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
-
1vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
-
1vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
-
1vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
-
1vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
-
1vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
-
1vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
-
1vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
-
1vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
-
3vendor/golang.org/x/sys/unix/zsysctl_openbsd_386.go
-
1vendor/golang.org/x/sys/unix/zsysctl_openbsd_amd64.go
-
1vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm.go
-
416vendor/golang.org/x/sys/unix/ztypes_linux.go
-
11vendor/golang.org/x/sys/windows/env_windows.go
-
5vendor/golang.org/x/sys/windows/memory_windows.go
-
20vendor/golang.org/x/sys/windows/security_windows.go
-
7vendor/golang.org/x/sys/windows/svc/security.go
-
11vendor/golang.org/x/sys/windows/svc/service.go
-
39vendor/golang.org/x/sys/windows/syscall_windows.go
-
19vendor/golang.org/x/sys/windows/zsyscall_windows.go
-
11vendor/modules.txt
@ -0,0 +1,38 @@ |
|||
package color |
|||
|
|||
// TODO read colors from a github.com/go-git/go-git/plumbing/format/config.Config struct
|
|||
// TODO implement color parsing, see https://github.com/git/git/blob/v2.26.2/color.c
|
|||
|
|||
// Colors. See https://github.com/git/git/blob/v2.26.2/color.h#L24-L53.
|
|||
const ( |
|||
Normal = "" |
|||
Reset = "\033[m" |
|||
Bold = "\033[1m" |
|||
Red = "\033[31m" |
|||
Green = "\033[32m" |
|||
Yellow = "\033[33m" |
|||
Blue = "\033[34m" |
|||
Magenta = "\033[35m" |
|||
Cyan = "\033[36m" |
|||
BoldRed = "\033[1;31m" |
|||
BoldGreen = "\033[1;32m" |
|||
BoldYellow = "\033[1;33m" |
|||
BoldBlue = "\033[1;34m" |
|||
BoldMagenta = "\033[1;35m" |
|||
BoldCyan = "\033[1;36m" |
|||
FaintRed = "\033[2;31m" |
|||
FaintGreen = "\033[2;32m" |
|||
FaintYellow = "\033[2;33m" |
|||
FaintBlue = "\033[2;34m" |
|||
FaintMagenta = "\033[2;35m" |
|||
FaintCyan = "\033[2;36m" |
|||
BgRed = "\033[41m" |
|||
BgGreen = "\033[42m" |
|||
BgYellow = "\033[43m" |
|||
BgBlue = "\033[44m" |
|||
BgMagenta = "\033[45m" |
|||
BgCyan = "\033[46m" |
|||
Faint = "\033[2m" |
|||
FaintItalic = "\033[2;3m" |
|||
Reverse = "\033[7m" |
|||
) |
|||
@ -0,0 +1,97 @@ |
|||
package diff |
|||
|
|||
import "github.com/go-git/go-git/v5/plumbing/color" |
|||
|
|||
// A ColorKey is a key into a ColorConfig map and also equal to the key in the
|
|||
// diff.color subsection of the config. See
|
|||
// https://github.com/git/git/blob/v2.26.2/diff.c#L83-L106.
|
|||
type ColorKey string |
|||
|
|||
// ColorKeys.
|
|||
const ( |
|||
Context ColorKey = "context" |
|||
Meta ColorKey = "meta" |
|||
Frag ColorKey = "frag" |
|||
Old ColorKey = "old" |
|||
New ColorKey = "new" |
|||
Commit ColorKey = "commit" |
|||
Whitespace ColorKey = "whitespace" |
|||
Func ColorKey = "func" |
|||
OldMoved ColorKey = "oldMoved" |
|||
OldMovedAlternative ColorKey = "oldMovedAlternative" |
|||
OldMovedDimmed ColorKey = "oldMovedDimmed" |
|||
OldMovedAlternativeDimmed ColorKey = "oldMovedAlternativeDimmed" |
|||
NewMoved ColorKey = "newMoved" |
|||
NewMovedAlternative ColorKey = "newMovedAlternative" |
|||
NewMovedDimmed ColorKey = "newMovedDimmed" |
|||
NewMovedAlternativeDimmed ColorKey = "newMovedAlternativeDimmed" |
|||
ContextDimmed ColorKey = "contextDimmed" |
|||
OldDimmed ColorKey = "oldDimmed" |
|||
NewDimmed ColorKey = "newDimmed" |
|||
ContextBold ColorKey = "contextBold" |
|||
OldBold ColorKey = "oldBold" |
|||
NewBold ColorKey = "newBold" |
|||
) |
|||
|
|||
// A ColorConfig is a color configuration. A nil or empty ColorConfig
|
|||
// corresponds to no color.
|
|||
type ColorConfig map[ColorKey]string |
|||
|
|||
// A ColorConfigOption sets an option on a ColorConfig.
|
|||
type ColorConfigOption func(ColorConfig) |
|||
|
|||
// WithColor sets the color for key.
|
|||
func WithColor(key ColorKey, color string) ColorConfigOption { |
|||
return func(cc ColorConfig) { |
|||
cc[key] = color |
|||
} |
|||
} |
|||
|
|||
// defaultColorConfig is the default color configuration. See
|
|||
// https://github.com/git/git/blob/v2.26.2/diff.c#L57-L81.
|
|||
var defaultColorConfig = ColorConfig{ |
|||
Context: color.Normal, |
|||
Meta: color.Bold, |
|||
Frag: color.Cyan, |
|||
Old: color.Red, |
|||
New: color.Green, |
|||
Commit: color.Yellow, |
|||
Whitespace: color.BgRed, |
|||
Func: color.Normal, |
|||
OldMoved: color.BoldMagenta, |
|||
OldMovedAlternative: color.BoldBlue, |
|||
OldMovedDimmed: color.Faint, |
|||
OldMovedAlternativeDimmed: color.FaintItalic, |
|||
NewMoved: color.BoldCyan, |
|||
NewMovedAlternative: color.BoldYellow, |
|||
NewMovedDimmed: color.Faint, |
|||
NewMovedAlternativeDimmed: color.FaintItalic, |
|||
ContextDimmed: color.Faint, |
|||
OldDimmed: color.FaintRed, |
|||
NewDimmed: color.FaintGreen, |
|||
ContextBold: color.Bold, |
|||
OldBold: color.BoldRed, |
|||
NewBold: color.BoldGreen, |
|||
} |
|||
|
|||
// NewColorConfig returns a new ColorConfig.
|
|||
func NewColorConfig(options ...ColorConfigOption) ColorConfig { |
|||
cc := make(ColorConfig) |
|||
for key, value := range defaultColorConfig { |
|||
cc[key] = value |
|||
} |
|||
for _, option := range options { |
|||
option(cc) |
|||
} |
|||
return cc |
|||
} |
|||
|
|||
// Reset returns the ANSI escape sequence to reset the color with key set from
|
|||
// cc. If no color was set then no reset is needed so it returns the empty
|
|||
// string.
|
|||
func (cc ColorConfig) Reset(key ColorKey) string { |
|||
if cc[key] == "" { |
|||
return "" |
|||
} |
|||
return color.Reset |
|||
} |
|||