.. _changelog:

=========

Changelog

=========

1.4.1 (**2012-09-04**)

----------------------

:status: in-progress

:branch: beta

news

++++

- always put a comment about code-review status change even if user send

  empty data 

- modified_on column saves repository update and it's going to be used

  later for light version of main page ref #500

- pull request notifications send much nicer emails with details about pull

  request

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

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

- changed setup-app into setup-rhodecode and added default options to it.

- new git repos are created as bare now by default

- #464 added links to groups in permission box

- #465 mentions autocomplete inside comments boxes

- #469 added --update-only option to whoosh to re-index only given list

  of repos in index 

- rhodecode-api CLI client

- new git http protocol replaced buggy dulwich implementation.

  Now based on pygrack & gitweb

- Improved RSS/ATOM feeds. Discoverable by browsers using proper headers, and 

  reformated based on user suggestions. Additional rss/atom feeds for user

  journal

- various i18n improvements

- #478 permissions overview for admin in user edit view

- File view now displays small gravatars off all authors of given file

- Implemented landing revisions. Each repository will get landing_rev attribute

  that defines 'default' revision/branch for generating readme files

- Implemented #509, RhodeCode enforces SSL for push/pulling if requested at 

  earliest possible call.

- Import remote svn repositories to mercurial using hgsubversion.

- Fixed #508 RhodeCode now has a option to explicitly set forking permissions

- RhodeCode can use alternative server for generating avatar icons

- implemented repositories locking. Pull locks, push unlocks. Also can be done

  via API calls

- #538 form for permissions can handle multiple users at once 

fixes

+++++

- improved translations

- fixes issue #455 Creating an archive generates an exception on Windows

- fixes #448 Download ZIP archive keeps file in /tmp open and results 

  in out of disk space

- fixes issue #454 Search results under Windows include proceeding

  backslash

- fixed issue #450. Rhodecode no longer will crash when bad revision is

  present in journal data.

- fix for issue #417, git execution was broken on windows for certain

  commands.

- fixed #413. Don't disable .git directory for bare repos on deleting

- fixed issue #459. Changed the way of obtaining logger in reindex task.

- fixed #453 added ID field in whoosh SCHEMA that solves the issue of

  reindexing modified files

- fixed #481 rhodecode emails are sent without Date header 

- fixed #458 wrong count when no repos are present

- fixed issue #492 missing `\ No newline at end of file` test at the end of 

  new chunk in html diff

- full text search now works also for commit messages

1.3.6 (**2012-05-17**)

----------------------

news

++++

- chinese traditional translation

- changed setup-app into setup-rhodecode and added arguments for auto-setup 

  mode that doesn't need user interaction 

fixes

+++++

- fixed no scm found warning

- fixed __future__ import error on rcextensions

- made simplejson required lib for speedup on JSON encoding

- fixes #449 bad regex could get more than revisions from parsing history

- don't clear DB session when CELERY_EAGER is turned ON

1.3.5 (**2012-05-10**)

----------------------

news

++++

- use ext_json for json module

- unified annotation view with file source view

- notification improvements, better inbox + css

- #419 don't strip passwords for login forms, make rhodecode 

  more compatible with LDAP servers

- Added HTTP_X_FORWARDED_FOR as another method of extracting 

  IP for pull/push logs. - moved all to base controller  

- #415: Adding comment to changeset causes reload. 

  Comments are now added via ajax and doesn't reload the page

- #374 LDAP config is discarded when LDAP can't be activated

                        'olc': old_lineno_class

                    })

                    _html.append('''%(link)s''' % {

                        'link': _link_to_if(True, change['old_lineno'],

                                            '#%s' % anchor_old)

                    })

                    _html.append('''</td>\n''')

                    ###########################################################

                    # NEW LINE NUMBER

                    ###########################################################

                    _html.append('''\t<td %(a_id)s class="%(nlc)s">''' % {

                        'a_id': anchor_new_id,

                        'nlc': new_lineno_class

                    })

                    _html.append('''%(link)s''' % {

                        'link': _link_to_if(True, change['new_lineno'],

                                            '#%s' % anchor_new)

                    })

                    _html.append('''</td>\n''')

                    ###########################################################

                    # CODE

                    ###########################################################

                    comments = '' if enable_comments else 'no-comment'

                    _html.append('''\t<td class="%(cc)s %(inc)s">''' % {

                        'cc': code_class,

                        'inc': comments

                    })

                    _html.append('''\n\t\t<pre>%(code)s</pre>\n''' % {

                        'code': change['line']

                    })

                    _html.append('''\t</td>''')

                    _html.append('''\n</tr>\n''')

        _html.append('''</table>''')

        if _html_empty:

            return None

        return ''.join(_html)

    def stat(self):

        """

        Returns tuple of added, and removed lines for this instance

        """

        return self.adds, self.removes

