1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/bad5602cdf99/ changeset: bad5602cdf99 user: greg date: 2012-10-23 20:59:31 summary: Add help text to the tool shed repository upload form to advertise John Chilton's recent enhancement allowing for mercurial repository urls staring with hg:// or hgs://. affected #: 2 files diff -r 5ae989999225b9edf884de6dfe23a2e82f9de403 -r bad5602cdf998dff9c2aecf478dc4ed1a797a023 lib/galaxy/webapps/community/controllers/upload.py --- a/lib/galaxy/webapps/community/controllers/upload.py +++ b/lib/galaxy/webapps/community/controllers/upload.py @@ -48,13 +48,12 @@ message = 'No files were entered on the upload form.' status = 'error' uploaded_file = None - elif url and url.startswith("hg"): - # Use mercurial clone to fetch repository, contents will then - # be copied over. + elif url and url.startswith( 'hg' ): + # Use mercurial clone to fetch repository, contents will then be copied over. uploaded_directory = tempfile.mkdtemp() - repo_url = "http%s" % url[len("hg"):] - repo_url = repo_url.encode('ascii', 'replace') - commands.clone(get_configured_ui(), repo_url, uploaded_directory) + repo_url = 'http%s' % url[ len( 'hg' ): ] + repo_url = repo_url.encode( 'ascii', 'replace' ) + commands.clone( get_configured_ui(), repo_url, uploaded_directory ) elif url: valid_url = True try: diff -r 5ae989999225b9edf884de6dfe23a2e82f9de403 -r bad5602cdf998dff9c2aecf478dc4ed1a797a023 templates/webapps/community/repository/upload.mako --- a/templates/webapps/community/repository/upload.mako +++ b/templates/webapps/community/repository/upload.mako @@ -85,7 +85,10 @@ <input name="url" type="textfield" value="${url | h}" size="40"/></div><div class="toolParamHelp" style="clear: both;"> - Enter a URL to upload your files via http. + Enter a URL to upload your files via http. URLs that point to mercurial repositories (URLs that start with hg:// or hgs://) + are allowed. This mechanism results in the tip revision of an external mercurial repository being added to the tool shed + repository as a single new changeset. The revision history of the originating external mercurial repository is not uploaded + to the tool shed repository. </div><div style="clear: both"></div></div> Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.