Skip to content

Gazelle: remove support for graphical multidiff #357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jayconrod merged 1 commit into from
Apr 4, 2017
Merged

Gazelle: remove support for graphical multidiff #357

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions go/tools/gazelle/gazelle/diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ package main
import (
"io/ioutil"
"os"
"os/exec"

bzl "github.com/bazelbuild/buildifier/build"
"github.com/bazelbuild/buildifier/differ"
)

func diffFile(file *bzl.File) error {
Expand All @@ -37,11 +37,17 @@ func diffFile(file *bzl.File) error {
return err
}

diff := differ.Find()
if _, err := os.Stat(file.Path); os.IsNotExist(err) {
diff.Show(os.DevNull, f.Name())
origFileName := file.Path
if _, err := os.Stat(origFileName); os.IsNotExist(err) {
origFileName = os.DevNull
}
cmd := exec.Command("diff", "-u", origFileName, f.Name())
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
err = cmd.Run()
if _, ok := err.(*exec.ExitError); ok {
// diff returns non-zero when files are different. This is not an error.
return nil
}
diff.Show(file.Path, f.Name())
return nil
return err
}