Files
@ 3c4afb8894bd
Branch filter:
Location: kallithea/rhodecode/controllers/compare.py
3c4afb8894bd
6.4 KiB
text/x-python
Improved cross repos diffs
- added logging
- fixed branch issues and empty bundle case
- added logging
- fixed branch issues and empty bundle case
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 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 | # -*- 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
import binascii
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 import helpers as h
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_db_repo.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:
_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_discovery(self, org_repo, org_ref, other_repo, other_ref):
from mercurial import discovery
other = org_repo._repo
repo = other_repo._repo
tip = other[org_ref[1]]
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]' % (tip, org_ref[1]))
tmp = discovery.findcommonincoming(
repo=repo, # other_repo we check for incoming
remote=other, # org_repo source for incoming
heads=[tip.node()],
force=False
)
return tmp
def _get_changesets(self, org_repo, org_ref, other_repo, other_ref, tmp):
changesets = []
#case two independent repos
if org_repo != other_repo:
common, incoming, rheads = tmp
if not incoming:
revs = []
else:
revs = org_repo._repo.changelog.findmissing(common, rheads)
for cs in reversed(map(binascii.hexlify, revs)):
changesets.append(org_repo.get_changeset(cs))
else:
revs = ['ancestors(%s) and not ancestors(%s)' % (org_ref[1],
other_ref[1])]
from mercurial import scmutil
out = scmutil.revrange(org_repo._repo, revs)
for cs in reversed(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.swap_url = h.url('compare_home', repo_name=other_repo,
ref='%s...%s' % (':'.join(other_ref),
':'.join(org_ref)),
repo=org_repo)
c.org_repo = org_repo = Repository.get_by_repo_name(org_repo)
c.other_repo = other_repo = Repository.get_by_repo_name(other_repo)
if c.org_repo is None or c.other_repo is None:
log.error('Could not found repo %s or %s' % (org_repo, other_repo))
raise HTTPNotFound
discovery_data = self._get_discovery(org_repo.scm_instance,
org_ref,
other_repo.scm_instance,
other_ref)
c.cs_ranges = self._get_changesets(org_repo.scm_instance,
org_ref,
other_repo.scm_instance,
other_ref,
discovery_data)
c.org_ref = org_ref[1]
c.other_ref = other_ref[1]
# diff needs to have swapped org with other to generate proper diff
_diff = diffs.differ(other_repo, other_ref, org_repo, org_ref,
discovery_data)
diff_processor = diffs.DiffProcessor(_diff, format='gitdiff')
_parsed = diff_processor.prepare()
c.files = []
c.changes = {}
# sort Added first then Modified last Deleted files
sorter = lambda info: {'A': 0, 'M': 1, 'D': 2}.get(info['operation'])
for f in sorted(_parsed, key=sorter):
fid = h.FID('', f['filename'])
c.files.append([fid, f['operation'], f['filename'], f['stats']])
diff = diff_processor.as_html(enable_comments=False, diff_lines=[f])
c.changes[fid] = [f['operation'], f['filename'], diff]
return render('compare/compare_diff.html')
|