From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, mhagger@alum.mit.edu
Cc: David Turner <dturner@twopensource.com>
Subject: [PATCH v3 09/20] refs: add method to rename refs
Date: Thu, 14 Jan 2016 11:26:06 -0500 [thread overview]
Message-ID: <1452788777-24954-10-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1452788777-24954-1-git-send-email-dturner@twopensource.com>
Signed-off-by: David Turner <dturner@twopensource.com>
---
refs.c | 5 +++++
refs/files-backend.c | 4 +++-
refs/refs-internal.h | 9 +++++++++
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/refs.c b/refs.c
index b43d9ea..deeb7cf 100644
--- a/refs.c
+++ b/refs.c
@@ -1122,6 +1122,11 @@ int delete_refs(struct string_list *refnames)
return the_refs_backend->delete_refs(refnames);
}
+int rename_ref(const char *oldref, const char *newref, const char *logmsg)
+{
+ return the_refs_backend->rename_ref(oldref, newref, logmsg);
+}
+
const char *resolve_ref_unsafe(const char *ref, int resolve_flags,
unsigned char *sha1, int *flags)
{
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 7f8c3d1..f14b6f9 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -2484,7 +2484,8 @@ static int commit_ref_update(struct ref_lock *lock,
const unsigned char *sha1, const char *logmsg,
int flags, struct strbuf *err);
-int rename_ref(const char *oldrefname, const char *newrefname, const char *logmsg)
+static int files_rename_ref(const char *oldrefname, const char *newrefname,
+ const char *logmsg)
{
unsigned char sha1[20], orig_sha1[20];
int flag = 0, logmoved = 0;
@@ -3575,6 +3576,7 @@ struct ref_storage_be refs_be_files = {
files_peel_ref,
files_create_symref,
files_delete_refs,
+ files_rename_ref,
files_resolve_ref_unsafe,
files_verify_refname_available,
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 1373c02..36a5bf8 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -67,6 +67,13 @@ int do_for_each_per_worktree_ref(const char *submodule, const char *base,
each_ref_fn fn, int trim, int flags,
void *cb_data);
+/*
+ * Check if the new name does not conflict with any existing refs
+ * (other than possibly the old ref). Return 0 if the ref can be
+ * renamed to the new name.
+ */
+int rename_ref_available(const char *oldname, const char *newname);
+
enum peel_status {
/* object was peeled successfully: */
PEEL_PEELED = 0,
@@ -246,6 +253,7 @@ typedef const char *resolve_ref_unsafe_fn(const char *ref,
typedef int verify_refname_available_fn(const char *refname, struct string_list *extra, struct string_list *skip, struct strbuf *err);
typedef int resolve_gitlink_ref_fn(const char *path, const char *refname,
unsigned char *sha1);
+typedef int rename_ref_fn(const char *oldref, const char *newref, const char *logmsg);
/* iteration methods */
typedef int head_ref_fn(each_ref_fn fn, void *cb_data);
@@ -284,6 +292,7 @@ struct ref_storage_be {
peel_ref_fn *peel_ref;
create_symref_fn *create_symref;
delete_refs_fn *delete_refs;
+ rename_ref_fn *rename_ref;
resolve_ref_unsafe_fn *resolve_ref_unsafe;
verify_refname_available_fn *verify_refname_available;
--
2.4.2.749.g730654d-twtrsrc
next prev parent reply other threads:[~2016-01-14 16:26 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-14 16:25 [PATCH v3 00/20] refs backend rebase on pu David Turner
2016-01-14 16:25 ` [PATCH v3 01/20] refs: add a backend method structure with transaction functions David Turner
2016-01-14 16:25 ` [PATCH v3 02/20] refs: add methods for misc ref operations David Turner
2016-01-14 16:26 ` [PATCH v3 03/20] refs: add methods for the ref iterators David Turner
2016-01-14 16:26 ` [PATCH v3 04/20] refs: add do_for_each_per_worktree_ref David Turner
2016-01-14 16:26 ` [PATCH v3 05/20] refs: add methods for reflog David Turner
2016-01-14 16:26 ` [PATCH v3 06/20] refs: add method for initial ref transaction commit David Turner
2016-01-14 16:26 ` [PATCH v3 07/20] refs: add method for delete_refs David Turner
2016-01-14 16:26 ` [PATCH v3 08/20] refs: add methods to init refs db David Turner
2016-01-14 16:26 ` David Turner [this message]
2016-01-14 16:26 ` [PATCH v3 10/20] refs: make lock generic David Turner
2016-01-14 16:26 ` [PATCH v3 11/20] refs: move duplicate check to common code David Turner
2016-01-14 16:26 ` [PATCH v3 12/20] refs: allow log-only updates David Turner
2016-01-14 16:26 ` [PATCH v3 13/20] refs: resolve symbolic refs first David Turner
2016-02-04 7:37 ` Jeff King
2016-02-04 19:24 ` David Turner
2016-01-14 16:26 ` [PATCH v3 14/20] refs: always handle non-normal refs in files backend David Turner
2016-01-14 16:26 ` [PATCH v3 15/20] init: allow alternate backends to be set for new repos David Turner
2016-01-15 11:33 ` SZEDER Gábor
2016-01-15 12:51 ` Thomas Gummerer
2016-01-19 19:12 ` David Turner
2016-02-04 9:48 ` Duy Nguyen
2016-02-04 20:05 ` David Turner
2016-01-14 16:26 ` [PATCH v3 16/20] refs: check submodules ref storage config David Turner
2016-01-14 16:26 ` [PATCH v3 17/20] refs: allow ref backend to be set for clone David Turner
2016-01-15 11:32 ` SZEDER Gábor
2016-01-19 17:06 ` David Turner
2016-01-21 9:08 ` SZEDER Gábor
2016-01-14 16:26 ` [PATCH v3 18/20] svn: learn ref-storage argument David Turner
2016-01-15 11:34 ` SZEDER Gábor
2016-01-14 16:26 ` [PATCH v3 19/20] refs: add LMDB refs backend David Turner
2016-01-15 13:33 ` Thomas Gummerer
2016-01-19 18:55 ` David Turner
2016-02-04 9:58 ` Duy Nguyen
2016-02-04 19:33 ` David Turner
2016-01-14 16:26 ` [PATCH v3 20/20] refs: tests for lmdb backend David Turner
2016-02-02 20:08 ` [PATCH v3 00/20] refs backend rebase on pu David Turner
2016-02-02 22:13 ` Junio C Hamano
2016-02-04 0:09 ` Junio C Hamano
2016-02-04 1:12 ` David Turner
2016-02-04 1:54 ` Ramsay Jones
2016-02-04 2:58 ` Jeff King
2016-02-04 22:44 ` David Turner
2016-02-04 10:09 ` Duy Nguyen
2016-02-04 21:39 ` David Turner
2016-02-04 11:42 ` Duy Nguyen
2016-02-04 20:25 ` David Turner
2016-02-04 20:39 ` Ramsay Jones
2016-02-04 21:23 ` David Turner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452788777-24954-10-git-send-email-dturner@twopensource.com \
--to=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).