commit - 7a1d6b72b6b0e351fb46965a7f46bc58b18e7cc8
commit + 71a276322e39e17baf5697b5daac8e8fe6ad2ae1
blob - 5afeb7145773fe8a5971e580cd834a604d85d6ca
blob + 8557a12f9a89263a136978089113a713c63984a7
--- got/got.c
+++ got/got.c
if (commit_id_str) {
struct got_object_id *commit_id;
- error = got_repo_resolve_commit_arg(&commit_id,
- commit_id_str, repo);
+ error = got_repo_match_object_id(&commit_id, NULL,
+ commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
if (error)
goto done;
error = check_linear_ancestry(commit_id,
if (error != NULL)
goto done;
} else {
- error = got_repo_resolve_commit_arg(&commit_id,
- commit_id_str, repo);
+ error = got_repo_match_object_id(&commit_id, NULL,
+ commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
free(commit_id_str);
commit_id_str = NULL;
if (error)
}
static const struct got_error *
-match_object_id(struct got_object_id **id, char **label,
- const char *id_str, int obj_type, int resolve_tags,
- struct got_repository *repo)
-{
- const struct got_error *err;
- struct got_tag_object *tag;
- struct got_reference *ref = NULL;
-
- *id = NULL;
- *label = NULL;
-
- if (resolve_tags) {
- err = got_repo_object_match_tag(&tag, id_str, GOT_OBJ_TYPE_ANY,
- repo);
- if (err == NULL) {
- *id = got_object_id_dup(
- got_object_tag_get_object_id(tag));
- if (*id == NULL)
- err = got_error_from_errno("got_object_id_dup");
- else if (asprintf(label, "refs/tags/%s",
- got_object_tag_get_name(tag)) == -1) {
- err = got_error_from_errno("asprintf");
- free(*id);
- *id = NULL;
- }
- got_object_tag_close(tag);
- return err;
- } else if (err->code != GOT_ERR_OBJ_TYPE &&
- err->code != GOT_ERR_NO_OBJ)
- return err;
- }
-
- err = got_repo_match_object_id_prefix(id, id_str, obj_type, repo);
- if (err) {
- if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
- return err;
- err = got_ref_open(&ref, repo, id_str, 0);
- if (err != NULL)
- goto done;
- *label = strdup(got_ref_get_name(ref));
- if (*label == NULL) {
- err = got_error_from_errno("strdup");
- goto done;
- }
- err = got_ref_resolve(id, repo, ref);
- } else {
- err = got_object_id_str(label, *id);
- if (*label == NULL) {
- err = got_error_from_errno("strdup");
- goto done;
- }
- }
-done:
- if (ref)
- got_ref_close(ref);
- return err;
-}
-
-
-static const struct got_error *
cmd_diff(int argc, char *argv[])
{
const struct got_error *error;
goto done;
}
- error = match_object_id(&id1, &label1, id_str1, GOT_OBJ_TYPE_ANY, 1,
- repo);
+ error = got_repo_match_object_id(&id1, &label1, id_str1,
+ GOT_OBJ_TYPE_ANY, 1, repo);
if (error)
goto done;
- error = match_object_id(&id2, &label2, id_str2, GOT_OBJ_TYPE_ANY, 1,
- repo);
+ error = got_repo_match_object_id(&id2, &label2, id_str2,
+ GOT_OBJ_TYPE_ANY, 1, repo);
if (error)
goto done;
if (error != NULL)
goto done;
} else {
- error = got_repo_resolve_commit_arg(&commit_id,
- commit_id_str, repo);
+ error = got_repo_match_object_id(&commit_id, NULL,
+ commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
if (error)
goto done;
}
if (error != NULL)
goto done;
} else {
- error = got_repo_resolve_commit_arg(&commit_id,
- commit_id_str, repo);
+ error = got_repo_match_object_id(&commit_id, NULL,
+ commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
if (error)
goto done;
}
commit_id_arg = worktree ?
got_worktree_get_head_ref_name(worktree) :
GOT_REF_HEAD;
- error = got_repo_resolve_commit_arg(&commit_id,
- commit_id_arg, repo);
+ error = got_repo_match_object_id(&commit_id, NULL,
+ commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
if (error)
goto done;
error = add_branch(repo, argv[0], commit_id);
if (err)
return err;
- err = match_object_id(&commit_id, &label, commit_arg,
+ err = got_repo_match_object_id(&commit_id, &label, commit_arg,
GOT_OBJ_TYPE_COMMIT, 1, repo);
if (err)
goto done;
if (commit_id_str == NULL)
commit_id_str = GOT_REF_HEAD;
- error = got_repo_resolve_commit_arg(&commit_id, commit_id_str, repo);
+ error = got_repo_match_object_id(&commit_id, NULL,
+ commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
if (error)
goto done;
if (error)
break;
} else {
- error = match_object_id(&id, &label, argv[i],
+ error = got_repo_match_object_id(&id, &label, argv[i],
GOT_OBJ_TYPE_ANY, 0, repo);
if (error) {
if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
blob - 42554343a0e5078618cbd6f0bb7cef5de70f25e4
blob + f54c896e78705e3833a92b32f7a8d1a89d804886
--- include/got_repository.h
+++ include/got_repository.h
const char *, int, struct got_repository *);
/*
+ * Given an object ID string or reference name, attempt to find a corresponding
+ * commit object. Tags can optionally be ignored during matching.
+ * The object type may be restricted to commit, tree, blob, or tag.
+ * GOT_OBJ_TYPE_ANY will match any type of object.
+ * A human-readable label can optionally be returned, which the caller should
+ * dispose of with free(3).
+ * Return GOT_ERR_NO_OBJ if no matching commit can be found.
+ */
+const struct got_error *got_repo_match_object_id(struct got_object_id **,
+ char **, const char *, int, int, struct got_repository *);
+
+/*
* Attempt to find a tag object with a given name and target object type.
* Return GOT_ERR_NO_OBJ if no matching tag can be found.
*/
const struct got_error *got_repo_object_match_tag(struct got_tag_object **,
const char *, int, struct got_repository *);
-/*
- * Given an object ID string or reference name argument,
- * attempt to find a corresponding commit object.
- * Return GOT_ERR_NO_OBJ if no matching commit can be found.
- */
-const struct got_error *got_repo_resolve_commit_arg(struct got_object_id **,
- const char *, struct got_repository *);
-
/* A callback function which is invoked when a path is imported. */
typedef const struct got_error *(*got_repo_import_cb)(void *, const char *);
blob - 6ab751cddcd926e54f696b9ea550929fec17c4c5
blob + 694024dff777495df250aba392c630bb04e3e65a
--- lib/repository.c
+++ lib/repository.c
}
const struct got_error *
+got_repo_match_object_id(struct got_object_id **id, char **label,
+ const char *id_str, int obj_type, int resolve_tags,
+ struct got_repository *repo)
+{
+ const struct got_error *err;
+ struct got_tag_object *tag;
+ struct got_reference *ref = NULL;
+
+ *id = NULL;
+ if (label)
+ *label = NULL;
+
+ if (resolve_tags) {
+ err = got_repo_object_match_tag(&tag, id_str, GOT_OBJ_TYPE_ANY,
+ repo);
+ if (err == NULL) {
+ *id = got_object_id_dup(
+ got_object_tag_get_object_id(tag));
+ if (*id == NULL)
+ err = got_error_from_errno("got_object_id_dup");
+ else if (label && asprintf(label, "refs/tags/%s",
+ got_object_tag_get_name(tag)) == -1) {
+ err = got_error_from_errno("asprintf");
+ free(*id);
+ *id = NULL;
+ }
+ got_object_tag_close(tag);
+ return err;
+ } else if (err->code != GOT_ERR_OBJ_TYPE &&
+ err->code != GOT_ERR_NO_OBJ)
+ return err;
+ }
+
+ err = got_repo_match_object_id_prefix(id, id_str, obj_type, repo);
+ if (err) {
+ if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
+ return err;
+ err = got_ref_open(&ref, repo, id_str, 0);
+ if (err != NULL)
+ goto done;
+ if (label) {
+ *label = strdup(got_ref_get_name(ref));
+ if (*label == NULL) {
+ err = got_error_from_errno("strdup");
+ goto done;
+ }
+ }
+ err = got_ref_resolve(id, repo, ref);
+ } else if (label) {
+ err = got_object_id_str(label, *id);
+ if (*label == NULL) {
+ err = got_error_from_errno("strdup");
+ goto done;
+ }
+ }
+done:
+ if (ref)
+ got_ref_close(ref);
+ return err;
+}
+
+const struct got_error *
got_repo_object_match_tag(struct got_tag_object **tag, const char *name,
int obj_type, struct got_repository *repo)
{
return err;
}
-const struct got_error *
-got_repo_resolve_commit_arg(struct got_object_id **commit_id,
- const char *commit_id_arg, struct got_repository *repo)
-{
- const struct got_error *err;
- struct got_reference *ref;
- struct got_tag_object *tag;
-
- err = got_repo_object_match_tag(&tag, commit_id_arg,
- GOT_OBJ_TYPE_COMMIT, repo);
- if (err == NULL) {
- *commit_id = got_object_id_dup(
- got_object_tag_get_object_id(tag));
- if (*commit_id == NULL)
- err = got_error_from_errno("got_object_id_dup");
- got_object_tag_close(tag);
- return err;
- } else if (err->code != GOT_ERR_NO_OBJ)
- return err;
-
- err = got_ref_open(&ref, repo, commit_id_arg, 0);
- if (err == NULL) {
- err = got_ref_resolve(commit_id, repo, ref);
- got_ref_close(ref);
- } else {
- if (err->code != GOT_ERR_NOT_REF)
- return err;
- err = got_repo_match_object_id_prefix(commit_id,
- commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
- }
- return err;
-}
-
static const struct got_error *
alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
const char *name, mode_t mode, struct got_object_id *blob_id)
blob - 6a748ce9cafda7c09c51658f230596550a522a5d
blob + ac26de54f7e6abcc20ae785249eaa69b16e9718c
--- tog/tog.c
+++ tog/tog.c
view->begin_y, view->begin_x, TOG_VIEW_LOG);
if (lv == NULL)
return got_error_from_errno("view_open");
- err = got_repo_resolve_commit_arg(&start_id,
- s->head_ref_name ? s->head_ref_name : GOT_REF_HEAD,
- s->repo);
+ err = got_repo_match_object_id(&start_id, NULL,
+ s->head_ref_name ? s->head_ref_name : GOT_REF_HEAD,
+ GOT_OBJ_TYPE_COMMIT, 1, s->repo);
if (err) {
view_close(lv);
return err;
goto done;
if (start_commit == NULL)
- error = got_repo_resolve_commit_arg(&start_id, worktree ?
+ error = got_repo_match_object_id(&start_id, NULL, worktree ?
got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
- repo);
+ GOT_OBJ_TYPE_COMMIT, 1, repo);
else
- error = got_repo_resolve_commit_arg(&start_id, start_commit,
- repo);
+ error = got_repo_match_object_id(&start_id, NULL, start_commit,
+ GOT_OBJ_TYPE_COMMIT, 1, repo);
if (error != NULL)
goto done;
error = got_ref_resolve(&commit_id, repo, head_ref);
got_ref_close(head_ref);
} else {
- error = got_repo_resolve_commit_arg(&commit_id, commit_id_str,
- repo);
+ error = got_repo_match_object_id(&commit_id, NULL,
+ commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
}
if (error != NULL)
goto done;
if (error)
goto done;
- error = got_repo_resolve_commit_arg(&commit_id,
- commit_id_arg ? commit_id_arg : GOT_REF_HEAD, repo);
+ error = got_repo_match_object_id(&commit_id, NULL,
+ commit_id_arg ? commit_id_arg : GOT_REF_HEAD,
+ GOT_OBJ_TYPE_COMMIT, 1, repo);
if (error != NULL)
goto done;
