|
@@ -0,0 +1,35 @@
|
|
|
+# merge.py -- Merge support in Dulwich
|
|
|
+# Copyright (C) 2020 Jelmer Vernooij <jelmer@jelmer.uk>
|
|
|
+#
|
|
|
+# Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
|
|
|
+# General Public License as public by the Free Software Foundation; version 2.0
|
|
|
+# or (at your option) any later version. You can redistribute it and/or
|
|
|
+# modify it under the terms of either of these two licenses.
|
|
|
+#
|
|
|
+# Unless required by applicable law or agreed to in writing, software
|
|
|
+# distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
+# See the License for the specific language governing permissions and
|
|
|
+# limitations under the License.
|
|
|
+#
|
|
|
+# You should have received a copy of the licenses; if not, see
|
|
|
+# <http://www.gnu.org/licenses/> for a copy of the GNU General Public License
|
|
|
+# and <http://www.apache.org/licenses/LICENSE-2.0> for a copy of the Apache
|
|
|
+# License, Version 2.0.
|
|
|
+#
|
|
|
+
|
|
|
+"""Merge support."""
|
|
|
+
|
|
|
+
|
|
|
+def find_merge_base(repo, commit_ids):
|
|
|
+ """Find a reasonable merge base.
|
|
|
+
|
|
|
+ Args:
|
|
|
+ repo: Repository object
|
|
|
+ commit_ids: List of commit ids
|
|
|
+ """
|
|
|
+ import subprocess
|
|
|
+ return subprocess.check_output(
|
|
|
+ ['git', 'merge-base'] +
|
|
|
+ [x.decode('ascii') for x in commit_ids],
|
|
|
+ cwd=repo.path).rstrip(b'\n')
|