# HG changeset patch # User Marcin Kuzminski # Date 1340740865 -7200 # Node ID 9b734e9530c265311299baeac78e079ad6271ed5 # Parent 388843a3a3c05fd95d2c39321fa592fa4cb6dfa7 fixed pull method repo lookup diff -r 388843a3a3c0 -r 9b734e9530c2 rhodecode/model/scm.py --- 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