delta/git.git, branch mh/lockfile

lockfile.h: extract new header file for the functions in lockfile.c

2014-10-01T20:56:14+00:00

Move the interface declaration for the functions in lockfile.c from
cache.h to a new file, lockfile.h. Add #includes where necessary (and
remove some redundant includes of cache.h by files that already
include builtin.h).

Move the documentation of the lock_file state diagram from lockfile.c
to the new header file.

Signed-off-by: Michael Haggerty 
Signed-off-by: Junio C Hamano

hold_locked_index(): move from lockfile.c to read-cache.c

2014-10-01T20:54:31+00:00

lockfile.c contains the general API for locking any file. Code
specifically about the index file doesn't belong here.

Signed-off-by: Michael Haggerty 
Signed-off-by: Junio C Hamano

hold_lock_file_for_append(): restore errno before returning

2014-10-01T20:53:54+00:00

Callers who don't pass LOCK_DIE_ON_ERROR might want to examine errno
to see what went wrong, so restore errno before returning.

In fact this function only has one caller, add_to_alternates_file(),
and it *does* use LOCK_DIE_ON_ERROR, but, you know, think of future
generations.

Signed-off-by: Michael Haggerty 
Signed-off-by: Junio C Hamano

get_locked_file_path(): new function

2014-10-01T20:53:54+00:00

Add a function to return the path of the file that is locked by a
lock_file object. This reduces the knowledge that callers have to have
about the lock_file layout.

Suggested-by: Ronnie Sahlberg 
Signed-off-by: Michael Haggerty 
Signed-off-by: Junio C Hamano

lockfile.c: rename static functions

2014-10-01T20:53:53+00:00

* remove_lock_file() -> remove_lock_files()
* remove_lock_file_on_signal() -> remove_lock_files_on_signal()

Suggested-by: Torsten Bögershausen 
Signed-off-by: Michael Haggerty 
Signed-off-by: Junio C Hamano

lockfile: rename LOCK_NODEREF to LOCK_NO_DEREF

2014-10-01T20:53:28+00:00

This makes it harder to misread the name as LOCK_NODE_REF.

Suggested-by: Torsten Bögershausen 
Signed-off-by: Michael Haggerty 
Signed-off-by: Junio C Hamano

commit_lock_file_to(): refactor a helper out of commit_lock_file()

2014-10-01T20:52:06+00:00

commit_locked_index(), when writing to an alternate index file,
duplicates (poorly) the code in commit_lock_file(). And anyway, it
shouldn't have to know so much about the internal workings of lockfile
objects. So extract a new function commit_lock_file_to() that does the
work common to the two functions, and call it from both
commit_lock_file() and commit_locked_index().

Signed-off-by: Michael Haggerty 
Signed-off-by: Junio C Hamano

trim_last_path_component(): replace last_path_elm()

2014-10-01T20:51:30+00:00

Rewrite last_path_elm() to take a strbuf parameter and to trim off the
last path name element in place rather than returning a pointer to the
beginning of the last path name element. This simplifies the function
a bit and makes it integrate better with its caller, which is now also
strbuf-based. Rename the function accordingly and a bit less tersely.

Signed-off-by: Michael Haggerty 
Signed-off-by: Junio C Hamano

resolve_symlink(): take a strbuf parameter

2014-10-01T20:51:29+00:00

Change resolve_symlink() to take a strbuf rather than a string as
parameter.  This simplifies the code and removes an arbitrary pathname
length restriction.  It also means that lock_file's filename field no
longer needs to be initialized to a large size.

Helped-by: Torsten Bögershausen 
Signed-off-by: Michael Haggerty 
Signed-off-by: Junio C Hamano

resolve_symlink(): use a strbuf for internal scratch space

2014-10-01T20:51:29+00:00

Aside from shortening and simplifying the code, this removes another
place where the path name length is arbitrarily limited.

Signed-off-by: Michael Haggerty 
Signed-off-by: Junio C Hamano