Mercurial > kallithea

changeset 5358:68bdd7646187

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pullrequests: if no ancestor is found, use the null revision hash instead of 'None' (Issue #149)
author Mads Kiilerich <madski@unity3d.com>
date Wed, 05 Aug 2015 12:29:41 +0200
parents eb337bdaa0e1
children 42c1a1c7ffdd
files kallithea/controllers/pullrequests.py
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/controllers/pullrequests.py	Wed Aug 05 12:29:41 2015 +0200
+++ b/kallithea/controllers/pullrequests.py	Wed Aug 05 12:29:41 2015 +0200
@@ -338,6 +338,8 @@
                                               other_repo.scm_instance, other_rev, # org and other "swapped"
                                               org_repo.scm_instance, org_rev,
                                               )
+        if ancestor_rev is None:
+            ancestor_rev = org_repo.scm_instance.EMPTY_CHANGESET
         revisions = [cs.raw_id for cs in cs_ranges]
 
         # hack: ancestor_rev is not an other_rev but we want to show the