Skip to content

Commit

Permalink
rename (#18)
Browse files Browse the repository at this point in the history
  • Loading branch information
jshawl authored May 19, 2024
1 parent eba567a commit bf1388d
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# diffrn
# abcd

A Better Console Diff

## CLI

```
diffrn [--staged] [treeish]
abcd [--staged] [treeish]
```

opens a pager, watches for changes, and updates the diff
Expand All @@ -18,13 +20,13 @@ import (
"fmt"
"os"

diffrn "github.com/jshawl/diffrn"
abcd "github.com/jshawl/abcd"
)

func main() {
cmd := exec.Command("git", "diff")
stdout, err := cmd.Output()
diff := diffrn.ParseDiff(string(stdout))
diff := abcd.ParseDiff(string(stdout))

diffJson, _ := json.MarshalIndent(diff, "", " ")
fmt.Println(string(diffJson))
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
module diffrn
module abcd

go 1.21.6

require (
github.com/charmbracelet/bubbles v0.18.0
github.com/charmbracelet/bubbletea v0.26.2
github.com/charmbracelet/lipgloss v0.10.0
github.com/jshawl/diffrn v0.0.0
github.com/jshawl/abcd v0.0.0
)

require (
Expand All @@ -27,4 +27,4 @@ require (
golang.org/x/text v0.3.8 // indirect
)

replace github.com/jshawl/diffrn v0.0.0 => ./
replace github.com/jshawl/abcd v0.0.0 => ./
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package main

import "github.com/jshawl/diffrn/ui"
import "github.com/jshawl/abcd/ui"

func main() {
ui.Render()
Expand Down
2 changes: 1 addition & 1 deletion ui/diff.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/charmbracelet/bubbles/viewport"
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss"
parser "github.com/jshawl/diffrn/parser"
parser "github.com/jshawl/abcd/parser"
)

type Diff struct {
Expand Down
2 changes: 1 addition & 1 deletion ui/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ui
import (
"strings"

"github.com/jshawl/diffrn/parser"
"github.com/jshawl/abcd/parser"
)

type File struct {
Expand Down

0 comments on commit bf1388d

Please sign in to comment.