1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
|
Description: Use original git-todo-parser instead of fork
Upstream uses fork. and we use the original version, which is already in
Debian. There is no API conflicts.
Author: Jongmin Kim <jmkim@debian.org>
Forwarded: not-needed
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/pkg/app/daemon/rebase.go
+++ b/pkg/app/daemon/rebase.go
@@ -10,7 +10,7 @@ import (
"github.com/jesseduffield/lazygit/pkg/env"
"github.com/jesseduffield/lazygit/pkg/utils"
"github.com/samber/lo"
- "github.com/stefanhaller/git-todo-parser/todo"
+ "github.com/fsmiamoto/git-todo-parser/todo"
)
type TodoLine struct {
--- a/pkg/commands/git_commands/commit_loader.go
+++ b/pkg/commands/git_commands/commit_loader.go
@@ -16,7 +16,7 @@ import (
"github.com/jesseduffield/lazygit/pkg/common"
"github.com/jesseduffield/lazygit/pkg/utils"
"github.com/samber/lo"
- "github.com/stefanhaller/git-todo-parser/todo"
+ "github.com/fsmiamoto/git-todo-parser/todo"
)
// context:
--- a/pkg/commands/git_commands/commit_loader_test.go
+++ b/pkg/commands/git_commands/commit_loader_test.go
@@ -11,7 +11,7 @@ import (
"github.com/jesseduffield/lazygit/pkg/config"
"github.com/jesseduffield/lazygit/pkg/utils"
"github.com/samber/lo"
- "github.com/stefanhaller/git-todo-parser/todo"
+ "github.com/fsmiamoto/git-todo-parser/todo"
"github.com/stretchr/testify/assert"
)
--- a/pkg/commands/git_commands/patch.go
+++ b/pkg/commands/git_commands/patch.go
@@ -8,7 +8,7 @@ import (
"github.com/jesseduffield/lazygit/pkg/app/daemon"
"github.com/jesseduffield/lazygit/pkg/commands/models"
"github.com/jesseduffield/lazygit/pkg/commands/patch"
- "github.com/stefanhaller/git-todo-parser/todo"
+ "github.com/fsmiamoto/git-todo-parser/todo"
)
type PatchCommands struct {
--- a/pkg/commands/git_commands/rebase.go
+++ b/pkg/commands/git_commands/rebase.go
@@ -11,7 +11,7 @@ import (
"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
"github.com/jesseduffield/lazygit/pkg/utils"
"github.com/samber/lo"
- "github.com/stefanhaller/git-todo-parser/todo"
+ "github.com/fsmiamoto/git-todo-parser/todo"
)
type RebaseCommands struct {
--- a/pkg/commands/models/commit.go
+++ b/pkg/commands/models/commit.go
@@ -5,7 +5,7 @@ import (
"github.com/jesseduffield/lazygit/pkg/utils"
"github.com/samber/lo"
- "github.com/stefanhaller/git-todo-parser/todo"
+ "github.com/fsmiamoto/git-todo-parser/todo"
)
// Special commit hash for empty tree object
--- a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
+++ b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
@@ -13,7 +13,7 @@ import (
"github.com/jesseduffield/lazygit/pkg/gui/types"
"github.com/jesseduffield/lazygit/pkg/utils"
"github.com/samber/lo"
- "github.com/stefanhaller/git-todo-parser/todo"
+ "github.com/fsmiamoto/git-todo-parser/todo"
)
type MergeAndRebaseHelper struct {
--- a/pkg/gui/controllers/local_commits_controller.go
+++ b/pkg/gui/controllers/local_commits_controller.go
@@ -15,7 +15,7 @@ import (
"github.com/jesseduffield/lazygit/pkg/gui/types"
"github.com/jesseduffield/lazygit/pkg/utils"
"github.com/samber/lo"
- "github.com/stefanhaller/git-todo-parser/todo"
+ "github.com/fsmiamoto/git-todo-parser/todo"
)
// after selecting the 200th commit, we'll load in all the rest
--- a/pkg/gui/presentation/commits.go
+++ b/pkg/gui/presentation/commits.go
@@ -18,7 +18,7 @@ import (
"github.com/kyokomi/emoji/v2"
"github.com/samber/lo"
"github.com/sasha-s/go-deadlock"
- "github.com/stefanhaller/git-todo-parser/todo"
+ "github.com/fsmiamoto/git-todo-parser/todo"
)
type pipeSetCacheKey struct {
--- a/pkg/gui/presentation/commits_test.go
+++ b/pkg/gui/presentation/commits_test.go
@@ -12,7 +12,7 @@ import (
"github.com/jesseduffield/lazygit/pkg/commands/models"
"github.com/jesseduffield/lazygit/pkg/utils"
"github.com/samber/lo"
- "github.com/stefanhaller/git-todo-parser/todo"
+ "github.com/fsmiamoto/git-todo-parser/todo"
"github.com/stretchr/testify/assert"
"github.com/xo/terminfo"
)
--- a/pkg/gui/services/custom_commands/models.go
+++ b/pkg/gui/services/custom_commands/models.go
@@ -2,7 +2,7 @@ package custom_commands
import (
"github.com/jesseduffield/lazygit/pkg/commands/models"
- "github.com/stefanhaller/git-todo-parser/todo"
+ "github.com/fsmiamoto/git-todo-parser/todo"
)
// We create shims for all the model classes in order to get a more stable API
--- a/pkg/utils/rebase_todo.go
+++ b/pkg/utils/rebase_todo.go
@@ -8,7 +8,7 @@ import (
"slices"
"github.com/samber/lo"
- "github.com/stefanhaller/git-todo-parser/todo"
+ "github.com/fsmiamoto/git-todo-parser/todo"
)
type Todo struct {
--- a/pkg/utils/rebase_todo_test.go
+++ b/pkg/utils/rebase_todo_test.go
@@ -5,7 +5,7 @@ import (
"fmt"
"testing"
- "github.com/stefanhaller/git-todo-parser/todo"
+ "github.com/fsmiamoto/git-todo-parser/todo"
"github.com/stretchr/testify/assert"
)
|
