aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/github.com/sourcegraph/go-diff/diff/print.go
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2020-09-15 18:05:35 +0200
committerDmitry Vyukov <dvyukov@google.com>2020-09-15 19:34:30 +0200
commit712de1c63d9db97c81af68cd0dc4372c53d2e57a (patch)
treeae1761fec52c3ae4ddd003a4130ddbda8d0a2d69 /vendor/github.com/sourcegraph/go-diff/diff/print.go
parent298a69c38dd5c8a9bbd7a022e88f4ddbcf885e16 (diff)
vendor/github.com/golangci/golangci-lint: update to v1.31
Diffstat (limited to 'vendor/github.com/sourcegraph/go-diff/diff/print.go')
-rw-r--r--vendor/github.com/sourcegraph/go-diff/diff/print.go25
1 files changed, 13 insertions, 12 deletions
diff --git a/vendor/github.com/sourcegraph/go-diff/diff/print.go b/vendor/github.com/sourcegraph/go-diff/diff/print.go
index d440cb9ad..012651a33 100644
--- a/vendor/github.com/sourcegraph/go-diff/diff/print.go
+++ b/vendor/github.com/sourcegraph/go-diff/diff/print.go
@@ -4,9 +4,8 @@ import (
"bytes"
"fmt"
"io"
+ "path/filepath"
"time"
-
- "sourcegraph.com/sqs/pbtypes"
)
// PrintMultiFileDiff prints a multi-file diff in unified diff format.
@@ -36,14 +35,24 @@ func PrintFileDiff(d *FileDiff) ([]byte, error) {
}
}
+ // FileDiff is added/deleted file
+ // No further hunks printing needed
+ if d.NewName == "" {
+ _, err := fmt.Fprintf(&buf, onlyInMessage, filepath.Dir(d.OrigName), filepath.Base(d.OrigName))
+ if err != nil {
+ return nil, err
+ }
+ return buf.Bytes(), nil
+ }
+
if d.Hunks == nil {
return buf.Bytes(), nil
}
- if err := printFileHeader(&buf, "--- ", d.OrigName, timePtr(d.OrigTime)); err != nil {
+ if err := printFileHeader(&buf, "--- ", d.OrigName, d.OrigTime); err != nil {
return nil, err
}
- if err := printFileHeader(&buf, "+++ ", d.NewName, timePtr(d.NewTime)); err != nil {
+ if err := printFileHeader(&buf, "+++ ", d.NewName, d.NewTime); err != nil {
return nil, err
}
@@ -58,14 +67,6 @@ func PrintFileDiff(d *FileDiff) ([]byte, error) {
return buf.Bytes(), nil
}
-func timePtr(ts *pbtypes.Timestamp) *time.Time {
- if ts == nil {
- return nil
- }
- t := ts.Time()
- return &t
-}
-
func printFileHeader(w io.Writer, prefix string, filename string, timestamp *time.Time) error {
if _, err := fmt.Fprint(w, prefix, filename); err != nil {
return err