You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by he...@apache.org on 2015/04/01 23:10:33 UTC
[16/45] allura git commit: [#7830] ticket:733 Temporary fix for the
case when downstream repo has no new commits from upstream
[#7830] ticket:733 Temporary fix for the case when downstream repo has no new commits from upstream
In the case of Mercurial, log raises Exception. It might happen after automerge
of merge request. Will be fixed more rigorously in [#7836].
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/2b4f69ff
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/2b4f69ff
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/2b4f69ff
Branch: refs/heads/hss/7072
Commit: 2b4f69ffe5503f100aa623a05de36e6377545900
Parents: 0efaa30
Author: Igor Bondarenko <je...@gmail.com>
Authored: Thu Feb 26 14:20:16 2015 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Fri Mar 20 20:40:30 2015 +0000
----------------------------------------------------------------------
Allura/allura/model/repository.py | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/2b4f69ff/Allura/allura/model/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py
index d866598..867a6d2 100644
--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -775,10 +775,16 @@ class MergeRequest(VersionedArtifact, ActivityObject):
commit = rev._id
else:
commit = self.app.repo.head
- return list(c.app.repo.log(
- self.downstream.commit_id,
- exclude=commit,
- id_only=False))
+ try:
+ return list(c.app.repo.log(
+ self.downstream.commit_id,
+ exclude=commit,
+ id_only=False))
+ except Exception:
+ log.exception(
+ "Can't get commits for merge request",
+ self.url())
+ return []
@classmethod
def upsert(cls, **kw):