Consolidate use of get_repo_for_repository()

lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py

@@ -1634,10 +1634,7 @@ def update_to_changeset_revision(self, trans, **kwd):
                         repo_files_dir = os.path.abspath(os.path.join(tool_path, relative_install_dir, name))
                     else:
                         repo_files_dir = os.path.abspath(os.path.join(relative_install_dir, name))
-                    repo = hg_util.get_repo_for_repository(trans.app,
-                                                           repository=None,
-                                                           repo_path=repo_files_dir,
-                                                           create=False)
+                    repo = hg_util.get_repo_for_repository(trans.app, repo_path=repo_files_dir)
                     repository_clone_url = os.path.join(tool_shed_url, 'repos', owner, name)
                     hg_util.pull_repository(repo, repository_clone_url, latest_ctx_rev)
                     hg_util.update_repository(repo, latest_ctx_rev)

lib/galaxy/webapps/tool_shed/api/repositories.py

@@ -216,7 +216,7 @@ def get_repository_revision_install_info(self, trans, name, owner, changeset_rev
             if repository_metadata is None:
                 # The changeset_revision column in the repository_metadata table has been updated with a new
                 # value value, so find the changeset_revision to which we need to update.
-                repo = hg_util.get_repo_for_repository(self.app, repository=repository, repo_path=None, create=False)
+                repo = hg_util.get_repo_for_repository(self.app, repository=repository)
                 new_changeset_revision = metadata_util.get_next_downloadable_changeset_revision(repository, repo, changeset_revision)
                 repository_metadata = metadata_util.get_repository_metadata_by_changeset_revision(self.app,
                                                                                                   encoded_repository_id,
@@ -800,7 +800,7 @@ def updates(self, trans, **kwd):
             repository_metadata = metadata_util.get_repository_metadata_by_changeset_revision(trans.app,
                                                                                               trans.security.encode_id(repository.id),
                                                                                               changeset_revision)
-            repo = hg_util.get_repo_for_repository(trans.app, repository=repository, repo_path=None, create=False)
+            repo = hg_util.get_repo_for_repository(trans.app, repository=repository)
             tool_shed_status_dict = {}
             # Handle repository deprecation.
             tool_shed_status_dict['repository_deprecated'] = str(repository.deprecated)
@@ -1066,8 +1066,7 @@ def create_changeset_revision(self, trans, id, payload, **kwd):
                 "err_msg": "You do not have permission to update this repository.",
             }
 
-        repo_dir = repository.repo_path(self.app)
-        repo = hg_util.get_repo_for_repository(self.app, repository=None, repo_path=repo_dir, create=False)
+        repo = hg_util.get_repo_for_repository(self.app, repository=repository)
 
         upload_point = commit_util.get_upload_point(repository, **kwd)
         tip = repository.tip(self.app)

lib/galaxy/webapps/tool_shed/api/repository_revisions.py

@@ -141,10 +141,7 @@ def repository_dependencies(self, trans, id, **kwd):
                 if repository_dependency_repository_metadata is None:
                     # The changeset_revision column in the repository_metadata table has been updated with a new
                     # value value, so find the changeset_revision to which we need to update.
-                    repo = hg_util.get_repo_for_repository(trans.app,
-                                                           repository=repository_dependency,
-                                                           repo_path=None,
-                                                           create=False)
+                    repo = hg_util.get_repo_for_repository(trans.app, repository=repository_dependency)
                     new_changeset_revision = metadata_util.get_next_downloadable_changeset_revision(repository_dependency,
                                                                                                     repo,
                                                                                                     changeset_revision)

lib/galaxy/webapps/tool_shed/controllers/repository.py

@@ -422,7 +422,7 @@ def browse_repository(self, trans, id, **kwd):
         status = kwd.get('status', 'done')
         commit_message = escape(kwd.get('commit_message', 'Deleted selected files'))
         repository = repository_util.get_repository_in_tool_shed(trans.app, id)
-        repo = hg_util.get_repo_for_repository(trans.app, repository=repository, repo_path=None, create=False)
+        repo = hg_util.get_repo_for_repository(trans.app, repository=repository)
         # Update repository files for browsing.
         hg_util.update_repository(repo)
         changeset_revision = repository.tip(trans.app)
@@ -595,7 +595,7 @@ def check_for_updates(self, trans, **kwd):
         owner = kwd.get('owner', None)
         changeset_revision = kwd.get('changeset_revision', None)
         repository = repository_util.get_repository_by_name_and_owner(trans.app, name, owner)
-        repo = hg_util.get_repo_for_repository(trans.app, repository=repository, repo_path=None, create=False)
+        repo = hg_util.get_repo_for_repository(trans.app, repository=repository)
         # Default to the current changeset revision.
         update_to_ctx = hg_util.get_changectx_for_changeset(repo, changeset_revision)
         latest_changeset_revision = changeset_revision
@@ -1238,7 +1238,7 @@ def has_galaxy_utilities(repository_metadata):
         has_repository_dependencies_only_if_compiling_contained_td = \
             has_galaxy_utilities_dict['has_repository_dependencies_only_if_compiling_contained_td']
         includes_workflows = has_galaxy_utilities_dict['includes_workflows']
-        repo = hg_util.get_repo_for_repository(trans.app, repository=repository, repo_path=None, create=False)
+        repo = hg_util.get_repo_for_repository(trans.app, repository=repository)
         # Default to the received changeset revision and ctx_rev.
         update_to_ctx = hg_util.get_changectx_for_changeset(repo, changeset_revision)
         ctx_rev = str(update_to_ctx.rev())
@@ -1315,7 +1315,7 @@ def get_ctx_rev(self, trans, **kwd):
         repository_owner = kwd['owner']
         changeset_revision = kwd['changeset_revision']
         repository = repository_util.get_repository_by_name_and_owner(trans.app, repository_name, repository_owner)
-        repo = hg_util.get_repo_for_repository(trans.app, repository=repository, repo_path=None, create=False)
+        repo = hg_util.get_repo_for_repository(trans.app, repository=repository)
         ctx = hg_util.get_changectx_for_changeset(repo, changeset_revision)
         if ctx:
             return str(ctx.rev())
@@ -1341,7 +1341,7 @@ def get_latest_downloadable_changeset_revision(self, trans, **kwd):
         if repository_name is not None and repository_owner is not None:
             repository = repository_util.get_repository_by_name_and_owner(trans.app, repository_name, repository_owner)
             if repository:
-                repo = hg_util.get_repo_for_repository(trans.app, repository=repository, repo_path=None, create=False)
+                repo = hg_util.get_repo_for_repository(trans.app, repository=repository)
                 return metadata_util.get_latest_downloadable_changeset_revision(trans.app, repository, repo)
         return hg_util.INITIAL_CHANGELOG_HASH
 
@@ -1528,7 +1528,7 @@ def get_tool_versions(self, trans, **kwd):
         owner = kwd['owner']
         changeset_revision = kwd['changeset_revision']
         repository = repository_util.get_repository_by_name_and_owner(trans.app, name, owner)
-        repo = hg_util.get_repo_for_repository(trans.app, repository=repository, repo_path=None, create=False)
+        repo = hg_util.get_repo_for_repository(trans.app, repository=repository)
         tool_version_dicts = []
         for changeset in repo.changelog:
             current_changeset_revision = str(repo.changectx(changeset))
@@ -1552,7 +1552,7 @@ def get_updated_repository_information(self, trans, name, owner, changeset_revis
         repository = repository_util.get_repository_by_name_and_owner(trans.app, name, owner)
         repository_id = trans.security.encode_id(repository.id)
         repository_clone_url = common_util.generate_clone_url_for_repository_in_tool_shed(trans.user, repository)
-        repo = hg_util.get_repo_for_repository(trans.app, repository=repository, repo_path=None, create=False)
+        repo = hg_util.get_repo_for_repository(trans.app, repository=repository)
         repository_metadata = metadata_util.get_repository_metadata_by_changeset_revision(trans.app, repository_id, changeset_revision)
         if not repository_metadata:
             # The received changeset_revision is no longer associated with metadata, so get the next changeset_revision in the repository
@@ -1845,8 +1845,7 @@ def manage_repository(self, trans, id, **kwd):
         status = kwd.get('status', 'done')
         repository = repository_util.get_repository_in_tool_shed(trans.app, id)
         repository_type = kwd.get('repository_type', str(repository.type))
-        repo_dir = repository.repo_path(trans.app)
-        repo = hg_util.get_repo_for_repository(trans.app, repository=None, repo_path=repo_dir, create=False)
+        repo = hg_util.get_repo_for_repository(trans.app, repository=repository)
         repo_name = kwd.get('repo_name', repository.name)
         changeset_revision = kwd.get('changeset_revision', repository.tip(trans.app))
         repository.share_url = repository_util.generate_sharable_link_for_repository_in_tool_shed(repository, changeset_revision=changeset_revision)
@@ -2066,7 +2065,7 @@ def manage_repository_admins(self, trans, id, **kwd):
             else:
                 # There is no repository_metadata defined for the changeset_revision, so see if it was defined
                 # in a previous changeset in the changelog.
-                repo = hg_util.get_repo_for_repository(trans.app, repository=repository, repo_path=None, create=False)
+                repo = hg_util.get_repo_for_repository(trans.app, repository=repository)
                 previous_changeset_revision = \
                     metadata_util.get_previous_metadata_changeset_revision(repository,
                                                                            repo,
@@ -2143,7 +2142,7 @@ def next_installable_changeset_revision(self, trans, **kwd):
         owner = kwd.get('owner', None)
         changeset_revision = kwd.get('changeset_revision', None)
         repository = repository_util.get_repository_by_name_and_owner(trans.app, name, owner)
-        repo = hg_util.get_repo_for_repository(trans.app, repository=repository, repo_path=None, create=False)
+        repo = hg_util.get_repo_for_repository(trans.app, repository=repository)
         # Get the next installable changeset_revision beyond the received changeset_revision.
         next_changeset_revision = metadata_util.get_next_downloadable_changeset_revision(repository, repo, changeset_revision)
         if next_changeset_revision and next_changeset_revision != changeset_revision:
@@ -2245,7 +2244,7 @@ def previous_changeset_revisions(self, trans, from_tip=False, **kwd):
             else:
                 changeset_revision = kwd.get('changeset_revision', None)
             if changeset_revision is not None:
-                repo = hg_util.get_repo_for_repository(trans.app, repository=repository, repo_path=None, create=False)
+                repo = hg_util.get_repo_for_repository(trans.app, repository=repository)
                 # Get the lower bound changeset revision.
                 lower_bound_changeset_revision = metadata_util.get_previous_metadata_changeset_revision(repository,
                                                                                                         repo,
@@ -2357,7 +2356,7 @@ def select_files_to_delete(self, trans, id, **kwd):
         commit_message = escape(kwd.get('commit_message', 'Deleted selected files'))
         repository = repository_util.get_repository_in_tool_shed(trans.app, id)
         repo_dir = repository.repo_path(trans.app)
-        repo = hg_util.get_repo_for_repository(trans.app, repository=None, repo_path=repo_dir, create=False)
+        repo = hg_util.get_repo_for_repository(trans.app, repo_path=repo_dir)
         selected_files_to_delete = kwd.get('selected_files_to_delete', '')
         if kwd.get('select_files_to_delete_button', False):
             if selected_files_to_delete:
@@ -2593,7 +2592,7 @@ def sharable_repository_revision(self, trans, owner, name, changeset_revision):
                                                                                                             changeset_revision)
             if not repository_metadata:
                 # Get updates to the received changeset_revision if any exist.
-                repo = hg_util.get_repo_for_repository(trans.app, repository=repository, repo_path=None, create=False)
+                repo = hg_util.get_repo_for_repository(trans.app, repository=repository)
                 upper_bound_changeset_revision = metadata_util.get_next_downloadable_changeset_revision(repository, repo, changeset_revision)
                 if upper_bound_changeset_revision and upper_bound_changeset_revision != changeset_revision:
                     changeset_revision = upper_bound_changeset_revision
@@ -2672,7 +2671,7 @@ def view_changelog(self, trans, id, **kwd):
         message = escape(kwd.get('message', ''))
         status = kwd.get('status', 'done')
         repository = repository_util.get_repository_in_tool_shed(trans.app, id)
-        repo = hg_util.get_repo_for_repository(trans.app, repository=repository, repo_path=None, create=False)
+        repo = hg_util.get_repo_for_repository(trans.app, repository=repository)
         changesets = []
         for changeset in repo.changelog:
             ctx = repo.changectx(changeset)
@@ -2707,7 +2706,7 @@ def view_changeset(self, trans, id, ctx_str, **kwd):
         message = escape(kwd.get('message', ''))
         status = kwd.get('status', 'done')
         repository = repository_util.get_repository_in_tool_shed(trans.app, id)
-        repo = hg_util.get_repo_for_repository(trans.app, repository=repository, repo_path=None, create=False)
+        repo = hg_util.get_repo_for_repository(trans.app, repository=repository)
         ctx = hg_util.get_changectx_for_changeset(repo, ctx_str)
         if ctx is None:
             message = "Repository does not include changeset revision '%s'." % str(ctx_str)
@@ -2799,7 +2798,7 @@ def view_repository(self, trans, id, **kwd):
         message = escape(kwd.get('message', ''))
         status = kwd.get('status', 'done')
         repository = repository_util.get_repository_in_tool_shed(trans.app, id)
-        repo = hg_util.get_repo_for_repository(trans.app, repository=repository, repo_path=None, create=False)
+        repo = hg_util.get_repo_for_repository(trans.app, repository=repository)
         avg_rating, num_ratings = self.get_ave_item_rating_data(trans.sa_session, repository, webapp_model=trans.model)
         changeset_revision = kwd.get('changeset_revision', repository.tip(trans.app))
         repository.share_url = repository_util.generate_sharable_link_for_repository_in_tool_shed(repository, changeset_revision=changeset_revision)
@@ -2891,7 +2890,7 @@ def view_tool_metadata(self, trans, repository_id, changeset_revision, tool_id,
         render_repository_actions_for = kwd.get('render_repository_actions_for', 'tool_shed')
         repository = repository_util.get_repository_in_tool_shed(trans.app, repository_id)
         repo_files_dir = repository.repo_path(trans.app)
-        repo = hg_util.get_repo_for_repository(trans.app, repository=None, repo_path=repo_files_dir, create=False)
+        repo = hg_util.get_repo_for_repository(trans.app, repo_path=repo_files_dir)
         tool_metadata_dict = {}
         tool_lineage = []
         tool = None

lib/galaxy/webapps/tool_shed/controllers/repository_review.py

@@ -82,7 +82,7 @@ def browse_review(self, trans, **kwd):
         status = kwd.get('status', 'done')
         review = review_util.get_review(trans.app, kwd['id'])
         repository = review.repository
-        repo = hg_util.get_repo_for_repository(trans.app, repository=repository, repo_path=None, create=False)
+        repo = hg_util.get_repo_for_repository(trans.app, repository=repository)
         rev, changeset_revision_label = hg_util.get_rev_label_from_changeset_revision(repo, review.changeset_revision)
         return trans.fill_template('/webapps/tool_shed/repository_review/browse_review.mako',
                                    repository=repository,
@@ -244,7 +244,7 @@ def edit_review(self, trans, **kwd):
         for component in review_util.get_components(trans.app):
             components_dict[component.name] = dict(component=component, component_review=None)
         repository = review.repository
-        repo = hg_util.get_repo_for_repository(trans.app, repository=repository, repo_path=None, create=False)
+        repo = hg_util.get_repo_for_repository(trans.app, repository=repository)
         for component_review in review.component_reviews:
             if component_review and component_review.component:
                 component_name = component_review.component.name
@@ -483,7 +483,7 @@ def manage_repository_reviews(self, trans, mine=False, **kwd):
         repository_id = kwd.get('id', None)
         if repository_id:
             repository = suc.get_repository_in_tool_shed(trans.app, repository_id)
-            repo = hg_util.get_repo_for_repository(trans.app, repository=repository, repo_path=None, create=False)
+            repo = hg_util.get_repo_for_repository(trans.app, repository=repository)
             metadata_revision_hashes = [metadata_revision.changeset_revision for metadata_revision in repository.metadata_revisions]
             reviewed_revision_hashes = [review.changeset_revision for review in repository.reviews]
             reviews_dict = odict()
@@ -532,7 +532,7 @@ def manage_repository_reviews_of_revision(self, trans, **kwd):
         repository_id = kwd.get('id', None)
         changeset_revision = kwd.get('changeset_revision', None)
         repository = repository_util.get_repository_in_tool_shed(trans.app, repository_id)
-        repo = hg_util.get_repo_for_repository(trans.app, repository=repository, repo_path=None, create=False)
+        repo = hg_util.get_repo_for_repository(trans.app, repository=repository)
         installable = changeset_revision in [metadata_revision.changeset_revision for metadata_revision in repository.metadata_revisions]
         rev, changeset_revision_label = hg_util.get_rev_label_from_changeset_revision(repo, changeset_revision)
         reviews = review_util.get_reviews_by_repository_id_changeset_revision(trans.app,
@@ -595,7 +595,7 @@ def select_previous_review(self, trans, **kwd):
         status = kwd.get('status', 'done')
         repository = repository_util.get_repository_in_tool_shed(trans.app, kwd['id'])
         changeset_revision = kwd.get('changeset_revision', None)
-        repo = hg_util.get_repo_for_repository(trans.app, repository=repository, repo_path=None, create=False)
+        repo = hg_util.get_repo_for_repository(trans.app, repository=repository)
         previous_reviews_dict = review_util.get_previous_repository_reviews(trans.app,
                                                                             repository,
                                                                             changeset_revision)