git/lockfile.c, branch v2.8.2

lockfile: improve error message when lockfile exists

2016-03-01T18:16:46Z

A common mistake leading a user to see this message is to launch "git commit", let the editor open (and forget about it), and try again to commit. The previous message was going too quickly to "a git process crashed" and to the advice "remove the file manually". This patch modifies the message in two ways: first, it considers that "another process is running" is the norm, not the exception, and it explicitly hints the user to look at text editors. The message is 2 lines longer, but this is not a problem since experienced users do not see the message often. Helped-by: Moritz Neeb Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

lockfile: mark strings for translation

2016-03-01T18:16:45Z

Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

lockfile: remove function "hold_lock_file_for_append"

2015-08-28T18:32:01Z

With 77b9b1d (add_to_alternates_file: don't add duplicate entries, 2015-08-10) the last caller of function "hold_lock_file_for_append" has been removed, so we can remove the function as well. Signed-off-by: Ralf Thielow Acked-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'mh/tempfile'

2015-08-25T21:57:09Z

The "lockfile" API has been rebuilt on top of a new "tempfile" API. * mh/tempfile: credential-cache--daemon: use tempfile module credential-cache--daemon: delete socket from main() gc: use tempfile module to handle gc.pid file lock_repo_for_gc(): compute the path to "gc.pid" only once diff: use tempfile module setup_temporary_shallow(): use tempfile module write_shared_index(): use tempfile module register_tempfile(): new function to handle an existing temporary file tempfile: add several functions for creating temporary files prepare_tempfile_object(): new function, extracted from create_tempfile() tempfile: a new module for handling temporary files commit_lock_file(): use get_locked_file_path() lockfile: add accessor get_lock_file_path() lockfile: add accessors get_lock_file_fd() and get_lock_file_fp() create_bundle(): duplicate file descriptor to avoid closing it twice lockfile: move documentation to lockfile.h and lockfile.c

tempfile: a new module for handling temporary files

2015-08-10T19:57:14Z

A lot of work went into defining the state diagram for lockfiles and ensuring correct, race-resistant cleanup in all circumstances. Most of that infrastructure can be applied directly to *any* temporary file. So extract a new "tempfile" module from the "lockfile" module. Reimplement lockfile on top of tempfile. Subsequent commits will add more users of the new module. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

commit_lock_file(): use get_locked_file_path()

2015-08-10T19:57:14Z

First beef up the sanity checking in get_locked_file_path() to match that in commit_lock_file(). Then rewrite commit_lock_file() to use get_locked_file_path() for its pathname computation. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

lockfile: add accessor get_lock_file_path()

2015-08-10T19:57:14Z

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

lockfile: add accessors get_lock_file_fd() and get_lock_file_fp()

2015-08-10T19:57:14Z

We are about to move those members, so change client code to read them through accessor functions. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

lockfile: move documentation to lockfile.h and lockfile.c

2015-08-10T19:57:14Z

Rearrange/rewrite it somewhat to fit its new environment. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

Merge branch 'js/sleep-without-select'

2015-06-24T19:21:47Z

Portability fix. * js/sleep-without-select: lockfile: wait using sleep_millisec() instead of select() lockfile: convert retry timeout computations to millisecond help.c: wrap wait-only poll() invocation in sleep_millisec() lockfile: replace random() by rand()