Commit ab20a43a2f9d75f0398a92f4d1f3eda36abb6d15
2020-01-29T12:47:13
don not open log message editor if there are no changes during 'histedit -c'
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
diff --git a/TODO b/TODO
index 16fc7da..fef0866 100644
--- a/TODO
+++ b/TODO
@@ -2,9 +2,6 @@ lib:
- improve performance of usr.bin/diff and port these changes back to got
(e.g. diffing between versions of sys/dev/pci/pcidevs is too slow)
-got:
-- 'histedit -c' prompts for log message even if there are no changes to commit
-
tog:
- implement horizonal scrolling in all views
- implement horizonal split view mode
diff --git a/got/got.c b/got/got.c
index 082207c..4e1dee6 100644
--- a/got/got.c
+++ b/got/got.c
@@ -6304,6 +6304,38 @@ histedit_skip_commit(struct got_histedit_list_entry *hle,
}
static const struct got_error *
+check_local_changes(void *arg, unsigned char status,
+ unsigned char staged_status, const char *path,
+ struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
+ struct got_object_id *commit_id, int dirfd, const char *de_name)
+{
+ int *have_local_changes = arg;
+
+ switch (status) {
+ case GOT_STATUS_ADD:
+ case GOT_STATUS_DELETE:
+ case GOT_STATUS_MODIFY:
+ case GOT_STATUS_CONFLICT:
+ *have_local_changes = 1;
+ return got_error(GOT_ERR_CANCELLED);
+ default:
+ break;
+ }
+
+ switch (staged_status) {
+ case GOT_STATUS_ADD:
+ case GOT_STATUS_DELETE:
+ case GOT_STATUS_MODIFY:
+ *have_local_changes = 1;
+ return got_error(GOT_ERR_CANCELLED);
+ default:
+ break;
+ }
+
+ return NULL;
+}
+
+static const struct got_error *
cmd_histedit(int argc, char *argv[])
{
const struct got_error *error = NULL;
@@ -6560,12 +6592,44 @@ cmd_histedit(int argc, char *argv[])
hle->cmd->code == GOT_HISTEDIT_FOLD) {
error = histedit_skip_commit(hle, worktree,
repo);
+ if (error)
+ goto done;
} else {
- error = histedit_commit(NULL, worktree,
- fileindex, tmp_branch, hle, repo);
+ struct got_pathlist_head paths;
+ int have_changes = 0;
+
+ TAILQ_INIT(&paths);
+ error = got_pathlist_append(&paths, "", NULL);
+ if (error)
+ goto done;
+ error = got_worktree_status(worktree, &paths,
+ repo, check_local_changes, &have_changes,
+ check_cancelled, NULL);
+ got_pathlist_free(&paths);
+ if (error) {
+ if (error->code != GOT_ERR_CANCELLED)
+ goto done;
+ if (sigint_received || sigpipe_received)
+ goto done;
+ }
+ if (have_changes) {
+ error = histedit_commit(NULL, worktree,
+ fileindex, tmp_branch, hle, repo);
+ if (error)
+ goto done;
+ } else {
+ error = got_object_open_as_commit(
+ &commit, repo, hle->commit_id);
+ if (error)
+ goto done;
+ error = show_histedit_progress(commit,
+ hle, NULL);
+ got_object_commit_close(commit);
+ commit = NULL;
+ if (error)
+ goto done;
+ }
}
- if (error)
- goto done;
continue;
}