delta/git.git, branch rs/ref-transaction-2

refs.c: remove forward declaration of write_ref_sha1

2014-05-15T21:12:45+00:00

Signed-off-by: Ronnie Sahlberg 
Signed-off-by: Junio C Hamano

refs.c: make rename_ref use a transaction

2014-05-15T21:12:41+00:00

Change rename_ref to use a single transaction to perform the ref rename.

Signed-off-by: Ronnie Sahlberg 
Signed-off-by: Junio C Hamano

refs.c: pass a skip list to name_conflict_fn

2014-05-15T21:12:39+00:00

Allow passing a list of refs to skip checking to name_conflict_fn.
There are some conditions where we want to allow a temporary conflict and skip
checking those refs. For example if we have a transaction that
1, guarantees that m is a packed refs and there is no loose ref for m
2, the transaction will delete m from the packed ref
3, the transaction will create conflicting m/m

For this case we want to be able to lock and create m/m since we know that the
conflict is only transient. I.e. the conflict will be automatically resolved
by the transaction when it deletes m.

Signed-off-by: Ronnie Sahlberg 
Signed-off-by: Junio C Hamano

refs.c: add a new flag for transaction delete for refs we know are packed only

2014-05-15T21:12:36+00:00

Add a new flag REF_ISPACKONLY that we can use in ref_transaction_delete.
This flag indicates that the ref does not exist as a loose ref andf only as
a packed ref. If this is the case we then change the commit code so that
we skip taking out a lock file and we skip calling delete_ref_loose.
Check for this flag and die(BUG:...) if used with _update or _create.

At the start of the transaction, before we even start locking any refs,
we add all such REF_ISPACKONLY refs to delnames so that we have a list of
all pack only refs that we will be deleting during this transaction.

Signed-off-by: Ronnie Sahlberg 
Signed-off-by: Junio C Hamano

refs.c: call lock_ref_sha1_basic directly from commit

2014-05-15T21:12:34+00:00

Skip using the lock_any_ref_for_update wrapper and call lock_ref_sha1_basic
directly from the commit function.

Signed-off-by: Ronnie Sahlberg 
Signed-off-by: Junio C Hamano

refs.c: move the check for valid refname to lock_ref_sha1_basic

2014-05-15T21:12:31+00:00

Move the check for check_refname_format from lock_any_ref_for_update
to lock_ref_sha1_basic. At some later stage we will get rid of
lock_any_ref_for_update completely.

This leaves lock_any_ref_for_updates as a no-op wrapper which could be removed.
But this wrapper is also called from an external caller and we will soon
make changes to the signature to lock_ref_sha1_basic that we do not want to
expose to that caller.

Signed-off-by: Ronnie Sahlberg 
Signed-off-by: Junio C Hamano

refs.c: pack all refs before we start to rename a ref

2014-05-15T21:12:27+00:00

This means that most loose refs will no longer be present after the rename
which triggered a test failure since it assumes the file for an unrelated
ref would still be present after the rename.

Signed-off-by: Ronnie Sahlberg 
Signed-off-by: Junio C Hamano

refs.c: pass NULL as *flags to read_ref_full

2014-05-15T21:12:24+00:00

We call read_ref_full with a pointer to flags from rename_ref but since
we never actually use the returned flags we can just pass NULL here instead.

Signed-off-by: Ronnie Sahlberg 
Signed-off-by: Junio C Hamano

refs.c: pass the ref log message to _create/delete/update instead of _commit

2014-05-15T21:12:21+00:00

Change the reference transactions so that we pass the reflog message
through to the create/delete/update function instead of the commit message.
This allows for individual messages for each change in a multi ref
transaction.

Signed-off-by: Ronnie Sahlberg 
Signed-off-by: Junio C Hamano

refs.c: make delete_ref use a transaction

2014-05-15T21:12:20+00:00

Change delete_ref to use a ref transaction for the deletion. At the same time
since we no longer have any callers of repack_without_ref we can now delete
this function.

Signed-off-by: Ronnie Sahlberg 
Signed-off-by: Junio C Hamano