Linus Torvalds | 8bc9a0c | 2005-04-07 15:16:10 -0700 | [diff] [blame] | 1 | /* |
| 2 | * GIT - The information manager from hell |
| 3 | * |
| 4 | * Copyright (C) Linus Torvalds, 2005 |
| 5 | */ |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 6 | #include "cache.h" |
Peter Eriksen | 8e44025 | 2006-04-02 14:44:09 +0200 | [diff] [blame] | 7 | #include "commit.h" |
| 8 | #include "tree.h" |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 9 | |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 10 | #define BLOCKING (1ul << 14) |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 11 | |
| 12 | /* |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 13 | * FIXME! Share the code with "write-tree.c" |
| 14 | */ |
| 15 | static void init_buffer(char **bufp, unsigned int *sizep) |
| 16 | { |
Christopher Li | 812666c | 2005-04-26 12:00:58 -0700 | [diff] [blame] | 17 | char *buf = xmalloc(BLOCKING); |
Linus Torvalds | a44c9a5 | 2005-04-25 10:19:53 -0700 | [diff] [blame] | 18 | *sizep = 0; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 19 | *bufp = buf; |
| 20 | } |
| 21 | |
| 22 | static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...) |
| 23 | { |
| 24 | char one_line[2048]; |
| 25 | va_list args; |
| 26 | int len; |
| 27 | unsigned long alloc, size, newsize; |
| 28 | char *buf; |
| 29 | |
| 30 | va_start(args, fmt); |
| 31 | len = vsnprintf(one_line, sizeof(one_line), fmt, args); |
| 32 | va_end(args); |
| 33 | size = *sizep; |
| 34 | newsize = size + len; |
| 35 | alloc = (size + 32767) & ~32767; |
| 36 | buf = *bufp; |
| 37 | if (newsize > alloc) { |
Ingo Molnar | aebb267 | 2005-04-12 11:36:26 -0700 | [diff] [blame] | 38 | alloc = (newsize + 32767) & ~32767; |
Christopher Li | 812666c | 2005-04-26 12:00:58 -0700 | [diff] [blame] | 39 | buf = xrealloc(buf, alloc); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 40 | *bufp = buf; |
| 41 | } |
| 42 | *sizep = newsize; |
| 43 | memcpy(buf + size, one_line, len); |
| 44 | } |
| 45 | |
Linus Torvalds | d0d7cbe | 2005-04-17 15:26:13 -0700 | [diff] [blame] | 46 | static void check_valid(unsigned char *sha1, const char *expect) |
| 47 | { |
| 48 | void *buf; |
| 49 | char type[20]; |
| 50 | unsigned long size; |
| 51 | |
| 52 | buf = read_sha1_file(sha1, type, &size); |
| 53 | if (!buf || strcmp(type, expect)) |
| 54 | die("%s is not a valid '%s' object", sha1_to_hex(sha1), expect); |
| 55 | free(buf); |
| 56 | } |
| 57 | |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 58 | /* |
Junio C Hamano | c5bac17 | 2005-04-20 19:49:16 -0700 | [diff] [blame] | 59 | * Having more than two parents is not strange at all, and this is |
| 60 | * how multi-way merges are represented. |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 61 | */ |
| 62 | #define MAXPARENT (16) |
Linus Torvalds | b389237 | 2005-06-19 10:40:10 -0700 | [diff] [blame] | 63 | static unsigned char parent_sha1[MAXPARENT][20]; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 64 | |
Petr Baudis | 4d1f119 | 2005-07-29 11:01:26 +0200 | [diff] [blame] | 65 | static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog"; |
Junio C Hamano | c5bac17 | 2005-04-20 19:49:16 -0700 | [diff] [blame] | 66 | |
Linus Torvalds | b389237 | 2005-06-19 10:40:10 -0700 | [diff] [blame] | 67 | static int new_parent(int idx) |
| 68 | { |
| 69 | int i; |
| 70 | unsigned char *sha1 = parent_sha1[idx]; |
| 71 | for (i = 0; i < idx; i++) { |
| 72 | if (!memcmp(parent_sha1[i], sha1, 20)) { |
| 73 | error("duplicate parent %s ignored", sha1_to_hex(sha1)); |
| 74 | return 0; |
| 75 | } |
| 76 | } |
| 77 | return 1; |
| 78 | } |
| 79 | |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 80 | int main(int argc, char **argv) |
| 81 | { |
Linus Torvalds | 6aa33f4 | 2005-07-12 11:49:27 -0700 | [diff] [blame] | 82 | int i; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 83 | int parents = 0; |
| 84 | unsigned char tree_sha1[20]; |
Linus Torvalds | d6d3f9d | 2005-04-09 17:09:34 -0700 | [diff] [blame] | 85 | unsigned char commit_sha1[20]; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 86 | char comment[1000]; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 87 | char *buffer; |
| 88 | unsigned int size; |
| 89 | |
Linus Torvalds | e1b1039 | 2005-10-11 18:47:34 -0700 | [diff] [blame] | 90 | setup_ident(); |
Junio C Hamano | ce1610e | 2006-02-09 14:41:39 -0800 | [diff] [blame] | 91 | setup_git_directory(); |
| 92 | |
Linus Torvalds | e1b1039 | 2005-10-11 18:47:34 -0700 | [diff] [blame] | 93 | git_config(git_default_config); |
| 94 | |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 95 | if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0) |
Junio C Hamano | c5bac17 | 2005-04-20 19:49:16 -0700 | [diff] [blame] | 96 | usage(commit_tree_usage); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 97 | |
Peter Eriksen | 8e44025 | 2006-04-02 14:44:09 +0200 | [diff] [blame] | 98 | check_valid(tree_sha1, tree_type); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 99 | for (i = 2; i < argc; i += 2) { |
| 100 | char *a, *b; |
| 101 | a = argv[i]; b = argv[i+1]; |
Linus Torvalds | 3c249c9 | 2005-05-01 16:36:56 -0700 | [diff] [blame] | 102 | if (!b || strcmp(a, "-p") || get_sha1(b, parent_sha1[parents])) |
Junio C Hamano | c5bac17 | 2005-04-20 19:49:16 -0700 | [diff] [blame] | 103 | usage(commit_tree_usage); |
Peter Eriksen | 8e44025 | 2006-04-02 14:44:09 +0200 | [diff] [blame] | 104 | check_valid(parent_sha1[parents], commit_type); |
Linus Torvalds | b389237 | 2005-06-19 10:40:10 -0700 | [diff] [blame] | 105 | if (new_parent(parents)) |
| 106 | parents++; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 107 | } |
| 108 | if (!parents) |
| 109 | fprintf(stderr, "Committing initial tree %s\n", argv[1]); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 110 | |
| 111 | init_buffer(&buffer, &size); |
| 112 | add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1)); |
| 113 | |
| 114 | /* |
| 115 | * NOTE! This ordering means that the same exact tree merged with a |
| 116 | * different order of parents will be a _different_ changeset even |
| 117 | * if everything else stays the same. |
| 118 | */ |
| 119 | for (i = 0; i < parents; i++) |
| 120 | add_buffer(&buffer, &size, "parent %s\n", sha1_to_hex(parent_sha1[i])); |
| 121 | |
| 122 | /* Person/date information */ |
Junio C Hamano | 749be72 | 2006-02-18 20:31:05 -0800 | [diff] [blame] | 123 | add_buffer(&buffer, &size, "author %s\n", git_author_info(1)); |
| 124 | add_buffer(&buffer, &size, "committer %s\n\n", git_committer_info(1)); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 125 | |
| 126 | /* And add the comment */ |
| 127 | while (fgets(comment, sizeof(comment), stdin) != NULL) |
| 128 | add_buffer(&buffer, &size, "%s", comment); |
| 129 | |
Peter Eriksen | 8e44025 | 2006-04-02 14:44:09 +0200 | [diff] [blame] | 130 | if (!write_sha1_file(buffer, size, commit_type, commit_sha1)) { |
Junio C Hamano | 7561d9f | 2006-03-24 22:23:25 -0800 | [diff] [blame] | 131 | printf("%s\n", sha1_to_hex(commit_sha1)); |
| 132 | return 0; |
| 133 | } |
| 134 | else |
| 135 | return 1; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 136 | } |