def archive_to_abandoned(self, review_hash, review_branch, base_branch):
"""Merge the specified review branch to the 'abandoned' archive branch.
:review_hash: the string of the commit hash to archive
:review_branch: the string name of the branch to archive
:base_branch: the string name of the branch the review is branched off
:returns: None
"""
# get on the archive branch, create new orphan if necessary
self._checkout_archive_ref_branch(_ARCYD_ABANDONED_BRANCH,
ARCYD_ABANDONED_BRANCH_FQ,
_ABANDONED_ARCHIVE_BRANCH_MESSAGE)
new_message = "abandoned {}, branched from {}".format(
review_branch, base_branch)
phlgit_merge.ours(self, review_hash, new_message)
def archive_to_abandoned(
self, review_hash, review_branch, base_branch):
"""Merge the specified review branch to the 'abandoned' archive branch.
:review_hash: the string of the commit hash to archive
:review_branch: the string name of the branch to archive
:base_branch: the string name of the branch the review is branched off
:returns: None
"""
# get on the archive branch, create new orphan if necessary
self._checkout_archive_ref_branch(
_ARCYD_ABANDONED_BRANCH,
ARCYD_ABANDONED_BRANCH_FQ,
_ABANDONED_ARCHIVE_BRANCH_MESSAGE)
new_message = "abandoned {}, branched from {}".format(
review_branch, base_branch)
phlgit_merge.ours(self, review_hash, new_message)
def archive_to_landed(self, review_hash, review_branch, base_branch,
land_hash, message):
"""Merge the specified review branch to the 'landed' archive branch.
:review_hash: the string of the commit hash to archive
:review_branch: the string name of the branch to archive
:base_branch: the string name of the branch the review is branched off
:land_hash: the string of the commit hash the branch landed with
:message: the string commit message the the branch landed with
:returns: None
"""
self._checkout_archive_ref_branch(_ARCYD_LANDED_BRANCH,
ARCYD_LANDED_BRANCH_FQ,
_LANDED_ARCHIVE_BRANCH_MESSAGE)
new_message = "landed {} on {} as {}\n\nwith message:\n{}".format(
review_branch, base_branch, land_hash, message)
phlgit_merge.ours(self, review_hash, new_message)
def archive_to_landed(
self, review_hash, review_branch, base_branch, land_hash, message):
"""Merge the specified review branch to the 'landed' archive branch.
:review_hash: the string of the commit hash to archive
:review_branch: the string name of the branch to archive
:base_branch: the string name of the branch the review is branched off
:land_hash: the string of the commit hash the branch landed with
:message: the string commit message the the branch landed with
:returns: None
"""
self._checkout_archive_ref_branch(
_ARCYD_LANDED_BRANCH,
ARCYD_LANDED_BRANCH_FQ,
_LANDED_ARCHIVE_BRANCH_MESSAGE)
new_message = "landed {} on {} as {}\n\nwith message:\n{}".format(
review_branch, base_branch, land_hash, message)
phlgit_merge.ours(self, review_hash, new_message)
