From 574c9b36f545a50e577f5dd9409f9718100e6ebf Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Tue, 30 Jun 2015 09:56:40 -0700
Subject: [PATCH] Add missing get_repo calls
Some places where we call getRepo were missed in the recent move
to gitrepo.get_repo. Correct those and also remove excess module
qualifications.
Change-Id: I55103b71e7fe35e282d69c3c95c61cbad95ef729
---
gertty/alembic/versions/50344aecd1c2_add_files_table.py | 3 ++-
gertty/sync.py | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/gertty/alembic/versions/50344aecd1c2_add_files_table.py b/gertty/alembic/versions/50344aecd1c2_add_files_table.py
index d04f1e4..64d417a 100644
--- a/gertty/alembic/versions/50344aecd1c2_add_files_table.py
+++ b/gertty/alembic/versions/50344aecd1c2_add_files_table.py
@@ -18,6 +18,7 @@ import sqlalchemy as sa
import git.exc
import gertty.db
+import gertty.gitrepo
def upgrade():
op.create_table('file',
@@ -54,7 +55,7 @@ def upgrade():
sys.stdout.flush()
ires = conn.execute(insert, revision_key=rkey, path='/COMMIT_MSG', old_path=None,
status=None, inserted=None, deleted=None)
- repo = context.config.gertty_app.getRepo(pname)
+ repo = gertty.gitrepo.get_repo(pname, context.config.gertty_app)
try:
stats = repo.diffstat(parent, commit)
except git.exc.GitCommandError:
diff --git a/gertty/sync.py b/gertty/sync.py
index 1bb7686..96a0fba 100644
--- a/gertty/sync.py
+++ b/gertty/sync.py
@@ -567,7 +567,7 @@ class SyncChangeTask(Task):
change.subject = remote_change['subject']
change.updated = dateutil.parser.parse(remote_change['updated'])
change.topic = remote_change.get('topic')
- repo = gertty.gitrepo.get_repo(change.project.name, app.config)
+ repo = gitrepo.get_repo(change.project.name, app.config)
new_revision = False
for remote_commit, remote_revision in remote_change.get('revisions', {}).items():
revision = session.getRevisionByCommit(remote_commit)
@@ -847,7 +847,7 @@ class CheckReposTask(Task):
try:
missing = False
try:
- repo = gertty.gitrepo.get_repo(project.name, app.config)
+ repo = gitrepo.get_repo(project.name, app.config)
except gitrepo.GitCloneError:
missing = True
if missing or app.fetch_missing_refs:
@@ -1209,7 +1209,7 @@ class PruneChangeTask(Task):
change = session.getChange(self.key)
if not change:
return
- repo = app.getRepo(change.project.name)
+ repo = gitrepo.get_repo(change.project.name, app.config)
self.log.info("Pruning %s change %s status:%s updated:%s" % (
change.project.name, change.number, change.status, change.updated))
change_ref = None