class InMemoryBundleRepo(bundlerepository):

    def __init__(self, ui, path, bundlestream):

        self._tempparent = None

        localrepo.localrepository.__init__(self, ui, path)

        self.ui.setconfig('phases', 'publish', False)

        self.bundle = bundlestream

        # dict with the mapping 'filename' -> position in the bundle

        self.bundlefilespos = {}

def differ(org_repo, org_ref, other_repo, other_ref, discovery_data=None):

    """

    General differ between branches, bookmarks or separate but releated

    repositories

    :param org_repo:

    :type org_repo:

    :param org_ref:

    :type org_ref:

    :param other_repo:

    :type other_repo:

    :param other_ref:

    :type other_ref:

    """

    bundlerepo = None

    ignore_whitespace = False

    context = 3

    org_repo = org_repo.scm_instance._repo

    other_repo = other_repo.scm_instance._repo

    opts = diffopts(git=True, ignorews=ignore_whitespace, context=context)

    org_ref = org_ref[1]

    other_ref = other_ref[1]

    if org_repo != other_repo:

        common, incoming, rheads = discovery_data

        other_repo_peer = localrepo.locallegacypeer(other_repo.local())

        # create a bundle (uncompressed if other repo is not local)

        if other_repo_peer.capable('getbundle') and incoming:

            # disable repo hooks here since it's just bundle !

            # patch and reset hooks section of UI config to not run any

            # hooks on fetching archives with subrepos

            for k, _ in other_repo.ui.configitems('hooks'):

                other_repo.ui.setconfig('hooks', k, None)

            unbundle = other_repo.getbundle('incoming', common=common,

            buf = BytesIO()

            while True:

                chunk = unbundle._stream.read(1024 * 4)

                if not chunk:

                    break

                buf.write(chunk)

            buf.seek(0)

            # replace chunked _stream with data that can do tell() and seek()

            unbundle._stream = buf

            ui = make_ui('db')

            bundlerepo = InMemoryBundleRepo(ui, path=org_repo.root,

                                            bundlestream=unbundle)

        return ''.join(patch.diff(bundlerepo or org_repo,

                                  node1=org_repo[org_ref].node(),

                                  node2=other_repo[other_ref].node(),

                                  opts=opts))

    else:

        return ''.join(patch.diff(org_repo, node1=org_ref, node2=other_ref,

                                  opts=opts))

"""

Mercurial libs compatibility

"""

from mercurial import archival, merge as hg_merge, patch, ui

from mercurial.commands import clone, nullid, pull

from mercurial.context import memctx, memfilectx

from mercurial.error import RepoError, RepoLookupError, Abort

from mercurial.hgweb.common import get_contact

from mercurial.localrepo import localrepository

from mercurial.match import match

from mercurial.mdiff import diffopts

from mercurial.node import hex

from mercurial.encoding import tolocal

from mercurial import discovery

from mercurial import localrepo

# -*- coding: utf-8 -*-

"""

    rhodecode.model.pull_request

    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~

    pull request model for RhodeCode

    :created_on: Jun 6, 2012

    :author: marcink

    :copyright: (C) 2012-2012 Marcin Kuzminski <marcin@python-works.com>

    :license: GPLv3, see COPYING for more details.

"""

# This program is free software: you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

# the Free Software Foundation, either version 3 of the License, or

# (at your option) any later version.

#

# This program is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

# GNU General Public License for more details.

#

# You should have received a copy of the GNU General Public License

# along with this program.  If not, see <http://www.gnu.org/licenses/>.

import logging

import binascii

import datetime

from pylons.i18n.translation import _

from rhodecode.model.meta import Session

from rhodecode.lib import helpers as h

from rhodecode.model import BaseModel

from rhodecode.model.db import PullRequest, PullRequestReviewers, Notification

from rhodecode.model.notification import NotificationModel

from rhodecode.lib.utils2 import safe_unicode

log = logging.getLogger(__name__)

class PullRequestModel(BaseModel):

    cls = PullRequest

    def __get_pull_request(self, pull_request):

        return self._get_instance(PullRequest, pull_request)

    def get_all(self, repo):

        repo = self._get_repo(repo)

        return PullRequest.query().filter(PullRequest.other_repo == repo).all()

    def create(self, created_by, org_repo, org_ref, other_repo,

               other_ref, revisions, reviewers, title, description=None):

        created_by_user = self._get_user(created_by)

        org_repo = self._get_repo(org_repo)

        other_repo = self._get_repo(other_repo)

        new = PullRequest()

        new.org_repo = org_repo

        new.org_ref = org_ref

        new.other_repo = other_repo

        new.other_ref = other_ref

        new.revisions = revisions

        new.title = title

        new.description = description

        new.author = created_by_user

        self.sa.add(new)

        Session().flush()

        #members

        for member in reviewers:

            _usr = self._get_user(member)

            reviewer = PullRequestReviewers(_usr, new)

            self.sa.add(reviewer)

        #notification to reviewers

        notif = NotificationModel()

        pr_url = h.url('pullrequest_show', repo_name=other_repo.repo_name,

                       pull_request_id=new.pull_request_id,

                       qualified=True,

        )

        subject = safe_unicode(

            h.link_to(

              _('%(user)s wants you to review pull request #%(pr_id)s') % \

                {'user': created_by_user.username,

                 'pr_id': new.pull_request_id},

                pr_url

            )

        )

        body = description

        kwargs = {

            'pr_title': title,

            'pr_user_created': h.person(created_by_user.email),

            'pr_repo_url': h.url('summary_home', repo_name=other_repo.repo_name,

                                 qualified=True,),

            'pr_url': pr_url,

            'pr_revisions': revisions

        }

        notif.create(created_by=created_by_user, subject=subject, body=body,

                     recipients=reviewers,

                     type_=Notification.TYPE_PULL_REQUEST, email_kwargs=kwargs)

        return new

    def update_reviewers(self, pull_request, reviewers_ids):

        reviewers_ids = set(reviewers_ids)

        pull_request = self.__get_pull_request(pull_request)

        current_reviewers = PullRequestReviewers.query()\

                            .filter(PullRequestReviewers.pull_request==

                                   pull_request)\

                            .all()

        current_reviewers_ids = set([x.user.user_id for x in current_reviewers])

        to_add = reviewers_ids.difference(current_reviewers_ids)

        to_remove = current_reviewers_ids.difference(reviewers_ids)

        log.debug("Adding %s reviewers" % to_add)

        log.debug("Removing %s reviewers" % to_remove)

        for uid in to_add:

            _usr = self._get_user(uid)

            reviewer = PullRequestReviewers(_usr, pull_request)

            self.sa.add(reviewer)

        for uid in to_remove:

            reviewer = PullRequestReviewers.query()\

                    .filter(PullRequestReviewers.user_id==uid,

                            PullRequestReviewers.pull_request==pull_request)\

                    .scalar()

            if reviewer:

                self.sa.delete(reviewer)

    def delete(self, pull_request):

        pull_request = self.__get_pull_request(pull_request)

        Session().delete(pull_request)

    def close_pull_request(self, pull_request):

        pull_request = self.__get_pull_request(pull_request)

        pull_request.status = PullRequest.STATUS_CLOSED

        pull_request.updated_on = datetime.datetime.now()

        self.sa.add(pull_request)

    def _get_changesets(self, org_repo, org_ref, other_repo, other_ref,

                        discovery_data):

        """

        Returns a list of changesets that are incoming from org_repo@org_ref

        to other_repo@other_ref

        :param org_repo:

        :type org_repo:

        :param org_ref:

        :type org_ref:

        :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:

            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',

                }

            revs = [

                "ancestors(%s('%s')) and not ancestors(%s('%s'))" % (

                    _revset_predicates[org_ref[0]], org_ref[1],

                    _revset_predicates[other_ref[0]], other_ref[1]

               )

            ]

            out = scmutil.revrange(org_repo._repo, revs)

            for cs in reversed(out):

                changesets.append(org_repo.get_changeset(cs))

        return changesets

    def _get_discovery(self, org_repo, org_ref, other_repo, other_ref):

        """

        Get's mercurial discovery data used to calculate difference between

        repos and refs

        :param org_repo:

        :type org_repo:

        :param org_ref:

        :type org_ref:

        :param other_repo:

        :type other_repo:

        :param other_ref:

        :type other_ref:

        """

        _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

        )

        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:

        :param other_repo:

        :type other_repo:

        :param other_ref:

        :type other_ref:

        """

        if len(org_ref) != 2 or not isinstance(org_ref, (list, tuple)):

            raise Exception('org_ref must be a two element list/tuple')

        if len(other_ref) != 2 or not isinstance(org_ref, (list, tuple)):

            raise Exception('other_ref must be a two element list/tuple')

        discovery_data = self._get_discovery(org_repo.scm_instance,

                                           org_ref,

                                           other_repo.scm_instance,

                                           other_ref)

        cs_ranges = self._get_changesets(org_repo.scm_instance,

                                         org_ref,

                                         other_repo.scm_instance,

                                         other_ref,

                                         discovery_data)

        return cs_ranges, discovery_data

from rhodecode.tests import *

from rhodecode.model.repo import RepoModel

from rhodecode.model.meta import Session

from rhodecode.model.db import Repository

from rhodecode.model.scm import ScmModel

from rhodecode.lib.vcs.backends.base import EmptyChangeset

class TestCompareController(TestController):

    def test_index_tag(self):

        self.log_user()

        tag1 = '0.1.3'

        tag2 = '0.1.2'

        response = self.app.get(url(controller='compare', action='index',

                                    repo_name=HG_REPO,

                                    org_ref_type="tag",

                                    org_ref=tag1,

                                    other_ref_type="tag",

                                    other_ref=tag2,

                                    ))

        response.mustcontain('%s@%s -> %s@%s' % (HG_REPO, tag1, HG_REPO, tag2))

        ## outgoing changesets between tags

        response.mustcontain('''<a href="/%s/changeset/17544fbfcd33ffb439e2b728b5d526b1ef30bfcf">r120:17544fbfcd33</a>''' % HG_REPO)

        response.mustcontain('''<a href="/%s/changeset/36e0fc9d2808c5022a24f49d6658330383ed8666">r119:36e0fc9d2808</a>''' % HG_REPO)

        response.mustcontain('''<a href="/%s/changeset/bb1a3ab98cc45cb934a77dcabf87a5a598b59e97">r118:bb1a3ab98cc4</a>''' % HG_REPO)

        response.mustcontain('''<a href="/%s/changeset/41fda979f02fda216374bf8edac4e83f69e7581c">r117:41fda979f02f</a>''' % HG_REPO)

        response.mustcontain('''<a href="/%s/changeset/9749bfbfc0d2eba208d7947de266303b67c87cda">r116:9749bfbfc0d2</a>''' % HG_REPO)

        response.mustcontain('''<a href="/%s/changeset/70d4cef8a37657ee4cf5aabb3bd9f68879769816">r115:70d4cef8a376</a>''' % HG_REPO)

        response.mustcontain('''<a href="/%s/changeset/c5ddebc06eaaba3010c2d66ea6ec9d074eb0f678">r112:c5ddebc06eaa</a>''' % HG_REPO)

        ## files diff

    def test_index_branch(self):

        self.log_user()

        response = self.app.get(url(controller='compare', action='index',

                                    repo_name=HG_REPO,

                                    org_ref_type="branch",

                                    org_ref='default',

                                    other_ref_type="branch",

                                    other_ref='default',

                                    ))

        response.mustcontain('%s@default -> %s@default' % (HG_REPO, HG_REPO))

        # branch are equal

        response.mustcontain('<tr><td>No changesets</td></tr>')

    def test_compare_revisions(self):

        self.log_user()

        rev1 = '3d8f361e72ab'

        rev2 = 'b986218ba1c9'

        response = self.app.get(url(controller='compare', action='index',

                                    repo_name=HG_REPO,

                                    org_ref_type="rev",

                                    org_ref=rev1,

                                    other_ref_type="rev",

                                    other_ref=rev2,

                                    ))

        response.mustcontain('%s@%s -> %s@%s' % (HG_REPO, rev1, HG_REPO, rev2))

        ## outgoing changesets between those revisions

        response.mustcontain("""<a href="/%s/changeset/3d8f361e72ab303da48d799ff1ac40d5ac37c67e">r1:%s</a>""" % (HG_REPO, rev1))

        ## files

        response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s#C--c8e92ef85cd1">.hgignore</a>""" % (HG_REPO, rev1, rev2))

    def test_compare_remote_repos(self):

        self.log_user()

        form_data = dict(

            repo_name=HG_FORK,

            repo_name_full=HG_FORK,

            repo_group=None,

            repo_type='hg',

            description='',

            private=False,

            copy_permissions=False,

            landing_rev='tip',

            update_after_clone=False,

            fork_parent_id=Repository.get_by_repo_name(HG_REPO),

        )

        RepoModel().create_fork(form_data, cur_user=TEST_USER_ADMIN_LOGIN)

        Session().commit()

        rev1 = '7d4bc8ec6be5'

        rev2 = '56349e29c2af'

        response = self.app.get(url(controller='compare', action='index',

                                    repo_name=HG_REPO,

                                    org_ref_type="rev",

                                    org_ref=rev1,

                                    other_ref_type="rev",

                                    other_ref=rev2,

                                    repo=HG_FORK

                                    ))

        try:

            response.mustcontain('%s@%s -> %s@%s' % (HG_REPO, rev1, HG_FORK, rev2))

            ## outgoing changesets between those revisions

            response.mustcontain("""<a href="/%s/changeset/7d4bc8ec6be56c0f10425afb40b6fc315a4c25e7">r6:%s</a>""" % (HG_REPO, rev1))

            response.mustcontain("""<a href="/%s/changeset/6fff84722075f1607a30f436523403845f84cd9e">r5:6fff84722075</a>""" % (HG_REPO))

            response.mustcontain("""<a href="/%s/changeset/2dda4e345facb0ccff1a191052dd1606dba6781d">r4:2dda4e345fac</a>""" % (HG_REPO))

            ## files

            response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s#C--9c390eb52cd6">vcs/backends/hg.py</a>""" % (HG_REPO, rev1, rev2))

            response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s#C--41b41c1f2796">vcs/backends/__init__.py</a>""" % (HG_REPO, rev1, rev2))

            response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s#C--2f574d260608">vcs/backends/base.py</a>""" % (HG_REPO, rev1, rev2))

        finally:

            RepoModel().delete(HG_FORK)

    def test_compare_extra_commits(self):

        self.log_user()

        repo1 = RepoModel().create_repo(repo_name='one', repo_type='hg',

                                        description='diff-test',

                                        owner=TEST_USER_ADMIN_LOGIN)

        repo2 = RepoModel().create_repo(repo_name='one-fork', repo_type='hg',

                                        description='diff-test',

                                        owner=TEST_USER_ADMIN_LOGIN)

        Session().commit()

        r1_id = repo1.repo_id

        r1_name = repo1.repo_name

        r2_id = repo2.repo_id

        r2_name = repo2.repo_name

        #commit something !

        cs0 = ScmModel().create_node(

            repo=repo1.scm_instance, repo_name=r1_name,

            cs=EmptyChangeset(alias='hg'), user=TEST_USER_ADMIN_LOGIN,

            author=TEST_USER_ADMIN_LOGIN,

            message='commit1',

            content='line1',

            f_path='file1'

        )

        cs0_prim = ScmModel().create_node(

            repo=repo2.scm_instance, repo_name=r2_name,

            cs=EmptyChangeset(alias='hg'), user=TEST_USER_ADMIN_LOGIN,

            author=TEST_USER_ADMIN_LOGIN,

            message='commit1',

            content='line1',

            f_path='file1'

        )

        cs1 = ScmModel().commit_change(

            repo=repo2.scm_instance, repo_name=r2_name,

            cs=cs0_prim, user=TEST_USER_ADMIN_LOGIN, author=TEST_USER_ADMIN_LOGIN,

            message='commit2',

            content='line1\nline2',

            f_path='file1'

        )

        rev1 = 'default'

        rev2 = 'default'

        response = self.app.get(url(controller='compare', action='index',

                                    repo_name=r2_name,

                                    org_ref_type="branch",

                                    org_ref=rev1,

                                    other_ref_type="branch",

                                    other_ref=rev2,

                                    repo=r1_name

                                    ))

        try:

            response.mustcontain('%s@%s -> %s@%s' % (r2_name, rev1, r1_name, rev2))

            response.mustcontain("""<div class="message">commit2</div>""")

            response.mustcontain("""<a href="/%s/changeset/%s">r1:%s</a>""" % (r2_name, cs1.raw_id, cs1.short_id))

            ## files

            response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s#C--826e8142e6ba">file1</a>""" % (r2_name, rev1, rev2))

        finally:

            RepoModel().delete(r1_id)

            RepoModel().delete(r2_id)