mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'jn/svn-fe' of git://github.com/gitster/git into svn-fe

Browse Source 
* git://github.com/gitster/git:
  vcs-svn: Allow change nodes for root of tree (/)
  vcs-svn: Implement Prop-delta handling
  vcs-svn: Sharpen parsing of property lines
  vcs-svn: Split off function for handling of individual properties
  vcs-svn: Make source easier to read on small screens
  vcs-svn: More dump format sanity checks
  vcs-svn: Reject path nodes without Node-action
  vcs-svn: Delay read of per-path properties
  vcs-svn: Combine repo_replace and repo_modify functions
  vcs-svn: Replace = Delete + Add
  vcs-svn: handle_node: Handle deletion case early
  vcs-svn: Use mark to indicate nodes with included text
  vcs-svn: Unclutter handle_node by introducing have_props var
  vcs-svn: Eliminate node_ctx.mark global
  vcs-svn: Eliminate node_ctx.srcRev global
  vcs-svn: Check for errors from open()
  vcs-svn: Allow simple v3 dumps (no deltas yet)

Conflicts:
	t/t9010-svn-fe.sh
	vcs-svn/svndump.c
This commit is contained in:
Jonathan Nieder
2011-02-26 05:21:29 -06:00
parent b1c9b798a6 9e8c532108
commit a62bbf8f01
7 changed files with 857 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
vcs-svn/repo_tree.c
View File

@ -175,25 +175,18 @@ void repo_add(uint32_t *path, uint32_t mode, uint32_t blob_mark)
repo_write_dirent(path, mode, blob_mark, 0);
}
uint32_t repo_replace(uint32_t *path, uint32_t blob_mark)
{
uint32_t mode = 0;
struct repo_dirent *src_dent;
src_dent = repo_read_dirent(active_commit, path);
if (src_dent != NULL) {
mode = src_dent->mode;
repo_write_dirent(path, mode, blob_mark, 0);
}
return mode;
}
void repo_modify(uint32_t *path, uint32_t mode, uint32_t blob_mark)
uint32_t repo_modify_path(uint32_t *path, uint32_t mode, uint32_t blob_mark)
{
struct repo_dirent *src_dent;
src_dent = repo_read_dirent(active_commit, path);
if (src_dent != NULL && blob_mark == 0)
if (!src_dent)
return 0;
if (!blob_mark)
blob_mark = src_dent->content_offset;
if (!mode)
mode = src_dent->mode;
repo_write_dirent(path, mode, blob_mark, 0);
return mode;
}
void repo_delete(uint32_t *path)