@@ -25,24 +25,25 @@ fixes
+++++
- fixed migrations of permissions that can lead to inconsistency.
Some users sent feedback that after upgrading from older versions issues
with updating default permissions occurred. RhodeCode detects that now and
resets default user permission to initial state if there is a need for that.
Also forces users to set the default value for new forking permission.
- #535 improved apache wsgi example configuration in docs
- fixes #550 mercurial repositories comparision failed when origin repo had
additional not-common changesets
- fixed status of code-review in preview windows of pull request
- git forks were not initialized at bare repos
- fixes #555 fixes issues with comparing non-related repositories
1.4.0 (**2012-09-03**)
----------------------
news
++++
- new codereview system
- email map, allowing users to have multiple email addresses mapped into
their accounts
- improved git-hook system. Now all actions for git are logged into journal
including pushed revisions, user and IP address
@@ -157,25 +157,26 @@ class PullRequestModel(BaseModel):
:param other_repo:
:type other_repo:
:param other_ref:
:type other_ref:
:param tmp:
:type tmp:
"""
changesets = []
#case two independent repos
common, incoming, rheads = discovery_data
if org_repo != other_repo and incoming:
obj = findcommonoutgoing(org_repo._repo,
localrepo.locallegacypeer(other_repo._repo.local()))
localrepo.locallegacypeer(other_repo._repo.local()),
force=True)
revs = obj.missing
for cs in reversed(map(binascii.hexlify, revs)):
changesets.append(org_repo.get_changeset(cs))
else:
_revset_predicates = {
'branch': 'branch',
'book': 'bookmark',
'tag': 'tag',
'rev': 'id',
}
@@ -207,32 +208,33 @@ class PullRequestModel(BaseModel):
_org_repo = org_repo._repo
org_rev_type, org_rev = org_ref
_other_repo = other_repo._repo
other_rev_type, other_rev = other_ref
log.debug('Doing discovery for %s@%s vs %s@%s' % (
org_repo, org_ref, other_repo, other_ref)
)
#log.debug('Filter heads are %s[%s]' % ('', org_ref[1]))
org_peer = localrepo.locallegacypeer(_org_repo.local())
tmp = discovery.findcommonincoming(
repo=_other_repo, # other_repo we check for incoming
remote=org_peer, # org_repo source for incoming
heads=[_other_repo[other_rev].node(),
_org_repo[org_rev].node()],
force=False
force=True
return tmp
def get_compare_data(self, org_repo, org_ref, other_repo, other_ref):
Returns a tuple of incomming changesets, and discoverydata cache
:param org_repo:
:type org_repo:
:param org_ref:
:type org_ref:
Status change: