kallithea Changeset - 008e460c5b9d

Changeset - 008e460c5b9d

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Marcin Kuzminski - 12 years ago 2013-06-30 21:30:44
marcin@python-works.com

fixes issue #860.

IMC web commits poisoned caches when they failed. We now
always invalidate caches so objects are refreshed and will be accessible.

3 files changed with 18 insertions and 11 deletions:

rhodecode/controllers/files.py

rhodecode/lib/exceptions.py

rhodecode/model/scm.py

0 comments (0 inline, 0 general)

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -34,13 +34,13 @@ from pylons.i18n.translation import _ @@
 from pylons.controllers.util import redirect
 from rhodecode.lib.utils import jsonify, action_logger
 from rhodecode.lib import diffs
 from rhodecode.lib import helpers as h
-from rhodecode.lib.compat import OrderedDict, json
 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
@@ @@ -54,13 +54,13 @@ from rhodecode.model.repo import RepoMod @@
 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
 from webob.exc import HTTPNotFound
 from rhodecode.lib.exceptions import NonRelativePathError
+from rhodecode.lib.exceptions import NonRelativePathError, IMCCommitError
 log = logging.getLogger(__name__)
 class FilesController(BaseRepoController):
@@ @@ -268,13 +268,13 @@ class FilesController(BaseRepoController @@
     def edit(self, repo_name, revision, f_path):
         repo = c.rhodecode_db_repo
         if repo.enable_locking and repo.locked[0]:
             h.flash(_('This repository is has been locked by %s on %s')
                 % (h.person_by_id(repo.locked[0]),
                    h.fmt_date(h.time_to_datetime(repo.locked[1]))),
-                  'warning')
                 'warning')
             return redirect(h.url('files_home',
                                   repo_name=repo_name, revision='tip'))
         # check if revision is a branch identifier- basically we cannot
         # create multiple heads via file editing
         _branches = repo.scm_instance.branches
@@ @@ -290,13 +290,13 @@ class FilesController(BaseRepoController @@
         c.cs = self.__get_cs_or_redirect(revision, repo_name)
         c.file = self.__get_filenode_or_redirect(repo_name, c.cs, f_path)
         if c.file.is_binary:
             return redirect(url('files_home', repo_name=c.repo_name,
                          revision=c.cs.raw_id, f_path=f_path))
+                            revision=c.cs.raw_id, f_path=f_path))
         c.default_message = _('Edited file %s via RhodeCode') % (f_path)
         c.f_path = f_path
         if r_post:
             old_content = c.file.content
@@ @@ -318,13 +318,12 @@ class FilesController(BaseRepoController @@
                                              repo_name=repo_name, cs=c.cs,
                                              user=self.rhodecode_user.user_id,
                                              author=author, message=message,
                                              content=content, f_path=f_path)
                 h.flash(_('Successfully committed to %s') % f_path,
                         category='success')
             except Exception:
                 log.error(traceback.format_exc())
                 h.flash(_('Error occurred during commit'), category='error')
             return redirect(url('changeset_home',
                                 repo_name=c.repo_name, revision='tip'))

rhodecode/lib/exceptions.py

➞

Show inline comments

@@ @@ -83,6 +83,10 @@ class HTTPLockedRC(HTTPClientError): @@
         from rhodecode.lib.utils2 import safe_int
         _code = CONFIG.get('lock_ret_code')
         self.code = safe_int(_code, self.code)
         self.title = self.explanation = ('Repository `%s` locked by '
                                          'user `%s`' % (reponame, username))
         super(HTTPLockedRC, self).__init__(*args, **kwargs)
 class IMCCommitError(Exception):
     pass

rhodecode/model/scm.py

➞

Show inline comments

@@ @@ -51,13 +51,13 @@ from rhodecode.lib.auth import HasRepoPe @@
 from rhodecode.lib.utils import get_filesystem_repos, make_ui, \
     action_logger
 from rhodecode.model import BaseModel
 from rhodecode.model.db import Repository, RhodeCodeUi, CacheInvalidation, \
     UserFollowing, UserLog, User, RepoGroup, PullRequest
 from rhodecode.lib.hooks import log_push_action
 from rhodecode.lib.exceptions import NonRelativePathError
+from rhodecode.lib.exceptions import NonRelativePathError, IMCCommitError
 log = logging.getLogger(__name__)
 class UserTemp(object):
     def __init__(self, user_id):
@@ @@ -543,17 +543,21 @@ class ScmModel(BaseModel): @@
         # message and author needs to be unicode
         # proper backend should then translate that into required type
         message = safe_unicode(message)
         author = safe_unicode(author)
         imc = IMC(repo)
         imc.change(FileNode(path, content, mode=cs.get_file_mode(f_path)))
         tip = imc.commit(message=message,
                        author=author,
                        parents=[cs], branch=cs.branch)
         self.mark_for_invalidation(repo_name)
         try:
             tip = imc.commit(message=message, author=author,
                              parents=[cs], branch=cs.branch)
         except Exception, e:
             log.error(traceback.format_exc())
             raise IMCCommitError(str(e))
         finally:
             # always clear caches, if commit fails we want fresh object also
             self.mark_for_invalidation(repo_name)
         self._handle_push(repo,
                           username=user.username,
                           action='push_local',
                           repo_name=repo_name,
                           revisions=[tip.raw_id])
         return tip

0 comments (0 inline, 0 general)