kallithea Changeset - 630c98f52416

Changeset - 630c98f52416

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Mads Kiilerich - 13 years ago 2013-04-05 00:40:58
madski@unity3d.com

Grafted from: f467333e900c

pullrequests: better handling of cases with more than one ancestor

1 file changed with 2 insertions and 1 deletions:

rhodecode/model/pull_request.py

0 comments (0 inline, 0 general)

rhodecode/model/pull_request.py

➞

Show inline comments

@@ @@ -208,13 +208,14 @@ class PullRequestModel(BaseModel): @@
             if merge:
                 revs = ["ancestors(id('%s')) and not ancestors(id('%s')) and not id('%s')" %
                         (other_rev, org_rev, org_rev)]
                 ancestors = scmutil.revrange(hgrepo,
                      ["ancestor(id('%s'), id('%s'))" % (org_rev, other_rev)])
                 if len(ancestors) == 1:
                 if ancestors:
                     # pick arbitrary ancestor - but there is usually only one
                     ancestor = hgrepo[ancestors[0]].hex()
             else:
                 # TODO: have both + and - changesets
                 revs = ["id('%s') :: id('%s') - id('%s')" %
                         (org_rev, other_rev, org_rev)]

0 comments (0 inline, 0 general)