kallithea Changeset - 6705eeebc41b

Changeset - 6705eeebc41b

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 15 years ago 2011-05-04 18:37:32
marcin@python-works.com

moved out commit into scm model, and added cache invalidation after commit.

2 files changed with 31 insertions and 17 deletions:

rhodecode/controllers/files.py

rhodecode/model/scm.py

0 comments (0 inline, 0 general)

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -215,17 +215,12 @@ class FilesController(BaseRepoController @@
         return render('files/files_annotate.html')
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     def edit(self, repo_name, revision, f_path):
         r_post = request.POST
         if c.rhodecode_repo.alias == 'hg':
             from vcs.backends.hg import MercurialInMemoryChangeset as IMC
         elif c.rhodecode_repo.alias == 'git':
             from vcs.backends.git import GitInMemoryChangeset as IMC
         c.cs = self.__get_cs_or_redirect(revision, repo_name)
         c.file = self.__get_filenode_or_redirect(repo_name, c.cs, f_path)
         c.file_history = self._get_node_history(c.cs, f_path)
         c.f_path = f_path
@@ @@ -237,35 +232,29 @@ class FilesController(BaseRepoController @@
             # modes:  0 - Unix, 1 - Mac, 2 - DOS
             mode = detect_mode(first_line, 0)
             content = convert_line_endings(r_post.get('content'), mode)
             message = r_post.get('message') or (_('Edited %s via RhodeCode')
                                                 % (f_path))
             author = self.rhodecode_user.full_contact
             if content == old_content:
                 h.flash(_('No changes'),
                     category='warning')
                 return redirect(url('changeset_home', repo_name=c.repo_name,
                                     revision='tip'))
             try:
                 # decoding here will force that we have proper encoded values
                 # in any other case this will throw exceptions and deny commit
                 content = content.encode('utf8')
                 message = message.encode('utf8')
                 path = f_path.encode('utf8')
                 author = self.rhodecode_user.full_contact.encode('utf8')
                 m = IMC(c.rhodecode_repo)
                 m.change(FileNode(path, content))
                 m.commit(message=message,
                          author=author,
                          parents=[c.cs], branch=c.cs.branch)
                 self.scm_model.commit_change(repo=c.rhodecode_repo,
                                              repo_name=repo_name, cs=c.cs,
                                              author=author, message=message,
                                              content=content, f_path=f_path)
                 h.flash(_('Successfully committed to %s' % f_path),
                         category='success')
-            except Exception, e:
             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'))
         return render('files/files_edit.html')

rhodecode/model/scm.py

➞

Show inline comments

@@ @@ -35,12 +35,13 @@ from sqlalchemy.orm import make_transien @@
 from beaker.cache import cache_region, region_invalidate
 from vcs import get_backend
 from vcs.utils.helpers import get_scm
 from vcs.exceptions import RepositoryError, VCSError
 from vcs.utils.lazy import LazyProperty
 from vcs.nodes import FileNode
 from rhodecode import BACKENDS
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import HasRepoPermissionAny
 from rhodecode.lib.utils import get_repos as get_filesystem_repos, make_ui, \
     action_logger
@@ @@ -373,12 +374,36 @@ class ScmModel(BaseModel): @@
             repo.pull(dbrepo.clone_uri)
             self.mark_for_invalidation(repo_name)
         except:
             log.error(traceback.format_exc())
             raise
     def commit_change(self, repo, repo_name, cs, author, message, content,
                       f_path):
         if repo.alias == 'hg':
             from vcs.backends.hg import MercurialInMemoryChangeset as IMC
         elif repo.alias == 'git':
             from vcs.backends.git import GitInMemoryChangeset as IMC
         # decoding here will force that we have proper encoded values
         # in any other case this will throw exceptions and deny commit
         content = content.encode('utf8')
         message = message.encode('utf8')
         path = f_path.encode('utf8')
         author = author.encode('utf8')
         m = IMC(repo)
         m.change(FileNode(path, content))
         m.commit(message=message,
                  author=author,
                  parents=[cs], branch=cs.branch)
         self.mark_for_invalidation(repo_name)
     def get_unread_journal(self):
         return self.sa.query(UserLog).count()
     def _should_invalidate(self, repo_name):
         """Looks up database for invalidation signals for this repo_name

0 comments (0 inline, 0 general)