undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make reflog filename independent from struct ref_lock

Browse Source 
This allows for ref_log_write() to be used in a more flexible way,
and is needed for future changes.

This is only code reorg with no behavior change.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Nicolas Pitre 2007-01-26 17:26:05 -05:00 committed by Junio C Hamano
parent 1b600e659a
commit 9a13f0b71b
3 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin-reflog.c
View File

@ -242,7 +242,7 @@ static int expire_reflog(const char *ref, const unsigned char *sha1, int unused,
struct cmd_reflog_expire_cb *cmd = cb_data; struct cmd_reflog_expire_cb *cmd = cb_data;
struct expire_reflog_cb cb; struct expire_reflog_cb cb;
struct ref_lock *lock; struct ref_lock *lock;
char *newlog_path = NULL; char *log_file, *newlog_path = NULL;
int status = 0; int status = 0;
if (strncmp(ref, "refs/", 5)) if (strncmp(ref, "refs/", 5))
@ -255,7 +255,8 @@ static int expire_reflog(const char *ref, const unsigned char *sha1, int unused,
lock = lock_ref_sha1(ref + 5, sha1); lock = lock_ref_sha1(ref + 5, sha1);
if (!lock) if (!lock)
return error("cannot lock ref '%s'", ref); return error("cannot lock ref '%s'", ref);
if (!file_exists(lock->log_file)) log_file = xstrdup(git_path("logs/%s", ref));
if (!file_exists(log_file))
goto finish; goto finish;
if (!cmd->dry_run) { if (!cmd->dry_run) {
newlog_path = xstrdup(git_path("logs/%s.lock", ref)); newlog_path = xstrdup(git_path("logs/%s.lock", ref));
@ -271,13 +272,14 @@ static int expire_reflog(const char *ref, const unsigned char *sha1, int unused,
if (fclose(cb.newlog)) if (fclose(cb.newlog))
status |= error("%s: %s", strerror(errno), status |= error("%s: %s", strerror(errno),
newlog_path); newlog_path);
if (rename(newlog_path, lock->log_file)) { if (rename(newlog_path, log_file)) {
status |= error("cannot rename %s to %s", status |= error("cannot rename %s to %s",
newlog_path, lock->log_file); newlog_path, log_file);
unlink(newlog_path); unlink(newlog_path);
} }
} }
free(newlog_path); free(newlog_path);
free(log_file);
unlock_ref(lock); unlock_ref(lock);
return status; return status;
} }

40
refs.c
View File

@ -680,7 +680,6 @@ static struct ref_lock *lock_ref_sha1_basic(const char *ref, const unsigned char
lock->lk = xcalloc(1, sizeof(struct lock_file)); lock->lk = xcalloc(1, sizeof(struct lock_file));
lock->ref_name = xstrdup(ref); lock->ref_name = xstrdup(ref);
lock->log_file = xstrdup(git_path("logs/%s", ref));
ref_file = git_path("%s", ref); ref_file = git_path("%s", ref);
lock->force_write = lstat(ref_file, &st) && errno == ENOENT; lock->force_write = lstat(ref_file, &st) && errno == ENOENT;
@ -776,10 +775,10 @@ int delete_ref(const char *refname, unsigned char *sha1)
*/ */
ret |= repack_without_ref(refname); ret |= repack_without_ref(refname);
err = unlink(lock->log_file); err = unlink(git_path("logs/%s", lock->ref_name));
if (err && errno != ENOENT) if (err && errno != ENOENT)
fprintf(stderr, "warning: unlink(%s) failed: %s", fprintf(stderr, "warning: unlink(%s) failed: %s",
lock->log_file, strerror(errno)); git_path("logs/%s", lock->ref_name), strerror(errno));
invalidate_cached_refs(); invalidate_cached_refs();
unlock_ref(lock); unlock_ref(lock);
return ret; return ret;
@ -920,47 +919,48 @@ void unlock_ref(struct ref_lock *lock)
rollback_lock_file(lock->lk); rollback_lock_file(lock->lk);
} }
free(lock->ref_name); free(lock->ref_name);
free(lock->log_file);
free(lock); free(lock);
} }
static int log_ref_write(struct ref_lock *lock, static int log_ref_write(const char *ref_name, const unsigned char *old_sha1,
const unsigned char *sha1, const char *msg) const unsigned char *new_sha1, const char *msg)
{ {
int logfd, written, oflags = O_APPEND | O_WRONLY; int logfd, written, oflags = O_APPEND | O_WRONLY;
unsigned maxlen, len; unsigned maxlen, len;
int msglen; int msglen;
char *logrec; char *log_file, *logrec;
const char *committer; const char *committer;
if (log_all_ref_updates < 0) if (log_all_ref_updates < 0)
log_all_ref_updates = !is_bare_repository(); log_all_ref_updates = !is_bare_repository();
log_file = git_path("logs/%s", ref_name);
if (log_all_ref_updates && if (log_all_ref_updates &&
(!strncmp(lock->ref_name, "refs/heads/", 11) || (!strncmp(ref_name, "refs/heads/", 11) ||
!strncmp(lock->ref_name, "refs/remotes/", 13))) { !strncmp(ref_name, "refs/remotes/", 13))) {
if (safe_create_leading_directories(lock->log_file) < 0) if (safe_create_leading_directories(log_file) < 0)
return error("unable to create directory for %s", return error("unable to create directory for %s",
lock->log_file); log_file);
oflags |= O_CREAT; oflags |= O_CREAT;
} }
logfd = open(lock->log_file, oflags, 0666); logfd = open(log_file, oflags, 0666);
if (logfd < 0) { if (logfd < 0) {
if (!(oflags & O_CREAT) && errno == ENOENT) if (!(oflags & O_CREAT) && errno == ENOENT)
return 0; return 0;
if ((oflags & O_CREAT) && errno == EISDIR) { if ((oflags & O_CREAT) && errno == EISDIR) {
if (remove_empty_directories(lock->log_file)) { if (remove_empty_directories(log_file)) {
return error("There are still logs under '%s'", return error("There are still logs under '%s'",
lock->log_file); log_file);
} }
logfd = open(lock->log_file, oflags, 0666); logfd = open(log_file, oflags, 0666);
} }
if (logfd < 0) if (logfd < 0)
return error("Unable to append to %s: %s", return error("Unable to append to %s: %s",
lock->log_file, strerror(errno)); log_file, strerror(errno));
} }
msglen = 0; msglen = 0;
@ -982,8 +982,8 @@ static int log_ref_write(struct ref_lock *lock,
maxlen = strlen(committer) + msglen + 100; maxlen = strlen(committer) + msglen + 100;
logrec = xmalloc(maxlen); logrec = xmalloc(maxlen);
len = sprintf(logrec, "%s %s %s\n", len = sprintf(logrec, "%s %s %s\n",
sha1_to_hex(lock->old_sha1), sha1_to_hex(old_sha1),
sha1_to_hex(sha1), sha1_to_hex(new_sha1),
committer); committer);
if (msglen) if (msglen)
len += sprintf(logrec + len - 1, "\t%.*s\n", msglen, msg) - 1; len += sprintf(logrec + len - 1, "\t%.*s\n", msglen, msg) - 1;
@ -991,7 +991,7 @@ static int log_ref_write(struct ref_lock *lock,
free(logrec); free(logrec);
close(logfd); close(logfd);
if (written != len) if (written != len)
return error("Unable to append to %s", lock->log_file); return error("Unable to append to %s", log_file);
return 0; return 0;
} }
@ -1014,7 +1014,7 @@ int write_ref_sha1(struct ref_lock *lock,
return -1; return -1;
} }
invalidate_cached_refs(); invalidate_cached_refs();
if (log_ref_write(lock, sha1, logmsg) < 0) { if (log_ref_write(lock->ref_name, lock->old_sha1, sha1, logmsg) < 0) {
unlock_ref(lock); unlock_ref(lock);
return -1; return -1;
} }

1
refs.h
View File

@ -3,7 +3,6 @@
struct ref_lock { struct ref_lock {
char *ref_name; char *ref_name;
char *log_file;
struct lock_file *lk; struct lock_file *lk;
unsigned char old_sha1[20]; unsigned char old_sha1[20];
int lock_fd; int lock_fd;