7 #include "run-command.h"
8 #include "vcs-svn/svndump.h"
10 #include "argv-array.h"
12 static const char *url
;
13 static int dump_from_file
;
14 static const char *private_ref
;
15 static const char *remote_ref
= "refs/heads/master";
16 static const char *marksfilename
, *notes_ref
;
17 struct rev_note
{ unsigned int rev_nr
; };
19 static int cmd_capabilities(const char *line
);
20 static int cmd_import(const char *line
);
21 static int cmd_list(const char *line
);
23 typedef int (*input_command_handler
)(const char *);
24 struct input_command_entry
{
26 input_command_handler fn
;
27 unsigned char batchable
; /* whether the command starts or is part of a batch */
30 static const struct input_command_entry input_command_list
[] = {
31 { "capabilities", cmd_capabilities
, 0 },
32 { "import", cmd_import
, 1 },
33 { "list", cmd_list
, 0 },
37 static int cmd_capabilities(const char *line
)
40 printf("bidi-import\n");
41 printf("refspec %s:%s\n\n", remote_ref
, private_ref
);
46 static void terminate_batch(void)
48 /* terminate a current batch's fast-import stream */
53 /* NOTE: 'ref' refers to a git reference, while 'rev' refers to a svn revision. */
54 static char *read_ref_note(const unsigned char sha1
[20])
56 const unsigned char *note_sha1
;
59 enum object_type type
;
61 init_notes(NULL
, notes_ref
, NULL
, 0);
62 if (!(note_sha1
= get_note(NULL
, sha1
)))
63 return NULL
; /* note tree not found */
64 if (!(msg
= read_sha1_file(note_sha1
, &type
, &msglen
)))
65 error("Empty notes tree. %s", notes_ref
);
66 else if (!msglen
|| type
!= OBJ_BLOB
) {
67 error("Note contains unusable content. "
68 "Is something else using this notes tree? %s", notes_ref
);
76 static int parse_rev_note(const char *msg
, struct rev_note
*res
)
78 const char *key
, *value
, *end
;
82 end
= strchrnul(msg
, '\n');
85 key
= "Revision-number: ";
86 if (starts_with(msg
, key
)) {
89 value
= msg
+ strlen(key
);
90 i
= strtol(value
, &end
, 0);
91 if (end
== value
|| i
< 0 || i
> UINT32_MAX
)
102 static int note2mark_cb(const unsigned char *object_sha1
,
103 const unsigned char *note_sha1
, char *note_path
,
106 FILE *file
= (FILE *)cb_data
;
108 unsigned long msglen
;
109 enum object_type type
;
110 struct rev_note note
;
112 if (!(msg
= read_sha1_file(note_sha1
, &type
, &msglen
)) ||
113 !msglen
|| type
!= OBJ_BLOB
) {
117 if (parse_rev_note(msg
, ¬e
))
119 if (fprintf(file
, ":%d %s\n", note
.rev_nr
, sha1_to_hex(object_sha1
)) < 1)
124 static void regenerate_marks(void)
127 FILE *marksfile
= fopen(marksfilename
, "w+");
130 die_errno("Couldn't create mark file %s.", marksfilename
);
131 ret
= for_each_note(NULL
, 0, note2mark_cb
, marksfile
);
133 die("Regeneration of marks failed, returned %d.", ret
);
137 static void check_or_regenerate_marks(int latestrev
)
140 struct strbuf sb
= STRBUF_INIT
;
141 struct strbuf line
= STRBUF_INIT
;
147 init_notes(NULL
, notes_ref
, NULL
, 0);
148 marksfile
= fopen(marksfilename
, "r");
151 marksfile
= fopen(marksfilename
, "r");
153 die_errno("cannot read marks file %s!", marksfilename
);
156 strbuf_addf(&sb
, ":%d ", latestrev
);
157 while (strbuf_getline_lf(&line
, marksfile
) != EOF
) {
158 if (starts_with(line
.buf
, sb
.buf
)) {
169 strbuf_release(&line
);
172 static int cmd_import(const char *line
)
177 unsigned char head_sha1
[20];
178 unsigned int startrev
;
179 struct child_process svndump_proc
= CHILD_PROCESS_INIT
;
180 const char *command
= "svnrdump";
182 if (read_ref(private_ref
, head_sha1
))
185 note_msg
= read_ref_note(head_sha1
);
186 if(note_msg
== NULL
) {
187 warning("No note found for %s.", private_ref
);
190 struct rev_note note
= { 0 };
191 if (parse_rev_note(note_msg
, ¬e
))
192 die("Revision number couldn't be parsed from note.");
193 startrev
= note
.rev_nr
+ 1;
197 check_or_regenerate_marks(startrev
- 1);
199 if (dump_from_file
) {
200 dumpin_fd
= open(url
, O_RDONLY
);
202 die_errno("Couldn't open svn dump file %s.", url
);
204 svndump_proc
.out
= -1;
205 argv_array_push(&svndump_proc
.args
, command
);
206 argv_array_push(&svndump_proc
.args
, "dump");
207 argv_array_push(&svndump_proc
.args
, url
);
208 argv_array_pushf(&svndump_proc
.args
, "-r%u:HEAD", startrev
);
210 code
= start_command(&svndump_proc
);
212 die("Unable to start %s, code %d", command
, code
);
213 dumpin_fd
= svndump_proc
.out
;
215 /* setup marks file import/export */
216 printf("feature import-marks-if-exists=%s\n"
217 "feature export-marks=%s\n", marksfilename
, marksfilename
);
219 svndump_init_fd(dumpin_fd
, STDIN_FILENO
);
220 svndump_read(url
, private_ref
, notes_ref
);
225 if (!dump_from_file
) {
226 code
= finish_command(&svndump_proc
);
228 warning("%s, returned %d", command
, code
);
234 static int cmd_list(const char *line
)
236 printf("? %s\n\n", remote_ref
);
241 static int do_command(struct strbuf
*line
)
243 const struct input_command_entry
*p
= input_command_list
;
244 static struct string_list batchlines
= STRING_LIST_INIT_DUP
;
245 static const struct input_command_entry
*batch_cmd
;
247 * commands can be grouped together in a batch.
248 * Batches are ended by \n. If no batch is active the program ends.
249 * During a batch all lines are buffered and passed to the handler function
250 * when the batch is terminated.
252 if (line
->len
== 0) {
254 struct string_list_item
*item
;
255 for_each_string_list_item(item
, &batchlines
)
256 batch_cmd
->fn(item
->string
);
259 string_list_clear(&batchlines
, 0);
260 return 0; /* end of the batch, continue reading other commands. */
262 return 1; /* end of command stream, quit */
265 if (!starts_with(batch_cmd
->name
, line
->buf
))
266 die("Active %s batch interrupted by %s", batch_cmd
->name
, line
->buf
);
267 /* buffer batch lines */
268 string_list_append(&batchlines
, line
->buf
);
272 for (p
= input_command_list
; p
->name
; p
++) {
273 if (starts_with(line
->buf
, p
->name
) && (strlen(p
->name
) == line
->len
||
274 line
->buf
[strlen(p
->name
)] == ' ')) {
277 string_list_append(&batchlines
, line
->buf
);
280 return p
->fn(line
->buf
);
283 die("Unknown command '%s'\n", line
->buf
);
287 int cmd_main(int argc
, const char **argv
)
289 struct strbuf buf
= STRBUF_INIT
, url_sb
= STRBUF_INIT
,
290 private_ref_sb
= STRBUF_INIT
, marksfilename_sb
= STRBUF_INIT
,
291 notes_ref_sb
= STRBUF_INIT
;
292 static struct remote
*remote
;
295 setup_git_directory();
296 if (argc
< 2 || argc
> 3) {
297 usage("git-remote-svn <remote-name> [<url>]");
301 remote
= remote_get(argv
[1]);
302 url_in
= (argc
== 3) ? argv
[2] : remote
->url
[0];
304 if (starts_with(url_in
, "file://")) {
306 url
= url_decode(url_in
+ sizeof("file://")-1);
309 end_url_with_slash(&url_sb
, url_in
);
313 strbuf_addf(&private_ref_sb
, "refs/svn/%s/master", remote
->name
);
314 private_ref
= private_ref_sb
.buf
;
316 strbuf_addf(¬es_ref_sb
, "refs/notes/%s/revs", remote
->name
);
317 notes_ref
= notes_ref_sb
.buf
;
319 strbuf_addf(&marksfilename_sb
, "%s/info/fast-import/remote-svn/%s.marks",
320 get_git_dir(), remote
->name
);
321 marksfilename
= marksfilename_sb
.buf
;
324 if (strbuf_getline_lf(&buf
, stdin
) == EOF
) {
326 die("Error reading command stream");
328 die("Unexpected end of command stream");
330 if (do_command(&buf
))
335 strbuf_release(&buf
);
336 strbuf_release(&url_sb
);
337 strbuf_release(&private_ref_sb
);
338 strbuf_release(¬es_ref_sb
);
339 strbuf_release(&marksfilename_sb
);