Files
@ a5888ca796b5
Branch filter:
Location: kallithea/rhodecode/controllers/compare.py - annotation
a5888ca796b5
10.7 KiB
text/x-python
Fixed spelling of get's to gets
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 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 | b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec 70309536c143 b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec 6c79bfcd3b54 b2a2868d7bec b2a2868d7bec 6c79bfcd3b54 b2a2868d7bec 0e1023147334 b2a2868d7bec b2a2868d7bec 16a6a2f5d422 b2a2868d7bec 16a6a2f5d422 6c79bfcd3b54 42bca6fa923b a07e04ef7bb4 b2a2868d7bec b2a2868d7bec 42bca6fa923b 0e1023147334 f8c953c6b040 25d77aef2729 6c79bfcd3b54 b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b2a2868d7bec b44fabc4377c 1cd0a0c05f42 16a6a2f5d422 16a6a2f5d422 1cd0a0c05f42 1cd0a0c05f42 16a6a2f5d422 16a6a2f5d422 16a6a2f5d422 16a6a2f5d422 16a6a2f5d422 ed50319aab94 ed50319aab94 ed50319aab94 ed50319aab94 ed50319aab94 ed50319aab94 ed50319aab94 ed50319aab94 ed50319aab94 ed50319aab94 ed50319aab94 ed50319aab94 ed50319aab94 ed50319aab94 ed50319aab94 16a6a2f5d422 b44fabc4377c 16a6a2f5d422 16a6a2f5d422 16a6a2f5d422 16a6a2f5d422 16a6a2f5d422 16a6a2f5d422 16a6a2f5d422 16a6a2f5d422 2b6939a77052 0e1023147334 1cd0a0c05f42 1cd0a0c05f42 1cd0a0c05f42 16a6a2f5d422 15f4825890fe b950b884ab87 15f4825890fe 15f4825890fe b950b884ab87 b950b884ab87 b950b884ab87 b950b884ab87 d415621fa7c5 d415621fa7c5 d415621fa7c5 d415621fa7c5 d415621fa7c5 d415621fa7c5 b950b884ab87 b950b884ab87 b950b884ab87 b950b884ab87 b950b884ab87 b950b884ab87 b950b884ab87 b950b884ab87 b950b884ab87 b950b884ab87 b950b884ab87 b950b884ab87 b950b884ab87 3591b33e0c94 3591b33e0c94 b950b884ab87 3591b33e0c94 b950b884ab87 b950b884ab87 b950b884ab87 b950b884ab87 b950b884ab87 3591b33e0c94 3591b33e0c94 b950b884ab87 3591b33e0c94 b950b884ab87 b950b884ab87 f533c054fb19 f533c054fb19 f533c054fb19 f533c054fb19 b950b884ab87 d23f2bea2346 15f4825890fe b950b884ab87 b950b884ab87 b950b884ab87 b950b884ab87 b950b884ab87 b950b884ab87 b950b884ab87 b950b884ab87 b950b884ab87 745dda7817ed 3ac76dfdab8e 745dda7817ed 745dda7817ed 3ac76dfdab8e 745dda7817ed b36285f90f89 2053053e0882 2053053e0882 2053053e0882 2053053e0882 2053053e0882 2053053e0882 2053053e0882 2053053e0882 2053053e0882 3ac76dfdab8e 3ac76dfdab8e b3680a200f75 b3680a200f75 b3680a200f75 b3680a200f75 b3680a200f75 b3680a200f75 b36285f90f89 b36285f90f89 75431548602a 2053053e0882 2053053e0882 745dda7817ed 01fe360a66c0 01fe360a66c0 3c4afb8894bd 01fe360a66c0 db4ca2212ec0 db4ca2212ec0 01fe360a66c0 db4ca2212ec0 3c4afb8894bd 3c4afb8894bd 01fe360a66c0 bf96fd1920c1 b45e9fd75ac0 bf96fd1920c1 01fe360a66c0 bf96fd1920c1 bf96fd1920c1 bf96fd1920c1 b44fabc4377c b44fabc4377c 50927aedcab5 01fe360a66c0 01fe360a66c0 01fe360a66c0 01fe360a66c0 01fe360a66c0 01fe360a66c0 16a6a2f5d422 6c79bfcd3b54 15f4825890fe 15f4825890fe 6c79bfcd3b54 f8c953c6b040 b94eac50ec4d b94eac50ec4d 48142e84bdc8 48142e84bdc8 d23f2bea2346 1cd0a0c05f42 b262e349a7a5 b94eac50ec4d 2053053e0882 2053053e0882 a07296564f6b a07296564f6b 2053053e0882 01fe360a66c0 2053053e0882 b44fabc4377c c9b0f1d363c7 5fba3778431c 3ac76dfdab8e c2a206162062 4324d6899e55 b44fabc4377c b44fabc4377c 5fba3778431c 4324d6899e55 25d77aef2729 a07e04ef7bb4 f8c953c6b040 25d77aef2729 25d77aef2729 25d77aef2729 25d77aef2729 a07e04ef7bb4 a07e04ef7bb4 16af24982e30 16af24982e30 b94eac50ec4d 16af24982e30 ce4b7023a492 ce4b7023a492 ce4b7023a492 a07e04ef7bb4 a07e04ef7bb4 4324d6899e55 4324d6899e55 f8c953c6b040 f8c953c6b040 | # -*- coding: utf-8 -*-
"""
rhodecode.controllers.compare
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compare controller for pylons showing 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 re
from webob.exc import HTTPNotFound, HTTPBadRequest
from pylons import request, response, session, tmpl_context as c, url
from pylons.controllers.util import abort, redirect
from pylons.i18n.translation import _
from rhodecode.lib.vcs.exceptions import EmptyRepositoryError, RepositoryError
from rhodecode.lib.vcs.utils import safe_str
from rhodecode.lib.vcs.utils.hgcompat import scmutil, unionrepo
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.lib.utils2 import safe_str
from rhodecode.model.db import Repository
from rhodecode.lib.diffs import LimitedDiffContainer
log = logging.getLogger(__name__)
class CompareController(BaseRepoController):
def __before__(self):
super(CompareController, self).__before__()
def __get_rev_or_redirect(self, ref, repo, redirect_after=True,
partial=False):
"""
Safe way to get changeset if error occur it redirects to changeset with
proper message. If partial is set then don't do redirect raise Exception
instead
:param rev: revision to fetch
:param repo: repo instance
"""
rev = ref[1] # default and used for git
if repo.scm_instance.alias == 'hg':
# lookup up the exact node id
_revset_predicates = {
'branch': 'branch',
'book': 'bookmark',
'tag': 'tag',
'rev': 'id',
}
rev_spec = "max(%s(%%s))" % _revset_predicates[ref[0]]
revs = repo.scm_instance._repo.revs(rev_spec, safe_str(ref[1]))
if revs:
rev = revs[-1]
# else: TODO: just report 'not found'
try:
return repo.scm_instance.get_changeset(rev).raw_id
except EmptyRepositoryError, e:
if not redirect_after:
return None
h.flash(h.literal(_('There are no changesets yet')),
category='warning')
redirect(url('summary_home', repo_name=repo.repo_name))
except RepositoryError, e:
log.error(traceback.format_exc())
h.flash(safe_str(e), category='warning')
if not partial:
redirect(h.url('summary_home', repo_name=repo.repo_name))
raise HTTPBadRequest()
def _get_changesets(self, alias, org_repo, org_rev, other_repo, other_rev, merge):
"""
Returns a list of changesets that can be merged from org_repo@org_rev
to other_repo@other_rev ... and the ancestor that would be used for merge
"""
ancestor = None
if org_rev == other_rev:
changesets = []
if merge:
ancestor = org_rev
elif alias == 'hg':
#case two independent repos
if org_repo != other_repo:
hgrepo = unionrepo.unionrepository(other_repo.baseui,
other_repo.path,
org_repo.path)
# all the changesets we are looking for will be in other_repo,
# so rev numbers from hgrepo can be used in other_repo
#no remote compare do it on the same repository
else:
hgrepo = other_repo._repo
if merge:
revs = hgrepo.revs("ancestors(id(%s)) and not ancestors(id(%s)) and not id(%s)",
other_rev, org_rev, org_rev)
ancestors = hgrepo.revs("ancestor(id(%s), id(%s))", org_rev, other_rev)
if ancestors:
# pick arbitrary ancestor - but there is usually only one
ancestor = hgrepo[ancestors[0]].hex()
else:
# TODO: have both + and - changesets
revs = hgrepo.revs("id(%s) :: id(%s) - id(%s)",
org_rev, other_rev, org_rev)
changesets = [other_repo.get_changeset(rev) for rev in revs]
elif alias == 'git':
if org_repo != other_repo:
raise Exception('Comparing of different GIT repositories is not'
'allowed. Got %s != %s' % (org_repo, other_repo))
so, se = org_repo.run_git_command(
'log --reverse --pretty="format: %%H" -s -p %s..%s'
% (org_rev, other_rev)
)
changesets = [org_repo.get_changeset(cs)
for cs in re.findall(r'[0-9a-fA-F]{40}', so)]
return changesets, ancestor
@LoginRequired()
@HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
'repository.admin')
def index(self, org_ref_type, org_ref, other_ref_type, other_ref):
# org_ref will be evaluated in org_repo
org_repo = c.rhodecode_db_repo.repo_name
org_ref = (org_ref_type, org_ref)
# other_ref will be evaluated in other_repo
other_ref = (other_ref_type, other_ref)
other_repo = request.GET.get('other_repo', org_repo)
# If merge is True:
# Show what org would get if merged with other:
# List changesets that are ancestors of other but not of org.
# New changesets in org is thus ignored.
# Diff will be from common ancestor, and merges of org to other will thus be ignored.
# If merge is False:
# Make a raw diff from org to other, no matter if related or not.
# Changesets in one and not in the other will be ignored
merge = bool(request.GET.get('merge'))
# fulldiff disables cut_off_limit
c.fulldiff = request.GET.get('fulldiff')
# partial uses compare_cs.html template directly
partial = request.environ.get('HTTP_X_PARTIAL_XHR')
# as_form puts hidden input field with changeset revisions
c.as_form = partial and request.GET.get('as_form')
# swap url for compare_diff page - never partial and never as_form
c.swap_url = h.url('compare_url',
repo_name=other_repo,
org_ref_type=other_ref[0], org_ref=other_ref[1],
other_repo=org_repo,
other_ref_type=org_ref[0], other_ref=org_ref[1],
merge=merge or '')
org_repo = Repository.get_by_repo_name(org_repo)
other_repo = Repository.get_by_repo_name(other_repo)
if org_repo is None:
log.error('Could not find org repo %s' % org_repo)
raise HTTPNotFound
if other_repo is None:
log.error('Could not find other repo %s' % other_repo)
raise HTTPNotFound
if org_repo != other_repo and h.is_git(org_repo):
log.error('compare of two remote repos not available for GIT REPOS')
raise HTTPNotFound
if org_repo.scm_instance.alias != other_repo.scm_instance.alias:
log.error('compare of two different kind of remote repos not available')
raise HTTPNotFound
org_rev = self.__get_rev_or_redirect(ref=org_ref, repo=org_repo, partial=partial)
other_rev = self.__get_rev_or_redirect(ref=other_ref, repo=other_repo, partial=partial)
c.org_repo = org_repo
c.other_repo = other_repo
c.org_ref = org_ref[1]
c.other_ref = other_ref[1]
c.org_ref_type = org_ref[0]
c.other_ref_type = other_ref[0]
c.cs_ranges, c.ancestor = self._get_changesets(org_repo.scm_instance.alias,
org_repo.scm_instance, org_rev,
other_repo.scm_instance, other_rev,
merge)
c.statuses = c.rhodecode_db_repo.statuses([x.raw_id for x in
c.cs_ranges])
if merge and not c.ancestor:
log.error('Unable to find ancestor revision')
if partial:
return render('compare/compare_cs.html')
if c.ancestor:
assert merge
# case we want a simple diff without incoming changesets,
# previewing what will be merged.
# Make the diff on the other repo (which is known to have other_ref)
log.debug('Using ancestor %s as org_ref instead of %s'
% (c.ancestor, org_ref))
org_rev = c.ancestor
org_repo = other_repo
diff_limit = self.cut_off_limit if not c.fulldiff else None
log.debug('running diff between %s and %s in %s'
% (org_rev, other_rev, org_repo.scm_instance.path))
txtdiff = org_repo.scm_instance.get_diff(rev1=org_rev, rev2=other_rev)
diff_processor = diffs.DiffProcessor(txtdiff or '', format='gitdiff',
diff_limit=diff_limit)
_parsed = diff_processor.prepare()
c.limited_diff = False
if isinstance(_parsed, LimitedDiffContainer):
c.limited_diff = True
c.files = []
c.changes = {}
c.lines_added = 0
c.lines_deleted = 0
for f in _parsed:
st = f['stats']
if not st['binary']:
c.lines_added += st['added']
c.lines_deleted += st['deleted']
fid = h.FID('', f['filename'])
c.files.append([fid, f['operation'], f['filename'], f['stats']])
htmldiff = diff_processor.as_html(enable_comments=False, parsed_lines=[f])
c.changes[fid] = [f['operation'], f['filename'], htmldiff]
return render('compare/compare_diff.html')
|