Mercurial > kallithea
comparison kallithea/controllers/changeset.py @ 4196:06e49be38d78 kallithea-2.2.5-rebrand
Rename rhodecode_repo to db_repo_scm_instance
author | Bradley M. Kuhn <bkuhn@sfconservancy.org> |
---|---|
date | Wed, 02 Jul 2014 19:05:00 -0400 |
parents | 9581233e9275 |
children | d208416c84c6 |
comparison
equal
deleted
inserted
replaced
4195:9581233e9275 | 4196:06e49be38d78 |
---|---|
191 try: | 191 try: |
192 if len(rev_range) == 2: | 192 if len(rev_range) == 2: |
193 enable_comments = False | 193 enable_comments = False |
194 rev_start = rev_range[0] | 194 rev_start = rev_range[0] |
195 rev_end = rev_range[1] | 195 rev_end = rev_range[1] |
196 rev_ranges = c.rhodecode_repo.get_changesets(start=rev_start, | 196 rev_ranges = c.db_repo_scm_instance.get_changesets(start=rev_start, |
197 end=rev_end) | 197 end=rev_end) |
198 else: | 198 else: |
199 rev_ranges = [c.rhodecode_repo.get_changeset(revision)] | 199 rev_ranges = [c.db_repo_scm_instance.get_changeset(revision)] |
200 | 200 |
201 c.cs_ranges = list(rev_ranges) | 201 c.cs_ranges = list(rev_ranges) |
202 if not c.cs_ranges: | 202 if not c.cs_ranges: |
203 raise RepositoryError('Changeset range returned empty result') | 203 raise RepositoryError('Changeset range returned empty result') |
204 | 204 |
255 cs2 = changeset.raw_id | 255 cs2 = changeset.raw_id |
256 cs1 = changeset.parents[0].raw_id if changeset.parents else EmptyChangeset().raw_id | 256 cs1 = changeset.parents[0].raw_id if changeset.parents else EmptyChangeset().raw_id |
257 context_lcl = get_line_ctx('', request.GET) | 257 context_lcl = get_line_ctx('', request.GET) |
258 ign_whitespace_lcl = ign_whitespace_lcl = get_ignore_ws('', request.GET) | 258 ign_whitespace_lcl = ign_whitespace_lcl = get_ignore_ws('', request.GET) |
259 | 259 |
260 _diff = c.rhodecode_repo.get_diff(cs1, cs2, | 260 _diff = c.db_repo_scm_instance.get_diff(cs1, cs2, |
261 ignore_whitespace=ign_whitespace_lcl, context=context_lcl) | 261 ignore_whitespace=ign_whitespace_lcl, context=context_lcl) |
262 diff_limit = self.cut_off_limit if not fulldiff else None | 262 diff_limit = self.cut_off_limit if not fulldiff else None |
263 diff_processor = diffs.DiffProcessor(_diff, | 263 diff_processor = diffs.DiffProcessor(_diff, |
264 vcs=c.rhodecode_repo.alias, | 264 vcs=c.db_repo_scm_instance.alias, |
265 format='gitdiff', | 265 format='gitdiff', |
266 diff_limit=diff_limit) | 266 diff_limit=diff_limit) |
267 cs_changes = OrderedDict() | 267 cs_changes = OrderedDict() |
268 if method == 'show': | 268 if method == 'show': |
269 _parsed = diff_processor.prepare() | 269 _parsed = diff_processor.prepare() |
439 'repository.admin') | 439 'repository.admin') |
440 @jsonify | 440 @jsonify |
441 def changeset_info(self, repo_name, revision): | 441 def changeset_info(self, repo_name, revision): |
442 if request.is_xhr: | 442 if request.is_xhr: |
443 try: | 443 try: |
444 return c.rhodecode_repo.get_changeset(revision) | 444 return c.db_repo_scm_instance.get_changeset(revision) |
445 except ChangesetDoesNotExistError, e: | 445 except ChangesetDoesNotExistError, e: |
446 return EmptyChangeset(message=str(e)) | 446 return EmptyChangeset(message=str(e)) |
447 else: | 447 else: |
448 raise HTTPBadRequest() | 448 raise HTTPBadRequest() |
449 | 449 |
451 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', | 451 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', |
452 'repository.admin') | 452 'repository.admin') |
453 @jsonify | 453 @jsonify |
454 def changeset_children(self, repo_name, revision): | 454 def changeset_children(self, repo_name, revision): |
455 if request.is_xhr: | 455 if request.is_xhr: |
456 changeset = c.rhodecode_repo.get_changeset(revision) | 456 changeset = c.db_repo_scm_instance.get_changeset(revision) |
457 result = {"results": []} | 457 result = {"results": []} |
458 if changeset.children: | 458 if changeset.children: |
459 result = {"results": changeset.children} | 459 result = {"results": changeset.children} |
460 return result | 460 return result |
461 else: | 461 else: |
465 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', | 465 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', |
466 'repository.admin') | 466 'repository.admin') |
467 @jsonify | 467 @jsonify |
468 def changeset_parents(self, repo_name, revision): | 468 def changeset_parents(self, repo_name, revision): |
469 if request.is_xhr: | 469 if request.is_xhr: |
470 changeset = c.rhodecode_repo.get_changeset(revision) | 470 changeset = c.db_repo_scm_instance.get_changeset(revision) |
471 result = {"results": []} | 471 result = {"results": []} |
472 if changeset.parents: | 472 if changeset.parents: |
473 result = {"results": changeset.parents} | 473 result = {"results": changeset.parents} |
474 return result | 474 return result |
475 else: | 475 else: |