2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/613f3d93261b/ Changeset: 613f3d93261b User: inithello Date: 2014-01-08 18:20:41 Summary: Fix error when time_last_tested has a None value. Affected #: 1 file diff -r 709c4b85bc411e5424c9536435d76fa4ee62781e -r 613f3d93261b282d6260b09100ffd5d3be3ff7dc lib/galaxy/webapps/tool_shed/model/__init__.py --- a/lib/galaxy/webapps/tool_shed/model/__init__.py +++ b/lib/galaxy/webapps/tool_shed/model/__init__.py @@ -275,7 +275,8 @@ rval = super( RepositoryMetadata, self ).to_dict( view=view, value_mapper=value_mapper ) if 'time_last_tested' in rval: time_last_tested = rval[ 'time_last_tested' ] - rval[ 'time_last_tested' ] = time_last_tested.isoformat() + if time_last_tested is not None: + rval[ 'time_last_tested' ] = time_last_tested.isoformat() return rval https://bitbucket.org/galaxy/galaxy-central/commits/725010d022f3/ Changeset: 725010d022f3 User: inithello Date: 2014-01-08 18:27:14 Summary: When a push is received in the hg controller, update the repository on disk after the push is complete. Affected #: 1 file diff -r 613f3d93261b282d6260b09100ffd5d3be3ff7dc -r 725010d022f3dae2400fab9d009b3d65af70f440 lib/galaxy/webapps/tool_shed/controllers/hg.py --- a/lib/galaxy/webapps/tool_shed/controllers/hg.py +++ b/lib/galaxy/webapps/tool_shed/controllers/hg.py @@ -2,6 +2,7 @@ from galaxy import web from galaxy.web.base.controller import BaseUIController from tool_shed.util.shed_util_common import get_repository_by_name_and_owner +from tool_shed.util.shed_util_common import update_repository from tool_shed.util.metadata_util import set_repository_metadata from galaxy import eggs @@ -9,6 +10,8 @@ import mercurial.__version__ from mercurial.hgweb.hgwebdir_mod import hgwebdir from mercurial.hgweb.request import wsgiapplication +from mercurial import hg +from mercurial import ui log = logging.getLogger(__name__) @@ -36,6 +39,11 @@ repository = get_repository_by_name_and_owner( trans.app, name, owner ) if repository: if hg_version >= '2.2.3': + # Update the repository on disk to the tip revision, because the web upload form uses the on-disk working + # directory. If the repository is not updated on disk, pushing from the command line and then uploading + # via the web interface will result in a new head being created. + repo = hg.repository( ui.ui(), repository.repo_path( trans.app ) ) + update_repository( repo, ctx_rev=None ) # Set metadata using the repository files on disk. error_message, status = set_repository_metadata( trans, repository ) if status == 'ok' and error_message: 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.