Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 1 | /* |
| 2 | * Builtin "git branch" |
| 3 | * |
Junio C Hamano | d972cce | 2007-07-11 22:52:45 -0700 | [diff] [blame] | 4 | * Copyright (c) 2006 Kristian Høgsberg <krh@redhat.com> |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 5 | * Based on git-branch.sh by Junio C Hamano. |
| 6 | */ |
| 7 | |
| 8 | #include "cache.h" |
Junio C Hamano | 8502357 | 2006-12-19 14:34:12 -0800 | [diff] [blame] | 9 | #include "color.h" |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 10 | #include "refs.h" |
| 11 | #include "commit.h" |
| 12 | #include "builtin.h" |
Johannes Schindelin | 6f084a5 | 2007-07-10 18:50:44 +0100 | [diff] [blame] | 13 | #include "remote.h" |
Pierre Habouzit | a8dfd5e | 2007-10-07 18:26:21 +0200 | [diff] [blame] | 14 | #include "parse-options.h" |
Daniel Barkalow | e496c00 | 2008-02-07 11:40:08 -0500 | [diff] [blame] | 15 | #include "branch.h" |
Junio C Hamano | 68067ca | 2008-07-23 15:13:41 -0700 | [diff] [blame] | 16 | #include "diff.h" |
| 17 | #include "revision.h" |
Nguyễn Thái Ngọc Duy | ebe31ef | 2012-04-13 17:54:38 +0700 | [diff] [blame] | 18 | #include "string-list.h" |
| 19 | #include "column.h" |
Nguyễn Thái Ngọc Duy | 1452bd6 | 2012-08-26 01:17:12 +0700 | [diff] [blame] | 20 | #include "utf8.h" |
Nguyễn Thái Ngọc Duy | c8183cd | 2013-03-13 18:42:53 +0700 | [diff] [blame] | 21 | #include "wt-status.h" |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 22 | |
Pierre Habouzit | a8dfd5e | 2007-10-07 18:26:21 +0200 | [diff] [blame] | 23 | static const char * const builtin_branch_usage[] = { |
Nguyễn Thái Ngọc Duy | 24a8521 | 2012-08-20 19:31:55 +0700 | [diff] [blame] | 24 | N_("git branch [options] [-r | -a] [--merged | --no-merged]"), |
| 25 | N_("git branch [options] [-l] [-f] <branchname> [<start-point>]"), |
| 26 | N_("git branch [options] [-r] (-d | -D) <branchname>..."), |
| 27 | N_("git branch [options] (-m | -M) [<oldbranch>] <newbranch>"), |
Pierre Habouzit | a8dfd5e | 2007-10-07 18:26:21 +0200 | [diff] [blame] | 28 | NULL |
| 29 | }; |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 30 | |
Junio C Hamano | f3d985c | 2006-12-17 23:58:16 -0800 | [diff] [blame] | 31 | #define REF_LOCAL_BRANCH 0x01 |
| 32 | #define REF_REMOTE_BRANCH 0x02 |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 33 | |
| 34 | static const char *head; |
| 35 | static unsigned char head_sha1[20]; |
| 36 | |
Matthias Kestenholz | 6b2f2d9 | 2008-02-18 08:26:03 +0100 | [diff] [blame] | 37 | static int branch_use_color = -1; |
Andy Parkins | a1158ca | 2006-12-12 06:41:52 +0000 | [diff] [blame] | 38 | static char branch_colors[][COLOR_MAXLEN] = { |
Arjen Laarhoven | dc6ebd4 | 2009-02-13 22:53:40 +0100 | [diff] [blame] | 39 | GIT_COLOR_RESET, |
| 40 | GIT_COLOR_NORMAL, /* PLAIN */ |
| 41 | GIT_COLOR_RED, /* REMOTE */ |
| 42 | GIT_COLOR_NORMAL, /* LOCAL */ |
| 43 | GIT_COLOR_GREEN, /* CURRENT */ |
Felipe Contreras | dbda21f | 2013-04-14 21:37:49 -0500 | [diff] [blame] | 44 | GIT_COLOR_BLUE, /* UPSTREAM */ |
Andy Parkins | a1158ca | 2006-12-12 06:41:52 +0000 | [diff] [blame] | 45 | }; |
| 46 | enum color_branch { |
Arjen Laarhoven | 74bb2df | 2009-02-13 22:53:41 +0100 | [diff] [blame] | 47 | BRANCH_COLOR_RESET = 0, |
| 48 | BRANCH_COLOR_PLAIN = 1, |
| 49 | BRANCH_COLOR_REMOTE = 2, |
| 50 | BRANCH_COLOR_LOCAL = 3, |
Felipe Contreras | dbda21f | 2013-04-14 21:37:49 -0500 | [diff] [blame] | 51 | BRANCH_COLOR_CURRENT = 4, |
| 52 | BRANCH_COLOR_UPSTREAM = 5 |
Andy Parkins | a1158ca | 2006-12-12 06:41:52 +0000 | [diff] [blame] | 53 | }; |
| 54 | |
Junio C Hamano | 049716b | 2008-07-08 17:55:47 -0700 | [diff] [blame] | 55 | static enum merge_filter { |
| 56 | NO_FILTER = 0, |
| 57 | SHOW_NOT_MERGED, |
Gary V. Vaughan | 4b05548 | 2010-05-14 09:31:35 +0000 | [diff] [blame] | 58 | SHOW_MERGED |
Junio C Hamano | 049716b | 2008-07-08 17:55:47 -0700 | [diff] [blame] | 59 | } merge_filter; |
| 60 | static unsigned char merge_filter_ref[20]; |
Lars Hjemli | e8b404c | 2008-04-17 22:24:50 +0200 | [diff] [blame] | 61 | |
Nguyễn Thái Ngọc Duy | ebe31ef | 2012-04-13 17:54:38 +0700 | [diff] [blame] | 62 | static struct string_list output = STRING_LIST_INIT_DUP; |
| 63 | static unsigned int colopts; |
| 64 | |
Andy Parkins | a1158ca | 2006-12-12 06:41:52 +0000 | [diff] [blame] | 65 | static int parse_branch_color_slot(const char *var, int ofs) |
| 66 | { |
| 67 | if (!strcasecmp(var+ofs, "plain")) |
Arjen Laarhoven | 74bb2df | 2009-02-13 22:53:41 +0100 | [diff] [blame] | 68 | return BRANCH_COLOR_PLAIN; |
Andy Parkins | a1158ca | 2006-12-12 06:41:52 +0000 | [diff] [blame] | 69 | if (!strcasecmp(var+ofs, "reset")) |
Arjen Laarhoven | 74bb2df | 2009-02-13 22:53:41 +0100 | [diff] [blame] | 70 | return BRANCH_COLOR_RESET; |
Andy Parkins | a1158ca | 2006-12-12 06:41:52 +0000 | [diff] [blame] | 71 | if (!strcasecmp(var+ofs, "remote")) |
Arjen Laarhoven | 74bb2df | 2009-02-13 22:53:41 +0100 | [diff] [blame] | 72 | return BRANCH_COLOR_REMOTE; |
Andy Parkins | a1158ca | 2006-12-12 06:41:52 +0000 | [diff] [blame] | 73 | if (!strcasecmp(var+ofs, "local")) |
Arjen Laarhoven | 74bb2df | 2009-02-13 22:53:41 +0100 | [diff] [blame] | 74 | return BRANCH_COLOR_LOCAL; |
Andy Parkins | a1158ca | 2006-12-12 06:41:52 +0000 | [diff] [blame] | 75 | if (!strcasecmp(var+ofs, "current")) |
Arjen Laarhoven | 74bb2df | 2009-02-13 22:53:41 +0100 | [diff] [blame] | 76 | return BRANCH_COLOR_CURRENT; |
Felipe Contreras | dbda21f | 2013-04-14 21:37:49 -0500 | [diff] [blame] | 77 | if (!strcasecmp(var+ofs, "upstream")) |
| 78 | return BRANCH_COLOR_UPSTREAM; |
Jeff King | 8b8e862 | 2009-12-12 07:25:24 -0500 | [diff] [blame] | 79 | return -1; |
Andy Parkins | a1158ca | 2006-12-12 06:41:52 +0000 | [diff] [blame] | 80 | } |
| 81 | |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 82 | static int git_branch_config(const char *var, const char *value, void *cb) |
Andy Parkins | a1158ca | 2006-12-12 06:41:52 +0000 | [diff] [blame] | 83 | { |
Nguyễn Thái Ngọc Duy | ebe31ef | 2012-04-13 17:54:38 +0700 | [diff] [blame] | 84 | if (!prefixcmp(var, "column.")) |
| 85 | return git_column_config(var, value, "branch", &colopts); |
Andy Parkins | a1158ca | 2006-12-12 06:41:52 +0000 | [diff] [blame] | 86 | if (!strcmp(var, "color.branch")) { |
Jeff King | e269eb7 | 2011-08-17 22:03:48 -0700 | [diff] [blame] | 87 | branch_use_color = git_config_colorbool(var, value); |
Andy Parkins | a1158ca | 2006-12-12 06:41:52 +0000 | [diff] [blame] | 88 | return 0; |
| 89 | } |
Junio C Hamano | cc44c76 | 2007-02-20 01:53:29 -0800 | [diff] [blame] | 90 | if (!prefixcmp(var, "color.branch.")) { |
Andy Parkins | a1158ca | 2006-12-12 06:41:52 +0000 | [diff] [blame] | 91 | int slot = parse_branch_color_slot(var, 13); |
Jeff King | 8b8e862 | 2009-12-12 07:25:24 -0500 | [diff] [blame] | 92 | if (slot < 0) |
| 93 | return 0; |
Junio C Hamano | 5768c98 | 2008-02-11 10:45:50 -0800 | [diff] [blame] | 94 | if (!value) |
| 95 | return config_error_nonbool(var); |
Andy Parkins | a1158ca | 2006-12-12 06:41:52 +0000 | [diff] [blame] | 96 | color_parse(value, var, branch_colors[slot]); |
| 97 | return 0; |
| 98 | } |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 99 | return git_color_default_config(var, value, cb); |
Andy Parkins | a1158ca | 2006-12-12 06:41:52 +0000 | [diff] [blame] | 100 | } |
| 101 | |
Pierre Habouzit | 52fae7d | 2007-06-07 22:45:00 +0200 | [diff] [blame] | 102 | static const char *branch_get_color(enum color_branch ix) |
Andy Parkins | a1158ca | 2006-12-12 06:41:52 +0000 | [diff] [blame] | 103 | { |
Jeff King | daa0c3d | 2011-08-17 22:04:23 -0700 | [diff] [blame] | 104 | if (want_color(branch_use_color)) |
Andy Parkins | a1158ca | 2006-12-12 06:41:52 +0000 | [diff] [blame] | 105 | return branch_colors[ix]; |
| 106 | return ""; |
| 107 | } |
| 108 | |
Junio C Hamano | 99c419c | 2009-12-29 22:43:04 -0800 | [diff] [blame] | 109 | static int branch_merged(int kind, const char *name, |
| 110 | struct commit *rev, struct commit *head_rev) |
| 111 | { |
| 112 | /* |
| 113 | * This checks whether the merge bases of branch and HEAD (or |
| 114 | * the other branch this branch builds upon) contains the |
| 115 | * branch, which means that the branch has already been merged |
| 116 | * safely to HEAD (or the other branch). |
| 117 | */ |
| 118 | struct commit *reference_rev = NULL; |
| 119 | const char *reference_name = NULL; |
Nguyễn Thái Ngọc Duy | 96ec7b1 | 2011-12-13 21:17:48 +0700 | [diff] [blame] | 120 | void *reference_name_to_free = NULL; |
Junio C Hamano | 99c419c | 2009-12-29 22:43:04 -0800 | [diff] [blame] | 121 | int merged; |
| 122 | |
| 123 | if (kind == REF_LOCAL_BRANCH) { |
| 124 | struct branch *branch = branch_get(name); |
| 125 | unsigned char sha1[20]; |
| 126 | |
| 127 | if (branch && |
| 128 | branch->merge && |
| 129 | branch->merge[0] && |
| 130 | branch->merge[0]->dst && |
Nguyễn Thái Ngọc Duy | 96ec7b1 | 2011-12-13 21:17:48 +0700 | [diff] [blame] | 131 | (reference_name = reference_name_to_free = |
| 132 | resolve_refdup(branch->merge[0]->dst, sha1, 1, NULL)) != NULL) |
Junio C Hamano | 99c419c | 2009-12-29 22:43:04 -0800 | [diff] [blame] | 133 | reference_rev = lookup_commit_reference(sha1); |
| 134 | } |
| 135 | if (!reference_rev) |
| 136 | reference_rev = head_rev; |
| 137 | |
Junio C Hamano | a20efee | 2012-08-27 14:46:01 -0700 | [diff] [blame] | 138 | merged = in_merge_bases(rev, reference_rev); |
Junio C Hamano | 99c419c | 2009-12-29 22:43:04 -0800 | [diff] [blame] | 139 | |
| 140 | /* |
| 141 | * After the safety valve is fully redefined to "check with |
| 142 | * upstream, if any, otherwise with HEAD", we should just |
| 143 | * return the result of the in_merge_bases() above without |
| 144 | * any of the following code, but during the transition period, |
| 145 | * a gentle reminder is in order. |
| 146 | */ |
| 147 | if ((head_rev != reference_rev) && |
Junio C Hamano | a20efee | 2012-08-27 14:46:01 -0700 | [diff] [blame] | 148 | in_merge_bases(rev, head_rev) != merged) { |
Junio C Hamano | 99c419c | 2009-12-29 22:43:04 -0800 | [diff] [blame] | 149 | if (merged) |
Ævar Arnfjörð Bjarmason | 49df4b0 | 2011-02-22 23:41:34 +0000 | [diff] [blame] | 150 | warning(_("deleting branch '%s' that has been merged to\n" |
Junio C Hamano | 6c80cd2 | 2011-04-01 17:55:55 -0700 | [diff] [blame] | 151 | " '%s', but not yet merged to HEAD."), |
Junio C Hamano | 99c419c | 2009-12-29 22:43:04 -0800 | [diff] [blame] | 152 | name, reference_name); |
| 153 | else |
Ævar Arnfjörð Bjarmason | 49df4b0 | 2011-02-22 23:41:34 +0000 | [diff] [blame] | 154 | warning(_("not deleting branch '%s' that is not yet merged to\n" |
| 155 | " '%s', even though it is merged to HEAD."), |
Junio C Hamano | 99c419c | 2009-12-29 22:43:04 -0800 | [diff] [blame] | 156 | name, reference_name); |
| 157 | } |
Nguyễn Thái Ngọc Duy | 96ec7b1 | 2011-12-13 21:17:48 +0700 | [diff] [blame] | 158 | free(reference_name_to_free); |
Junio C Hamano | 99c419c | 2009-12-29 22:43:04 -0800 | [diff] [blame] | 159 | return merged; |
| 160 | } |
| 161 | |
René Scharfe | f5d0e16 | 2012-10-18 14:02:51 +0200 | [diff] [blame] | 162 | static int check_branch_commit(const char *branchname, const char *refname, |
| 163 | unsigned char *sha1, struct commit *head_rev, |
| 164 | int kinds, int force) |
| 165 | { |
| 166 | struct commit *rev = lookup_commit_reference(sha1); |
| 167 | if (!rev) { |
| 168 | error(_("Couldn't look up commit object for '%s'"), refname); |
| 169 | return -1; |
| 170 | } |
| 171 | if (!force && !branch_merged(kinds, branchname, rev, head_rev)) { |
| 172 | error(_("The branch '%s' is not fully merged.\n" |
| 173 | "If you are sure you want to delete it, " |
| 174 | "run 'git branch -D %s'."), branchname, branchname); |
| 175 | return -1; |
| 176 | } |
| 177 | return 0; |
| 178 | } |
| 179 | |
René Scharfe | 22ed792 | 2012-10-18 14:04:08 +0200 | [diff] [blame] | 180 | static void delete_branch_config(const char *branchname) |
| 181 | { |
| 182 | struct strbuf buf = STRBUF_INIT; |
| 183 | strbuf_addf(&buf, "branch.%s", branchname); |
| 184 | if (git_config_rename_section(buf.buf, NULL) < 0) |
| 185 | warning(_("Update of config-file failed")); |
| 186 | strbuf_release(&buf); |
| 187 | } |
| 188 | |
Jeff King | d65ddf1 | 2012-03-26 19:51:06 -0400 | [diff] [blame] | 189 | static int delete_branches(int argc, const char **argv, int force, int kinds, |
| 190 | int quiet) |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 191 | { |
René Scharfe | f5d0e16 | 2012-10-18 14:02:51 +0200 | [diff] [blame] | 192 | struct commit *head_rev = NULL; |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 193 | unsigned char sha1[20]; |
Quy Tonthat | b8e9a00 | 2006-12-19 09:42:16 +1100 | [diff] [blame] | 194 | char *name = NULL; |
Ævar Arnfjörð Bjarmason | c179837 | 2012-04-30 15:33:12 +0000 | [diff] [blame] | 195 | const char *fmt; |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 196 | int i; |
Quy Tonthat | b8e9a00 | 2006-12-19 09:42:16 +1100 | [diff] [blame] | 197 | int ret = 0; |
Ævar Arnfjörð Bjarmason | c179837 | 2012-04-30 15:33:12 +0000 | [diff] [blame] | 198 | int remote_branch = 0; |
Junio C Hamano | 8415d5c | 2009-02-13 23:08:05 -0800 | [diff] [blame] | 199 | struct strbuf bname = STRBUF_INIT; |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 200 | |
Junio C Hamano | f3d985c | 2006-12-17 23:58:16 -0800 | [diff] [blame] | 201 | switch (kinds) { |
| 202 | case REF_REMOTE_BRANCH: |
| 203 | fmt = "refs/remotes/%s"; |
Ævar Arnfjörð Bjarmason | c179837 | 2012-04-30 15:33:12 +0000 | [diff] [blame] | 204 | /* For subsequent UI messages */ |
| 205 | remote_branch = 1; |
| 206 | |
Junio C Hamano | f3d985c | 2006-12-17 23:58:16 -0800 | [diff] [blame] | 207 | force = 1; |
| 208 | break; |
| 209 | case REF_LOCAL_BRANCH: |
| 210 | fmt = "refs/heads/%s"; |
Junio C Hamano | f3d985c | 2006-12-17 23:58:16 -0800 | [diff] [blame] | 211 | break; |
| 212 | default: |
Ævar Arnfjörð Bjarmason | 49df4b0 | 2011-02-22 23:41:34 +0000 | [diff] [blame] | 213 | die(_("cannot use -a with -d")); |
Junio C Hamano | f3d985c | 2006-12-17 23:58:16 -0800 | [diff] [blame] | 214 | } |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 215 | |
Junio C Hamano | 67affd5 | 2006-11-24 23:10:23 -0800 | [diff] [blame] | 216 | if (!force) { |
| 217 | head_rev = lookup_commit_reference(head_sha1); |
| 218 | if (!head_rev) |
Ævar Arnfjörð Bjarmason | 49df4b0 | 2011-02-22 23:41:34 +0000 | [diff] [blame] | 219 | die(_("Couldn't look up commit object for HEAD")); |
Junio C Hamano | 67affd5 | 2006-11-24 23:10:23 -0800 | [diff] [blame] | 220 | } |
Junio C Hamano | 8415d5c | 2009-02-13 23:08:05 -0800 | [diff] [blame] | 221 | for (i = 0; i < argc; i++, strbuf_release(&bname)) { |
René Scharfe | 0fe700e | 2012-10-18 14:07:11 +0200 | [diff] [blame] | 222 | const char *target; |
| 223 | int flags = 0; |
| 224 | |
Junio C Hamano | a552de7 | 2009-03-21 13:17:30 -0700 | [diff] [blame] | 225 | strbuf_branchname(&bname, argv[i]); |
Junio C Hamano | 8415d5c | 2009-02-13 23:08:05 -0800 | [diff] [blame] | 226 | if (kinds == REF_LOCAL_BRANCH && !strcmp(head, bname.buf)) { |
Ævar Arnfjörð Bjarmason | 49df4b0 | 2011-02-22 23:41:34 +0000 | [diff] [blame] | 227 | error(_("Cannot delete the branch '%s' " |
| 228 | "which you are currently on."), bname.buf); |
Quy Tonthat | b8e9a00 | 2006-12-19 09:42:16 +1100 | [diff] [blame] | 229 | ret = 1; |
| 230 | continue; |
| 231 | } |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 232 | |
Jim Meyering | 8e0f700 | 2008-01-31 18:26:32 +0100 | [diff] [blame] | 233 | free(name); |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 234 | |
Ramsay Jones | 4e2d094 | 2012-09-04 18:31:14 +0100 | [diff] [blame] | 235 | name = mkpathdup(fmt, bname.buf); |
René Scharfe | 0fe700e | 2012-10-18 14:07:11 +0200 | [diff] [blame] | 236 | target = resolve_ref_unsafe(name, sha1, 0, &flags); |
| 237 | if (!target || |
| 238 | (!(flags & REF_ISSYMREF) && is_null_sha1(sha1))) { |
Ævar Arnfjörð Bjarmason | c179837 | 2012-04-30 15:33:12 +0000 | [diff] [blame] | 239 | error(remote_branch |
| 240 | ? _("remote branch '%s' not found.") |
| 241 | : _("branch '%s' not found."), bname.buf); |
Quy Tonthat | b8e9a00 | 2006-12-19 09:42:16 +1100 | [diff] [blame] | 242 | ret = 1; |
| 243 | continue; |
| 244 | } |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 245 | |
René Scharfe | 0fe700e | 2012-10-18 14:07:11 +0200 | [diff] [blame] | 246 | if (!(flags & REF_ISSYMREF) && |
| 247 | check_branch_commit(bname.buf, name, sha1, head_rev, kinds, |
René Scharfe | f5d0e16 | 2012-10-18 14:02:51 +0200 | [diff] [blame] | 248 | force)) { |
Quy Tonthat | b8e9a00 | 2006-12-19 09:42:16 +1100 | [diff] [blame] | 249 | ret = 1; |
| 250 | continue; |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 251 | } |
| 252 | |
René Scharfe | 566c770 | 2012-10-18 14:05:17 +0200 | [diff] [blame] | 253 | if (delete_ref(name, sha1, REF_NODEREF)) { |
Ævar Arnfjörð Bjarmason | c179837 | 2012-04-30 15:33:12 +0000 | [diff] [blame] | 254 | error(remote_branch |
| 255 | ? _("Error deleting remote branch '%s'") |
| 256 | : _("Error deleting branch '%s'"), |
Junio C Hamano | 8415d5c | 2009-02-13 23:08:05 -0800 | [diff] [blame] | 257 | bname.buf); |
Quy Tonthat | b8e9a00 | 2006-12-19 09:42:16 +1100 | [diff] [blame] | 258 | ret = 1; |
René Scharfe | 13baa9f | 2012-10-18 14:08:03 +0200 | [diff] [blame] | 259 | continue; |
Gerrit Pape | f1eccba | 2007-06-09 12:40:35 +0000 | [diff] [blame] | 260 | } |
René Scharfe | 13baa9f | 2012-10-18 14:08:03 +0200 | [diff] [blame] | 261 | if (!quiet) { |
| 262 | printf(remote_branch |
| 263 | ? _("Deleted remote branch %s (was %s).\n") |
| 264 | : _("Deleted branch %s (was %s).\n"), |
| 265 | bname.buf, |
| 266 | (flags & REF_ISSYMREF) |
| 267 | ? target |
| 268 | : find_unique_abbrev(sha1, DEFAULT_ABBREV)); |
| 269 | } |
| 270 | delete_branch_config(bname.buf); |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 271 | } |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 272 | |
Jim Meyering | 8e0f700 | 2008-01-31 18:26:32 +0100 | [diff] [blame] | 273 | free(name); |
Quy Tonthat | b8e9a00 | 2006-12-19 09:42:16 +1100 | [diff] [blame] | 274 | |
| 275 | return(ret); |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 276 | } |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 277 | |
Andy Parkins | bfcc921 | 2006-11-21 19:31:24 +0000 | [diff] [blame] | 278 | struct ref_item { |
| 279 | char *name; |
Jay Soffian | 209d336 | 2009-02-13 04:40:18 -0500 | [diff] [blame] | 280 | char *dest; |
Nguyễn Thái Ngọc Duy | 1452bd6 | 2012-08-26 01:17:12 +0700 | [diff] [blame] | 281 | unsigned int kind, width; |
Junio C Hamano | 68067ca | 2008-07-23 15:13:41 -0700 | [diff] [blame] | 282 | struct commit *commit; |
Andy Parkins | bfcc921 | 2006-11-21 19:31:24 +0000 | [diff] [blame] | 283 | }; |
| 284 | |
| 285 | struct ref_list { |
Junio C Hamano | 68067ca | 2008-07-23 15:13:41 -0700 | [diff] [blame] | 286 | struct rev_info revs; |
Linus Torvalds | 7e9ff00 | 2009-07-23 12:13:48 -0700 | [diff] [blame] | 287 | int index, alloc, maxwidth, verbose, abbrev; |
Andy Parkins | bfcc921 | 2006-11-21 19:31:24 +0000 | [diff] [blame] | 288 | struct ref_item *list; |
Junio C Hamano | 694a577 | 2007-11-07 14:58:09 -0800 | [diff] [blame] | 289 | struct commit_list *with_commit; |
Andy Parkins | bfcc921 | 2006-11-21 19:31:24 +0000 | [diff] [blame] | 290 | int kinds; |
| 291 | }; |
| 292 | |
Jay Soffian | 209d336 | 2009-02-13 04:40:18 -0500 | [diff] [blame] | 293 | static char *resolve_symref(const char *src, const char *prefix) |
| 294 | { |
| 295 | unsigned char sha1[20]; |
| 296 | int flag; |
| 297 | const char *dst, *cp; |
| 298 | |
Nguyễn Thái Ngọc Duy | 8cad474 | 2011-12-12 18:20:32 +0700 | [diff] [blame] | 299 | dst = resolve_ref_unsafe(src, sha1, 0, &flag); |
Jay Soffian | 209d336 | 2009-02-13 04:40:18 -0500 | [diff] [blame] | 300 | if (!(dst && (flag & REF_ISSYMREF))) |
| 301 | return NULL; |
| 302 | if (prefix && (cp = skip_prefix(dst, prefix))) |
| 303 | dst = cp; |
| 304 | return xstrdup(dst); |
| 305 | } |
| 306 | |
Simo Melenius | 1603ade | 2010-06-04 12:50:10 +0300 | [diff] [blame] | 307 | struct append_ref_cb { |
| 308 | struct ref_list *ref_list; |
Michael J Gruber | d8d3373 | 2011-08-28 16:54:32 +0200 | [diff] [blame] | 309 | const char **pattern; |
Simo Melenius | 1603ade | 2010-06-04 12:50:10 +0300 | [diff] [blame] | 310 | int ret; |
| 311 | }; |
| 312 | |
Michael J Gruber | d8d3373 | 2011-08-28 16:54:32 +0200 | [diff] [blame] | 313 | static int match_patterns(const char **pattern, const char *refname) |
| 314 | { |
| 315 | if (!*pattern) |
| 316 | return 1; /* no pattern always matches */ |
| 317 | while (*pattern) { |
| 318 | if (!fnmatch(*pattern, refname, 0)) |
| 319 | return 1; |
| 320 | pattern++; |
| 321 | } |
| 322 | return 0; |
| 323 | } |
| 324 | |
Andy Parkins | bfcc921 | 2006-11-21 19:31:24 +0000 | [diff] [blame] | 325 | static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data) |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 326 | { |
Simo Melenius | 1603ade | 2010-06-04 12:50:10 +0300 | [diff] [blame] | 327 | struct append_ref_cb *cb = (struct append_ref_cb *)(cb_data); |
| 328 | struct ref_list *ref_list = cb->ref_list; |
Andy Parkins | bfcc921 | 2006-11-21 19:31:24 +0000 | [diff] [blame] | 329 | struct ref_item *newitem; |
Junio C Hamano | 68067ca | 2008-07-23 15:13:41 -0700 | [diff] [blame] | 330 | struct commit *commit; |
Jay Soffian | 209d336 | 2009-02-13 04:40:18 -0500 | [diff] [blame] | 331 | int kind, i; |
| 332 | const char *prefix, *orig_refname = refname; |
| 333 | |
| 334 | static struct { |
| 335 | int kind; |
| 336 | const char *prefix; |
| 337 | int pfxlen; |
| 338 | } ref_kind[] = { |
| 339 | { REF_LOCAL_BRANCH, "refs/heads/", 11 }, |
| 340 | { REF_REMOTE_BRANCH, "refs/remotes/", 13 }, |
| 341 | }; |
Andy Parkins | bfcc921 | 2006-11-21 19:31:24 +0000 | [diff] [blame] | 342 | |
| 343 | /* Detect kind */ |
Jay Soffian | 209d336 | 2009-02-13 04:40:18 -0500 | [diff] [blame] | 344 | for (i = 0; i < ARRAY_SIZE(ref_kind); i++) { |
| 345 | prefix = ref_kind[i].prefix; |
| 346 | if (strncmp(refname, prefix, ref_kind[i].pfxlen)) |
| 347 | continue; |
| 348 | kind = ref_kind[i].kind; |
| 349 | refname += ref_kind[i].pfxlen; |
| 350 | break; |
| 351 | } |
| 352 | if (ARRAY_SIZE(ref_kind) <= i) |
Junio C Hamano | 0f31d68 | 2008-07-23 14:52:47 -0700 | [diff] [blame] | 353 | return 0; |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 354 | |
Andy Parkins | bfcc921 | 2006-11-21 19:31:24 +0000 | [diff] [blame] | 355 | /* Don't add types the caller doesn't want */ |
| 356 | if ((kind & ref_list->kinds) == 0) |
| 357 | return 0; |
| 358 | |
Michael J Gruber | d8d3373 | 2011-08-28 16:54:32 +0200 | [diff] [blame] | 359 | if (!match_patterns(cb->pattern, refname)) |
| 360 | return 0; |
| 361 | |
Linus Torvalds | 191d1ac | 2009-07-23 12:05:34 -0700 | [diff] [blame] | 362 | commit = NULL; |
| 363 | if (ref_list->verbose || ref_list->with_commit || merge_filter != NO_FILTER) { |
| 364 | commit = lookup_commit_reference_gently(sha1, 1); |
Simo Melenius | 1603ade | 2010-06-04 12:50:10 +0300 | [diff] [blame] | 365 | if (!commit) { |
Ævar Arnfjörð Bjarmason | 49df4b0 | 2011-02-22 23:41:34 +0000 | [diff] [blame] | 366 | cb->ret = error(_("branch '%s' does not point at a commit"), refname); |
Simo Melenius | 0e9716e | 2010-06-04 12:50:11 +0300 | [diff] [blame] | 367 | return 0; |
Simo Melenius | 1603ade | 2010-06-04 12:50:10 +0300 | [diff] [blame] | 368 | } |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 369 | |
Linus Torvalds | 191d1ac | 2009-07-23 12:05:34 -0700 | [diff] [blame] | 370 | /* Filter with with_commit if specified */ |
| 371 | if (!is_descendant_of(commit, ref_list->with_commit)) |
| 372 | return 0; |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 373 | |
Linus Torvalds | 191d1ac | 2009-07-23 12:05:34 -0700 | [diff] [blame] | 374 | if (merge_filter != NO_FILTER) |
| 375 | add_pending_object(&ref_list->revs, |
| 376 | (struct object *)commit, refname); |
| 377 | } |
Lars Hjemli | e8b404c | 2008-04-17 22:24:50 +0200 | [diff] [blame] | 378 | |
Thiago Farina | fcbc0d8 | 2010-12-13 23:59:55 -0200 | [diff] [blame] | 379 | ALLOC_GROW(ref_list->list, ref_list->index + 1, ref_list->alloc); |
Andy Parkins | bfcc921 | 2006-11-21 19:31:24 +0000 | [diff] [blame] | 380 | |
| 381 | /* Record the new item */ |
| 382 | newitem = &(ref_list->list[ref_list->index++]); |
| 383 | newitem->name = xstrdup(refname); |
| 384 | newitem->kind = kind; |
Junio C Hamano | 68067ca | 2008-07-23 15:13:41 -0700 | [diff] [blame] | 385 | newitem->commit = commit; |
Nguyễn Thái Ngọc Duy | 1452bd6 | 2012-08-26 01:17:12 +0700 | [diff] [blame] | 386 | newitem->width = utf8_strwidth(refname); |
Jay Soffian | 209d336 | 2009-02-13 04:40:18 -0500 | [diff] [blame] | 387 | newitem->dest = resolve_symref(orig_refname, prefix); |
| 388 | /* adjust for "remotes/" */ |
| 389 | if (newitem->kind == REF_REMOTE_BRANCH && |
| 390 | ref_list->kinds != REF_REMOTE_BRANCH) |
Nguyễn Thái Ngọc Duy | 1452bd6 | 2012-08-26 01:17:12 +0700 | [diff] [blame] | 391 | newitem->width += 8; |
| 392 | if (newitem->width > ref_list->maxwidth) |
| 393 | ref_list->maxwidth = newitem->width; |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 394 | |
| 395 | return 0; |
| 396 | } |
| 397 | |
Andy Parkins | bfcc921 | 2006-11-21 19:31:24 +0000 | [diff] [blame] | 398 | static void free_ref_list(struct ref_list *ref_list) |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 399 | { |
Andy Parkins | bfcc921 | 2006-11-21 19:31:24 +0000 | [diff] [blame] | 400 | int i; |
| 401 | |
Jay Soffian | 209d336 | 2009-02-13 04:40:18 -0500 | [diff] [blame] | 402 | for (i = 0; i < ref_list->index; i++) { |
Andy Parkins | bfcc921 | 2006-11-21 19:31:24 +0000 | [diff] [blame] | 403 | free(ref_list->list[i].name); |
Jay Soffian | 209d336 | 2009-02-13 04:40:18 -0500 | [diff] [blame] | 404 | free(ref_list->list[i].dest); |
| 405 | } |
Andy Parkins | bfcc921 | 2006-11-21 19:31:24 +0000 | [diff] [blame] | 406 | free(ref_list->list); |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 407 | } |
| 408 | |
Andy Parkins | bfcc921 | 2006-11-21 19:31:24 +0000 | [diff] [blame] | 409 | static int ref_cmp(const void *r1, const void *r2) |
| 410 | { |
| 411 | struct ref_item *c1 = (struct ref_item *)(r1); |
| 412 | struct ref_item *c2 = (struct ref_item *)(r2); |
| 413 | |
| 414 | if (c1->kind != c2->kind) |
| 415 | return c1->kind - c2->kind; |
| 416 | return strcmp(c1->name, c2->name); |
| 417 | } |
| 418 | |
Jeff King | 2d8a7f0 | 2009-04-07 03:16:56 -0400 | [diff] [blame] | 419 | static void fill_tracking_info(struct strbuf *stat, const char *branch_name, |
| 420 | int show_upstream_ref) |
Junio C Hamano | 94fcb73 | 2008-07-02 00:52:41 -0700 | [diff] [blame] | 421 | { |
| 422 | int ours, theirs; |
Nguyễn Thái Ngọc Duy | 21dfc09 | 2012-05-03 20:12:00 +0700 | [diff] [blame] | 423 | char *ref = NULL; |
Junio C Hamano | 94fcb73 | 2008-07-02 00:52:41 -0700 | [diff] [blame] | 424 | struct branch *branch = branch_get(branch_name); |
Felipe Contreras | dbda21f | 2013-04-14 21:37:49 -0500 | [diff] [blame] | 425 | struct strbuf fancy = STRBUF_INIT; |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 426 | int upstream_is_gone = 0; |
Torstein Hegge | 6b364d4 | 2013-11-14 19:18:01 +0100 | [diff] [blame] | 427 | int added_decoration = 1; |
Junio C Hamano | 94fcb73 | 2008-07-02 00:52:41 -0700 | [diff] [blame] | 428 | |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 429 | switch (stat_tracking_info(branch, &ours, &theirs)) { |
| 430 | case 0: |
| 431 | /* no base */ |
Junio C Hamano | 94fcb73 | 2008-07-02 00:52:41 -0700 | [diff] [blame] | 432 | return; |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 433 | case -1: |
| 434 | /* with "gone" base */ |
| 435 | upstream_is_gone = 1; |
| 436 | break; |
| 437 | default: |
| 438 | /* with base */ |
| 439 | break; |
Jeff King | 2d8a7f0 | 2009-04-07 03:16:56 -0400 | [diff] [blame] | 440 | } |
| 441 | |
Felipe Contreras | dbda21f | 2013-04-14 21:37:49 -0500 | [diff] [blame] | 442 | if (show_upstream_ref) { |
Nguyễn Thái Ngọc Duy | 21dfc09 | 2012-05-03 20:12:00 +0700 | [diff] [blame] | 443 | ref = shorten_unambiguous_ref(branch->merge[0]->dst, 0); |
Felipe Contreras | dbda21f | 2013-04-14 21:37:49 -0500 | [diff] [blame] | 444 | if (want_color(branch_use_color)) |
| 445 | strbuf_addf(&fancy, "%s%s%s", |
| 446 | branch_get_color(BRANCH_COLOR_UPSTREAM), |
| 447 | ref, branch_get_color(BRANCH_COLOR_RESET)); |
| 448 | else |
| 449 | strbuf_addstr(&fancy, ref); |
| 450 | } |
| 451 | |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 452 | if (upstream_is_gone) { |
| 453 | if (show_upstream_ref) |
| 454 | strbuf_addf(stat, _("[%s: gone]"), fancy.buf); |
Torstein Hegge | 6b364d4 | 2013-11-14 19:18:01 +0100 | [diff] [blame] | 455 | else |
| 456 | added_decoration = 0; |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 457 | } else if (!ours && !theirs) { |
| 458 | if (show_upstream_ref) |
| 459 | strbuf_addf(stat, _("[%s]"), fancy.buf); |
Torstein Hegge | 6b364d4 | 2013-11-14 19:18:01 +0100 | [diff] [blame] | 460 | else |
| 461 | added_decoration = 0; |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 462 | } else if (!ours) { |
| 463 | if (show_upstream_ref) |
Felipe Contreras | dbda21f | 2013-04-14 21:37:49 -0500 | [diff] [blame] | 464 | strbuf_addf(stat, _("[%s: behind %d]"), fancy.buf, theirs); |
Nguyễn Thái Ngọc Duy | 21dfc09 | 2012-05-03 20:12:00 +0700 | [diff] [blame] | 465 | else |
| 466 | strbuf_addf(stat, _("[behind %d]"), theirs); |
| 467 | |
| 468 | } else if (!theirs) { |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 469 | if (show_upstream_ref) |
Felipe Contreras | dbda21f | 2013-04-14 21:37:49 -0500 | [diff] [blame] | 470 | strbuf_addf(stat, _("[%s: ahead %d]"), fancy.buf, ours); |
Nguyễn Thái Ngọc Duy | 21dfc09 | 2012-05-03 20:12:00 +0700 | [diff] [blame] | 471 | else |
| 472 | strbuf_addf(stat, _("[ahead %d]"), ours); |
| 473 | } else { |
Jiang Xin | f2e0873 | 2013-08-26 15:02:48 +0800 | [diff] [blame] | 474 | if (show_upstream_ref) |
Nguyễn Thái Ngọc Duy | 21dfc09 | 2012-05-03 20:12:00 +0700 | [diff] [blame] | 475 | strbuf_addf(stat, _("[%s: ahead %d, behind %d]"), |
Felipe Contreras | dbda21f | 2013-04-14 21:37:49 -0500 | [diff] [blame] | 476 | fancy.buf, ours, theirs); |
Nguyễn Thái Ngọc Duy | 21dfc09 | 2012-05-03 20:12:00 +0700 | [diff] [blame] | 477 | else |
| 478 | strbuf_addf(stat, _("[ahead %d, behind %d]"), |
| 479 | ours, theirs); |
| 480 | } |
Felipe Contreras | dbda21f | 2013-04-14 21:37:49 -0500 | [diff] [blame] | 481 | strbuf_release(&fancy); |
Torstein Hegge | 6b364d4 | 2013-11-14 19:18:01 +0100 | [diff] [blame] | 482 | if (added_decoration) |
| 483 | strbuf_addch(stat, ' '); |
Nguyễn Thái Ngọc Duy | 21dfc09 | 2012-05-03 20:12:00 +0700 | [diff] [blame] | 484 | free(ref); |
Junio C Hamano | 94fcb73 | 2008-07-02 00:52:41 -0700 | [diff] [blame] | 485 | } |
| 486 | |
Lars Hjemli | 7950cda | 2008-07-26 12:27:24 +0200 | [diff] [blame] | 487 | static int matches_merge_filter(struct commit *commit) |
| 488 | { |
| 489 | int is_merged; |
| 490 | |
| 491 | if (merge_filter == NO_FILTER) |
| 492 | return 1; |
| 493 | |
| 494 | is_merged = !!(commit->object.flags & UNINTERESTING); |
| 495 | return (is_merged == (merge_filter == SHOW_MERGED)); |
| 496 | } |
| 497 | |
Jonathan Nieder | 6e0332e | 2011-03-16 02:10:14 -0500 | [diff] [blame] | 498 | static void add_verbose_info(struct strbuf *out, struct ref_item *item, |
| 499 | int verbose, int abbrev) |
| 500 | { |
| 501 | struct strbuf subject = STRBUF_INIT, stat = STRBUF_INIT; |
Nguyễn Thái Ngọc Duy | 045e388 | 2013-01-28 08:18:16 +0700 | [diff] [blame] | 502 | const char *sub = _(" **** invalid ref ****"); |
Jonathan Nieder | 6e0332e | 2011-03-16 02:10:14 -0500 | [diff] [blame] | 503 | struct commit *commit = item->commit; |
| 504 | |
| 505 | if (commit && !parse_commit(commit)) { |
Junio C Hamano | f67d2e8 | 2011-05-31 12:19:11 -0700 | [diff] [blame] | 506 | pp_commit_easy(CMIT_FMT_ONELINE, commit, &subject); |
Jonathan Nieder | 6e0332e | 2011-03-16 02:10:14 -0500 | [diff] [blame] | 507 | sub = subject.buf; |
| 508 | } |
| 509 | |
| 510 | if (item->kind == REF_LOCAL_BRANCH) |
| 511 | fill_tracking_info(&stat, item->name, verbose > 1); |
| 512 | |
| 513 | strbuf_addf(out, " %s %s%s", |
| 514 | find_unique_abbrev(item->commit->object.sha1, abbrev), |
| 515 | stat.buf, sub); |
| 516 | strbuf_release(&stat); |
| 517 | strbuf_release(&subject); |
| 518 | } |
| 519 | |
Lars Hjemli | af0e4ac | 2007-01-03 21:10:09 +0100 | [diff] [blame] | 520 | static void print_ref_item(struct ref_item *item, int maxwidth, int verbose, |
Jay Soffian | 209d336 | 2009-02-13 04:40:18 -0500 | [diff] [blame] | 521 | int abbrev, int current, char *prefix) |
Lars Hjemli | 75e6e21 | 2006-11-24 14:45:10 +0100 | [diff] [blame] | 522 | { |
Lars Hjemli | af0e4ac | 2007-01-03 21:10:09 +0100 | [diff] [blame] | 523 | char c; |
| 524 | int color; |
Junio C Hamano | 68067ca | 2008-07-23 15:13:41 -0700 | [diff] [blame] | 525 | struct commit *commit = item->commit; |
Jay Soffian | 209d336 | 2009-02-13 04:40:18 -0500 | [diff] [blame] | 526 | struct strbuf out = STRBUF_INIT, name = STRBUF_INIT; |
Junio C Hamano | 68067ca | 2008-07-23 15:13:41 -0700 | [diff] [blame] | 527 | |
Lars Hjemli | 7950cda | 2008-07-26 12:27:24 +0200 | [diff] [blame] | 528 | if (!matches_merge_filter(commit)) |
| 529 | return; |
Lars Hjemli | 75e6e21 | 2006-11-24 14:45:10 +0100 | [diff] [blame] | 530 | |
Lars Hjemli | af0e4ac | 2007-01-03 21:10:09 +0100 | [diff] [blame] | 531 | switch (item->kind) { |
| 532 | case REF_LOCAL_BRANCH: |
Arjen Laarhoven | 74bb2df | 2009-02-13 22:53:41 +0100 | [diff] [blame] | 533 | color = BRANCH_COLOR_LOCAL; |
Lars Hjemli | af0e4ac | 2007-01-03 21:10:09 +0100 | [diff] [blame] | 534 | break; |
| 535 | case REF_REMOTE_BRANCH: |
Arjen Laarhoven | 74bb2df | 2009-02-13 22:53:41 +0100 | [diff] [blame] | 536 | color = BRANCH_COLOR_REMOTE; |
Lars Hjemli | af0e4ac | 2007-01-03 21:10:09 +0100 | [diff] [blame] | 537 | break; |
| 538 | default: |
Arjen Laarhoven | 74bb2df | 2009-02-13 22:53:41 +0100 | [diff] [blame] | 539 | color = BRANCH_COLOR_PLAIN; |
Lars Hjemli | af0e4ac | 2007-01-03 21:10:09 +0100 | [diff] [blame] | 540 | break; |
| 541 | } |
Lars Hjemli | 75e6e21 | 2006-11-24 14:45:10 +0100 | [diff] [blame] | 542 | |
Lars Hjemli | af0e4ac | 2007-01-03 21:10:09 +0100 | [diff] [blame] | 543 | c = ' '; |
| 544 | if (current) { |
| 545 | c = '*'; |
Arjen Laarhoven | 74bb2df | 2009-02-13 22:53:41 +0100 | [diff] [blame] | 546 | color = BRANCH_COLOR_CURRENT; |
Lars Hjemli | af0e4ac | 2007-01-03 21:10:09 +0100 | [diff] [blame] | 547 | } |
Lars Hjemli | 75e6e21 | 2006-11-24 14:45:10 +0100 | [diff] [blame] | 548 | |
Jay Soffian | 209d336 | 2009-02-13 04:40:18 -0500 | [diff] [blame] | 549 | strbuf_addf(&name, "%s%s", prefix, item->name); |
Nguyễn Thái Ngọc Duy | 1452bd6 | 2012-08-26 01:17:12 +0700 | [diff] [blame] | 550 | if (verbose) { |
| 551 | int utf8_compensation = strlen(name.buf) - utf8_strwidth(name.buf); |
Jay Soffian | 209d336 | 2009-02-13 04:40:18 -0500 | [diff] [blame] | 552 | strbuf_addf(&out, "%c %s%-*s%s", c, branch_get_color(color), |
Nguyễn Thái Ngọc Duy | 1452bd6 | 2012-08-26 01:17:12 +0700 | [diff] [blame] | 553 | maxwidth + utf8_compensation, name.buf, |
Junio C Hamano | 8147426 | 2009-03-05 15:41:35 -0800 | [diff] [blame] | 554 | branch_get_color(BRANCH_COLOR_RESET)); |
Nguyễn Thái Ngọc Duy | 1452bd6 | 2012-08-26 01:17:12 +0700 | [diff] [blame] | 555 | } else |
Jay Soffian | 209d336 | 2009-02-13 04:40:18 -0500 | [diff] [blame] | 556 | strbuf_addf(&out, "%c %s%s%s", c, branch_get_color(color), |
Junio C Hamano | 8147426 | 2009-03-05 15:41:35 -0800 | [diff] [blame] | 557 | name.buf, branch_get_color(BRANCH_COLOR_RESET)); |
Jay Soffian | 209d336 | 2009-02-13 04:40:18 -0500 | [diff] [blame] | 558 | |
| 559 | if (item->dest) |
| 560 | strbuf_addf(&out, " -> %s", item->dest); |
Jonathan Nieder | 6e0332e | 2011-03-16 02:10:14 -0500 | [diff] [blame] | 561 | else if (verbose) |
| 562 | /* " f7c0c00 [ahead 58, behind 197] vcs-svn: drop obj_pool.h" */ |
| 563 | add_verbose_info(&out, item, verbose, abbrev); |
Nguyễn Thái Ngọc Duy | ebe31ef | 2012-04-13 17:54:38 +0700 | [diff] [blame] | 564 | if (column_active(colopts)) { |
| 565 | assert(!verbose && "--column and --verbose are incompatible"); |
| 566 | string_list_append(&output, out.buf); |
| 567 | } else { |
| 568 | printf("%s\n", out.buf); |
| 569 | } |
Jay Soffian | 209d336 | 2009-02-13 04:40:18 -0500 | [diff] [blame] | 570 | strbuf_release(&name); |
| 571 | strbuf_release(&out); |
Lars Hjemli | 75e6e21 | 2006-11-24 14:45:10 +0100 | [diff] [blame] | 572 | } |
| 573 | |
Lars Hjemli | b6f637d | 2008-07-26 12:27:25 +0200 | [diff] [blame] | 574 | static int calc_maxwidth(struct ref_list *refs) |
| 575 | { |
Jay Soffian | 209d336 | 2009-02-13 04:40:18 -0500 | [diff] [blame] | 576 | int i, w = 0; |
Lars Hjemli | b6f637d | 2008-07-26 12:27:25 +0200 | [diff] [blame] | 577 | for (i = 0; i < refs->index; i++) { |
| 578 | if (!matches_merge_filter(refs->list[i].commit)) |
| 579 | continue; |
Nguyễn Thái Ngọc Duy | 1452bd6 | 2012-08-26 01:17:12 +0700 | [diff] [blame] | 580 | if (refs->list[i].width > w) |
| 581 | w = refs->list[i].width; |
Lars Hjemli | b6f637d | 2008-07-26 12:27:25 +0200 | [diff] [blame] | 582 | } |
| 583 | return w; |
| 584 | } |
| 585 | |
Nguyễn Thái Ngọc Duy | c8183cd | 2013-03-13 18:42:53 +0700 | [diff] [blame] | 586 | static char *get_head_description(void) |
| 587 | { |
| 588 | struct strbuf desc = STRBUF_INIT; |
| 589 | struct wt_status_state state; |
| 590 | memset(&state, 0, sizeof(state)); |
| 591 | wt_status_get_state(&state, 1); |
| 592 | if (state.rebase_in_progress || |
| 593 | state.rebase_interactive_in_progress) |
| 594 | strbuf_addf(&desc, _("(no branch, rebasing %s)"), |
| 595 | state.branch); |
| 596 | else if (state.bisect_in_progress) |
Nguyễn Thái Ngọc Duy | 6deab24 | 2013-03-23 10:52:44 +0700 | [diff] [blame] | 597 | strbuf_addf(&desc, _("(no branch, bisect started on %s)"), |
Nguyễn Thái Ngọc Duy | c8183cd | 2013-03-13 18:42:53 +0700 | [diff] [blame] | 598 | state.branch); |
| 599 | else if (state.detached_from) |
| 600 | strbuf_addf(&desc, _("(detached from %s)"), |
| 601 | state.detached_from); |
| 602 | else |
| 603 | strbuf_addstr(&desc, _("(no branch)")); |
| 604 | free(state.branch); |
| 605 | free(state.onto); |
| 606 | free(state.detached_from); |
| 607 | return strbuf_detach(&desc, NULL); |
| 608 | } |
Linus Torvalds | 7e9ff00 | 2009-07-23 12:13:48 -0700 | [diff] [blame] | 609 | |
| 610 | static void show_detached(struct ref_list *ref_list) |
| 611 | { |
| 612 | struct commit *head_commit = lookup_commit_reference_gently(head_sha1, 1); |
| 613 | |
| 614 | if (head_commit && is_descendant_of(head_commit, ref_list->with_commit)) { |
| 615 | struct ref_item item; |
Nguyễn Thái Ngọc Duy | c8183cd | 2013-03-13 18:42:53 +0700 | [diff] [blame] | 616 | item.name = get_head_description(); |
Nguyễn Thái Ngọc Duy | 1452bd6 | 2012-08-26 01:17:12 +0700 | [diff] [blame] | 617 | item.width = utf8_strwidth(item.name); |
Linus Torvalds | 7e9ff00 | 2009-07-23 12:13:48 -0700 | [diff] [blame] | 618 | item.kind = REF_LOCAL_BRANCH; |
| 619 | item.dest = NULL; |
| 620 | item.commit = head_commit; |
Nguyễn Thái Ngọc Duy | 1452bd6 | 2012-08-26 01:17:12 +0700 | [diff] [blame] | 621 | if (item.width > ref_list->maxwidth) |
| 622 | ref_list->maxwidth = item.width; |
Linus Torvalds | 7e9ff00 | 2009-07-23 12:13:48 -0700 | [diff] [blame] | 623 | print_ref_item(&item, ref_list->maxwidth, ref_list->verbose, ref_list->abbrev, 1, ""); |
| 624 | free(item.name); |
| 625 | } |
| 626 | } |
| 627 | |
Michael J Gruber | d8d3373 | 2011-08-28 16:54:32 +0200 | [diff] [blame] | 628 | static int print_ref_list(int kinds, int detached, int verbose, int abbrev, struct commit_list *with_commit, const char **pattern) |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 629 | { |
| 630 | int i; |
Simo Melenius | 1603ade | 2010-06-04 12:50:10 +0300 | [diff] [blame] | 631 | struct append_ref_cb cb; |
Andy Parkins | bfcc921 | 2006-11-21 19:31:24 +0000 | [diff] [blame] | 632 | struct ref_list ref_list; |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 633 | |
Andy Parkins | bfcc921 | 2006-11-21 19:31:24 +0000 | [diff] [blame] | 634 | memset(&ref_list, 0, sizeof(ref_list)); |
| 635 | ref_list.kinds = kinds; |
Linus Torvalds | 191d1ac | 2009-07-23 12:05:34 -0700 | [diff] [blame] | 636 | ref_list.verbose = verbose; |
Linus Torvalds | 7e9ff00 | 2009-07-23 12:13:48 -0700 | [diff] [blame] | 637 | ref_list.abbrev = abbrev; |
Junio C Hamano | 694a577 | 2007-11-07 14:58:09 -0800 | [diff] [blame] | 638 | ref_list.with_commit = with_commit; |
Junio C Hamano | 68067ca | 2008-07-23 15:13:41 -0700 | [diff] [blame] | 639 | if (merge_filter != NO_FILTER) |
| 640 | init_revisions(&ref_list.revs, NULL); |
Simo Melenius | 1603ade | 2010-06-04 12:50:10 +0300 | [diff] [blame] | 641 | cb.ref_list = &ref_list; |
Michael J Gruber | d8d3373 | 2011-08-28 16:54:32 +0200 | [diff] [blame] | 642 | cb.pattern = pattern; |
Simo Melenius | 1603ade | 2010-06-04 12:50:10 +0300 | [diff] [blame] | 643 | cb.ret = 0; |
| 644 | for_each_rawref(append_ref, &cb); |
Junio C Hamano | 68067ca | 2008-07-23 15:13:41 -0700 | [diff] [blame] | 645 | if (merge_filter != NO_FILTER) { |
| 646 | struct commit *filter; |
| 647 | filter = lookup_commit_reference_gently(merge_filter_ref, 0); |
Carlos Martín Nieto | 6c41e97 | 2012-02-27 16:11:53 +0100 | [diff] [blame] | 648 | if (!filter) |
Nguyễn Thái Ngọc Duy | 045e388 | 2013-01-28 08:18:16 +0700 | [diff] [blame] | 649 | die(_("object '%s' does not point to a commit"), |
Carlos Martín Nieto | 6c41e97 | 2012-02-27 16:11:53 +0100 | [diff] [blame] | 650 | sha1_to_hex(merge_filter_ref)); |
| 651 | |
Junio C Hamano | 68067ca | 2008-07-23 15:13:41 -0700 | [diff] [blame] | 652 | filter->object.flags |= UNINTERESTING; |
| 653 | add_pending_object(&ref_list.revs, |
| 654 | (struct object *) filter, ""); |
| 655 | ref_list.revs.limited = 1; |
| 656 | prepare_revision_walk(&ref_list.revs); |
Lars Hjemli | b6f637d | 2008-07-26 12:27:25 +0200 | [diff] [blame] | 657 | if (verbose) |
| 658 | ref_list.maxwidth = calc_maxwidth(&ref_list); |
Junio C Hamano | 68067ca | 2008-07-23 15:13:41 -0700 | [diff] [blame] | 659 | } |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 660 | |
Andy Parkins | bfcc921 | 2006-11-21 19:31:24 +0000 | [diff] [blame] | 661 | qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp); |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 662 | |
Lars Hjemli | 0016a48 | 2007-01-03 21:10:10 +0100 | [diff] [blame] | 663 | detached = (detached && (kinds & REF_LOCAL_BRANCH)); |
Michael J Gruber | d8d3373 | 2011-08-28 16:54:32 +0200 | [diff] [blame] | 664 | if (detached && match_patterns(pattern, "HEAD")) |
Linus Torvalds | 7e9ff00 | 2009-07-23 12:13:48 -0700 | [diff] [blame] | 665 | show_detached(&ref_list); |
Lars Hjemli | 0016a48 | 2007-01-03 21:10:10 +0100 | [diff] [blame] | 666 | |
Andy Parkins | bfcc921 | 2006-11-21 19:31:24 +0000 | [diff] [blame] | 667 | for (i = 0; i < ref_list.index; i++) { |
Lars Hjemli | 0016a48 | 2007-01-03 21:10:10 +0100 | [diff] [blame] | 668 | int current = !detached && |
| 669 | (ref_list.list[i].kind == REF_LOCAL_BRANCH) && |
Lars Hjemli | af0e4ac | 2007-01-03 21:10:09 +0100 | [diff] [blame] | 670 | !strcmp(ref_list.list[i].name, head); |
Jay Soffian | 209d336 | 2009-02-13 04:40:18 -0500 | [diff] [blame] | 671 | char *prefix = (kinds != REF_REMOTE_BRANCH && |
| 672 | ref_list.list[i].kind == REF_REMOTE_BRANCH) |
| 673 | ? "remotes/" : ""; |
Lars Hjemli | af0e4ac | 2007-01-03 21:10:09 +0100 | [diff] [blame] | 674 | print_ref_item(&ref_list.list[i], ref_list.maxwidth, verbose, |
Jay Soffian | 209d336 | 2009-02-13 04:40:18 -0500 | [diff] [blame] | 675 | abbrev, current, prefix); |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 676 | } |
Andy Parkins | bfcc921 | 2006-11-21 19:31:24 +0000 | [diff] [blame] | 677 | |
| 678 | free_ref_list(&ref_list); |
Simo Melenius | 1603ade | 2010-06-04 12:50:10 +0300 | [diff] [blame] | 679 | |
Simo Melenius | 0e9716e | 2010-06-04 12:50:11 +0300 | [diff] [blame] | 680 | if (cb.ret) |
Ævar Arnfjörð Bjarmason | 49df4b0 | 2011-02-22 23:41:34 +0000 | [diff] [blame] | 681 | error(_("some refs could not be read")); |
Simo Melenius | 0e9716e | 2010-06-04 12:50:11 +0300 | [diff] [blame] | 682 | |
Simo Melenius | 1603ade | 2010-06-04 12:50:10 +0300 | [diff] [blame] | 683 | return cb.ret; |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 684 | } |
| 685 | |
Lars Hjemli | c976d41 | 2006-11-28 15:47:40 +0100 | [diff] [blame] | 686 | static void rename_branch(const char *oldname, const char *newname, int force) |
| 687 | { |
Miklos Vajna | da3f78a | 2008-11-17 21:48:37 +0100 | [diff] [blame] | 688 | struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT; |
Miklos Vajna | da3f78a | 2008-11-17 21:48:37 +0100 | [diff] [blame] | 689 | struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT; |
Junio C Hamano | cbdffe4 | 2009-03-21 13:27:31 -0700 | [diff] [blame] | 690 | int recovery = 0; |
Jonathan Nieder | 3f59481 | 2011-11-25 20:30:02 -0600 | [diff] [blame] | 691 | int clobber_head_ok; |
Lars Hjemli | c976d41 | 2006-11-28 15:47:40 +0100 | [diff] [blame] | 692 | |
Junio C Hamano | c847f53 | 2007-01-01 23:31:08 -0800 | [diff] [blame] | 693 | if (!oldname) |
Ævar Arnfjörð Bjarmason | 49df4b0 | 2011-02-22 23:41:34 +0000 | [diff] [blame] | 694 | die(_("cannot rename the current branch while not on any.")); |
Junio C Hamano | c847f53 | 2007-01-01 23:31:08 -0800 | [diff] [blame] | 695 | |
Junio C Hamano | cbdffe4 | 2009-03-21 13:27:31 -0700 | [diff] [blame] | 696 | if (strbuf_check_branch_ref(&oldref, oldname)) { |
| 697 | /* |
| 698 | * Bad name --- this could be an attempt to rename a |
| 699 | * ref that we used to allow to be created by accident. |
| 700 | */ |
Nguyễn Thái Ngọc Duy | c689332 | 2011-11-13 17:22:14 +0700 | [diff] [blame] | 701 | if (ref_exists(oldref.buf)) |
Junio C Hamano | cbdffe4 | 2009-03-21 13:27:31 -0700 | [diff] [blame] | 702 | recovery = 1; |
| 703 | else |
Ævar Arnfjörð Bjarmason | 49df4b0 | 2011-02-22 23:41:34 +0000 | [diff] [blame] | 704 | die(_("Invalid branch name: '%s'"), oldname); |
Junio C Hamano | cbdffe4 | 2009-03-21 13:27:31 -0700 | [diff] [blame] | 705 | } |
Lars Hjemli | c976d41 | 2006-11-28 15:47:40 +0100 | [diff] [blame] | 706 | |
Jonathan Nieder | 3f59481 | 2011-11-25 20:30:02 -0600 | [diff] [blame] | 707 | /* |
| 708 | * A command like "git branch -M currentbranch currentbranch" cannot |
| 709 | * cause the worktree to become inconsistent with HEAD, so allow it. |
| 710 | */ |
| 711 | clobber_head_ok = !strcmp(oldname, newname); |
| 712 | |
| 713 | validate_new_branchname(newname, &newref, force, clobber_head_ok); |
Lars Hjemli | c976d41 | 2006-11-28 15:47:40 +0100 | [diff] [blame] | 714 | |
Miklos Vajna | da3f78a | 2008-11-17 21:48:37 +0100 | [diff] [blame] | 715 | strbuf_addf(&logmsg, "Branch: renamed %s to %s", |
| 716 | oldref.buf, newref.buf); |
Lars Hjemli | 678d0f4 | 2006-11-30 03:16:56 +0100 | [diff] [blame] | 717 | |
Miklos Vajna | da3f78a | 2008-11-17 21:48:37 +0100 | [diff] [blame] | 718 | if (rename_ref(oldref.buf, newref.buf, logmsg.buf)) |
Ævar Arnfjörð Bjarmason | 49df4b0 | 2011-02-22 23:41:34 +0000 | [diff] [blame] | 719 | die(_("Branch rename failed")); |
Miklos Vajna | da3f78a | 2008-11-17 21:48:37 +0100 | [diff] [blame] | 720 | strbuf_release(&logmsg); |
Lars Hjemli | c976d41 | 2006-11-28 15:47:40 +0100 | [diff] [blame] | 721 | |
Junio C Hamano | cbdffe4 | 2009-03-21 13:27:31 -0700 | [diff] [blame] | 722 | if (recovery) |
Ævar Arnfjörð Bjarmason | 49df4b0 | 2011-02-22 23:41:34 +0000 | [diff] [blame] | 723 | warning(_("Renamed a misnamed branch '%s' away"), oldref.buf + 11); |
Junio C Hamano | cbdffe4 | 2009-03-21 13:27:31 -0700 | [diff] [blame] | 724 | |
Nicolas Pitre | 8b5157e | 2007-01-26 17:26:10 -0500 | [diff] [blame] | 725 | /* no need to pass logmsg here as HEAD didn't really move */ |
Miklos Vajna | da3f78a | 2008-11-17 21:48:37 +0100 | [diff] [blame] | 726 | if (!strcmp(oldname, head) && create_symref("HEAD", newref.buf, NULL)) |
Ævar Arnfjörð Bjarmason | 49df4b0 | 2011-02-22 23:41:34 +0000 | [diff] [blame] | 727 | die(_("Branch renamed to %s, but HEAD is not updated!"), newname); |
Lars Hjemli | 19eba15 | 2007-04-06 14:13:00 +0200 | [diff] [blame] | 728 | |
Miklos Vajna | da3f78a | 2008-11-17 21:48:37 +0100 | [diff] [blame] | 729 | strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11); |
| 730 | strbuf_release(&oldref); |
| 731 | strbuf_addf(&newsection, "branch.%s", newref.buf + 11); |
| 732 | strbuf_release(&newref); |
| 733 | if (git_config_rename_section(oldsection.buf, newsection.buf) < 0) |
Ævar Arnfjörð Bjarmason | 49df4b0 | 2011-02-22 23:41:34 +0000 | [diff] [blame] | 734 | die(_("Branch is renamed, but update of config-file failed")); |
Miklos Vajna | da3f78a | 2008-11-17 21:48:37 +0100 | [diff] [blame] | 735 | strbuf_release(&oldsection); |
| 736 | strbuf_release(&newsection); |
Lars Hjemli | c976d41 | 2006-11-28 15:47:40 +0100 | [diff] [blame] | 737 | } |
| 738 | |
Junio C Hamano | 049716b | 2008-07-08 17:55:47 -0700 | [diff] [blame] | 739 | static int opt_parse_merge_filter(const struct option *opt, const char *arg, int unset) |
| 740 | { |
| 741 | merge_filter = ((opt->long_name[0] == 'n') |
| 742 | ? SHOW_NOT_MERGED |
| 743 | : SHOW_MERGED); |
| 744 | if (unset) |
| 745 | merge_filter = SHOW_NOT_MERGED; /* b/c for --no-merged */ |
| 746 | if (!arg) |
| 747 | arg = "HEAD"; |
| 748 | if (get_sha1(arg, merge_filter_ref)) |
Ævar Arnfjörð Bjarmason | 49df4b0 | 2011-02-22 23:41:34 +0000 | [diff] [blame] | 749 | die(_("malformed object name %s"), arg); |
Junio C Hamano | 049716b | 2008-07-08 17:55:47 -0700 | [diff] [blame] | 750 | return 0; |
| 751 | } |
| 752 | |
Junio C Hamano | b7200e8 | 2011-09-20 15:10:08 -0700 | [diff] [blame] | 753 | static const char edit_description[] = "BRANCH_DESCRIPTION"; |
| 754 | |
| 755 | static int edit_branch_description(const char *branch_name) |
| 756 | { |
| 757 | FILE *fp; |
| 758 | int status; |
| 759 | struct strbuf buf = STRBUF_INIT; |
| 760 | struct strbuf name = STRBUF_INIT; |
| 761 | |
| 762 | read_branch_desc(&buf, branch_name); |
| 763 | if (!buf.len || buf.buf[buf.len-1] != '\n') |
| 764 | strbuf_addch(&buf, '\n'); |
Junio C Hamano | eff80a9 | 2013-01-16 20:18:48 +0100 | [diff] [blame] | 765 | strbuf_commented_addf(&buf, |
| 766 | "Please edit the description for the branch\n" |
| 767 | " %s\n" |
| 768 | "Lines starting with '%c' will be stripped.\n", |
| 769 | branch_name, comment_line_char); |
Junio C Hamano | b7200e8 | 2011-09-20 15:10:08 -0700 | [diff] [blame] | 770 | fp = fopen(git_path(edit_description), "w"); |
| 771 | if ((fwrite(buf.buf, 1, buf.len, fp) < buf.len) || fclose(fp)) { |
| 772 | strbuf_release(&buf); |
Pete Wyckoff | 82247e9 | 2012-04-29 20:28:45 -0400 | [diff] [blame] | 773 | return error(_("could not write branch description template: %s"), |
Junio C Hamano | b7200e8 | 2011-09-20 15:10:08 -0700 | [diff] [blame] | 774 | strerror(errno)); |
| 775 | } |
| 776 | strbuf_reset(&buf); |
| 777 | if (launch_editor(git_path(edit_description), &buf, NULL)) { |
| 778 | strbuf_release(&buf); |
| 779 | return -1; |
| 780 | } |
| 781 | stripspace(&buf, 1); |
| 782 | |
| 783 | strbuf_addf(&name, "branch.%s.description", branch_name); |
Nguyễn Thái Ngọc Duy | 4b5553b | 2013-01-03 21:03:08 +0700 | [diff] [blame] | 784 | status = git_config_set(name.buf, buf.len ? buf.buf : NULL); |
Junio C Hamano | b7200e8 | 2011-09-20 15:10:08 -0700 | [diff] [blame] | 785 | strbuf_release(&name); |
| 786 | strbuf_release(&buf); |
| 787 | |
| 788 | return status; |
| 789 | } |
| 790 | |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 791 | int cmd_branch(int argc, const char **argv, const char *prefix) |
| 792 | { |
Michael J Gruber | cddd127 | 2011-08-28 16:54:31 +0200 | [diff] [blame] | 793 | int delete = 0, rename = 0, force_create = 0, list = 0; |
Namhyung Kim | b792c06 | 2011-07-01 15:06:08 +0900 | [diff] [blame] | 794 | int verbose = 0, abbrev = -1, detached = 0; |
Junio C Hamano | b7200e8 | 2011-09-20 15:10:08 -0700 | [diff] [blame] | 795 | int reflog = 0, edit_description = 0; |
Carlos Martín Nieto | b84869e | 2012-08-30 19:23:12 +0200 | [diff] [blame] | 796 | int quiet = 0, unset_upstream = 0; |
Carlos Martín Nieto | 6183d82 | 2012-08-20 15:47:38 +0200 | [diff] [blame] | 797 | const char *new_upstream = NULL; |
Jay Soffian | 9ed36cf | 2008-02-19 11:24:37 -0500 | [diff] [blame] | 798 | enum branch_track track; |
Pierre Habouzit | d11d44f | 2007-11-07 11:20:28 +0100 | [diff] [blame] | 799 | int kinds = REF_LOCAL_BRANCH; |
Junio C Hamano | 694a577 | 2007-11-07 14:58:09 -0800 | [diff] [blame] | 800 | struct commit_list *with_commit = NULL; |
Pierre Habouzit | a8dfd5e | 2007-10-07 18:26:21 +0200 | [diff] [blame] | 801 | |
| 802 | struct option options[] = { |
Nguyễn Thái Ngọc Duy | 24a8521 | 2012-08-20 19:31:55 +0700 | [diff] [blame] | 803 | OPT_GROUP(N_("Generic options")), |
René Scharfe | 3927142 | 2010-11-08 19:03:58 +0100 | [diff] [blame] | 804 | OPT__VERBOSE(&verbose, |
Nguyễn Thái Ngọc Duy | 24a8521 | 2012-08-20 19:31:55 +0700 | [diff] [blame] | 805 | N_("show hash and subject, give twice for upstream branch")), |
| 806 | OPT__QUIET(&quiet, N_("suppress informational messages")), |
| 807 | OPT_SET_INT('t', "track", &track, N_("set up tracking mode (see git-pull(1))"), |
Jay Soffian | 9ed36cf | 2008-02-19 11:24:37 -0500 | [diff] [blame] | 808 | BRANCH_TRACK_EXPLICIT), |
Nguyễn Thái Ngọc Duy | 24a8521 | 2012-08-20 19:31:55 +0700 | [diff] [blame] | 809 | OPT_SET_INT( 0, "set-upstream", &track, N_("change upstream info"), |
Ilari Liusvaara | 4fc5006 | 2010-01-18 22:44:11 +0200 | [diff] [blame] | 810 | BRANCH_TRACK_OVERRIDE), |
Carlos Martín Nieto | 6183d82 | 2012-08-20 15:47:38 +0200 | [diff] [blame] | 811 | OPT_STRING('u', "set-upstream-to", &new_upstream, "upstream", "change the upstream info"), |
Stefan Beller | d5d09d4 | 2013-08-03 13:51:19 +0200 | [diff] [blame] | 812 | OPT_BOOL(0, "unset-upstream", &unset_upstream, "Unset the upstream info"), |
Nguyễn Thái Ngọc Duy | 24a8521 | 2012-08-20 19:31:55 +0700 | [diff] [blame] | 813 | OPT__COLOR(&branch_use_color, N_("use colored output")), |
| 814 | OPT_SET_INT('r', "remotes", &kinds, N_("act on remote-tracking branches"), |
Pierre Habouzit | d11d44f | 2007-11-07 11:20:28 +0100 | [diff] [blame] | 815 | REF_REMOTE_BRANCH), |
Junio C Hamano | e84fb2f | 2008-07-08 17:31:51 -0700 | [diff] [blame] | 816 | { |
Nguyễn Thái Ngọc Duy | 24a8521 | 2012-08-20 19:31:55 +0700 | [diff] [blame] | 817 | OPTION_CALLBACK, 0, "contains", &with_commit, N_("commit"), |
| 818 | N_("print only branches that contain the commit"), |
Junio C Hamano | e84fb2f | 2008-07-08 17:31:51 -0700 | [diff] [blame] | 819 | PARSE_OPT_LASTARG_DEFAULT, |
Jake Goulding | 269defd | 2009-01-26 09:13:23 -0500 | [diff] [blame] | 820 | parse_opt_with_commit, (intptr_t)"HEAD", |
Junio C Hamano | e84fb2f | 2008-07-08 17:31:51 -0700 | [diff] [blame] | 821 | }, |
Junio C Hamano | 694a577 | 2007-11-07 14:58:09 -0800 | [diff] [blame] | 822 | { |
Nguyễn Thái Ngọc Duy | 24a8521 | 2012-08-20 19:31:55 +0700 | [diff] [blame] | 823 | OPTION_CALLBACK, 0, "with", &with_commit, N_("commit"), |
| 824 | N_("print only branches that contain the commit"), |
Junio C Hamano | e84fb2f | 2008-07-08 17:31:51 -0700 | [diff] [blame] | 825 | PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT, |
Jake Goulding | 269defd | 2009-01-26 09:13:23 -0500 | [diff] [blame] | 826 | parse_opt_with_commit, (intptr_t) "HEAD", |
Junio C Hamano | 694a577 | 2007-11-07 14:58:09 -0800 | [diff] [blame] | 827 | }, |
Pierre Habouzit | a8dfd5e | 2007-10-07 18:26:21 +0200 | [diff] [blame] | 828 | OPT__ABBREV(&abbrev), |
| 829 | |
Nguyễn Thái Ngọc Duy | 24a8521 | 2012-08-20 19:31:55 +0700 | [diff] [blame] | 830 | OPT_GROUP(N_("Specific git-branch actions:")), |
| 831 | OPT_SET_INT('a', "all", &kinds, N_("list both remote-tracking and local branches"), |
Pierre Habouzit | d11d44f | 2007-11-07 11:20:28 +0100 | [diff] [blame] | 832 | REF_REMOTE_BRANCH | REF_LOCAL_BRANCH), |
Nguyễn Thái Ngọc Duy | 24a8521 | 2012-08-20 19:31:55 +0700 | [diff] [blame] | 833 | OPT_BIT('d', "delete", &delete, N_("delete fully merged branch"), 1), |
| 834 | OPT_BIT('D', NULL, &delete, N_("delete branch (even if not merged)"), 2), |
| 835 | OPT_BIT('m', "move", &rename, N_("move/rename a branch and its reflog"), 1), |
| 836 | OPT_BIT('M', NULL, &rename, N_("move/rename a branch, even if target exists"), 2), |
Stefan Beller | d5d09d4 | 2013-08-03 13:51:19 +0200 | [diff] [blame] | 837 | OPT_BOOL(0, "list", &list, N_("list branch names")), |
| 838 | OPT_BOOL('l', "create-reflog", &reflog, N_("create the branch's reflog")), |
| 839 | OPT_BOOL(0, "edit-description", &edit_description, |
| 840 | N_("edit the description for the branch")), |
Nguyễn Thái Ngọc Duy | 24a8521 | 2012-08-20 19:31:55 +0700 | [diff] [blame] | 841 | OPT__FORCE(&force_create, N_("force creation (when already exists)")), |
Junio C Hamano | 049716b | 2008-07-08 17:55:47 -0700 | [diff] [blame] | 842 | { |
| 843 | OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref, |
Nguyễn Thái Ngọc Duy | 24a8521 | 2012-08-20 19:31:55 +0700 | [diff] [blame] | 844 | N_("commit"), N_("print only not merged branches"), |
Junio C Hamano | 049716b | 2008-07-08 17:55:47 -0700 | [diff] [blame] | 845 | PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG, |
| 846 | opt_parse_merge_filter, (intptr_t) "HEAD", |
| 847 | }, |
| 848 | { |
| 849 | OPTION_CALLBACK, 0, "merged", &merge_filter_ref, |
Nguyễn Thái Ngọc Duy | 24a8521 | 2012-08-20 19:31:55 +0700 | [diff] [blame] | 850 | N_("commit"), N_("print only merged branches"), |
Junio C Hamano | 049716b | 2008-07-08 17:55:47 -0700 | [diff] [blame] | 851 | PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG, |
| 852 | opt_parse_merge_filter, (intptr_t) "HEAD", |
| 853 | }, |
Nguyễn Thái Ngọc Duy | 24a8521 | 2012-08-20 19:31:55 +0700 | [diff] [blame] | 854 | OPT_COLUMN(0, "column", &colopts, N_("list branches in columns")), |
Pierre Habouzit | a8dfd5e | 2007-10-07 18:26:21 +0200 | [diff] [blame] | 855 | OPT_END(), |
| 856 | }; |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 857 | |
Nguyễn Thái Ngọc Duy | 1dacfbc | 2010-10-22 01:42:58 -0500 | [diff] [blame] | 858 | if (argc == 2 && !strcmp(argv[1], "-h")) |
| 859 | usage_with_options(builtin_branch_usage, options); |
| 860 | |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 861 | git_config(git_branch_config, NULL); |
Matthias Kestenholz | 6b2f2d9 | 2008-02-18 08:26:03 +0100 | [diff] [blame] | 862 | |
Jay Soffian | 9ed36cf | 2008-02-19 11:24:37 -0500 | [diff] [blame] | 863 | track = git_branch_track; |
Lars Hjemli | c976d41 | 2006-11-28 15:47:40 +0100 | [diff] [blame] | 864 | |
Nguyễn Thái Ngọc Duy | 96ec7b1 | 2011-12-13 21:17:48 +0700 | [diff] [blame] | 865 | head = resolve_refdup("HEAD", head_sha1, 0, NULL); |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 866 | if (!head) |
Ævar Arnfjörð Bjarmason | 49df4b0 | 2011-02-22 23:41:34 +0000 | [diff] [blame] | 867 | die(_("Failed to resolve HEAD as a valid ref.")); |
Lars Hjemli | 0016a48 | 2007-01-03 21:10:10 +0100 | [diff] [blame] | 868 | if (!strcmp(head, "HEAD")) { |
| 869 | detached = 1; |
Pierre Habouzit | a8dfd5e | 2007-10-07 18:26:21 +0200 | [diff] [blame] | 870 | } else { |
Junio C Hamano | cc44c76 | 2007-02-20 01:53:29 -0800 | [diff] [blame] | 871 | if (prefixcmp(head, "refs/heads/")) |
Ævar Arnfjörð Bjarmason | 49df4b0 | 2011-02-22 23:41:34 +0000 | [diff] [blame] | 872 | die(_("HEAD not found below refs/heads!")); |
Lars Hjemli | 0016a48 | 2007-01-03 21:10:10 +0100 | [diff] [blame] | 873 | head += 11; |
| 874 | } |
Junio C Hamano | 049716b | 2008-07-08 17:55:47 -0700 | [diff] [blame] | 875 | hashcpy(merge_filter_ref, head_sha1); |
| 876 | |
Nguyễn Thái Ngọc Duy | ebe31ef | 2012-04-13 17:54:38 +0700 | [diff] [blame] | 877 | |
Stephen Boyd | 3778292 | 2009-05-23 11:53:12 -0700 | [diff] [blame] | 878 | argc = parse_options(argc, argv, prefix, options, builtin_branch_usage, |
| 879 | 0); |
Michael J Gruber | cddd127 | 2011-08-28 16:54:31 +0200 | [diff] [blame] | 880 | |
Carlos Martín Nieto | b84869e | 2012-08-30 19:23:12 +0200 | [diff] [blame] | 881 | if (!delete && !rename && !edit_description && !new_upstream && !unset_upstream && argc == 0) |
Michael J Gruber | cddd127 | 2011-08-28 16:54:31 +0200 | [diff] [blame] | 882 | list = 1; |
| 883 | |
Jeff King | d040350 | 2013-01-31 01:46:11 -0500 | [diff] [blame] | 884 | if (with_commit || merge_filter != NO_FILTER) |
| 885 | list = 1; |
| 886 | |
Stefan Beller | 05efb7b | 2013-08-07 09:32:25 +0200 | [diff] [blame] | 887 | if (!!delete + !!rename + !!force_create + !!new_upstream + |
| 888 | list + unset_upstream > 1) |
Junio C Hamano | 049716b | 2008-07-08 17:55:47 -0700 | [diff] [blame] | 889 | usage_with_options(builtin_branch_usage, options); |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 890 | |
Namhyung Kim | b792c06 | 2011-07-01 15:06:08 +0900 | [diff] [blame] | 891 | if (abbrev == -1) |
| 892 | abbrev = DEFAULT_ABBREV; |
Nguyễn Thái Ngọc Duy | ebe31ef | 2012-04-13 17:54:38 +0700 | [diff] [blame] | 893 | finalize_colopts(&colopts, -1); |
| 894 | if (verbose) { |
| 895 | if (explicitly_enable_column(colopts)) |
| 896 | die(_("--column and --verbose are incompatible")); |
| 897 | colopts = 0; |
| 898 | } |
Namhyung Kim | b792c06 | 2011-07-01 15:06:08 +0900 | [diff] [blame] | 899 | |
Nguyễn Thái Ngọc Duy | 640d040 | 2013-01-28 08:18:14 +0700 | [diff] [blame] | 900 | if (delete) { |
| 901 | if (!argc) |
| 902 | die(_("branch name required")); |
Jeff King | d65ddf1 | 2012-03-26 19:51:06 -0400 | [diff] [blame] | 903 | return delete_branches(argc, argv, delete > 1, kinds, quiet); |
Nguyễn Thái Ngọc Duy | 640d040 | 2013-01-28 08:18:14 +0700 | [diff] [blame] | 904 | } else if (list) { |
Nguyễn Thái Ngọc Duy | ebe31ef | 2012-04-13 17:54:38 +0700 | [diff] [blame] | 905 | int ret = print_ref_list(kinds, detached, verbose, abbrev, |
| 906 | with_commit, argv); |
| 907 | print_columns(&output, colopts, NULL); |
| 908 | string_list_clear(&output, 0); |
| 909 | return ret; |
| 910 | } |
Junio C Hamano | b7200e8 | 2011-09-20 15:10:08 -0700 | [diff] [blame] | 911 | else if (edit_description) { |
| 912 | const char *branch_name; |
Junio C Hamano | c2d17ba | 2012-02-05 17:13:36 -0800 | [diff] [blame] | 913 | struct strbuf branch_ref = STRBUF_INIT; |
| 914 | |
Nguyễn Thái Ngọc Duy | 75135b2 | 2013-01-28 08:18:13 +0700 | [diff] [blame] | 915 | if (!argc) { |
| 916 | if (detached) |
Nguyễn Thái Ngọc Duy | 045e388 | 2013-01-28 08:18:16 +0700 | [diff] [blame] | 917 | die(_("Cannot give description to detached HEAD")); |
Junio C Hamano | b7200e8 | 2011-09-20 15:10:08 -0700 | [diff] [blame] | 918 | branch_name = head; |
Nguyễn Thái Ngọc Duy | 75135b2 | 2013-01-28 08:18:13 +0700 | [diff] [blame] | 919 | } else if (argc == 1) |
Junio C Hamano | b7200e8 | 2011-09-20 15:10:08 -0700 | [diff] [blame] | 920 | branch_name = argv[0]; |
| 921 | else |
Nguyễn Thái Ngọc Duy | 43722c4 | 2013-01-28 08:18:15 +0700 | [diff] [blame] | 922 | die(_("cannot edit description of more than one branch")); |
Junio C Hamano | c2d17ba | 2012-02-05 17:13:36 -0800 | [diff] [blame] | 923 | |
| 924 | strbuf_addf(&branch_ref, "refs/heads/%s", branch_name); |
| 925 | if (!ref_exists(branch_ref.buf)) { |
| 926 | strbuf_release(&branch_ref); |
| 927 | |
| 928 | if (!argc) |
Nguyễn Thái Ngọc Duy | 045e388 | 2013-01-28 08:18:16 +0700 | [diff] [blame] | 929 | return error(_("No commit on branch '%s' yet."), |
Junio C Hamano | c2d17ba | 2012-02-05 17:13:36 -0800 | [diff] [blame] | 930 | branch_name); |
| 931 | else |
Nguyễn Thái Ngọc Duy | 045e388 | 2013-01-28 08:18:16 +0700 | [diff] [blame] | 932 | return error(_("No branch named '%s'."), |
| 933 | branch_name); |
Junio C Hamano | c2d17ba | 2012-02-05 17:13:36 -0800 | [diff] [blame] | 934 | } |
| 935 | strbuf_release(&branch_ref); |
| 936 | |
Junio C Hamano | b7200e8 | 2011-09-20 15:10:08 -0700 | [diff] [blame] | 937 | if (edit_branch_description(branch_name)) |
| 938 | return 1; |
Junio C Hamano | a4043ae | 2011-12-09 13:37:05 -0800 | [diff] [blame] | 939 | } else if (rename) { |
Jonathon Mah | d1520c4 | 2013-03-30 18:27:44 -0700 | [diff] [blame] | 940 | if (!argc) |
| 941 | die(_("branch name required")); |
| 942 | else if (argc == 1) |
Tay Ray Chuan | 3706ed2 | 2011-11-03 00:17:12 +0800 | [diff] [blame] | 943 | rename_branch(head, argv[0], rename > 1); |
| 944 | else if (argc == 2) |
| 945 | rename_branch(argv[0], argv[1], rename > 1); |
| 946 | else |
Nguyễn Thái Ngọc Duy | 43722c4 | 2013-01-28 08:18:15 +0700 | [diff] [blame] | 947 | die(_("too many branches for a rename operation")); |
Carlos Martín Nieto | 6183d82 | 2012-08-20 15:47:38 +0200 | [diff] [blame] | 948 | } else if (new_upstream) { |
| 949 | struct branch *branch = branch_get(argv[0]); |
| 950 | |
Nguyễn Thái Ngọc Duy | 8efb889 | 2013-02-23 19:22:27 +0700 | [diff] [blame] | 951 | if (argc > 1) |
| 952 | die(_("too many branches to set new upstream")); |
| 953 | |
| 954 | if (!branch) { |
| 955 | if (!argc || !strcmp(argv[0], "HEAD")) |
| 956 | die(_("could not set upstream of HEAD to %s when " |
| 957 | "it does not point to any branch."), |
| 958 | new_upstream); |
| 959 | die(_("no such branch '%s'"), argv[0]); |
| 960 | } |
| 961 | |
Carlos Martín Nieto | 6183d82 | 2012-08-20 15:47:38 +0200 | [diff] [blame] | 962 | if (!ref_exists(branch->refname)) |
| 963 | die(_("branch '%s' does not exist"), branch->name); |
| 964 | |
| 965 | /* |
| 966 | * create_branch takes care of setting up the tracking |
| 967 | * info and making sure new_upstream is correct |
| 968 | */ |
| 969 | create_branch(head, branch->name, new_upstream, 0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE); |
Carlos Martín Nieto | b84869e | 2012-08-30 19:23:12 +0200 | [diff] [blame] | 970 | } else if (unset_upstream) { |
| 971 | struct branch *branch = branch_get(argv[0]); |
| 972 | struct strbuf buf = STRBUF_INIT; |
| 973 | |
Nguyễn Thái Ngọc Duy | 8efb889 | 2013-02-23 19:22:27 +0700 | [diff] [blame] | 974 | if (argc > 1) |
| 975 | die(_("too many branches to unset upstream")); |
| 976 | |
| 977 | if (!branch) { |
| 978 | if (!argc || !strcmp(argv[0], "HEAD")) |
| 979 | die(_("could not unset upstream of HEAD when " |
| 980 | "it does not point to any branch.")); |
| 981 | die(_("no such branch '%s'"), argv[0]); |
| 982 | } |
| 983 | |
Felipe Contreras | 54d07f2 | 2013-10-31 03:25:38 -0600 | [diff] [blame] | 984 | if (!branch_has_merge_config(branch)) |
Carlos Martín Nieto | b84869e | 2012-08-30 19:23:12 +0200 | [diff] [blame] | 985 | die(_("Branch '%s' has no upstream information"), branch->name); |
Carlos Martín Nieto | b84869e | 2012-08-30 19:23:12 +0200 | [diff] [blame] | 986 | |
| 987 | strbuf_addf(&buf, "branch.%s.remote", branch->name); |
| 988 | git_config_set_multivar(buf.buf, NULL, NULL, 1); |
| 989 | strbuf_reset(&buf); |
| 990 | strbuf_addf(&buf, "branch.%s.merge", branch->name); |
| 991 | git_config_set_multivar(buf.buf, NULL, NULL, 1); |
| 992 | strbuf_release(&buf); |
Vincent van Ravesteijn | 5cd75c7 | 2011-11-23 07:31:55 +0100 | [diff] [blame] | 993 | } else if (argc > 0 && argc <= 2) { |
Carlos Martín Nieto | b347d06 | 2012-08-30 19:23:13 +0200 | [diff] [blame] | 994 | struct branch *branch = branch_get(argv[0]); |
| 995 | int branch_existed = 0, remote_tracking = 0; |
| 996 | struct strbuf buf = STRBUF_INIT; |
| 997 | |
Nguyễn Thái Ngọc Duy | 8efb889 | 2013-02-23 19:22:27 +0700 | [diff] [blame] | 998 | if (!strcmp(argv[0], "HEAD")) |
| 999 | die(_("it does not make sense to create 'HEAD' manually")); |
| 1000 | |
| 1001 | if (!branch) |
| 1002 | die(_("no such branch '%s'"), argv[0]); |
| 1003 | |
Matthieu Moy | 6e8f993 | 2009-12-30 15:45:31 +0100 | [diff] [blame] | 1004 | if (kinds != REF_LOCAL_BRANCH) |
Ævar Arnfjörð Bjarmason | 49df4b0 | 2011-02-22 23:41:34 +0000 | [diff] [blame] | 1005 | die(_("-a and -r options to 'git branch' do not make sense with a branch name")); |
Carlos Martín Nieto | b347d06 | 2012-08-30 19:23:13 +0200 | [diff] [blame] | 1006 | |
| 1007 | if (track == BRANCH_TRACK_OVERRIDE) |
| 1008 | fprintf(stderr, _("The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to\n")); |
| 1009 | |
| 1010 | strbuf_addf(&buf, "refs/remotes/%s", branch->name); |
| 1011 | remote_tracking = ref_exists(buf.buf); |
| 1012 | strbuf_release(&buf); |
| 1013 | |
| 1014 | branch_existed = ref_exists(branch->refname); |
Daniel Barkalow | e496c00 | 2008-02-07 11:40:08 -0500 | [diff] [blame] | 1015 | create_branch(head, argv[0], (argc == 2) ? argv[1] : head, |
Jeff King | d65ddf1 | 2012-03-26 19:51:06 -0400 | [diff] [blame] | 1016 | force_create, reflog, 0, quiet, track); |
Carlos Martín Nieto | b347d06 | 2012-08-30 19:23:13 +0200 | [diff] [blame] | 1017 | |
| 1018 | /* |
| 1019 | * We only show the instructions if the user gave us |
| 1020 | * one branch which doesn't exist locally, but is the |
| 1021 | * name of a remote-tracking branch. |
| 1022 | */ |
| 1023 | if (argc == 1 && track == BRANCH_TRACK_OVERRIDE && |
| 1024 | !branch_existed && remote_tracking) { |
| 1025 | fprintf(stderr, _("\nIf you wanted to make '%s' track '%s', do this:\n\n"), head, branch->name); |
| 1026 | fprintf(stderr, _(" git branch -d %s\n"), branch->name); |
| 1027 | fprintf(stderr, _(" git branch --set-upstream-to %s\n"), branch->name); |
| 1028 | } |
| 1029 | |
Matthieu Moy | 6e8f993 | 2009-12-30 15:45:31 +0100 | [diff] [blame] | 1030 | } else |
Pierre Habouzit | a8dfd5e | 2007-10-07 18:26:21 +0200 | [diff] [blame] | 1031 | usage_with_options(builtin_branch_usage, options); |
Lars Hjemli | c31820c | 2006-10-23 23:27:45 +0200 | [diff] [blame] | 1032 | |
| 1033 | return 0; |
| 1034 | } |