~abentley/bzrtools/bzrtools.dev

# Copyright (C) 2005 Canonical Limited

#   Authors: Robert Collins <robert.collins@canonical.com>

#

#    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.tests import TestCaseInTempDir, TestCase

from bzrlib.osutils import has_symlinks

try:

    import pybaz

except ImportError:

    pybaz = None

import os

from bzrlib.plugins.bzrtools.baz_import import (import_version, revision_id, 

                                                cmd_baz_import, make_archive)

from bzrlib.errors import NoSuchRevision

import shutil

from StringIO import StringIO

import tempfile

from testresources import (TestResource, TestLoader, OptimisingTestSuite,

                               ResourcedTestCase)

from bzrlib.plugins.bzrtools.fai import namespace_previous

from bzrlib.branch import Branch

def test_suite():

    if pybaz is None:

        from unittest import TestSuite

        return TestSuite()

    return TestLoader().loadTestsFromName(__name__)

class BazTreeResource(TestResource):

    def cleanUp(self):

        os.environ['HOME'] = self._oldhome

        shutil.rmtree(self._tmpdir)

    def __init__(self):

        self._tmpdir = tempfile.mkdtemp()

        self._homedir = os.path.join(self._tmpdir, 'home')

        self._oldhome = os.environ['HOME']

        os.mkdir(self._homedir)

        os.environ['HOME'] = self._homedir

        self._archiveroot = os.path.join(self._tmpdir, 'archive')

        self._archive = make_archive('demo@DONOTUSE', str(self._archiveroot))

        pybaz.set_my_id("Test User<test@example.org>")

        self.make_empty_import()

        self._empty_tag = 'demo@DONOTUSE/c--empty-tag--0'

        self._empty_tag_bzr = revision_id(self._empty_tag + '--base-0')

        pybaz.Revision('demo@DONOTUSE/c--import--0--base-0').make_continuation(

            pybaz.Version(self._empty_tag))

        self._empty_merged_tag = 'demo@DONOTUSE/c--empty-merged-tag--0'

        self._empty_merged_tag_bzr_base = revision_id(self._empty_merged_tag 

                                                 + '--base-0')

        self._empty_merged_tag_bzr = revision_id(self._empty_merged_tag 

                                                 + '--patch-1')

        pybaz.Revision('demo@DONOTUSE/c--import--0--base-0').make_continuation(

            pybaz.Version(self._empty_merged_tag))

        tree = pybaz.Revision(self._empty_merged_tag + '--base-0').get(

            os.path.join(self._tmpdir, 'tree'))

        tree.star_merge(self._empty_tag,

                        pybaz.Version('demo@DONOTUSE/c--import--0'))

        msg = tree.log_message()

        msg["summary"]="did a merge, yarh"

        tree.commit(msg)

        shutil.rmtree(os.path.join(self._tmpdir, 'tree'))

        # tree, two commits, includes merge of other branch

        self._empty_merged_tag_2 = 'demo@DONOTUSE/c--empty-tag-2--0'

        self._empty_merged_tag_2_bzr_base = revision_id(

            self._empty_merged_tag_2 + '--base-0')

        self._empty_merged_tag_2_bzr = revision_id(

            self._empty_merged_tag_2 + '--patch-1')

        pybaz.Revision('demo@DONOTUSE/c--import--0--base-0').make_continuation(

            pybaz.Version(self._empty_merged_tag_2))

        tree = pybaz.Revision(self._empty_merged_tag_2 + '--base-0').get (

            os.path.join(self._tmpdir, 'tree'))

        tree.star_merge(self._empty_merged_tag,

                        pybaz.Version('demo@DONOTUSE/c--import--0'))

        msg = tree.log_message()

        msg["summary"] = "merge in a merged tree."

        tree.commit(msg)

        shutil.rmtree(os.path.join(self._tmpdir, 'tree'))

        self._bad_id_tag = 'demo@DONOTUSE/c--bad-id--0'

        self._bad_id_tag_bzr_base = revision_id(self._bad_id_tag + '--base-0')

        self._bad_id_tag_bzr = revision_id(self._bad_id_tag + '--patch-1')

        pybaz.Revision('demo@DONOTUSE/c--import--0--base-0').make_continuation(

            pybaz.Version(self._bad_id_tag))

        tree = pybaz.Revision(self._bad_id_tag + '--base-0').get(

            os.path.join(self._tmpdir, 'tree'))

        from bzrlib.plugins.bzrtools.baz_import import add_file

        add_file(os.path.join(self._tmpdir,'tree/path'), 'text', 

                 'this_id/needs%escaping')

        msg = tree.log_message()

        msg["summary"] = "commit something which needs escaping."

        tree.commit(msg)

        shutil.rmtree(os.path.join(self._tmpdir, 'tree'))

        self.make_import_symlink()

        self.make_missing_ancestor()

        self.make_inbranch_continuation()

    def make_import_symlink(self):

        self._import_symlink = 'demo@DONOTUSE/c--import-symlink--0'

        self._import_symlink_bzr = revision_id(

            self._import_symlink + '--base-0')

        os.mkdir(os.path.join(self._tmpdir, 'tree'))

        tree = pybaz.init_tree(os.path.join(self._tmpdir, 'tree'),

                               self._import_symlink)

        os.symlink('missing-file-name',

                   os.path.join(self._tmpdir, 'tree', 'alink'))

        tree.add_tag('alink')

        id_file = open(os.path.join(tree, '.arch-ids', 'alink.id'), 'w')

        id_file.write('symlink_tag\n')

        id_file.close()

        msg = tree.log_message()

        msg["summary"] = "Import with a symlink"

        tree.import_(msg)

        shutil.rmtree(os.path.join(self._tmpdir, 'tree'))

    def make_empty_import(self):

        self._import = 'demo@DONOTUSE/c--import--0'

        os.mkdir(os.path.join(self._tmpdir, 'tree'))

        tree = pybaz.init_tree(os.path.join(self._tmpdir, 'tree'), 

                               self._import)

        msg = tree.log_message()

        msg["summary"] = "I am importing now"

        tree.import_(msg)

        shutil.rmtree(os.path.join(self._tmpdir, 'tree'))

    def make_missing_ancestor(self):

        self._archivegoneroot = os.path.join(self._tmpdir, 'archivegone')

        self._archive = make_archive('demo-gone@DONOTUSE',

                                     str(self._archivegoneroot))

        self._missing_import = 'demo-gone@DONOTUSE/c--import--0'

        self._missing_import_bzr = revision_id(self._missing_import 

                                                 + '--base-0')

        self._missing_ancestor = 'demo@DONOTUSE/c--gone--0'

        self._missing_ancestor_bzr = revision_id(self._missing_ancestor 

                                                 + '--base-0')

        os.mkdir(os.path.join(self._tmpdir, 'tree'))

        tree = pybaz.init_tree(os.path.join(self._tmpdir, 'tree'), 

                               self._missing_import)

        msg = tree.log_message()

        msg["summary"] = "I am importing now"

        tree.import_(msg)

        shutil.rmtree(os.path.join(self._tmpdir, 'tree'))

        # tag into the kept archive

        pybaz.Revision(self._missing_import + '--base-0').make_continuation(

            pybaz.Version(self._missing_ancestor))

        # make an import for testing history-reuse logic.

        def collect(text):

            pass

        # note the use of a namespace layout here.

        self._missing_import_imported = os.path.join(self._tmpdir, 

                                                     'archivegone-bzr')

        os.mkdir(os.path.join(self._tmpdir, 'archivegone-bzr'))

        os.mkdir(os.path.join(self._tmpdir, 'archivegone-bzr', 'c'))

        import_version(os.path.join(self._tmpdir, 'archivegone-bzr', 

                                    'c', 'import'),

                       pybaz.Version(self._missing_import),

                       collect)

        # and make it inaccessible

        pybaz.Archive('demo-gone@DONOTUSE').unregister()

    def make_inbranch_continuation(self):

        self._inbranch_tag = 'demo@DONOTUSE/c--inbranch-tag--0'

        self._inbranch_tag_base = self._inbranch_tag + '--base-0'

        self._inbranch_tag_base_bzr = revision_id(self._inbranch_tag_base)

        pybaz.Revision('demo@DONOTUSE/c--import--0--base-0').make_continuation(

            pybaz.Version(self._inbranch_tag))

        self._inbranch_tag_head = self._inbranch_tag + '--patch-1'

        self._inbranch_tag_head_bzr = revision_id(self._inbranch_tag_head)

        pybaz.Revision(self._inbranch_tag_base).make_continuation(

            pybaz.Version(self._inbranch_tag))

    @classmethod

    def _makeResource(self):

        return BazTreeResource()

    @classmethod

    def _cleanResource(self, resource):

        resource.cleanUp()

