kallithea Changeset - f6376261296d

Changeset - f6376261296d

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

domruf - 9 years ago 2016-06-15 18:33:27
dominikruf@gmail.com

pullrequests: better handling of revision range pullrequests with missing revisions - don't crash

Trying to display a revision range PR with missing changesets would give a
crash.

3f646f7bac39 solved a similar problem but caused another one when it did that
c.cs_ranges could be empty.

1 file changed with 10 insertions and 5 deletions:

kallithea/controllers/pullrequests.py

0 comments (0 inline, 0 general)

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -578,17 +578,22 @@ class PullrequestsController(BaseRepoCon @@
             c.cs_ranges = []
         c.cs_ranges_org = None # not stored and not important and moving target - could be calculated ...
         revs = [ctx.revision for ctx in reversed(c.cs_ranges)]
         c.jsdata = json.dumps(graph_data(org_scm_instance, revs))
         c.is_range = False
         if c.a_ref_type == 'rev': # this looks like a free range where target is ancestor
             cs_a = org_scm_instance.get_changeset(c.a_rev)
             root_parents = c.cs_ranges[0].parents
             c.is_range = cs_a in root_parents
             #c.merge_root = len(root_parents) > 1 # a range starting with a merge might deserve a warning
         try:
             if c.a_ref_type == 'rev': # this looks like a free range where target is ancestor
                 cs_a = org_scm_instance.get_changeset(c.a_rev)
                 root_parents = c.cs_ranges[0].parents
                 c.is_range = cs_a in root_parents
                 #c.merge_root = len(root_parents) > 1 # a range starting with a merge might deserve a warning
         except ChangesetDoesNotExistError: # probably because c.a_rev not found
             pass
         except IndexError: # probably because c.cs_ranges is empty, probably because revisions are missing
             pass
         avail_revs = set()
         avail_show = []
         c.cs_branch_name = c.cs_ref_name
         c.a_branch_name = None
         other_scm_instance = c.a_repo.scm_instance

0 comments (0 inline, 0 general)