mirror of
https://github.com/git/git.git
synced 2024-09-28 10:00:54 +02:00
08c39b5c44
There are two functions to change the staged content for a path in the svn importer's active commit: repo_replace, which changes the text and returns the mode, and repo_modify, which changes the text and mode and returns nothing. Worse, there are more subtle differences: - A mark of 0 passed to repo_modify means "use the existing content". repo_replace uses it as mark :0 and produces a corrupt stream. - When passed a path that is not part of the active commit, repo_replace returns without doing anything. repo_modify transparently adds a new directory entry. Get rid of both and introduce a new function with the best features of both: repo_modify_path modifies the mode, content, or both for a path, depending on which arguments are zero. If no such dirent already exists, it does nothing and reports the error by returning 0. Otherwise, the return value is the resulting mode. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
26 lines
754 B
C
26 lines
754 B
C
#ifndef REPO_TREE_H_
|
|
#define REPO_TREE_H_
|
|
|
|
#include "git-compat-util.h"
|
|
|
|
#define REPO_MODE_DIR 0040000
|
|
#define REPO_MODE_BLB 0100644
|
|
#define REPO_MODE_EXE 0100755
|
|
#define REPO_MODE_LNK 0120000
|
|
|
|
#define REPO_MAX_PATH_LEN 4096
|
|
#define REPO_MAX_PATH_DEPTH 1000
|
|
|
|
uint32_t next_blob_mark(void);
|
|
uint32_t repo_copy(uint32_t revision, uint32_t *src, uint32_t *dst);
|
|
void repo_add(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);
|
|
void repo_delete(uint32_t *path);
|
|
void repo_commit(uint32_t revision, uint32_t author, char *log, uint32_t uuid,
|
|
uint32_t url, long unsigned timestamp);
|
|
void repo_diff(uint32_t r1, uint32_t r2);
|
|
void repo_init(void);
|
|
void repo_reset(void);
|
|
|
|
#endif
|