class TestImportBranch(TestCaseInTempDir):

    _resources = [("_baz", BazTreeResource)]

    def setUp(self):

        TestCaseInTempDir.setUp(self)

        ResourcedTestCase.setUpResources(self)

        os.environ['HOME'] = self._baz._homedir

        self.output = StringIO()

    def tearDown(self):

        ResourcedTestCase.tearDownResources(self)

        TestCaseInTempDir.tearDown(self)

    def collect(self, text):

        self.output.write(text)

        self.output.write("\n")

    def test_import_empty(self):

        import_version('output', pybaz.Version(self._baz._import), 

                       self.collect)

        # expected results:

        # one commit, no files, revision identifier of 

        # 'demo@DONOTUSE_c--import--0--base-0'

        branch = Branch.open('output')

        repo = branch.repository

        self.assertEqual(branch.revision_history(),

                         ['Arch-1:demo@DONOTUSE%c--import--0--base-0'])

        rev = repo.get_revision('Arch-1:demo@DONOTUSE%c--import--0--base-0')

        # and again.

        import_version('output2', pybaz.Version('demo@DONOTUSE/c--import--0'),

                       self.collect)

        branch2 = Branch.open('output2')

        repo2 = branch2.repository

        self.assertEqual(branch.revision_history(), branch2.revision_history())

        rev2 = repo2.get_revision('Arch-1:demo@DONOTUSE%c--import--0--base-0')

        # they must be the same

        self.assertEqual(rev, rev2)

        # and we should get some expected values:

        self.assertEqual(rev.committer, "Test User<test@example.org>")

        self.assertEqual(rev.message, "I am importing now")

        self.assertEqual(rev.revision_id,

                         "Arch-1:demo@DONOTUSE%c--import--0--base-0")

    def test_empty_tagged(self):

        import_version('output', pybaz.Version(self._baz._empty_tag),

                       self.collect)

        # expected results:

        # two commits, no files, revision identifiers of 

        # 'demo@DONOTUSE_c--import--0--base-0' and

        # self._baz._empty_tag_bzr

        branch = Branch.open('output')

        self.assertEqual(branch.revision_history(),

                         ['Arch-1:demo@DONOTUSE%c--import--0--base-0',

                          self._baz._empty_tag_bzr])

        rev = branch.repository.get_revision(self._baz._empty_tag_bzr)

        # and again.

        import_version('output2', pybaz.Version(self._baz._empty_tag),

                       self.collect)

        branch2 = Branch.open('output2')

        self.assertEqual(branch.revision_history(), branch2.revision_history())

        rev2 = branch2.repository.get_revision(self._baz._empty_tag_bzr)

        # they must be the same

        self.assertEqual(rev, rev2)

        # and we should get some expected values:

        self.assertEqual(rev.committer, "Test User<test@example.org>")

        self.assertEqual(rev.message, 

                         "tag of demo@DONOTUSE/c--import--0--base-0")

        self.assertEqual(rev.revision_id, self._baz._empty_tag_bzr)

    def test_empty_merged_tagged(self):

        import_version('output', pybaz.Version(self._baz._empty_merged_tag),

                       self.collect)

        # expected results:

        # two commits, no files, revision identifiers of 

        # 'demo@DONOTUSE_c--import--0--base-0' and

        # self._baz._empty_merged_tag_bzr_base

        # self._baz._empty_merged_tag_bzr

        # and a merged revision from the latter of

        # self._baz._empty_tag_bzr

        branch = Branch.open('output')

        repo = branch.repository

        self.assertEqual(branch.revision_history(),

                         ['Arch-1:demo@DONOTUSE%c--import--0--base-0',

                          self._baz._empty_merged_tag_bzr_base,

                          self._baz._empty_merged_tag_bzr])

        # and again.

        import_version('output2', pybaz.Version(self._baz._empty_merged_tag),

                       self.collect)

        branch2 = Branch.open('output2')

        repo2 = branch2.repository

        # and import what we should be merged up against for checking with.

        import_version('output3', pybaz.Version(self._baz._empty_tag),

                       self.collect)

        branch3 = Branch.open('output3')

        self.assertEqual(branch.revision_history(), branch2.revision_history())

        self.assertNotEqual(branch.revision_history(), 

                            branch3.revision_history())

        # check revisions in the history.

        rev = repo.get_revision(self._baz._empty_merged_tag_bzr_base)

        rev2 = repo2.get_revision(self._baz._empty_merged_tag_bzr_base)

        # they must be the same

        self.assertEqual(rev, rev2)

        # and we should get some expected values:

        self.assertEqual(rev.committer, "Test User<test@example.org>")

        self.assertEqual(rev.message, 

                         "tag of demo@DONOTUSE/c--import--0--base-0")

        self.assertEqual(rev.revision_id, self._baz._empty_merged_tag_bzr_base)

        self.assertEqual(['Arch-1:demo@DONOTUSE%c--import--0--base-0'],

                         rev.parent_ids)

        # check next revisions in the history.

        rev = repo.get_revision(self._baz._empty_merged_tag_bzr)

        rev2 = repo2.get_revision(self._baz._empty_merged_tag_bzr)

        # they must be the same

        self.assertEqual(rev, rev2)

        # and we should get some expected values:

        self.assertEqual(rev.committer, "Test User<test@example.org>")

        self.assertEqual(rev.message, "did a merge, yarh")

        self.assertEqual(rev.revision_id, self._baz._empty_merged_tag_bzr)

        self.assertEqual(rev.parent_ids[0],

                         self._baz._empty_merged_tag_bzr_base)

        self.assertEqual(rev.parent_ids[1], self._baz._empty_tag_bzr)

        # this tree should have nothing missing from that tree.   

        # FIXME there is no code for this right now.

        # self.assertEqual(branch.missing_revisions(branch3), [])

    def test_merge_branch_with_merges(self):

        import_version('output', pybaz.Version(self._baz._empty_merged_tag_2),

                       self.collect)

        # expected results:

        # two commits, no files, revision identifiers of 

        # 'demo@DONOTUSE_c--import--0--base-0' and

        # self._baz._empty_merged_tag_2_bzr_base

        # self._baz._empty_merged_tag_2_bzr

        # and a merged revision from the latter of

        # self._baz._empty_merged_tag_bzr

        branch = Branch.open('output')

        repo = branch.repository

        self.assertEqual(branch.revision_history(),

                         ['Arch-1:demo@DONOTUSE%c--import--0--base-0',

                          self._baz._empty_merged_tag_2_bzr_base,

                          self._baz._empty_merged_tag_2_bzr])

        # and again.

        import_version('output2', pybaz.Version(self._baz._empty_merged_tag_2),

                       self.collect)

        branch2 = Branch.open('output2')

        repo2 = branch2.repository

        # and import what we should be merged up against for checking with.

        import_version('output3', pybaz.Version(self._baz._empty_merged_tag),

                       self.collect)

        branch3 = Branch.open('output3')

        self.assertEqual(branch.revision_history(), branch2.revision_history())

        self.assertNotEqual(branch.revision_history(), 

                            branch3.revision_history())

        # check revisions in the history.

        rev = repo.get_revision(self._baz._empty_merged_tag_2_bzr_base)

        rev2 = repo2.get_revision(self._baz._empty_merged_tag_2_bzr_base)

        # they must be the same

        self.assertEqual(rev, rev2)

        # and we should get some expected values:

        self.assertEqual(rev.committer, "Test User<test@example.org>")

        self.assertEqual(rev.message, 

                         "tag of demo@DONOTUSE/c--import--0--base-0")

        self.assertEqual(rev.revision_id, 

                         self._baz._empty_merged_tag_2_bzr_base)

        # check next revisions in the history.

        rev = repo.get_revision(self._baz._empty_merged_tag_2_bzr)

        rev2 = repo2.get_revision(self._baz._empty_merged_tag_2_bzr)

        # they must be the same

        self.assertEqual(rev, rev2)

        # and we should get some expected values:

        self.assertEqual(rev.committer, "Test User<test@example.org>")

        self.assertEqual(rev.message, "merge in a merged tree.")

        self.assertEqual(rev.revision_id, self._baz._empty_merged_tag_2_bzr)

        self.assertEqual(rev.parent_ids[0],

                         self._baz._empty_merged_tag_2_bzr_base)

        self.assertEqual(rev.parent_ids[1],

                         self._baz._empty_merged_tag_bzr)

        # this tree should have nothing missing from that tree.   

        # FIXME there is no code for this right now.

        # self.assertEqual(branch.missing_revisions(branch3), [])

    def test_import_symlink(self):

        import_version('output', pybaz.Version(self._baz._import_symlink),

                       self.collect)

        # expected results:

        # one commit, no files, revision identifier of 

        # 'demo@DONOTUSE_c--import--0--base-0'

        branch = Branch.open('output')

        self.assertEqual(branch.revision_history(),

                         [self._baz._import_symlink_bzr])

        rev = branch.repository.get_revision(self._baz._import_symlink_bzr)

        # and again.

        import_version('output2', pybaz.Version(self._baz._import_symlink),

                       self.collect)

        branch2 = Branch.open('output2')

        self.assertEqual(branch.revision_history(), branch2.revision_history())

        rev2 = branch2.repository.get_revision(self._baz._import_symlink_bzr)

        # they must be the same

        self.assertEqual(rev, rev2)

        # and we should get some expected values:

        self.assertEqual(rev.committer, "Test User<test@example.org>")

        self.assertEqual(rev.message, "Import with a symlink")

        self.assertEqual(rev.revision_id, self._baz._import_symlink_bzr)

        # and we want the symlink alink with target 'missing-file-name'

        inv = branch.repository.get_inventory(rev.revision_id)

        self.assertEqual(inv.path2id('alink'), 'x_symlink_tag')

        entry = inv['x_symlink_tag']

        self.assertEqual(entry.kind, 'symlink')

        self.assertEqual(entry.symlink_target, 'missing-file-name')

    def test_missing_ancestor(self):

        import_version('output', pybaz.Version(self._baz._missing_ancestor),

                       self.collect)

        # expected results:

        # one commits, no files, revision identifiers of 

        # 'demo@DONOTUSE_c--gone--0--base-0' and

        # a merge of demo-gone@DONOTUSE%c--import--0

        branch = Branch.open('output')

        self.assertEqual(branch.revision_history(),

                         [self._baz._missing_ancestor_bzr])

        rev = branch.repository.get_revision(self._baz._missing_ancestor_bzr)

        # and again.

        import_version('output2', pybaz.Version(self._baz._missing_ancestor),

                       self.collect)

        branch2 = Branch.open('output2')

        self.assertEqual(branch.revision_history(), branch2.revision_history())

        rev2 = branch2.repository.get_revision(self._baz._missing_ancestor_bzr)

        # they must be the same

        self.assertEqual(rev, rev2)

        # and we should get some expected values:

        self.assertEqual(rev.committer, "Test User<test@example.org>")

        self.assertEqual(rev.message, 

                         "tag of demo-gone@DONOTUSE/c--import--0--base-0")

        self.assertEqual(rev.revision_id, self._baz._missing_ancestor_bzr)

        self.assertEqual(rev.parent_ids[0], self._baz._missing_import_bzr)

        self.assertEqual(1, len(rev.parent_ids))

        # must NOT be able to get the merged evision

        self.assertRaises(NoSuchRevision, branch.repository.get_revision, 

                          self._baz._missing_import_bzr)

    def test_missing_ancestor_reusing_history(self):

        import_version('output', pybaz.Version(self._baz._missing_ancestor),

                       self.collect,

                       reuse_history_from=[self._baz._missing_import_imported])

        # expected results:

        # one commits, no files, revision identifiers of 

        # 'demo-gone@DONOTUSE%c--import--0--base-0' and 

        # 'demo@DONOTUSE%c--gone--0--base-0'

        branch = Branch.open('output')

        self.assertEqual(branch.revision_history(),

                         [self._baz._missing_import_bzr,

                          self._baz._missing_ancestor_bzr])

        rev = branch.repository.get_revision(self._baz._missing_ancestor_bzr)

        # and again.

        import_version('output2', pybaz.Version(self._baz._missing_ancestor),

                       self.collect,

                       reuse_history_from=[self._baz._missing_import_imported])

        branch2 = Branch.open('output2')

        self.assertEqual(branch.revision_history(), branch2.revision_history())

        rev2 = branch2.repository.get_revision(self._baz._missing_ancestor_bzr)

        # they must be the same

        self.assertEqual(rev, rev2)

        # must be able to get the missing base revision

        branch.repository.get_revision(self._baz._missing_import_bzr)

        # and we should get some expected values:

        self.assertEqual(rev.committer, "Test User<test@example.org>")

        self.assertEqual(rev.message, 

                         "tag of demo-gone@DONOTUSE/c--import--0--base-0")

        self.assertEqual(rev.revision_id, self._baz._missing_ancestor_bzr)

        self.assertEqual(rev.parent_ids[0], self._baz._missing_import_bzr)

        self.assertEqual(1, len(rev.parent_ids))

    def test_bad_file_id(self):

        import_version('output', pybaz.Version(self._baz._bad_id_tag),

                       self.collect)

        # expected results:

        # three commits, one files, revision identifiers of 

        # 'demo@DONOTUSE_c--import--0--base-0' ,

        # 'demo@DONOTUSE/c--bad-id--0--base-0' ,

        # ''demo@DONOTUSE/c--bad-id--0--patch-1'

        branch = Branch.open('output')

        self.assertEqual(branch.revision_history(),

                         ['Arch-1:demo@DONOTUSE%c--import--0--base-0',

                          self._baz._bad_id_tag_bzr_base,

                          self._baz._bad_id_tag_bzr])

        rev = branch.repository.get_revision(self._baz._bad_id_tag_bzr)

        inv = branch.repository.get_inventory(self._baz._bad_id_tag_bzr)

        self.assertEqual(inv.path2id('path'), 'x_this_id%2fneeds%25escaping')

        self.assertEqual('path', inv.id2path('x_this_id%2fneeds%25escaping'))

    def test_appending_revisions_already_present(self):

        import_version('output', pybaz.Version(self._baz._bad_id_tag),

                       self.collect, max_count=2)

        # expected results:

        # three commits, one files, revision identifiers of 

        # 'demo@DONOTUSE_c--import--0--base-0' ,

        # 'demo@DONOTUSE/c--bad-id--0--base-0' ,

        # ''demo@DONOTUSE/c--bad-id--0--patch-1'

        branch = Branch.open('output')

        self.assertEqual(branch.revision_history(),

                         ['Arch-1:demo@DONOTUSE%c--import--0--base-0',

                          self._baz._bad_id_tag_bzr_base])

        branch.set_revision_history(

            ['Arch-1:demo@DONOTUSE%c--import--0--base-0'])

        del branch

        branch = Branch.open('output')

        self.assertEqual(branch.revision_history(),

                         ['Arch-1:demo@DONOTUSE%c--import--0--base-0'])

        del branch

        import_version('output', pybaz.Version(self._baz._bad_id_tag),

                       self.collect)

        branch = Branch.open('output')

        self.assertEqual(branch.revision_history(),

                         ['Arch-1:demo@DONOTUSE%c--import--0--base-0',

                          self._baz._bad_id_tag_bzr_base,

                          self._baz._bad_id_tag_bzr])

        rev = branch.repository.get_revision(self._baz._bad_id_tag_bzr)

        inv = branch.repository.get_inventory(self._baz._bad_id_tag_bzr)

        self.assertEqual(inv.path2id('path'), 'x_this_id%2fneeds%25escaping')

        self.assertEqual('path', inv.id2path('x_this_id%2fneeds%25escaping'))

    def test_appending_revisions_all_already_present(self):

        import_version('output', pybaz.Version(self._baz._bad_id_tag),

                       self.collect)

        # expected results:

        # three commits, one files, revision identifiers of 

        # 'demo@DONOTUSE_c--import--0--base-0' ,

        # 'demo@DONOTUSE/c--bad-id--0--base-0' ,

        # ''demo@DONOTUSE/c--bad-id--0--patch-1'

        branch = Branch.open('output')

        self.assertEqual(branch.revision_history(),

                         ['Arch-1:demo@DONOTUSE%c--import--0--base-0',

                          self._baz._bad_id_tag_bzr_base,

                          self._baz._bad_id_tag_bzr])

        branch.set_revision_history(

            ['Arch-1:demo@DONOTUSE%c--import--0--base-0'])

        del branch

        branch = Branch.open('output')

        self.assertEqual(branch.revision_history(),

                         ['Arch-1:demo@DONOTUSE%c--import--0--base-0'])

        del branch

        import_version('output', pybaz.Version(self._baz._bad_id_tag),

                       self.collect)

        branch = Branch.open('output')

        self.assertEqual(branch.revision_history(),

                         ['Arch-1:demo@DONOTUSE%c--import--0--base-0',

                          self._baz._bad_id_tag_bzr_base,

                          self._baz._bad_id_tag_bzr])

        rev = branch.repository.get_revision(self._baz._bad_id_tag_bzr)

        inv = branch.repository.get_inventory(self._baz._bad_id_tag_bzr)

        self.assertEqual(inv.path2id('path'), 'x_this_id%2fneeds%25escaping')

        self.assertEqual('path', inv.id2path('x_this_id%2fneeds%25escaping'))

    def test_inbranch_conversion(self):

        import_version('output', pybaz.Version(self._baz._inbranch_tag),

                       self.collect)

        # expected results:

        # three commits, no files, revision identifiers of 

        # 'demo@DONOTUSE_c--import--0--base-0' and