Revert "original.yaml has just todo, merge against .original.yaml so mobile edits still get a history"

This reverts commit 242ad3e127.
This commit is contained in:
bel
2025-07-13 08:51:21 -06:00
parent 871e75f8a8
commit 263482f607
2 changed files with 2 additions and 15 deletions

View File

@@ -61,10 +61,6 @@ func _edit(filepaths []string) error {
original, err := pttodo.NewRootFromFile(func() string {
for _, f := range filepaths {
if path.Base(f) == path.Base(editedFile) {
rootF := path.Join(path.Dir(f), "."+path.Base(f))
if _, err := os.Stat(rootF); err == nil {
f = rootF
}
return f
}
}
@@ -106,15 +102,8 @@ func _edit(filepaths []string) error {
dir := ""
for _, f := range filepaths {
rootF := path.Join(path.Dir(f), "."+path.Base(f))
if edited, ok := edits[path.Base(f)]; ok {
if todos, err := pttodo.NewRootFromFile(edited); err != nil {
return err
} else if b, err := yaml.Marshal(todos.Todo); err != nil {
return err
} else if err := rename(edited, rootF); err != nil {
return err
} else if err := os.WriteFile(f, b, os.ModePerm); err != nil {
if err := rename(edited, f); err != nil {
return err
}
delete(edits, path.Base(f))