Merge lp:bzr-hg into lp:~launchpad-pqm/bzr-hg/devel

[Aaron Bentley]

Update to branch tip for bzr 2.2 compatibility

Update to trunk tip for compatibility with bzr 2.2

=== modified file 'Makefile'
--- Makefile	2009-11-01 16:37:38 +0000
+++ Makefile	2010-08-05 19:14:41 +0000
@@ -22,16 +22,8 @@
 	$(SETUP) clean
 	rm -f *.so
 
-TMP_PLUGINS_DIR = $(shell pwd)/.plugins
-
-$(TMP_PLUGINS_DIR):
-	mkdir -p $@
-
-$(TMP_PLUGINS_DIR)/hg: $(TMP_PLUGINS_DIR)
-	ln -sf .. $@
-
-check:: build-inplace $(TMP_PLUGINS_DIR)/hg
-	BZR_PLUGIN_PATH=$(TMP_PLUGINS_DIR) $(DEBUGGER) $(PYTHON) $(PYTHON_OPTIONS) $(BZR) $(BZR_OPTIONS) selftest $(TEST_OPTIONS) $(TESTS)
+check:: build-inplace 
+	BZR_PLUGINS_AT=hg@$(shell pwd) $(DEBUGGER) $(PYTHON) $(PYTHON_OPTIONS) $(BZR) $(BZR_OPTIONS) selftest $(TEST_OPTIONS) $(TESTS)
 
 check-verbose::
 	$(MAKE) check TEST_OPTIONS=-v
@@ -43,7 +35,7 @@
 	$(MAKE) check TEST_OPTIONS="--random=now --verbose --one"
 
 show-plugins::
