Commit 4e99b47e5866daf36b7280aa372ca5e7046ac586
2019-10-04T15:32:57
show temporary branch in 'got branch -l' during rebase and histedit
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
diff --git a/got/got.c b/got/got.c
index 212005d..6950da9 100644
--- a/got/got.c
+++ b/got/got.c
@@ -3213,44 +3213,83 @@ usage_branch(void)
}
static const struct got_error *
+list_branch(struct got_repository *repo, struct got_worktree *worktree,
+ struct got_reference *ref)
+{
+ const struct got_error *err = NULL;
+ const char *refname, *marker = " ";
+ char *refstr;
+
+ refname = got_ref_get_name(ref);
+ if (worktree && strcmp(refname,
+ got_worktree_get_head_ref_name(worktree)) == 0) {
+ struct got_object_id *id = NULL;
+
+ err = got_ref_resolve(&id, repo, ref);
+ if (err)
+ return err;
+ if (got_object_id_cmp(id,
+ got_worktree_get_base_commit_id(worktree)) == 0)
+ marker = "* ";
+ else
+ marker = "~ ";
+ free(id);
+ }
+
+ if (strncmp(refname, "refs/heads/", 11) == 0)
+ refname += 11;
+ if (strncmp(refname, "refs/got/worktree/", 18) == 0)
+ refname += 18;
+
+ refstr = got_ref_to_str(ref);
+ if (refstr == NULL)
+ return got_error_from_errno("got_ref_to_str");
+
+ printf("%s%s: %s\n", marker, refname, refstr);
+ free(refstr);
+ return NULL;
+}
+
+static const struct got_error *
list_branches(struct got_repository *repo, struct got_worktree *worktree)
{
static const struct got_error *err = NULL;
struct got_reflist_head refs;
struct got_reflist_entry *re;
+ struct got_reference *temp_ref = NULL;
+ int rebase_in_progress, histedit_in_progress;
SIMPLEQ_INIT(&refs);
- err = got_ref_list(&refs, repo, "refs/heads",
- got_ref_cmp_by_name, NULL);
- if (err)
- return err;
+ if (worktree) {
+ err = got_worktree_rebase_in_progress(&rebase_in_progress,
+ worktree);
+ if (err)
+ return err;
- SIMPLEQ_FOREACH(re, &refs, entry) {
- const char *refname, *marker = " ";
- char *refstr;
- refname = got_ref_get_name(re->ref);
- if (worktree && strcmp(refname,
- got_worktree_get_head_ref_name(worktree)) == 0) {
- struct got_object_id *id = NULL;
- err = got_ref_resolve(&id, repo, re->ref);
+ err = got_worktree_histedit_in_progress(&histedit_in_progress,
+ worktree);
+ if (err)
+ return err;
+
+ if (rebase_in_progress || histedit_in_progress) {
+ err = got_ref_open(&temp_ref, repo,
+ got_worktree_get_head_ref_name(worktree), 0);
if (err)
return err;
- if (got_object_id_cmp(id,
- got_worktree_get_base_commit_id(worktree)) == 0)
- marker = "* ";
- else
- marker = "~ ";
- free(id);
+ list_branch(repo, worktree, temp_ref);
+ got_ref_close(temp_ref);
}
- refname += strlen("refs/heads/");
- refstr = got_ref_to_str(re->ref);
- if (refstr == NULL)
- return got_error_from_errno("got_ref_to_str");
- printf("%s%s: %s\n", marker, refname, refstr);
- free(refstr);
}
+ err = got_ref_list(&refs, repo, "refs/heads",
+ got_ref_cmp_by_name, NULL);
+ if (err)
+ return err;
+
+ SIMPLEQ_FOREACH(re, &refs, entry)
+ list_branch(repo, worktree, re->ref);
+
got_ref_list_free(&refs);
return NULL;
}