engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vcs: Deprecate generic missing commit merge error reason.

Browse source 
There are two more specific error reasons (target/source ref missing)
which should be used instead.
This commit is contained in:
Martin Bornhold 2016-10-27 12:50:59 +02:00
parent 66a336156c
commit 0236ad15ca
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rhodecode/lib/vcs/backends/base.py
View file

@ -94,8 +94,9 @@ class MergeFailureReason(object):
# The target repository is locked
TARGET_IS_LOCKED = 7
# Deprecated, use MISSING_TARGET_REF or MISSING_SOURCE_REF instead.
# A involved commit could not be found.
MISSING_COMMIT = 8
_DEPRECATED_MISSING_COMMIT = 8
# The target repo reference is missing.
MISSING_TARGET_REF = 9

2
rhodecode/model/pull_request.py
View file

@ -95,7 +95,7 @@ class PullRequestModel(BaseModel):
MergeFailureReason.TARGET_IS_LOCKED: lazy_ugettext(
'This pull request cannot be merged because the target repository'
' is locked.'),
MergeFailureReason.MISSING_COMMIT: lazy_ugettext(
MergeFailureReason._DEPRECATED_MISSING_COMMIT: lazy_ugettext(
'This pull request cannot be merged because the target or the '
'source reference is missing.'),
MergeFailureReason.MISSING_TARGET_REF: lazy_ugettext(