Merged in davebgx/galaxy-central (pull request #626)

Upgrade mercurial egg to 3.2.4.

eggs.ini

@@ -15,7 +15,7 @@ no_auto = pbs_python
 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

lib/tool_shed/util/hg_util.py

@@ -16,7 +16,7 @@ from mercurial import cmdutil
 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 @@ log = logging.getLogger( __name__ )
 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 @@ def bundle_to_json( fh ):
     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 )