diff --git a/progit/ui/fork.py b/progit/ui/fork.py index 31c8ceb..9ccf983 100644 --- a/progit/ui/fork.py +++ b/progit/ui/fork.py @@ -24,6 +24,7 @@ from pygments.formatters import HtmlFormatter import progit.doc_utils import progit.lib +import progit.lib.git import progit.forms from progit import (APP, SESSION, LOG, __get_file_in_tree, cla_required, is_repo_admin, generate_gitolite_acls) @@ -246,7 +247,7 @@ def request_pull_patch(repo, requestid, username=None): 'view_repo', username=username, repo=repo.name)) diff_commits.reverse() - patch = progit.lib.commit_to_patch(repo_obj, diff_commits) + patch = progit.lib.git.commit_to_patch(repo_obj, diff_commits) return flask.Response(patch, content_type="text/plain;charset=UTF-8") diff --git a/progit/ui/repo.py b/progit/ui/repo.py index 2d04b36..42b282f 100644 --- a/progit/ui/repo.py +++ b/progit/ui/repo.py @@ -29,6 +29,7 @@ import chardet import progit.exceptions import progit.lib +import progit.lib.git import progit.forms import progit.ui.plugins from progit import (APP, SESSION, LOG, __get_file_in_tree, cla_required, @@ -506,7 +507,7 @@ def view_commit_patch(repo, commitid, username=None): except ValueError: flask.abort(404, 'Commit not found') - patch = progit.lib.commit_to_patch(repo_obj, commit) + patch = progit.lib.git.commit_to_patch(repo_obj, commit) return flask.Response(patch, content_type="text/plain;charset=UTF-8")