-	BZR_PLUGIN_PATH=$(TMP_PLUGINS_DIR) $(BZR) plugins
+	BZR_PLUGINS_AT=hg@$(shell pwd) $(BZR) plugins -v
 
 lint::
 	$(PYLINT) -f parseable *.py */*.py
 
=== modified file 'NEWS'
--- NEWS	2010-01-06 02:59:22 +0000
+++ NEWS	2010-08-05 19:14:41 +0000
@@ -21,6 +21,9 @@
 
   * Add extra constraints in sqlite cache. (Jelmer Vernooij)
 
+  * New 'bzr hg-import' command similar to 'bzr svn-import' and 
+    'bzr git-import'. (Jelmer Vernooij)
+
  BUG FIXES
 
   * Mark as compatible with Bazaar 2.1. (Jelmer Vernooij)
@@ -32,13 +35,30 @@
 
   * Remove empty directories during fetch. (Jelmer Vernooij)
 
-  * Mark Mercurial 1.4 as supported. (#486899, Jelmer Vernooij)
+  * Mark Mercurial 1.4 and 1.5 as supported. (#486899, Jelmer Vernooij)
 
   * Don't warn about development versions of Mercurial. (#492292, Jelmer 
     Vernooij)
 
   * Cope with unusual characters in changeset ids. (#498945, Jelmer Vernooij)
 
+  * Only mention Mercurial version to use yet. (#517345, Jelmer Vernooij)
+
+  * Only consider major version numbers in compatibility checks.
+    (#517343, Jelmer Vernooij)
+
+  * Cope with non-ascii characters in committer names, messages when 
+    trying to create delta bases. (Jelmer Vernooij)
+
+  * Fix conversion of symlinks. (#594335, Max Bowser)
+
+  * Don't allow probing for Mercurial repositories over HTTP to break 
+    bzr. (Jelmer Vernooij)
+
+ DOCUMENTATION
+
+  * Add some basic instructions in INSTALL. (Martin Pool)
+
 0.1.0		2009-09-24
 
  Initial release.
 
=== modified file 'README'
--- README	2009-09-03 11:12:21 +0000
+++ README	2010-08-05 19:14:41 +0000
@@ -4,3 +4,15 @@
 
 This plugin requires recent versions of Bazaar and Mercurial to be 
 installed to work.
+
+To install::
+
+  bzr branch lp:bzr-hg ~/.bazaar/plugins/hg
+
+To use:
+
+* Use bzr in folders with Mercurial repositories.  (Readonly commands only.)
+
+* Use ``bzr send --format hg``
+
+* Use ``-r hg:SPEC`` to look up Mercurial native revisions.
 
=== modified file '__init__.py'
--- __init__.py	2009-12-20 03:17:42 +0000
+++ __init__.py	2010-08-05 19:14:41 +0000
@@ -44,9 +44,14 @@
     format_registry as send_format_registry,
     )
 
+_mercurial_loaded = False
 LockWarner = bzrlib.lockable_files._LockWarner
 
 def lazy_load_mercurial():
+    global _mercurial_loaded
+    if _mercurial_loaded:
+        return
+    _mercurial_loaded = True
     import mercurial
     try:
         from mercurial import demandimport
@@ -54,7 +59,8 @@
     except ImportError:
         pass
     from mercurial.__version__ import version as hg_version
-    if hg_version not in hg_compatible_versions and not "+" in hg_version:
+    hg_major_version = ".".join(hg_version.split(".")[:2])
+    if hg_major_version not in hg_compatible_versions and not "+" in hg_version:
         raise errors.DependencyNotPresent("mercurial",
             'bzr-hg: Mercurial version %s not supported.' % hg_version)
     trace.mutter("bzr-hg: using Mercurial %s" % hg_version)
@@ -157,9 +163,9 @@
         result._hgrepo.pull(self._hgrepo)
         return result
 
-    def create_branch(self):
+    def create_branch(self, name=None):
         """'create' a branch for this dir."""
-        return self.open_branch()
+        return self.open_branch(name=name)
 
     def create_repository(self, shared=False):
         """'create' a repository for this dir."""
@@ -168,11 +174,29 @@
             raise errors.IncompatibleFormat(self._format, self._format)
         return self.open_repository()
 
-    def create_workingtree(self, shared=False):
+    def create_workingtree(self, revision_id=None, from_branch=None,
+            accelerator_tree=None, hardlink=False):
         """'create' a workingtree for this dir."""
+        if revision_id is not None:
+            raise NotImplementedError("revision_id argument not yet supported")
+        if from_branch is not None:
+            raise NotImplementedError("from_branch argument not yet supported")
         return self.open_workingtree()
 
-    def get_branch_transport(self, branch_format):
+    def destroy_branch(self, name=None):
+        if name is not None:
+            raise errors.NoColocatedBranchSupport(self)
+        raise errors.UnsupportedOperation(self.destroy_branch, self)
+
+    def destroy_workingtree(self):
+        raise errors.UnsupportedOperation(self.destroy_workingtree, self)
+
+    def destroy_repository(self):
+        raise errors.UnsupportedOperation(self.destroy_repository, self)
+
+    def get_branch_transport(self, branch_format, name=None):
+        if name is not None:
+            raise errors.NoColocatedBranchSupport(self)
         if branch_format is None:
             return self.transport
         if isinstance(branch_format, HgBzrDirFormat):
@@ -188,8 +212,10 @@
     def needs_format_conversion(self, format=None):
         return (format is not HgBzrDirFormat)
 
-    def open_branch(self, ignored=None):
-        """'crate' a branch for this dir."""
+    def open_branch(self, name=None, ignored=None, unsupported=False):
+        """'create' a branch for this dir."""
+        if name is not None:
+            raise errors.NoColocatedBranchSupport(self)
         from bzrlib.plugins.hg.branch import HgLocalBranch, HgRemoteBranch
         if self._hgrepo.local():
             branch_klass = HgLocalBranch
@@ -247,6 +273,9 @@
         """We should write a converter."""
         return HgToSomethingConverter(format)
 
+    def network_name(self):
+        return "hg"
+
     def get_format_description(self):
         return "Mercurial Branch"
 
@@ -254,6 +283,9 @@
         """Initialize a new .not dir in the base directory of a Transport."""
         return self.open(transport, _create=True)
 
+    def __eq__(self, other):
+        return type(self) == type(other)
+
     @classmethod
     def _known_formats(self):
         return set([HgBzrDirFormat()])
@@ -291,6 +323,7 @@
             # Explicitly check for .hg directories here, so we avoid
             # loading foreign branches through Mercurial.
             raise errors.NotBranchError(path=transport.base)
+        import urllib2
         try:
             format.open(transport)
         except hg_errors.RepoError, e:
@@ -298,6 +331,9 @@
         except hg_errors.Abort, e:
             trace.mutter('not a hg branch: %s', e)
             raise errors.NotBranchError(path=transport.base)
+        except urllib2.HTTPError, e:
+            trace.mutter('not a hg branch: %s', e)
+            raise errors.NotBranchError(path=transport.base)
         return format
 
 
@@ -313,6 +349,11 @@
 revspec_registry.register_lazy("hg:", "bzrlib.plugins.hg.revspec",
     "RevisionSpec_hg")
 
+from bzrlib.commands import (
+    plugin_cmds,
+    )
+plugin_cmds.register_lazy('cmd_hg_import', [], 'bzrlib.plugins.hg.commands')
+
 try:
     from bzrlib.revisionspec import dwim_revspecs
 except ImportError:
 
=== modified file 'branch.py'
--- branch.py	2009-12-12 21:47:15 +0000
+++ branch.py	2010-08-05 19:14:41 +0000
@@ -104,6 +104,18 @@
         return "long"
 
 
+class HgReadLock(object):
+
+    def __init__(self, unlock):
+        self.unlock = unlock
+
+
+class HgWriteLock(object):
+
+    def __init__(self, unlock):
+        self.unlock = unlock
+
+
 class HgBranch(ForeignBranch):
     """An adapter to mercurial repositories for bzr Branch objects."""
 
@@ -152,6 +164,7 @@
 
     def lock_write(self):
         self.control_files.lock_write()
+        return HgWriteLock(self.unlock)
 
     @needs_read_lock
     def revision_history(self):
@@ -161,6 +174,7 @@
 
     def lock_read(self):
         self.control_files.lock_read()
+        return HgReadLock(self.unlock)
 
     def is_locked(self):
         return self.control_files.is_locked()
@@ -168,11 +182,6 @@
     def unlock(self):
         self.control_files.unlock()
 
-    def clone(self, to_bzrdir, revision_id=None):
-        # hg repositories can only clone into hg repos.
-        # and have nothing to do as we follow the hg model.
-        return to_bzrdir.open_branch()
-
     def get_stacked_on_url(self):
         raise errors.UnstackableBranchFormat(self._format, self.base)
 
@@ -208,7 +217,7 @@
 
     @staticmethod
     def _get_branch_formats_to_test():
-        return None, None
+        return []
 
     @staticmethod
     def is_compatible(source, target):
@@ -233,11 +242,11 @@
         result = BranchPushResult()
         result.source_branch = self.source
         result.target_branch = self.target
-        result.old_revid = self.target.last_revision()
+        result.old_revno, result.old_revid = self.target.last_revision_info()
         inter = InterRepository.get(self.source.repository,
                                     self.target.repository)
         inter.fetch(revision_id=stop_revision)
-        result.new_revid = self.target.last_revision()
+        result.new_revno, result.new_revid = self.target.last_revision_info()
         return result
 
 
@@ -249,7 +258,7 @@
 
     @staticmethod
     def _get_branch_formats_to_test():
-        return None, None
+        return []
 
     @staticmethod
     def is_compatible(source, target):
@@ -317,7 +326,7 @@
 
     @staticmethod
     def _get_branch_formats_to_test():
-        return None, None
+        return []
 
     @classmethod
     def is_compatible(self, source, target):
 
=== added file 'commands.py'
--- commands.py	1970-01-01 00:00:00 +0000
+++ commands.py	2010-08-05 19:14:41 +0000
@@ -0,0 +1,55 @@
+# Copyright (C) 2010 Jelmer Vernooij <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+"""Commands specific to dealing with Mercurial branches."""
+
+
+from bzrlib import (
+    errors,
+    )
+from bzrlib.commands import (
+    Command,
+    )
+
+import os
+
+
+class cmd_hg_import(Command):
+    """Convert a Mercurial repository to a Bazaar repository.
+
+    """
+    _see_also = ['formats']
+    takes_args = ['from_location', 'to_location?']
+
+    def run(self, from_location, to_location=None):
+        from bzrlib.bzrdir import BzrDir
+        if to_location is None:
+            to_location = os.path.basename(from_location.rstrip("/\\"))
+        from_dir = BzrDir.open(from_location)
+        try:
+            to_dir = BzrDir.open(to_location)
+        except errors.NotBranchError:
+            to_dir = BzrDir.create(to_location)
+        try:
+            to_repo = to_dir.open_repository()
+        except errors.NoRepositoryPresent:
+            to_repo = to_dir.create_repository()
+        try:
+            to_branch = to_dir.open_branch()
+        except errors.NotBranchError:
+            to_branch = to_dir.create_branch()
+        to_branch.pull(from_dir.open_branch())
 
=== modified file 'fetch.py'
--- fetch.py	2009-12-18 21:43:34 +0000
+++ fetch.py	2010-08-05 19:14:41 +0000
@@ -357,9 +357,11 @@
                     key = (fileid, revision)
                     if kind == "symlink":
                         self._symlink_targets[key] = fulltext
-                        fulltext = ""
-                    record = FulltextContentFactory(key, [(fileid, p) for p in parents], osutils.sha_string(fulltext), fulltext)
-                    self._text_metadata[key] = (record.sha1, len(fulltext))
+                        bzr_fulltext = ""
+                    else:
+                        bzr_fulltext = fulltext
+                    record = FulltextContentFactory(key, [(fileid, p) for p in parents], osutils.sha_string(bzr_fulltext), bzr_fulltext)
+                    self._text_metadata[key] = (record.sha1, len(bzr_fulltext))
                     yield record
 
     def _add_inventories(self, todo, mapping, pb):
@@ -484,7 +486,7 @@
                             revisions = filetext_map[fileid][node]
                             tp = self._find_most_recent_ancestor(revisions.keys(), revid)
                             text_parents.append(tp)
-                        elif path2id(fileid) == path:
+                        elif path2id(path) == fileid:
                             # FIXME: Handle situation where path is not actually in parent
                             text_parents.append(parent[fileid].revision)
                     filetext_map[fileid][manifest[path]][revid] = (kind, text_parents)
 
=== modified file 'idmap.py'
--- idmap.py	2010-01-06 02:59:22 +0000
+++ idmap.py	2010-08-05 19:14:41 +0000
@@ -219,8 +219,8 @@
 
     def revids(self):
         ret = set()
-        for row in self.db.execute("select revid from revision").fetchall():
-            ret.add(row[0])
+        ret.update((row for 
+            (row,) in self.db.execute("select revid from revision")))
         return ret
 
     def insert_revision(self, revid, manifest_id, changeset_id, mapping):
 
=== modified file 'info.py'
--- info.py	2010-01-04 16:18:04 +0000
+++ info.py	2010-08-05 19:14:41 +0000
@@ -1,7 +1,7 @@
 bzr_plugin_name = 'hg'
 
 bzr_compatible_versions = [(1, x, 0) for x in [13, 14, 15, 16, 17, 18]] + \
-                          [(2, x, 0) for x in [0, 1]]
+                          [(2, x, 0) for x in [0, 1, 2]]
 
 bzr_minimum_version = bzr_compatible_versions[0]
 
@@ -11,4 +11,4 @@
 
 bzr_control_formats = {"Mercurial": {'.hg/': None}}
 
-hg_compatible_versions = ["1.3.1", "1.4", "1.4.1", "1.4.2"]
+hg_compatible_versions = ["1.3", "1.4", "1.5", "1.6"]
 
=== modified file 'mapping.py'
--- mapping.py	2009-11-26 21:33:32 +0000
+++ mapping.py	2010-08-05 19:14:41 +0000
@@ -288,7 +288,7 @@
         return unescape_path(fileid[len("hg:"):])
 
     def export_revision(self, rev, lossy=True, fileids={}):
-        user = rev.committer.encode("utf-8")
+        user = rev.committer
         time = rev.timestamp
         timezone = -rev.timezone
         extra = {}
@@ -320,18 +320,22 @@
                 extra["bzr-extra-parents"] = " ".join(rev.parent_ids[2:])
             if fileids:
                 extra["bzr-fileids"] = bencode.bencode(sorted(fileids.items()))
-        desc = rev.message.encode("utf-8")
+        desc = rev.message
         return (manifest, user, (time, timezone), desc, extra)
 
     def import_revision(self, revid, parent_ids, hgrevid, manifest, user,
                         (time, timezone), desc, extra):
         result = foreign.ForeignRevision(hgrevid, self, revid)
         result.parent_ids = parent_ids
-        result.message = desc.decode("utf-8")
+        if type(desc) != unicode:
+            raise AssertionError
+        result.message = desc
         result.inventory_sha1 = ""
         result.timezone = -timezone
         result.timestamp = time
-        result.committer = user.decode("utf-8")
+        if type(user) != unicode:
+            raise AssertionError
+        result.committer = user
         result.properties = {
                 'manifest': mercurial.node.hex(manifest)
                 }
 
=== modified file 'parsers.py'
--- parsers.py	2009-11-26 21:33:32 +0000
+++ parsers.py	2010-08-05 19:14:41 +0000
@@ -25,7 +25,6 @@
 """
 
 import mercurial.changelog
-import mercurial.encoding
 import mercurial.manifest
 import mercurial.mdiff
 import mercurial.node
@@ -55,9 +54,13 @@
         raise ValueError("empty username")
     if "\n" in user:
         raise ValueError("username %s contains a newline" % repr(user))
+    if type(user) != unicode:
+        raise TypeError("user should be unicode string")
+    if type(desc) != unicode:
+        raise TypeError("desc should be unicode string")
 
-    user = mercurial.encoding.fromlocal(user)
-    desc = mercurial.encoding.fromlocal(desc)
+    user = user.encode("utf-8")
+    desc = desc.encode("utf-8")
 
     if not isinstance(date, tuple):
         raise TypeError("date is not a tuple")
@@ -79,10 +82,10 @@
     :return: Tuple with (manifest, user, (time, timezone), files, desc, extra)
     """
     last = text.index("\n\n")
-    desc = mercurial.encoding.tolocal(text[last + 2:])
+    desc = text[last + 2:].decode("utf-8")
     l = text[:last].split('\n')
     manifest = mercurial.node.bin(l[0])
-    user = mercurial.encoding.tolocal(l[1])
+    user = l[1].decode("utf-8")
 
     extra_data = l[2].split(' ', 2)
     if len(extra_data) != 3:
 
=== modified file 'repository.py'
--- repository.py	2009-12-15 20:34:14 +0000
+++ repository.py	2010-08-05 19:14:41 +0000
@@ -63,6 +63,9 @@
     """
     rich_root_data = True
 
+    def initialize(self, url, shared=False, _internal=False):
+        raise errors.UninitializableFormat(self)
+
     def is_supported(self):
         return True
 
@@ -338,6 +341,7 @@
 
     def lookup_bzr_revision_id(self, revision_id):
         """See ForeignRepository.lookup_bzr_revision_id()."""
+        assert type(revision_id) is str
         # TODO: Handle round-tripped revisions
         try:
             return mapping_registry.revision_id_bzr_to_foreign(revision_id)
@@ -345,11 +349,12 @@
             raise errors.NoSuchRevision(self, revision_id)
 
     def get_revision(self, revision_id):
+        assert type(revision_id) is str
         hgrevid, mapping = self.lookup_bzr_revision_id(revision_id)
         hgchange = self._hgrepo.changelog.read(hgrevid)
         hgparents = self._hgrepo.changelog.parents(hgrevid)
         parent_ids = as_bzr_parents(hgparents, self.lookup_foreign_revision_id)
-        return mapping.import_revision(revision_id, parent_ids, hgrevid, hgchange[0], hgchange[1], hgchange[2], hgchange[4], hgchange[5])[0]
+        return mapping.import_revision(revision_id, parent_ids, hgrevid, hgchange[0], hgchange[1].decode("utf-8"), hgchange[2], hgchange[4].decode("utf-8"), hgchange[5])[0]
 
     def iter_inventories(self, revision_ids, ordering=None):
         for revid in revision_ids:
 
=== modified file 'setup.py'
--- setup.py	2009-11-26 21:33:32 +0000
+++ setup.py	2010-08-05 19:14:41 +0000
@@ -19,5 +19,5 @@
           Mercurial branches in Bazaar.
           """,
           package_dir={'bzrlib.plugins.hg':'.'},
-          packages=['bzrlib.plugins.hg']
+          packages=['bzrlib.plugins.hg', 'bzrlib.plugins.hg.tests']
           )
 
=== modified file 'tests/__init__.py'
--- tests/__init__.py	2009-10-14 21:02:20 +0000
+++ tests/__init__.py	2010-08-05 19:14:41 +0000
@@ -23,8 +23,15 @@
 
     suite = TestSuite()
 
-    testmod_names = ['test_branch', 'test_idmap', 'test_mapping', 'test_parsers', 'test_pull']
-            
+    testmod_names = [
+        'test_branch',
+        'test_dir',
+        'test_idmap',
+        'test_mapping',
+        'test_parsers',
+        'test_pull',
+        ]
+
     suite.addTest(loader.loadTestsFromModuleNames(["%s.%s" % (__name__, i) for i in testmod_names]))
 
     return suite
 
=== added file 'tests/test_dir.py'
--- tests/test_dir.py	1970-01-01 00:00:00 +0000
+++ tests/test_dir.py	2010-08-05 19:14:41 +0000
@@ -0,0 +1,42 @@
+# Copyright (C) 2010 Jelmer Vernooij <[e-mail]>
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+from bzrlib.bzrdir import (
+    format_registry,
+    )
+
+from bzrlib.tests import (
+    TestCase,
+    )
+
+from bzrlib.plugins.hg import (
+    HgBzrDirFormat,
+    )
+
+
+class HgBzrDirFormatTests(TestCase):
+
+    def test_eq(self):
+        format1 = HgBzrDirFormat()
+        format2 = HgBzrDirFormat()
+        self.assertEquals(format1, format2)
+        self.assertEquals(format1, format1)
+        bzr_format = format_registry.make_bzrdir("default")
+        self.assertNotEquals(bzr_format, format1)
+
+    def test_network_name(self):
+        format = HgBzrDirFormat()
+        self.assertEquals("hg", format.network_name())
 
=== modified file 'tests/test_mapping.py'
--- tests/test_mapping.py	2009-11-16 23:06:52 +0000
+++ tests/test_mapping.py	2010-08-05 19:14:41 +0000
@@ -121,7 +121,7 @@
             self.mapping.export_revision(rev)
         self.assertEquals("Jelmer <foo>", user)
         self.assertEquals(None, manifest)
-        self.assertEquals("ürk", desc)
+        self.assertEquals(u"ürk", desc)
         self.assertEquals({"bzr-revprop-something": "else", "foo": "bar"}, 
                           extra)
 
 
=== modified file 'tests/test_parsers.py'
--- tests/test_parsers.py	2009-10-10 12:19:36 +0000
+++ tests/test_parsers.py	2010-08-05 19:14:41 +0000
@@ -36,8 +36,8 @@
 commit
 message""",
             format_changeset(mercurial.node.nullid, ["myfile"],
-                "Jelmer Vernooij <[e-mail]>",
-                (1253260798.0, -7200), "Some\ncommit\nmessage",
+                u"Jelmer Vernooij <[e-mail]>",
+                (1253260798.0, -7200), u"Some\ncommit\nmessage",
                 {}))
 
     def test_extra(self):
@@ -50,27 +50,27 @@
 commit
 message""",
             format_changeset(mercurial.node.nullid, ["myfile"],
-                "Jelmer Vernooij <[e-mail]>",
-                (1253260798.0, -7200), "Some\ncommit\nmessage",
+                u"Jelmer Vernooij <[e-mail]>",
+                (1253260798.0, -7200), u"Some\ncommit\nmessage",
                 {"extra": "data", "more":"extra"}))
 
     def test_invalid_author(self):
         self.assertRaises(ValueError, format_changeset, 
                 mercurial.node.nullid, ["myfile"],
-                "",
-                (1253260798.0, -7200), "Some\ncommit\nmessage",
+                u"",
+                (1253260798.0, -7200), u"Some\ncommit\nmessage",
                 {})
         self.assertRaises(ValueError, format_changeset, 
                 mercurial.node.nullid, ["myfile"],
-                "Jelmer\nVernooij",
-                (1253260798.0, -7200), "Some\ncommit\nmessage",
+                u"Jelmer\nVernooij",
+                (1253260798.0, -7200), u"Some\ncommit\nmessage",
                 {})
 
     def test_invalid_date(self):
         self.assertRaises(TypeError, format_changeset, 
                 mercurial.node.nullid, ["myfile"],
-                "Jelmer Vernooij <[e-mail]>",
-                1253260798, "Some\ncommit\nmessage",
+                u"Jelmer Vernooij <[e-mail]>",
+                1253260798, u"Some\ncommit\nmessage",
                 {})
 
 
@@ -78,8 +78,8 @@
 
     def test_simple(self):
         self.assertEquals((mercurial.node.nullid, 
-                "Jelmer Vernooij <[e-mail]>",
-                (1253260798.0, -7200), ["myfile"], "Some\ncommit\nmessage",
+                u"Jelmer Vernooij <[e-mail]>",
+                (1253260798.0, -7200), ["myfile"], u"Some\ncommit\nmessage",
                 {}), parse_changeset("""0000000000000000000000000000000000000000
 Jelmer Vernooij <[e-mail]>
 1253260798 -7200
@@ -91,8 +91,8 @@
 
     def test_extra(self):
         self.assertEquals((mercurial.node.nullid, 
-                "Jelmer Vernooij <[e-mail]>",
-                (1253260798.0, -7200), ["myfile"], "Some\ncommit\nmessage",
+                u"Jelmer Vernooij <[e-mail]>",
+                (1253260798.0, -7200), ["myfile"], u"Some\ncommit\nmessage",
                 {"date": "extra"}), 
                 parse_changeset("""0000000000000000000000000000000000000000
 Jelmer Vernooij <[e-mail]>