Show More
@@ -41,6 +41,7 from rhodecode.model.db import Repositor | |||||
41 | from rhodecode.model.pull_request import PullRequestModel |
|
41 | from rhodecode.model.pull_request import PullRequestModel | |
42 | from webob.exc import HTTPBadRequest |
|
42 | from webob.exc import HTTPBadRequest | |
43 | from rhodecode.lib.diffs import LimitedDiffContainer |
|
43 | from rhodecode.lib.diffs import LimitedDiffContainer | |
|
44 | from rhodecode.lib.vcs.backends.base import EmptyChangeset | |||
44 |
|
45 | |||
45 | log = logging.getLogger(__name__) |
|
46 | log = logging.getLogger(__name__) | |
46 |
|
47 | |||
@@ -136,7 +137,7 class CompareController(BaseRepoControll | |||||
136 | # get parent of |
|
137 | # get parent of | |
137 | # rev start to include it in the diff |
|
138 | # rev start to include it in the diff | |
138 | _cs = other_repo.scm_instance.get_changeset(rev_start) |
|
139 | _cs = other_repo.scm_instance.get_changeset(rev_start) | |
139 | rev_start = _cs.parents[0].raw_id |
|
140 | rev_start = _cs.parents[0].raw_id if _cs.parents else EmptyChangeset() | |
140 | org_ref = ('rev', rev_start) |
|
141 | org_ref = ('rev', rev_start) | |
141 | other_ref = ('rev', rev_end) |
|
142 | other_ref = ('rev', rev_end) | |
142 | #if we cherry pick it's not remote, make the other_repo org_repo |
|
143 | #if we cherry pick it's not remote, make the other_repo org_repo |
General Comments 0
You need to be logged in to leave comments.
Login now