-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into jn/svn-fe
This simplifies svn-fe a great deal and fulfills a longstanding wish: support for dumps with deltas in them, and incremental imports. The cost is that commandline usage of the svn-fe tool becomes a little more complicated since it no longer keeps state itself but instead reads blobs back from fast-import in order to copy them between revisions and apply deltas to them. Also removes a couple of custom data structures and replaces them with strbufs like other parts of Git. * 'svn-fe' of git://repo.or.cz/git/jrn: (32 commits) vcs-svn: reset first_commit_done in fast_export_init vcs-svn: do not initialize report_buffer twice vcs-svn: avoid hangs from corrupt deltas vcs-svn: guard against overflow when computing preimage length vcs-svn: cap number of bytes read from sliding view test-svn-fe: split off "test-svn-fe -d" into a separate function vcs-svn: implement text-delta handling vcs-svn: let deltas use data from preimage vcs-svn: let deltas use data from postimage vcs-svn: verify that deltas consume all inline data vcs-svn: implement copyfrom_data delta instruction vcs-svn: read instructions from deltas vcs-svn: read inline data from deltas vcs-svn: read the preimage when applying deltas vcs-svn: parse svndiff0 window header vcs-svn: skeleton of an svn delta parser vcs-svn: make buffer_read_binary API more convenient vcs-svn: learn to maintain a sliding view of a file Makefile: list one vcs-svn/xdiff object or header per line vcs-svn: avoid using ls command twice ... Conflicts: Makefile contrib/svn-fe/svn-fe.txt
- Loading branch information
Showing
18 changed files
with
789 additions
and
938 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,28 @@ | ||
#ifndef FAST_EXPORT_H_ | ||
#define FAST_EXPORT_H_ | ||
|
||
#include "line_buffer.h" | ||
struct strbuf; | ||
struct line_buffer; | ||
|
||
void fast_export_delete(uint32_t depth, uint32_t *path); | ||
void fast_export_modify(uint32_t depth, uint32_t *path, uint32_t mode, | ||
uint32_t mark); | ||
void fast_export_commit(uint32_t revision, const char *author, | ||
void fast_export_init(int fd); | ||
void fast_export_deinit(void); | ||
void fast_export_reset(void); | ||
|
||
void fast_export_delete(const char *path); | ||
void fast_export_modify(const char *path, uint32_t mode, const char *dataref); | ||
void fast_export_begin_commit(uint32_t revision, const char *author, | ||
const struct strbuf *log, const char *uuid, | ||
const char *url, unsigned long timestamp); | ||
void fast_export_blob(uint32_t mode, uint32_t mark, uint32_t len, | ||
struct line_buffer *input); | ||
void fast_export_end_commit(uint32_t revision); | ||
void fast_export_data(uint32_t mode, uint32_t len, struct line_buffer *input); | ||
void fast_export_blob_delta(uint32_t mode, | ||
uint32_t old_mode, const char *old_data, | ||
uint32_t len, struct line_buffer *input); | ||
|
||
/* If there is no such file at that rev, returns -1, errno == ENOENT. */ | ||
int fast_export_ls_rev(uint32_t rev, const char *path, | ||
uint32_t *mode_out, struct strbuf *dataref_out); | ||
int fast_export_ls(const char *path, | ||
uint32_t *mode_out, struct strbuf *dataref_out); | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.