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
|
package pama
import (
"fmt"
"git.sr.ht/~rjarry/aerc/lib/pama/models"
"git.sr.ht/~rjarry/aerc/log"
)
func (m PatchManager) DropPatch(patch string) error {
p, err := m.CurrentProject()
if err != nil {
return err
}
if !models.Commits(p.Commits).HasTag(patch) {
return fmt.Errorf("Patch '%s' not found in project '%s'", patch, p.Name)
}
rc, err := m.rc(p.RevctrlID, p.Root)
if err != nil {
return revErr(err)
}
if !rc.Clean() {
return fmt.Errorf("Aborting... There are unstaged changes " +
"or a rebase in progress")
}
toRemove := make([]models.Commit, 0)
for _, c := range p.Commits {
if !rc.Exists(c.ID) {
log.Errorf("failed to find commit. %v", c)
return fmt.Errorf("Cannot drop patch. " +
"Please rebase first with ':patch rebase'")
}
if c.Tag == patch {
toRemove = append(toRemove, c)
}
}
removed := make(map[string]struct{})
for i := len(toRemove) - 1; i >= 0; i-- {
commitID := toRemove[i].ID
beforeIDs, err := rc.History(commitID)
if err != nil {
log.Errorf("failed to drop %v (commits before): %v", toRemove[i], err)
continue
}
err = rc.Drop(commitID)
if err != nil {
log.Errorf("failed to drop %v: %v", toRemove[i], err)
continue
}
removed[commitID] = struct{}{}
afterIDs, err := rc.History(p.Base.ID)
if err != nil {
log.Errorf("failed to drop %v (commits after): %v", toRemove[i], err)
continue
}
afterIDs = afterIDs[len(afterIDs)-len(beforeIDs):]
transform := make(map[string]string)
for j := 0; j < len(beforeIDs); j++ {
transform[beforeIDs[j]] = afterIDs[j]
}
for j, c := range p.Commits {
if newId, ok := transform[c.ID]; ok {
msgid := p.Commits[j].MessageId
p.Commits[j] = models.NewCommit(
rc,
newId,
p.Commits[j].Tag,
)
p.Commits[j].MessageId = msgid
}
}
}
if len(removed) < len(toRemove) {
return fmt.Errorf("Failed to drop commits. Dropped %d of %d.",
len(removed), len(toRemove))
}
commits := make([]models.Commit, 0, len(p.Commits))
for _, c := range p.Commits {
if _, ok := removed[c.ID]; ok {
continue
}
commits = append(commits, c)
}
p.Commits = commits
return storeErr(m.store().StoreProject(p, true))
}
|
