Skip to content

merge: combine merge_analysis_for_ref() into merge_analysis() #891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 19, 2019
Merged

merge: combine merge_analysis_for_ref() into merge_analysis() #891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 8 additions & 46 deletions src/repository.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,47 +637,10 @@ Repository_merge_base(Repository *self, PyObject *args)
}

PyDoc_STRVAR(Repository_merge_analysis__doc__,
"merge_analysis(id) -> (Integer, Integer)\n"
"\n"
"Analyzes the given branch and determines the opportunities for merging\n"
"them into the HEAD of the repository\n"
"\n"
"The first returned value is a mixture of the GIT_MERGE_ANALYSIS_NONE, _NORMAL,\n"
"_UP_TO_DATE, _FASTFORWARD and _UNBORN flags.\n"
"The second value is the user's preference from 'merge.ff'");

PyObject *
Repository_merge_analysis(Repository *self, PyObject *py_id)
{
int err;
size_t len;
git_oid id;
git_annotated_commit *commit;
git_merge_analysis_t analysis;
git_merge_preference_t preference;

len = py_oid_to_git_oid(py_id, &id);
if (len == 0)
return NULL;

err = git_annotated_commit_lookup(&commit, self->repo, &id);
if (err < 0)
return Error_set(err);

err = git_merge_analysis(&analysis, &preference, self->repo, (const git_annotated_commit **) &commit, 1);
git_annotated_commit_free(commit);

if (err < 0)
return Error_set(err);

return Py_BuildValue("(ii)", analysis, preference);
}

PyDoc_STRVAR(Repository_merge_analysis_for_ref__doc__,
"merge_analysis_for_ref(our_ref, their_head) -> (Integer, Integer)\n"
"merge_analysis(their_head, our_ref='HEAD') -> (Integer, Integer)\n"
"\n"
"Analyzes the given branch and determines the opportunities for\n"
"merging it into a reference.\n"
"merging it into a reference (defaults to HEAD).\n"
"\n"
"Parameters:\n"
"\n"
Expand All @@ -692,9 +655,9 @@ PyDoc_STRVAR(Repository_merge_analysis_for_ref__doc__,
"The second value is the user's preference from 'merge.ff'");

PyObject *
Repository_merge_analysis_for_ref(Repository *self, PyObject *args)
Repository_merge_analysis(Repository *self, PyObject *args)
{
char *our_ref_name = NULL;
char *our_ref_name = "HEAD";
PyObject *py_their_head;
PyObject *py_result = NULL;
git_oid head_id;
Expand All @@ -704,9 +667,9 @@ Repository_merge_analysis_for_ref(Repository *self, PyObject *args)
git_merge_preference_t preference;
int err = 0;

if (!PyArg_ParseTuple(args, "zO",
&our_ref_name,
&py_their_head))
if (!PyArg_ParseTuple(args, "O|z",
&py_their_head,
&our_ref_name))
return NULL;

err = git_reference_lookup(&our_ref, self->repo, our_ref_name);
Expand Down Expand Up @@ -2009,8 +1972,7 @@ PyMethodDef Repository_methods[] = {
METHOD(Repository, walk, METH_VARARGS),
METHOD(Repository, descendant_of, METH_VARARGS),
METHOD(Repository, merge_base, METH_VARARGS),
METHOD(Repository, merge_analysis, METH_O),
METHOD(Repository, merge_analysis_for_ref, METH_VARARGS),
METHOD(Repository, merge_analysis, METH_VARARGS),
METHOD(Repository, merge, METH_O),
METHOD(Repository, cherrypick, METH_O),
METHOD(Repository, apply, METH_O),
Expand Down
3 changes: 1 addition & 2 deletions src/repository.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ PyObject* Repository_blame(Repository *self, PyObject *args, PyObject *kwds);
PyObject* Repository_merge(Repository *self, PyObject *py_oid);
PyObject* Repository_cherrypick(Repository *self, PyObject *py_oid);
PyObject* Repository_apply(Repository *self, PyObject *py_diff);
PyObject* Repository_merge_analysis(Repository *self, PyObject *py_id);
PyObject* Repository_merge_analysis_for_ref(Repository *self, PyObject *args);
PyObject* Repository_merge_analysis(Repository *self, PyObject *args);

#endif
4 changes: 2 additions & 2 deletions test/test_merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def test_merge_analysis_uptodate(self):
assert not analysis & GIT_MERGE_ANALYSIS_FASTFORWARD
assert {} == self.repo.status()

analysis, preference = self.repo.merge_analysis_for_ref('HEAD', branch_id)
analysis, preference = self.repo.merge_analysis(branch_id, 'refs/heads/ff-branch')
assert analysis & GIT_MERGE_ANALYSIS_UP_TO_DATE
assert not analysis & GIT_MERGE_ANALYSIS_FASTFORWARD
assert {} == self.repo.status()
Expand All @@ -69,7 +69,7 @@ def test_merge_analysis_fastforward(self):
assert analysis & GIT_MERGE_ANALYSIS_FASTFORWARD
assert {} == self.repo.status()

analysis, preference = self.repo.merge_analysis_for_ref('HEAD', branch_id)
analysis, preference = self.repo.merge_analysis(branch_id, 'refs/heads/master')
assert not analysis & GIT_MERGE_ANALYSIS_UP_TO_DATE
assert analysis & GIT_MERGE_ANALYSIS_FASTFORWARD
assert {} == self.repo.status()
Expand Down