1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/4c98158b1f03/ Changeset: 4c98158b1f03 User: dannon Date: 2015-01-12 15:19:57+00:00 Summary: Merged in davebgx/galaxy-central (pull request #626) Upgrade mercurial egg to 3.2.4. Affected #: 2 files diff -r 85e8fb54b2851454a000cab23d57ce102af6aa30 -r 4c98158b1f031fbaee88ca7b04bf2be84cb507e9 eggs.ini --- a/eggs.ini +++ b/eggs.ini @@ -15,7 +15,7 @@ bx_python = 0.7.2 Cheetah = 2.2.2 MarkupSafe = 0.12 -mercurial = 2.2.3 +mercurial = 3.2.4 MySQL_python = 1.2.3c1 PyRods = 3.2.4 numpy = 1.6.0 diff -r 85e8fb54b2851454a000cab23d57ce102af6aa30 -r 4c98158b1f031fbaee88ca7b04bf2be84cb507e9 lib/tool_shed/util/hg_util.py --- a/lib/tool_shed/util/hg_util.py +++ b/lib/tool_shed/util/hg_util.py @@ -16,7 +16,7 @@ from mercurial import commands from mercurial import hg from mercurial import ui -from mercurial.changegroup import readbundle +from mercurial.exchange import readbundle from mercurial.changegroup import readexactly from tool_shed.util import basic_util @@ -26,7 +26,7 @@ INITIAL_CHANGELOG_HASH = '000000000000' def add_changeset( repo_ui, repo, path_to_filename_in_archive ): - commands.add( repo_ui, repo, path_to_filename_in_archive ) + commands.add( repo_ui, repo, str( path_to_filename_in_archive ) ) def archive_repository_revision( app, repository, archive_dir, changeset_revision ): '''Create an un-versioned archive of a repository.''' @@ -49,7 +49,7 @@ command line) to a json object. """ # See http://www.wstein.org/home/wstein/www/home/was/patches/hg_json - hg_unbundle10_obj = readbundle( fh, None ) + hg_unbundle10_obj = readbundle( None, fh, None ) groups = [ group for group in unpack_groups( hg_unbundle10_obj ) ] return json.dumps( groups, indent=4 ) 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.