##// END OF EJS Templates
fixes #555 issues when comparing non-related repositories on pull requests or compare view
marcink -
r2810:4a5c56da beta
parent child Browse files
Show More
@@ -34,6 +34,7 b' fixes'
34 34 additional not-common changesets
35 35 - fixed status of code-review in preview windows of pull request
36 36 - git forks were not initialized at bare repos
37 - fixes #555 fixes issues with comparing non-related repositories
37 38
38 39 1.4.0 (**2012-09-03**)
39 40 ----------------------
@@ -166,7 +166,8 b' class PullRequestModel(BaseModel):'
166 166 common, incoming, rheads = discovery_data
167 167 if org_repo != other_repo and incoming:
168 168 obj = findcommonoutgoing(org_repo._repo,
169 localrepo.locallegacypeer(other_repo._repo.local()))
169 localrepo.locallegacypeer(other_repo._repo.local()),
170 force=True)
170 171 revs = obj.missing
171 172
172 173 for cs in reversed(map(binascii.hexlify, revs)):
@@ -216,6 +217,7 b' class PullRequestModel(BaseModel):'
216 217 log.debug('Doing discovery for %s@%s vs %s@%s' % (
217 218 org_repo, org_ref, other_repo, other_ref)
218 219 )
220
219 221 #log.debug('Filter heads are %s[%s]' % ('', org_ref[1]))
220 222 org_peer = localrepo.locallegacypeer(_org_repo.local())
221 223 tmp = discovery.findcommonincoming(
@@ -223,7 +225,7 b' class PullRequestModel(BaseModel):'
223 225 remote=org_peer, # org_repo source for incoming
224 226 heads=[_other_repo[other_rev].node(),
225 227 _org_repo[org_rev].node()],
226 force=False
228 force=True
227 229 )
228 230 return tmp
229 231
General Comments 0
You need to be logged in to leave comments. Login now