rhodecode-enterprise-ce Compare - rhodecode-enterprise-ce@e31abe6080b9c2d08eb0f9617d5613f7914f9abf > rhodecode-enterprise-ce@ebe0247cd154889e46e1b1638efa15728fc577d0

Target:

Source:

Actions:

Compare Commits Swap Comment

Time	Author	Commit	Description
Fri, 28 Oct 2016 11:06:55	Martin Bornhold	`r1106:490ebeeb75af`	subrepo: Add merge failure reason code ad message for subrepo merge conflicts.
Fri, 28 Oct 2016 11:07:21	Martin Bornhold	`r1107:6bc055e1504d`	subrepo: Add exception for subrepo merge errors.
Fri, 28 Oct 2016 11:07:35	Martin Bornhold	`r1108:ebe0247cd154`	subrepo: Handle subrepo merge errors.
3 commits hidden, click expand to show them.

rhodecode/lib/vcs/backends/base.py

0 +4 0

                  # The source repo reference is missing.
                  MISSING_SOURCE_REF = 10
+                 # The merge was not successful, there are conflicts related to sub
+                 # repositories.
+                 SUBREPO_MERGE_FAILED = 11
              class UpdateFailureReason(object):
                  """

rhodecode/lib/vcs/backends/hg/repository.py

0 +6 -1

              from rhodecode.lib.vcs.backends.hg.inmemory import MercurialInMemoryCommit
              from rhodecode.lib.vcs.exceptions import (
                  EmptyRepositoryError, RepositoryError, TagAlreadyExistError,
-                 TagDoesNotExistError, CommitDoesNotExistError)
+                 TagDoesNotExistError, CommitDoesNotExistError, SubrepoMergeError)
              hexlify = binascii.hexlify
              nullid = "\0" * 20
                          # shadow repository.
                          shadow_repo.bookmark('pr-merge', revision=merge_commit_id)
                          merge_ref = Reference('book', 'pr-merge', merge_commit_id)
+                     except SubrepoMergeError:
+                         log.exception(
+                             'Subrepo merge error during local merge on hg shadow repo.')
+                         merge_possible = False
+                         merge_failure_reason = MergeFailureReason.SUBREPO_MERGE_FAILED
                      except RepositoryError:
                          log.exception('Failure when doing local merge on hg shadow repo')
                          merge_possible = False

rhodecode/lib/vcs/exceptions.py

0 +9 0

                  pass
+             class SubrepoMergeError(RepositoryError):
+                 """
+                 This happens if we try to merge a repository which contains subrepos and
+                 the subrepos cannot be merged. The subrepos are not merged itself but
+                 their references in the root repo are merged.
+                 """
              class ImproperArchiveTypeError(VCSError):
                  pass
                  # TODO: johbo: Define our own exception for this and stop abusing
                  # urllib's exception class.
                  'url_error': urllib2.URLError,
+                 'subrepo_merge_error': SubrepoMergeError,
              }

rhodecode/model/pull_request.py

0 +3 0

                      MergeFailureReason.MISSING_SOURCE_REF: lazy_ugettext(
                          'This pull request cannot be merged because the source '
                          'reference is missing.'),
+                     MergeFailureReason.SUBREPO_MERGE_FAILED: lazy_ugettext(
+                         'This pull request cannot be merged because of conflicts related '
+                         'to sub repositories.'),
                  }
                  UPDATE_STATUS_MESSAGES = {

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages