Files
@ f8c953c6b040
Branch filter:
Location: kallithea/rhodecode/controllers/compare.py - annotation
f8c953c6b040
4.4 KiB
text/x-python
Created base for diffing two repositories inside rhodecode
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 | b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec f8c953c6b040 b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec f8c953c6b040 f8c953c6b040 f8c953c6b040 b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec f8c953c6b040 f8c953c6b040 b2a2868d7bec 87e9718ab4a2 87e9718ab4a2 b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec 2d35bbff7c35 b2a2868d7bec b2a2868d7bec 2d35bbff7c35 f8c953c6b040 f8c953c6b040 b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 b2a2868d7bec b2a2868d7bec f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 b2a2868d7bec | # -*- coding: utf-8 -*-
"""
rhodecode.controllers.compare
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compare controller for pylons showoing differences between two
repos, branches, bookmarks or tips
:created_on: May 6, 2012
:author: marcink
:copyright: (C) 2010-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 traceback
from webob.exc import HTTPNotFound
from pylons import request, response, session, tmpl_context as c, url
from pylons.controllers.util import abort, redirect
from rhodecode.lib.base import BaseRepoController, render
from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
from rhodecode.lib import diffs
from rhodecode.model.db import Repository
log = logging.getLogger(__name__)
class CompareController(BaseRepoController):
@LoginRequired()
@HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
'repository.admin')
def __before__(self):
super(CompareController, self).__before__()
def _handle_ref(self, ref):
"""
Parse the org...other string
Possible formats are
`(branch|book|tag):<name>...(branch|book|tag):<othername>`
:param ref: <orginal_reference>...<other_reference>
:type ref: str
"""
org_repo = c.rhodecode_repo.name
def org_parser(org):
_repo = org_repo
name, val = org.split(':')
return _repo, (name, val)
def other_parser(other):
_other_repo = request.GET.get('repo')
_repo = org_repo
name, val = other.split(':')
if _other_repo:
#TODO: do an actual repo loookup within rhodecode
_repo = _other_repo
return _repo, (name, val)
if '...' in ref:
try:
org, other = ref.split('...')
org_repo, org_ref = org_parser(org)
other_repo, other_ref = other_parser(other)
return org_repo, org_ref, other_repo, other_ref
except:
log.error(traceback.format_exc())
raise HTTPNotFound
def _get_changesets(self, org_repo, org_ref, other_repo, other_ref):
changesets = []
#case two independent repos
if org_repo != other_repo:
from mercurial import discovery
import binascii
out = discovery.findcommonoutgoing(org_repo._repo, other_repo._repo)
for cs in map(binascii.hexlify, out.missing):
changesets.append(org_repo.get_changeset(cs))
else:
for cs in map(binascii.hexlify, out):
changesets.append(org_repo.get_changeset(cs))
return changesets
def index(self, ref):
org_repo, org_ref, other_repo, other_ref = self._handle_ref(ref)
c.org_repo = org_repo = Repository.get_by_repo_name(org_repo)
c.other_repo = other_repo = Repository.get_by_repo_name(other_repo)
c.cs_ranges = self._get_changesets(org_repo.scm_instance,
org_ref,
other_repo.scm_instance,
other_ref)
c.org_ref = org_ref[1]
c.other_ref = other_ref[1]
cs1 = org_repo.scm_instance.get_changeset(org_ref[1])
cs2 = other_repo.scm_instance.get_changeset(other_ref[1])
_diff = diffs.differ(org_repo, org_ref, other_repo, other_ref)
diff_processor = diffs.DiffProcessor(_diff, format='gitdiff')
diff = diff_processor.as_html(enable_comments=False)
stats = diff_processor.stat()
c.changes = [('change?', None, diff, cs1, cs2, stats,)]
return render('compare/compare_diff.html')
|