##// END OF EJS Templates
pullrequests: better handling of cases with more than one ancestor
Mads Kiilerich -
r3726:630c98f5 beta
parent child Browse files
Show More
@@ -211,7 +211,8 b' class PullRequestModel(BaseModel):'
211
211
212 ancestors = scmutil.revrange(hgrepo,
212 ancestors = scmutil.revrange(hgrepo,
213 ["ancestor(id('%s'), id('%s'))" % (org_rev, other_rev)])
213 ["ancestor(id('%s'), id('%s'))" % (org_rev, other_rev)])
214 if len(ancestors) == 1:
214 if ancestors:
215 # pick arbitrary ancestor - but there is usually only one
215 ancestor = hgrepo[ancestors[0]].hex()
216 ancestor = hgrepo[ancestors[0]].hex()
216 else:
217 else:
217 # TODO: have both + and - changesets
218 # TODO: have both + and - changesets
General Comments 0
You need to be logged in to leave comments. Login now