Mercurial > kallithea

changeset 2514:9b734e9530c2 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed pull method repo lookup
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 26 Jun 2012 22:01:05 +0200
parents 388843a3a3c0
children 623e1d68a2e0
files rhodecode/model/scm.py
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/model/scm.py	Tue Jun 26 21:57:31 2012 +0200
+++ b/rhodecode/model/scm.py	Tue Jun 26 22:01:05 2012 +0200
@@ -344,8 +344,8 @@
         self.sa.add(repo)
         return repo
 
-    def pull_changes(self, repo_name, username):
-        dbrepo = Repository.get_by_repo_name(repo_name)
+    def pull_changes(self, repo, username):
+        dbrepo = self.__get_repo(repo)
         clone_uri = dbrepo.clone_uri
         if not clone_uri:
             raise Exception("This repository doesn't have a clone uri")
@@ -356,7 +356,7 @@
                 'ip': '',
                 'username': username,
                 'action': 'push_remote',
-                'repository': repo_name,
+                'repository': repo.repo_name,
                 'scm': repo.alias,
             }
 
@@ -367,7 +367,7 @@
                 repo.fetch(clone_uri)
             else:
                 repo.pull(clone_uri)
-            self.mark_for_invalidation(repo_name)
+            self.mark_for_invalidation(repo.repo_name)
         except:
             log.error(traceback.format_exc())
             raise