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