kallithea Changeset - cff9d4e1d821

Changeset - cff9d4e1d821

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-11-04 13:08:27
marcin@python-works.com

Fixed issue when node didn't exists at 'tip' and we tried calculate history based on that assumption.
Now fallback to the changeset the node exists in for history calculation

2 files changed with 20 insertions and 7 deletions:

rhodecode/controllers/files.py

rhodecode/templates/files/files.html

0 comments (0 inline, 0 general)

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -36,25 +36,26 @@ from pylons.decorators import jsonify @@
 from rhodecode.lib import diffs
 from rhodecode.lib import helpers as h
 from rhodecode.lib.compat import OrderedDict
 from rhodecode.lib.utils2 import convert_line_endings, detect_mode, safe_str,\
     str2bool
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.vcs.backends.base import EmptyChangeset
 from rhodecode.lib.vcs.conf import settings
 from rhodecode.lib.vcs.exceptions import RepositoryError, \
     ChangesetDoesNotExistError, EmptyRepositoryError, \
     ImproperArchiveTypeError, VCSError, NodeAlreadyExistsError
     ImproperArchiveTypeError, VCSError, NodeAlreadyExistsError,\
     NodeDoesNotExistError
 from rhodecode.lib.vcs.nodes import FileNode
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.db import Repository
 from rhodecode.controllers.changeset import anchor_url, _ignorews_url,\
     _context_url, get_line_ctx, get_ignore_ws
 log = logging.getLogger(__name__)
@@ @@ -151,25 +152,26 @@ class FilesController(BaseRepoController @@
         # files or dirs
         try:
             c.file = c.changeset.get_node(f_path)
             if c.file.is_file():
                 _hist = c.rhodecode_repo.get_changeset().get_file_history(f_path)
                 c.file_changeset = c.changeset
                 if _hist:
                     c.file_changeset = (c.changeset
                                         if c.changeset.revision < _hist[0].revision
                                         else _hist[0])
                 c.file_history = self._get_node_history(None, f_path, _hist)
                 c.file_history = self._get_node_history(c.changeset, f_path,
                                                         _hist)
                 c.authors = []
                 for a in set([x.author for x in _hist]):
                     c.authors.append((h.email(a), h.person(a)))
             else:
                 c.authors = c.file_history = []
         except RepositoryError, e:
             h.flash(str(e), category='warning')
             redirect(h.url('files_home', repo_name=repo_name,
                            revision='tip'))
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return render('files/files_ypjax.html')
@@ @@ -495,29 +497,40 @@ class FilesController(BaseRepoController @@
             _, cs1, cs2, diff, st = diffs.wrapped_diff(filenode_old=node1,
                                          filenode_new=node2,
                                          cut_off_limit=lim,
                                          ignore_whitespace=ign_whitespace_lcl,
                                          line_context=line_context_lcl,
                                          enable_comments=False)
             c.changes = [('', node2, diff, cs1, cs2, st,)]
         return render('files/file_diff.html')
     def _get_node_history(self, cs, f_path, changesets=None):
         if cs is None:
             # if we pass empty CS calculate history based on tip
             cs = c.rhodecode_repo.get_changeset()
         """
         get changesets history for given node
         :param cs: changeset to calculate history
         :param f_path: path for node to calculate history for
         :param changesets: if passed don't calculate history and take
             changesets defined in this list
         """
         # calculate history based on tip
         tip_cs = c.rhodecode_repo.get_changeset()
         if changesets is None:
             changesets = cs.get_file_history(f_path)
             try:
                 changesets = tip_cs.get_file_history(f_path)
             except NodeDoesNotExistError:
                 #this node is not present at tip !
                 changesets = cs.get_file_history(f_path)
         hist_l = []
         changesets_group = ([], _("Changesets"))
         branches_group = ([], _("Branches"))
         tags_group = ([], _("Tags"))
         _hg = cs.repository.alias == 'hg'
         for chs in changesets:
             _branch = '(%s)' % chs.branch if _hg else ''
             n_desc = 'r%s:%s %s' % (chs.revision, chs.short_id, _branch)
             changesets_group[0].append((chs.raw_id, n_desc,))

rhodecode/templates/files/files.html

➞

Show inline comments

@@ @@ -71,25 +71,25 @@ var ypjax_links = function(){ @@
         var title = "${_('%s files') % c.repo_name}" + " - " + f_path;
         var _node_list_url = node_list_url.replace('__REV__',rev).replace('__FPATH__', f_path);
         var _url_base = url_base.replace('__REV__',rev);
         // Change our States and save some data for handling events
         var data = {url:url,title:title, url_base:_url_base,
                     node_list_url:_node_list_url};
         History.pushState(data, title, url);
         //now we're sure that we can do ypjax things
         YUE.preventDefault(e)
+        YUE.preventDefault(e);
         return false;
     });
+}
 var callbacks = function(State){
     ypjax_links();
     tooltip_activate();
     fileBrowserListeners(State.url, State.data.node_list_url, State.data.url_base);
     YUE.on('hlcode','mouseup',getSelectionLink("${_('Selection link')}"));
     // Inform Google Analytics of the change
     if ( typeof window.pageTracker !== 'undefined' ) {

0 comments (0 inline, 0 general)