2006-10-23 21:27:45 +00:00
|
|
|
|
/*
|
|
|
|
|
* Builtin "git branch"
|
|
|
|
|
*
|
|
|
|
|
* Copyright (c) 2006 Kristian H<EFBFBD>gsberg <krh@redhat.com>
|
|
|
|
|
* Based on git-branch.sh by Junio C Hamano.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "cache.h"
|
2006-12-19 22:34:12 +00:00
|
|
|
|
#include "color.h"
|
2006-10-23 21:27:45 +00:00
|
|
|
|
#include "refs.h"
|
|
|
|
|
#include "commit.h"
|
|
|
|
|
#include "builtin.h"
|
|
|
|
|
|
|
|
|
|
static const char builtin_branch_usage[] =
|
2007-03-03 00:31:16 +00:00
|
|
|
|
"git-branch [-r] (-d | -D) <branchname> | [-l] [-f] <branchname> [<start-point>] | (-m | -M) [<oldbranch>] <newbranch> | [--color | --no-color] [-r | -a] [-v [--abbrev=<length> | --no-abbrev]]";
|
2006-10-23 21:27:45 +00:00
|
|
|
|
|
2006-12-18 07:58:16 +00:00
|
|
|
|
#define REF_UNKNOWN_TYPE 0x00
|
|
|
|
|
#define REF_LOCAL_BRANCH 0x01
|
|
|
|
|
#define REF_REMOTE_BRANCH 0x02
|
|
|
|
|
#define REF_TAG 0x04
|
2006-10-23 21:27:45 +00:00
|
|
|
|
|
|
|
|
|
static const char *head;
|
|
|
|
|
static unsigned char head_sha1[20];
|
|
|
|
|
|
2006-12-12 06:41:52 +00:00
|
|
|
|
static int branch_use_color;
|
|
|
|
|
static char branch_colors[][COLOR_MAXLEN] = {
|
|
|
|
|
"\033[m", /* reset */
|
|
|
|
|
"", /* PLAIN (normal) */
|
|
|
|
|
"\033[31m", /* REMOTE (red) */
|
2006-12-13 18:55:21 +00:00
|
|
|
|
"", /* LOCAL (normal) */
|
|
|
|
|
"\033[32m", /* CURRENT (green) */
|
2006-12-12 06:41:52 +00:00
|
|
|
|
};
|
|
|
|
|
enum color_branch {
|
|
|
|
|
COLOR_BRANCH_RESET = 0,
|
|
|
|
|
COLOR_BRANCH_PLAIN = 1,
|
|
|
|
|
COLOR_BRANCH_REMOTE = 2,
|
|
|
|
|
COLOR_BRANCH_LOCAL = 3,
|
|
|
|
|
COLOR_BRANCH_CURRENT = 4,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static int parse_branch_color_slot(const char *var, int ofs)
|
|
|
|
|
{
|
|
|
|
|
if (!strcasecmp(var+ofs, "plain"))
|
|
|
|
|
return COLOR_BRANCH_PLAIN;
|
|
|
|
|
if (!strcasecmp(var+ofs, "reset"))
|
|
|
|
|
return COLOR_BRANCH_RESET;
|
|
|
|
|
if (!strcasecmp(var+ofs, "remote"))
|
|
|
|
|
return COLOR_BRANCH_REMOTE;
|
|
|
|
|
if (!strcasecmp(var+ofs, "local"))
|
|
|
|
|
return COLOR_BRANCH_LOCAL;
|
|
|
|
|
if (!strcasecmp(var+ofs, "current"))
|
|
|
|
|
return COLOR_BRANCH_CURRENT;
|
|
|
|
|
die("bad config variable '%s'", var);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int git_branch_config(const char *var, const char *value)
|
|
|
|
|
{
|
|
|
|
|
if (!strcmp(var, "color.branch")) {
|
|
|
|
|
branch_use_color = git_config_colorbool(var, value);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
Mechanical conversion to use prefixcmp()
This mechanically converts strncmp() to use prefixcmp(), but only when
the parameters match specific patterns, so that they can be verified
easily. Leftover from this will be fixed in a separate step, including
idiotic conversions like
if (!strncmp("foo", arg, 3))
=>
if (!(-prefixcmp(arg, "foo")))
This was done by using this script in px.perl
#!/usr/bin/perl -i.bak -p
if (/strncmp\(([^,]+), "([^\\"]*)", (\d+)\)/ && (length($2) == $3)) {
s|strncmp\(([^,]+), "([^\\"]*)", (\d+)\)|prefixcmp($1, "$2")|;
}
if (/strncmp\("([^\\"]*)", ([^,]+), (\d+)\)/ && (length($1) == $3)) {
s|strncmp\("([^\\"]*)", ([^,]+), (\d+)\)|(-prefixcmp($2, "$1"))|;
}
and running:
$ git grep -l strncmp -- '*.c' | xargs perl px.perl
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-20 09:53:29 +00:00
|
|
|
|
if (!prefixcmp(var, "color.branch.")) {
|
2006-12-12 06:41:52 +00:00
|
|
|
|
int slot = parse_branch_color_slot(var, 13);
|
|
|
|
|
color_parse(value, var, branch_colors[slot]);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
return git_default_config(var, value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const char *branch_get_color(enum color_branch ix)
|
|
|
|
|
{
|
|
|
|
|
if (branch_use_color)
|
|
|
|
|
return branch_colors[ix];
|
|
|
|
|
return "";
|
|
|
|
|
}
|
|
|
|
|
|
2006-12-18 22:42:16 +00:00
|
|
|
|
static int delete_branches(int argc, const char **argv, int force, int kinds)
|
2006-10-23 21:27:45 +00:00
|
|
|
|
{
|
2006-11-25 07:10:23 +00:00
|
|
|
|
struct commit *rev, *head_rev = head_rev;
|
2006-10-23 21:27:45 +00:00
|
|
|
|
unsigned char sha1[20];
|
2006-12-18 22:42:16 +00:00
|
|
|
|
char *name = NULL;
|
2006-12-18 07:58:16 +00:00
|
|
|
|
const char *fmt, *remote;
|
2006-10-23 21:27:45 +00:00
|
|
|
|
int i;
|
2006-12-18 22:42:16 +00:00
|
|
|
|
int ret = 0;
|
2006-10-23 21:27:45 +00:00
|
|
|
|
|
2006-12-18 07:58:16 +00:00
|
|
|
|
switch (kinds) {
|
|
|
|
|
case REF_REMOTE_BRANCH:
|
|
|
|
|
fmt = "refs/remotes/%s";
|
|
|
|
|
remote = "remote ";
|
|
|
|
|
force = 1;
|
|
|
|
|
break;
|
|
|
|
|
case REF_LOCAL_BRANCH:
|
|
|
|
|
fmt = "refs/heads/%s";
|
|
|
|
|
remote = "";
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
die("cannot use -a with -d");
|
|
|
|
|
}
|
2006-10-23 21:27:45 +00:00
|
|
|
|
|
2006-11-25 07:10:23 +00:00
|
|
|
|
if (!force) {
|
|
|
|
|
head_rev = lookup_commit_reference(head_sha1);
|
|
|
|
|
if (!head_rev)
|
|
|
|
|
die("Couldn't look up commit object for HEAD");
|
|
|
|
|
}
|
2006-10-23 21:27:45 +00:00
|
|
|
|
for (i = 0; i < argc; i++) {
|
2006-12-18 22:42:16 +00:00
|
|
|
|
if (kinds == REF_LOCAL_BRANCH && !strcmp(head, argv[i])) {
|
|
|
|
|
error("Cannot delete the branch '%s' "
|
|
|
|
|
"which you are currently on.", argv[i]);
|
|
|
|
|
ret = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (name)
|
|
|
|
|
free(name);
|
2006-10-23 21:27:45 +00:00
|
|
|
|
|
2006-12-18 07:58:16 +00:00
|
|
|
|
name = xstrdup(mkpath(fmt, argv[i]));
|
2006-12-18 22:42:16 +00:00
|
|
|
|
if (!resolve_ref(name, sha1, 1, NULL)) {
|
|
|
|
|
error("%sbranch '%s' not found.",
|
|
|
|
|
remote, argv[i]);
|
|
|
|
|
ret = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2006-10-23 21:27:45 +00:00
|
|
|
|
|
|
|
|
|
rev = lookup_commit_reference(sha1);
|
2006-12-18 22:42:16 +00:00
|
|
|
|
if (!rev) {
|
|
|
|
|
error("Couldn't look up commit object for '%s'", name);
|
|
|
|
|
ret = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2006-10-23 21:27:45 +00:00
|
|
|
|
|
|
|
|
|
/* This checks whether the merge bases of branch and
|
|
|
|
|
* HEAD contains branch -- which means that the HEAD
|
|
|
|
|
* contains everything in both.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
if (!force &&
|
2007-01-09 07:22:31 +00:00
|
|
|
|
!in_merge_bases(rev, &head_rev, 1)) {
|
2006-12-18 22:42:16 +00:00
|
|
|
|
error("The branch '%s' is not a strict subset of "
|
|
|
|
|
"your current HEAD.\n"
|
|
|
|
|
"If you are sure you want to delete it, "
|
|
|
|
|
"run 'git branch -D %s'.", argv[i], argv[i]);
|
|
|
|
|
ret = 1;
|
|
|
|
|
continue;
|
2006-10-23 21:27:45 +00:00
|
|
|
|
}
|
|
|
|
|
|
2006-12-18 22:42:16 +00:00
|
|
|
|
if (delete_ref(name, sha1)) {
|
|
|
|
|
error("Error deleting %sbranch '%s'", remote,
|
2006-12-18 07:58:16 +00:00
|
|
|
|
argv[i]);
|
2006-12-18 22:42:16 +00:00
|
|
|
|
ret = 1;
|
|
|
|
|
} else
|
2006-12-18 07:58:16 +00:00
|
|
|
|
printf("Deleted %sbranch %s.\n", remote, argv[i]);
|
2006-10-23 21:27:45 +00:00
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2006-12-18 22:42:16 +00:00
|
|
|
|
if (name)
|
|
|
|
|
free(name);
|
|
|
|
|
|
|
|
|
|
return(ret);
|
2006-10-23 21:27:45 +00:00
|
|
|
|
}
|
|
|
|
|
|
2006-11-21 19:31:24 +00:00
|
|
|
|
struct ref_item {
|
|
|
|
|
char *name;
|
|
|
|
|
unsigned int kind;
|
2006-11-24 13:45:10 +00:00
|
|
|
|
unsigned char sha1[20];
|
2006-11-21 19:31:24 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct ref_list {
|
2006-11-24 13:45:10 +00:00
|
|
|
|
int index, alloc, maxwidth;
|
2006-11-21 19:31:24 +00:00
|
|
|
|
struct ref_item *list;
|
|
|
|
|
int kinds;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
|
2006-10-23 21:27:45 +00:00
|
|
|
|
{
|
2006-11-21 19:31:24 +00:00
|
|
|
|
struct ref_list *ref_list = (struct ref_list*)(cb_data);
|
|
|
|
|
struct ref_item *newitem;
|
|
|
|
|
int kind = REF_UNKNOWN_TYPE;
|
2006-11-24 13:45:10 +00:00
|
|
|
|
int len;
|
2006-11-21 19:31:24 +00:00
|
|
|
|
|
|
|
|
|
/* Detect kind */
|
Mechanical conversion to use prefixcmp()
This mechanically converts strncmp() to use prefixcmp(), but only when
the parameters match specific patterns, so that they can be verified
easily. Leftover from this will be fixed in a separate step, including
idiotic conversions like
if (!strncmp("foo", arg, 3))
=>
if (!(-prefixcmp(arg, "foo")))
This was done by using this script in px.perl
#!/usr/bin/perl -i.bak -p
if (/strncmp\(([^,]+), "([^\\"]*)", (\d+)\)/ && (length($2) == $3)) {
s|strncmp\(([^,]+), "([^\\"]*)", (\d+)\)|prefixcmp($1, "$2")|;
}
if (/strncmp\("([^\\"]*)", ([^,]+), (\d+)\)/ && (length($1) == $3)) {
s|strncmp\("([^\\"]*)", ([^,]+), (\d+)\)|(-prefixcmp($2, "$1"))|;
}
and running:
$ git grep -l strncmp -- '*.c' | xargs perl px.perl
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-20 09:53:29 +00:00
|
|
|
|
if (!prefixcmp(refname, "refs/heads/")) {
|
2006-11-21 19:31:24 +00:00
|
|
|
|
kind = REF_LOCAL_BRANCH;
|
|
|
|
|
refname += 11;
|
Mechanical conversion to use prefixcmp()
This mechanically converts strncmp() to use prefixcmp(), but only when
the parameters match specific patterns, so that they can be verified
easily. Leftover from this will be fixed in a separate step, including
idiotic conversions like
if (!strncmp("foo", arg, 3))
=>
if (!(-prefixcmp(arg, "foo")))
This was done by using this script in px.perl
#!/usr/bin/perl -i.bak -p
if (/strncmp\(([^,]+), "([^\\"]*)", (\d+)\)/ && (length($2) == $3)) {
s|strncmp\(([^,]+), "([^\\"]*)", (\d+)\)|prefixcmp($1, "$2")|;
}
if (/strncmp\("([^\\"]*)", ([^,]+), (\d+)\)/ && (length($1) == $3)) {
s|strncmp\("([^\\"]*)", ([^,]+), (\d+)\)|(-prefixcmp($2, "$1"))|;
}
and running:
$ git grep -l strncmp -- '*.c' | xargs perl px.perl
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-20 09:53:29 +00:00
|
|
|
|
} else if (!prefixcmp(refname, "refs/remotes/")) {
|
2006-11-21 19:31:24 +00:00
|
|
|
|
kind = REF_REMOTE_BRANCH;
|
|
|
|
|
refname += 13;
|
Mechanical conversion to use prefixcmp()
This mechanically converts strncmp() to use prefixcmp(), but only when
the parameters match specific patterns, so that they can be verified
easily. Leftover from this will be fixed in a separate step, including
idiotic conversions like
if (!strncmp("foo", arg, 3))
=>
if (!(-prefixcmp(arg, "foo")))
This was done by using this script in px.perl
#!/usr/bin/perl -i.bak -p
if (/strncmp\(([^,]+), "([^\\"]*)", (\d+)\)/ && (length($2) == $3)) {
s|strncmp\(([^,]+), "([^\\"]*)", (\d+)\)|prefixcmp($1, "$2")|;
}
if (/strncmp\("([^\\"]*)", ([^,]+), (\d+)\)/ && (length($1) == $3)) {
s|strncmp\("([^\\"]*)", ([^,]+), (\d+)\)|(-prefixcmp($2, "$1"))|;
}
and running:
$ git grep -l strncmp -- '*.c' | xargs perl px.perl
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-20 09:53:29 +00:00
|
|
|
|
} else if (!prefixcmp(refname, "refs/tags/")) {
|
2006-11-21 19:31:24 +00:00
|
|
|
|
kind = REF_TAG;
|
|
|
|
|
refname += 10;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Don't add types the caller doesn't want */
|
|
|
|
|
if ((kind & ref_list->kinds) == 0)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Resize buffer */
|
|
|
|
|
if (ref_list->index >= ref_list->alloc) {
|
|
|
|
|
ref_list->alloc = alloc_nr(ref_list->alloc);
|
|
|
|
|
ref_list->list = xrealloc(ref_list->list,
|
|
|
|
|
ref_list->alloc * sizeof(struct ref_item));
|
2006-10-23 21:27:45 +00:00
|
|
|
|
}
|
|
|
|
|
|
2006-11-21 19:31:24 +00:00
|
|
|
|
/* Record the new item */
|
|
|
|
|
newitem = &(ref_list->list[ref_list->index++]);
|
|
|
|
|
newitem->name = xstrdup(refname);
|
|
|
|
|
newitem->kind = kind;
|
2006-11-24 13:45:10 +00:00
|
|
|
|
hashcpy(newitem->sha1, sha1);
|
|
|
|
|
len = strlen(newitem->name);
|
|
|
|
|
if (len > ref_list->maxwidth)
|
|
|
|
|
ref_list->maxwidth = len;
|
2006-10-23 21:27:45 +00:00
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-21 19:31:24 +00:00
|
|
|
|
static void free_ref_list(struct ref_list *ref_list)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < ref_list->index; i++)
|
|
|
|
|
free(ref_list->list[i].name);
|
|
|
|
|
free(ref_list->list);
|
|
|
|
|
}
|
|
|
|
|
|
2006-10-23 21:27:45 +00:00
|
|
|
|
static int ref_cmp(const void *r1, const void *r2)
|
|
|
|
|
{
|
2006-11-21 19:31:24 +00:00
|
|
|
|
struct ref_item *c1 = (struct ref_item *)(r1);
|
|
|
|
|
struct ref_item *c2 = (struct ref_item *)(r2);
|
|
|
|
|
|
|
|
|
|
if (c1->kind != c2->kind)
|
|
|
|
|
return c1->kind - c2->kind;
|
|
|
|
|
return strcmp(c1->name, c2->name);
|
2006-10-23 21:27:45 +00:00
|
|
|
|
}
|
|
|
|
|
|
2007-01-03 20:10:09 +00:00
|
|
|
|
static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
|
|
|
|
|
int abbrev, int current)
|
2006-11-24 13:45:10 +00:00
|
|
|
|
{
|
2007-01-03 20:10:09 +00:00
|
|
|
|
char c;
|
|
|
|
|
int color;
|
2006-11-24 13:45:10 +00:00
|
|
|
|
struct commit *commit;
|
|
|
|
|
char subject[256];
|
|
|
|
|
|
2007-01-03 20:10:09 +00:00
|
|
|
|
switch (item->kind) {
|
|
|
|
|
case REF_LOCAL_BRANCH:
|
|
|
|
|
color = COLOR_BRANCH_LOCAL;
|
|
|
|
|
break;
|
|
|
|
|
case REF_REMOTE_BRANCH:
|
|
|
|
|
color = COLOR_BRANCH_REMOTE;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
color = COLOR_BRANCH_PLAIN;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2006-11-24 13:45:10 +00:00
|
|
|
|
|
2007-01-03 20:10:09 +00:00
|
|
|
|
c = ' ';
|
|
|
|
|
if (current) {
|
|
|
|
|
c = '*';
|
|
|
|
|
color = COLOR_BRANCH_CURRENT;
|
|
|
|
|
}
|
2006-11-24 13:45:10 +00:00
|
|
|
|
|
2007-01-03 20:10:09 +00:00
|
|
|
|
if (verbose) {
|
|
|
|
|
commit = lookup_commit(item->sha1);
|
|
|
|
|
if (commit && !parse_commit(commit))
|
|
|
|
|
pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0,
|
|
|
|
|
subject, sizeof(subject), 0,
|
|
|
|
|
NULL, NULL, 0);
|
|
|
|
|
else
|
|
|
|
|
strcpy(subject, " **** invalid ref ****");
|
|
|
|
|
printf("%c %s%-*s%s %s %s\n", c, branch_get_color(color),
|
|
|
|
|
maxwidth, item->name,
|
|
|
|
|
branch_get_color(COLOR_BRANCH_RESET),
|
|
|
|
|
find_unique_abbrev(item->sha1, abbrev), subject);
|
|
|
|
|
} else {
|
|
|
|
|
printf("%c %s%s%s\n", c, branch_get_color(color), item->name,
|
|
|
|
|
branch_get_color(COLOR_BRANCH_RESET));
|
|
|
|
|
}
|
2006-11-24 13:45:10 +00:00
|
|
|
|
}
|
|
|
|
|
|
2007-01-03 20:10:10 +00:00
|
|
|
|
static void print_ref_list(int kinds, int detached, int verbose, int abbrev)
|
2006-10-23 21:27:45 +00:00
|
|
|
|
{
|
|
|
|
|
int i;
|
2006-11-21 19:31:24 +00:00
|
|
|
|
struct ref_list ref_list;
|
2006-10-23 21:27:45 +00:00
|
|
|
|
|
2006-11-21 19:31:24 +00:00
|
|
|
|
memset(&ref_list, 0, sizeof(ref_list));
|
|
|
|
|
ref_list.kinds = kinds;
|
|
|
|
|
for_each_ref(append_ref, &ref_list);
|
2006-10-23 21:27:45 +00:00
|
|
|
|
|
2006-11-21 19:31:24 +00:00
|
|
|
|
qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp);
|
2006-10-23 21:27:45 +00:00
|
|
|
|
|
2007-01-03 20:10:10 +00:00
|
|
|
|
detached = (detached && (kinds & REF_LOCAL_BRANCH));
|
|
|
|
|
if (detached) {
|
|
|
|
|
struct ref_item item;
|
|
|
|
|
item.name = "(no branch)";
|
|
|
|
|
item.kind = REF_LOCAL_BRANCH;
|
|
|
|
|
hashcpy(item.sha1, head_sha1);
|
|
|
|
|
if (strlen(item.name) > ref_list.maxwidth)
|
|
|
|
|
ref_list.maxwidth = strlen(item.name);
|
|
|
|
|
print_ref_item(&item, ref_list.maxwidth, verbose, abbrev, 1);
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-21 19:31:24 +00:00
|
|
|
|
for (i = 0; i < ref_list.index; i++) {
|
2007-01-03 20:10:10 +00:00
|
|
|
|
int current = !detached &&
|
|
|
|
|
(ref_list.list[i].kind == REF_LOCAL_BRANCH) &&
|
2007-01-03 20:10:09 +00:00
|
|
|
|
!strcmp(ref_list.list[i].name, head);
|
|
|
|
|
print_ref_item(&ref_list.list[i], ref_list.maxwidth, verbose,
|
|
|
|
|
abbrev, current);
|
2006-10-23 21:27:45 +00:00
|
|
|
|
}
|
2006-11-21 19:31:24 +00:00
|
|
|
|
|
|
|
|
|
free_ref_list(&ref_list);
|
2006-10-23 21:27:45 +00:00
|
|
|
|
}
|
|
|
|
|
|
2007-01-02 07:31:08 +00:00
|
|
|
|
static void create_branch(const char *name, const char *start_name,
|
|
|
|
|
unsigned char *start_sha1,
|
2006-10-23 21:27:45 +00:00
|
|
|
|
int force, int reflog)
|
|
|
|
|
{
|
|
|
|
|
struct ref_lock *lock;
|
|
|
|
|
struct commit *commit;
|
|
|
|
|
unsigned char sha1[20];
|
|
|
|
|
char ref[PATH_MAX], msg[PATH_MAX + 20];
|
2007-01-19 19:51:29 +00:00
|
|
|
|
int forcing = 0;
|
2006-10-23 21:27:45 +00:00
|
|
|
|
|
|
|
|
|
snprintf(ref, sizeof ref, "refs/heads/%s", name);
|
|
|
|
|
if (check_ref_format(ref))
|
|
|
|
|
die("'%s' is not a valid branch name.", name);
|
|
|
|
|
|
|
|
|
|
if (resolve_ref(ref, sha1, 1, NULL)) {
|
|
|
|
|
if (!force)
|
|
|
|
|
die("A branch named '%s' already exists.", name);
|
2007-01-20 18:51:37 +00:00
|
|
|
|
else if (!is_bare_repository() && !strcmp(head, name))
|
2006-10-23 21:27:45 +00:00
|
|
|
|
die("Cannot force update the current branch.");
|
2007-01-19 19:51:29 +00:00
|
|
|
|
forcing = 1;
|
2006-10-23 21:27:45 +00:00
|
|
|
|
}
|
|
|
|
|
|
2007-01-02 07:31:08 +00:00
|
|
|
|
if (start_sha1)
|
|
|
|
|
/* detached HEAD */
|
|
|
|
|
hashcpy(sha1, start_sha1);
|
|
|
|
|
else if (get_sha1(start_name, sha1))
|
|
|
|
|
die("Not a valid object name: '%s'.", start_name);
|
|
|
|
|
|
|
|
|
|
if ((commit = lookup_commit_reference(sha1)) == NULL)
|
|
|
|
|
die("Not a valid branch point: '%s'.", start_name);
|
2006-10-23 21:27:45 +00:00
|
|
|
|
hashcpy(sha1, commit->object.sha1);
|
|
|
|
|
|
|
|
|
|
lock = lock_any_ref_for_update(ref, NULL);
|
|
|
|
|
if (!lock)
|
|
|
|
|
die("Failed to lock ref for update: %s.", strerror(errno));
|
|
|
|
|
|
2007-01-19 19:51:29 +00:00
|
|
|
|
if (reflog)
|
2006-10-23 21:27:45 +00:00
|
|
|
|
log_all_ref_updates = 1;
|
2007-01-19 19:51:29 +00:00
|
|
|
|
|
|
|
|
|
if (forcing)
|
|
|
|
|
snprintf(msg, sizeof msg, "branch: Reset from %s",
|
|
|
|
|
start_name);
|
|
|
|
|
else
|
2007-01-02 07:31:08 +00:00
|
|
|
|
snprintf(msg, sizeof msg, "branch: Created from %s",
|
|
|
|
|
start_name);
|
2006-10-23 21:27:45 +00:00
|
|
|
|
|
|
|
|
|
if (write_ref_sha1(lock, sha1, msg) < 0)
|
|
|
|
|
die("Failed to write ref: %s.", strerror(errno));
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-28 14:47:40 +00:00
|
|
|
|
static void rename_branch(const char *oldname, const char *newname, int force)
|
|
|
|
|
{
|
2006-11-30 02:16:56 +00:00
|
|
|
|
char oldref[PATH_MAX], newref[PATH_MAX], logmsg[PATH_MAX*2 + 100];
|
2006-11-28 14:47:40 +00:00
|
|
|
|
unsigned char sha1[20];
|
|
|
|
|
|
2007-01-02 07:31:08 +00:00
|
|
|
|
if (!oldname)
|
2007-02-04 04:49:16 +00:00
|
|
|
|
die("cannot rename the current branch while not on any.");
|
2007-01-02 07:31:08 +00:00
|
|
|
|
|
2006-11-28 14:47:40 +00:00
|
|
|
|
if (snprintf(oldref, sizeof(oldref), "refs/heads/%s", oldname) > sizeof(oldref))
|
|
|
|
|
die("Old branchname too long");
|
|
|
|
|
|
|
|
|
|
if (check_ref_format(oldref))
|
|
|
|
|
die("Invalid branch name: %s", oldref);
|
|
|
|
|
|
|
|
|
|
if (snprintf(newref, sizeof(newref), "refs/heads/%s", newname) > sizeof(newref))
|
|
|
|
|
die("New branchname too long");
|
|
|
|
|
|
|
|
|
|
if (check_ref_format(newref))
|
|
|
|
|
die("Invalid branch name: %s", newref);
|
|
|
|
|
|
|
|
|
|
if (resolve_ref(newref, sha1, 1, NULL) && !force)
|
|
|
|
|
die("A branch named '%s' already exists.", newname);
|
|
|
|
|
|
2006-11-30 02:16:56 +00:00
|
|
|
|
snprintf(logmsg, sizeof(logmsg), "Branch: renamed %s to %s",
|
|
|
|
|
oldref, newref);
|
|
|
|
|
|
|
|
|
|
if (rename_ref(oldref, newref, logmsg))
|
2006-11-28 14:47:40 +00:00
|
|
|
|
die("Branch rename failed");
|
|
|
|
|
|
2007-01-26 22:26:10 +00:00
|
|
|
|
/* no need to pass logmsg here as HEAD didn't really move */
|
|
|
|
|
if (!strcmp(oldname, head) && create_symref("HEAD", newref, NULL))
|
2006-11-28 14:47:40 +00:00
|
|
|
|
die("Branch renamed to %s, but HEAD is not updated!", newname);
|
|
|
|
|
}
|
|
|
|
|
|
2006-10-23 21:27:45 +00:00
|
|
|
|
int cmd_branch(int argc, const char **argv, const char *prefix)
|
|
|
|
|
{
|
2006-11-21 19:31:24 +00:00
|
|
|
|
int delete = 0, force_delete = 0, force_create = 0;
|
2006-11-28 14:47:40 +00:00
|
|
|
|
int rename = 0, force_rename = 0;
|
2007-01-03 20:10:10 +00:00
|
|
|
|
int verbose = 0, abbrev = DEFAULT_ABBREV, detached = 0;
|
2006-10-23 21:27:45 +00:00
|
|
|
|
int reflog = 0;
|
2006-11-21 19:31:24 +00:00
|
|
|
|
int kinds = REF_LOCAL_BRANCH;
|
2006-10-23 21:27:45 +00:00
|
|
|
|
int i;
|
|
|
|
|
|
2006-12-12 06:41:52 +00:00
|
|
|
|
git_config(git_branch_config);
|
2006-10-23 21:27:45 +00:00
|
|
|
|
|
|
|
|
|
for (i = 1; i < argc; i++) {
|
|
|
|
|
const char *arg = argv[i];
|
|
|
|
|
|
|
|
|
|
if (arg[0] != '-')
|
|
|
|
|
break;
|
|
|
|
|
if (!strcmp(arg, "--")) {
|
|
|
|
|
i++;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (!strcmp(arg, "-d")) {
|
|
|
|
|
delete = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (!strcmp(arg, "-D")) {
|
|
|
|
|
delete = 1;
|
|
|
|
|
force_delete = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (!strcmp(arg, "-f")) {
|
|
|
|
|
force_create = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2006-11-28 14:47:40 +00:00
|
|
|
|
if (!strcmp(arg, "-m")) {
|
|
|
|
|
rename = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (!strcmp(arg, "-M")) {
|
|
|
|
|
rename = 1;
|
|
|
|
|
force_rename = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2006-10-23 21:27:45 +00:00
|
|
|
|
if (!strcmp(arg, "-r")) {
|
2006-11-21 19:31:24 +00:00
|
|
|
|
kinds = REF_REMOTE_BRANCH;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (!strcmp(arg, "-a")) {
|
|
|
|
|
kinds = REF_REMOTE_BRANCH | REF_LOCAL_BRANCH;
|
2006-10-23 21:27:45 +00:00
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (!strcmp(arg, "-l")) {
|
|
|
|
|
reflog = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2007-03-03 00:31:16 +00:00
|
|
|
|
if (!prefixcmp(arg, "--no-abbrev")) {
|
|
|
|
|
abbrev = 0;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
Mechanical conversion to use prefixcmp()
This mechanically converts strncmp() to use prefixcmp(), but only when
the parameters match specific patterns, so that they can be verified
easily. Leftover from this will be fixed in a separate step, including
idiotic conversions like
if (!strncmp("foo", arg, 3))
=>
if (!(-prefixcmp(arg, "foo")))
This was done by using this script in px.perl
#!/usr/bin/perl -i.bak -p
if (/strncmp\(([^,]+), "([^\\"]*)", (\d+)\)/ && (length($2) == $3)) {
s|strncmp\(([^,]+), "([^\\"]*)", (\d+)\)|prefixcmp($1, "$2")|;
}
if (/strncmp\("([^\\"]*)", ([^,]+), (\d+)\)/ && (length($1) == $3)) {
s|strncmp\("([^\\"]*)", ([^,]+), (\d+)\)|(-prefixcmp($2, "$1"))|;
}
and running:
$ git grep -l strncmp -- '*.c' | xargs perl px.perl
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-20 09:53:29 +00:00
|
|
|
|
if (!prefixcmp(arg, "--abbrev=")) {
|
2007-03-03 00:31:16 +00:00
|
|
|
|
abbrev = strtoul(arg + 9, NULL, 10);
|
|
|
|
|
if (abbrev < MINIMUM_ABBREV)
|
|
|
|
|
abbrev = MINIMUM_ABBREV;
|
|
|
|
|
else if (abbrev > 40)
|
|
|
|
|
abbrev = 40;
|
2006-11-24 13:45:10 +00:00
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (!strcmp(arg, "-v")) {
|
|
|
|
|
verbose = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2006-12-12 06:41:52 +00:00
|
|
|
|
if (!strcmp(arg, "--color")) {
|
|
|
|
|
branch_use_color = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (!strcmp(arg, "--no-color")) {
|
|
|
|
|
branch_use_color = 0;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2006-10-23 21:27:45 +00:00
|
|
|
|
usage(builtin_branch_usage);
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-28 14:47:40 +00:00
|
|
|
|
if ((delete && rename) || (delete && force_create) ||
|
|
|
|
|
(rename && force_create))
|
|
|
|
|
usage(builtin_branch_usage);
|
|
|
|
|
|
2006-10-23 21:27:45 +00:00
|
|
|
|
head = xstrdup(resolve_ref("HEAD", head_sha1, 0, NULL));
|
|
|
|
|
if (!head)
|
|
|
|
|
die("Failed to resolve HEAD as a valid ref.");
|
2007-01-03 20:10:10 +00:00
|
|
|
|
if (!strcmp(head, "HEAD")) {
|
|
|
|
|
detached = 1;
|
|
|
|
|
}
|
|
|
|
|
else {
|
Mechanical conversion to use prefixcmp()
This mechanically converts strncmp() to use prefixcmp(), but only when
the parameters match specific patterns, so that they can be verified
easily. Leftover from this will be fixed in a separate step, including
idiotic conversions like
if (!strncmp("foo", arg, 3))
=>
if (!(-prefixcmp(arg, "foo")))
This was done by using this script in px.perl
#!/usr/bin/perl -i.bak -p
if (/strncmp\(([^,]+), "([^\\"]*)", (\d+)\)/ && (length($2) == $3)) {
s|strncmp\(([^,]+), "([^\\"]*)", (\d+)\)|prefixcmp($1, "$2")|;
}
if (/strncmp\("([^\\"]*)", ([^,]+), (\d+)\)/ && (length($1) == $3)) {
s|strncmp\("([^\\"]*)", ([^,]+), (\d+)\)|(-prefixcmp($2, "$1"))|;
}
and running:
$ git grep -l strncmp -- '*.c' | xargs perl px.perl
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-20 09:53:29 +00:00
|
|
|
|
if (prefixcmp(head, "refs/heads/"))
|
2007-01-03 20:10:10 +00:00
|
|
|
|
die("HEAD not found below refs/heads!");
|
|
|
|
|
head += 11;
|
|
|
|
|
}
|
2006-10-23 21:27:45 +00:00
|
|
|
|
|
|
|
|
|
if (delete)
|
2006-12-18 22:42:16 +00:00
|
|
|
|
return delete_branches(argc - i, argv + i, force_delete, kinds);
|
2006-10-23 21:27:45 +00:00
|
|
|
|
else if (i == argc)
|
2007-01-03 20:10:10 +00:00
|
|
|
|
print_ref_list(kinds, detached, verbose, abbrev);
|
2006-11-28 14:47:40 +00:00
|
|
|
|
else if (rename && (i == argc - 1))
|
|
|
|
|
rename_branch(head, argv[i], force_rename);
|
|
|
|
|
else if (rename && (i == argc - 2))
|
|
|
|
|
rename_branch(argv[i], argv[i + 1], force_rename);
|
2006-10-23 21:27:45 +00:00
|
|
|
|
else if (i == argc - 1)
|
2007-01-02 07:31:08 +00:00
|
|
|
|
create_branch(argv[i], head, head_sha1, force_create, reflog);
|
2006-10-23 21:27:45 +00:00
|
|
|
|
else if (i == argc - 2)
|
2007-01-02 07:31:08 +00:00
|
|
|
|
create_branch(argv[i], argv[i+1], NULL, force_create, reflog);
|
2006-10-23 21:27:45 +00:00
|
|
|
|
else
|
|
|
|
|
usage(builtin_branch_usage);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|