@matheusbsbs / matheus-bagliano / commits / 5040f17eba
Fork 0

blame -S <ancestry-file>

This adds the -S <ancestry-file> option to blame, which is needed by the CVS server emulation. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Apr 6, 2006 at 23:58 UTC 5040f17eba15504bad66b14a645bddd9b015ebb7
3 files changed +127 -60
blame.c
+37 -5
@@ -703,11 +703,30 @@ static void* topo_getter(struct commit* c)
703 return util->topo_data;
704 }
705
706 +static int read_ancestry(const char *graft_file,
707 + unsigned char **start_sha1)
708 +{
709 + FILE *fp = fopen(graft_file, "r");
710 + char buf[1024];
711 + if (!fp)
712 + return -1;
713 + while (fgets(buf, sizeof(buf), fp)) {
714 + /* The format is just "Commit Parent1 Parent2 ...\n" */
715 + int len = strlen(buf);
716 + struct commit_graft *graft = read_graft_line(buf, len);
717 + register_commit_graft(graft, 0);
718 + if (!*start_sha1)
719 + *start_sha1 = graft->sha1;
720 + }
721 + fclose(fp);
722 + return 0;
723 +}
724 +
725 int main(int argc, const char **argv)
726 {
727 int i;
728 struct commit *initial = NULL;
710 - unsigned char sha1[20];
729 + unsigned char sha1[20], *sha1_p = NULL;
730
731 const char *filename = NULL, *commit = NULL;
732 char filename_buf[256];
@@ -741,6 +760,14 @@ int main(int argc, const char **argv)
760 !strcmp(argv[i], "--compability")) {
761 compability = 1;
762 continue;
763 + } else if(!strcmp(argv[i], "-S")) {
764 + if (i + 1 < argc &&
765 + !read_ancestry(argv[i + 1], &sha1_p)) {
766 + compability = 1;
767 + i++;
768 + continue;
769 + }
770 + usage(blame_usage);
771 } else if(!strcmp(argv[i], "--")) {
772 options = 0;
773 continue;
@@ -762,7 +789,9 @@ int main(int argc, const char **argv)
789
790 if(!filename)
791 usage(blame_usage);
765 - if(!commit)
792 + if (commit && sha1_p)
793 + usage(blame_usage);
794 + else if(!commit)
795 commit = "HEAD";
796
797 if(prefix)
@@ -771,9 +800,12 @@ int main(int argc, const char **argv)
800 strcpy(filename_buf, filename);
801 filename = filename_buf;
802
774 - if (get_sha1(commit, sha1))
775 - die("get_sha1 failed, commit '%s' not found", commit);
776 - start_commit = lookup_commit_reference(sha1);
803 + if (!sha1_p) {
804 + if (get_sha1(commit, sha1))
805 + die("get_sha1 failed, commit '%s' not found", commit);
806 + sha1_p = sha1;
807 + }
808 + start_commit = lookup_commit_reference(sha1_p);
809 get_util(start_commit)->pathname = filename;
810 if (fill_util_info(start_commit)) {
811 printf("%s not found in %s\n", filename, commit);
commit.c
+79 -55
@@ -101,11 +101,7 @@ static unsigned long parse_commit_date(const char *buf)
101 return date;
102 }
103
104 -static struct commit_graft {
105 - unsigned char sha1[20];
106 - int nr_parent;
107 - unsigned char parent[0][20]; /* more */
108 -} **commit_graft;
104 +static struct commit_graft **commit_graft;
105 static int commit_graft_alloc, commit_graft_nr;
106
107 static int commit_graft_pos(const unsigned char *sha1)
@@ -127,70 +123,98 @@ static int commit_graft_pos(const unsigned char *sha1)
123 return -lo - 1;
124 }
125
130 -static void prepare_commit_graft(void)
126 +int register_commit_graft(struct commit_graft *graft, int ignore_dups)
127 +{
128 + int pos = commit_graft_pos(graft->sha1);
129 +
130 + if (0 <= pos) {
131 + if (ignore_dups)
132 + free(graft);
133 + else {
134 + free(commit_graft[pos]);
135 + commit_graft[pos] = graft;
136 + }
137 + return 1;
138 + }
139 + pos = -pos - 1;
140 + if (commit_graft_alloc <= ++commit_graft_nr) {
141 + commit_graft_alloc = alloc_nr(commit_graft_alloc);
142 + commit_graft = xrealloc(commit_graft,
143 + sizeof(*commit_graft) *
144 + commit_graft_alloc);
145 + }
146 + if (pos < commit_graft_nr)
147 + memmove(commit_graft + pos + 1,
148 + commit_graft + pos,
149 + (commit_graft_nr - pos - 1) *
150 + sizeof(*commit_graft));
151 + commit_graft[pos] = graft;
152 + return 0;
153 +}
154 +
155 +struct commit_graft *read_graft_line(char *buf, int len)
156 +{
157 + /* The format is just "Commit Parent1 Parent2 ...\n" */
158 + int i;
159 + struct commit_graft *graft = NULL;
160 +
161 + if (buf[len-1] == '\n')
162 + buf[--len] = 0;
163 + if (buf[0] == '#')
164 + return 0;
165 + if ((len + 1) % 41) {
166 + bad_graft_data:
167 + error("bad graft data: %s", buf);
168 + free(graft);
169 + return NULL;
170 + }
171 + i = (len + 1) / 41 - 1;
172 + graft = xmalloc(sizeof(*graft) + 20 * i);
173 + graft->nr_parent = i;
174 + if (get_sha1_hex(buf, graft->sha1))
175 + goto bad_graft_data;
176 + for (i = 40; i < len; i += 41) {
177 + if (buf[i] != ' ')
178 + goto bad_graft_data;
179 + if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
180 + goto bad_graft_data;
181 + }
182 + return graft;
183 +}
184 +
185 +int read_graft_file(const char *graft_file)
186 {
132 - char *graft_file = get_graft_file();
187 FILE *fp = fopen(graft_file, "r");
188 char buf[1024];
135 - if (!fp) {
136 - commit_graft = (struct commit_graft **) "hack";
137 - return;
138 - }
189 + if (!fp)
190 + return -1;
191 while (fgets(buf, sizeof(buf), fp)) {
192 /* The format is just "Commit Parent1 Parent2 ...\n" */
193 int len = strlen(buf);
142 - int i;
143 - struct commit_graft *graft = NULL;
144 -
145 - if (buf[len-1] == '\n')
146 - buf[--len] = 0;
147 - if (buf[0] == '#')
148 - continue;
149 - if ((len + 1) % 41) {
150 - bad_graft_data:
151 - error("bad graft data: %s", buf);
152 - free(graft);
153 - continue;
154 - }
155 - i = (len + 1) / 41 - 1;
156 - graft = xmalloc(sizeof(*graft) + 20 * i);
157 - graft->nr_parent = i;
158 - if (get_sha1_hex(buf, graft->sha1))
159 - goto bad_graft_data;
160 - for (i = 40; i < len; i += 41) {
161 - if (buf[i] != ' ')
162 - goto bad_graft_data;
163 - if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
164 - goto bad_graft_data;
165 - }
166 - i = commit_graft_pos(graft->sha1);
167 - if (0 <= i) {
194 + struct commit_graft *graft = read_graft_line(buf, len);
195 + if (register_commit_graft(graft, 1))
196 error("duplicate graft data: %s", buf);
169 - free(graft);
170 - continue;
171 - }
172 - i = -i - 1;
173 - if (commit_graft_alloc <= ++commit_graft_nr) {
174 - commit_graft_alloc = alloc_nr(commit_graft_alloc);
175 - commit_graft = xrealloc(commit_graft,
176 - sizeof(*commit_graft) *
177 - commit_graft_alloc);
178 - }
179 - if (i < commit_graft_nr)
180 - memmove(commit_graft + i + 1,
181 - commit_graft + i,
182 - (commit_graft_nr - i - 1) *
183 - sizeof(*commit_graft));
184 - commit_graft[i] = graft;
197 }
198 fclose(fp);
199 + return 0;
200 +}
201 +
202 +static void prepare_commit_graft(void)
203 +{
204 + static int commit_graft_prepared;
205 + char *graft_file;
206 +
207 + if (commit_graft_prepared)
208 + return;
209 + graft_file = get_graft_file();
210 + read_graft_file(graft_file);
211 + commit_graft_prepared = 1;
212 }
213
214 static struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
215 {
216 int pos;
192 - if (!commit_graft)
193 - prepare_commit_graft();
217 + prepare_commit_graft();
218 pos = commit_graft_pos(sha1);
219 if (pos < 0)
220 return NULL;
commit.h
+11
@@ -90,4 +90,15 @@ void sort_in_topological_order(struct commit_list ** list, int lifo);
90 void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
91 topo_sort_set_fn_t setter,
92 topo_sort_get_fn_t getter);
93 +
94 +struct commit_graft {
95 + unsigned char sha1[20];
96 + int nr_parent;
97 + unsigned char parent[FLEX_ARRAY][20]; /* more */
98 +};
99 +
100 +struct commit_graft *read_graft_line(char *buf, int len);
101 +int register_commit_graft(struct commit_graft *, int);
102 +int read_graft_file(const char *graft_file);
103 +
104 #endif /* COMMIT_H */