refs: new transaction related ref-store api
The transaction struct now takes a ref store at creation and will operate on that ref store alone. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Mar 26, 2017 at 09:42 UTC
c0fe4e8ba3db828079f1288169a94294e713b3d8
3 files changed
+53
-12
refs.c
+43
-12
@@ -630,16 +630,20 @@ static int delete_pseudoref(const char *pseudoref, const unsigned char *old_sha1
630
return 0;
631
}
632
633
-int delete_ref(const char *msg, const char *refname,
634
- const unsigned char *old_sha1, unsigned int flags)
633
+int refs_delete_ref(struct ref_store *refs, const char *msg,
634
+ const char *refname,
635
+ const unsigned char *old_sha1,
636
+ unsigned int flags)
637
{
638
struct ref_transaction *transaction;
639
struct strbuf err = STRBUF_INIT;
640
639
- if (ref_type(refname) == REF_TYPE_PSEUDOREF)
641
+ if (ref_type(refname) == REF_TYPE_PSEUDOREF) {
642
+ assert(refs == get_main_ref_store());
643
return delete_pseudoref(refname, old_sha1);
644
+ }
645
642
- transaction = ref_transaction_begin(&err);
646
+ transaction = ref_store_transaction_begin(refs, &err);
647
if (!transaction ||
648
ref_transaction_delete(transaction, refname, old_sha1,
649
flags, msg, &err) ||
@@ -654,6 +658,13 @@ int delete_ref(const char *msg, const char *refname,
658
return 0;
659
}
660
661
+int delete_ref(const char *msg, const char *refname,
662
+ const unsigned char *old_sha1, unsigned int flags)
663
+{
664
+ return refs_delete_ref(get_main_ref_store(), msg, refname,
665
+ old_sha1, flags);
666
+}
667
+
668
int copy_reflog_msg(char *buf, const char *msg)
669
{
670
char *cp = buf;
@@ -813,11 +824,20 @@ int read_ref_at(const char *refname, unsigned int flags, unsigned long at_time,
824
return 1;
825
}
826
816
-struct ref_transaction *ref_transaction_begin(struct strbuf *err)
827
+struct ref_transaction *ref_store_transaction_begin(struct ref_store *refs,
828
+ struct strbuf *err)
829
{
830
+ struct ref_transaction *tr;
831
assert(err);
832
820
- return xcalloc(1, sizeof(struct ref_transaction));
833
+ tr = xcalloc(1, sizeof(struct ref_transaction));
834
+ tr->ref_store = refs;
835
+ return tr;
836
+}
837
+
838
+struct ref_transaction *ref_transaction_begin(struct strbuf *err)
839
+{
840
+ return ref_store_transaction_begin(get_main_ref_store(), err);
841
}
842
843
void ref_transaction_free(struct ref_transaction *transaction)
@@ -934,18 +954,20 @@ int update_ref_oid(const char *msg, const char *refname,
954
old_oid ? old_oid->hash : NULL, flags, onerr);
955
}
956
937
-int update_ref(const char *msg, const char *refname,
938
- const unsigned char *new_sha1, const unsigned char *old_sha1,
939
- unsigned int flags, enum action_on_err onerr)
957
+int refs_update_ref(struct ref_store *refs, const char *msg,
958
+ const char *refname, const unsigned char *new_sha1,
959
+ const unsigned char *old_sha1, unsigned int flags,
960
+ enum action_on_err onerr)
961
{
962
struct ref_transaction *t = NULL;
963
struct strbuf err = STRBUF_INIT;
964
int ret = 0;
965
966
if (ref_type(refname) == REF_TYPE_PSEUDOREF) {
967
+ assert(refs == get_main_ref_store());
968
ret = write_pseudoref(refname, new_sha1, old_sha1, &err);
969
} else {
948
- t = ref_transaction_begin(&err);
970
+ t = ref_store_transaction_begin(refs, &err);
971
if (!t ||
972
ref_transaction_update(t, refname, new_sha1, old_sha1,
973
flags, msg, &err) ||
@@ -976,6 +998,15 @@ int update_ref(const char *msg, const char *refname,
998
return 0;
999
}
1000
1001
+int update_ref(const char *msg, const char *refname,
1002
+ const unsigned char *new_sha1,
1003
+ const unsigned char *old_sha1,
1004
+ unsigned int flags, enum action_on_err onerr)
1005
+{
1006
+ return refs_update_ref(get_main_ref_store(), msg, refname, new_sha1,
1007
+ old_sha1, flags, onerr);
1008
+}
1009
+
1010
char *shorten_unambiguous_ref(const char *refname, int strict)
1011
{
1012
int i;
@@ -1607,7 +1638,7 @@ int create_symref(const char *ref_target, const char *refs_heads_master,
1638
int ref_transaction_commit(struct ref_transaction *transaction,
1639
struct strbuf *err)
1640
{
1610
- struct ref_store *refs = get_main_ref_store();
1641
+ struct ref_store *refs = transaction->ref_store;
1642
1643
return refs->be->transaction_commit(refs, transaction, err);
1644
}
@@ -1726,7 +1757,7 @@ int reflog_expire(const char *refname, const unsigned char *sha1,
1757
int initial_ref_transaction_commit(struct ref_transaction *transaction,
1758
struct strbuf *err)
1759
{
1729
- struct ref_store *refs = get_main_ref_store();
1760
+ struct ref_store *refs = transaction->ref_store;
1761
1762
return refs->be->initial_transaction_commit(refs, transaction, err);
1763
}
refs.h
+9
@@ -333,6 +333,10 @@ int reflog_exists(const char *refname);
333
* exists, regardless of its old value. It is an error for old_sha1 to
334
* be NULL_SHA1. flags is passed through to ref_transaction_delete().
335
*/
336
+int refs_delete_ref(struct ref_store *refs, const char *msg,
337
+ const char *refname,
338
+ const unsigned char *old_sha1,
339
+ unsigned int flags);
340
int delete_ref(const char *msg, const char *refname,
341
const unsigned char *old_sha1, unsigned int flags);
342
@@ -418,6 +422,8 @@ enum action_on_err {
422
* Begin a reference transaction. The reference transaction must
423
* be freed by calling ref_transaction_free().
424
*/
425
+struct ref_transaction *ref_store_transaction_begin(struct ref_store *refs,
426
+ struct strbuf *err);
427
struct ref_transaction *ref_transaction_begin(struct strbuf *err);
428
429
/*
@@ -552,6 +558,9 @@ void ref_transaction_free(struct ref_transaction *transaction);
558
* ref_transaction_update(). Handle errors as requested by the `onerr`
559
* argument.
560
*/
561
+int refs_update_ref(struct ref_store *refs, const char *msg, const char *refname,
562
+ const unsigned char *new_sha1, const unsigned char *old_sha1,
563
+ unsigned int flags, enum action_on_err onerr);
564
int update_ref(const char *msg, const char *refname,
565
const unsigned char *new_sha1, const unsigned char *old_sha1,
566
unsigned int flags, enum action_on_err onerr);
refs/refs-internal.h
+1
@@ -200,6 +200,7 @@ enum ref_transaction_state {
200
* as atomically as possible. This structure is opaque to callers.
201
*/
202
struct ref_transaction {
203
+ struct ref_store *ref_store;
204
struct ref_update **updates;
205
size_t alloc;
206
size_t nr;