break

                else:

                    # If found, updates parent

                    parent = self.repository._repo[dir_id]

                    ancestors.append((curdir, parent))

            # Now parent is deepest existing tree and we need to create subtrees

            # for dirnames (in reverse order) [this only applies for nodes from added]

            new_trees = []

            if not node.is_binary:

                content = node.content.encode(ENCODING)

            else:

                content = node.content

            blob = objects.Blob.from_string(content)

            node_path = node.name.encode(ENCODING)

            if dirnames:

                # If there are trees which should be created we need to build

                # them now (in reverse order)

                reversed_dirnames = list(reversed(dirnames))

                curtree = objects.Tree()

                curtree[node_path] = node.mode, blob.id

                new_trees.append(curtree)

                for dirname in reversed_dirnames[:-1]:

                    newtree = objects.Tree()

                    #newtree.add(DIRMOD, dirname, curtree.id)

                    newtree[dirname] = DIRMOD, curtree.id

                    new_trees.append(newtree)

                    curtree = newtree

                parent[reversed_dirnames[-1]] = DIRMOD, curtree.id

            else:

                parent.add(name=node_path, mode=node.mode, hexsha=blob.id)

            new_trees.append(parent)

            # Update ancestors

            for parent, tree, path in reversed([(a[1], b[1], b[0]) for a, b in

                zip(ancestors, ancestors[1:])]):

                parent[path] = DIRMOD, tree.id

                object_store.add_object(tree)

            object_store.add_object(blob)

            for tree in new_trees:

                object_store.add_object(tree)

        for node in self.removed:

            paths = node.path.split('/')

            tree = commit_tree

            trees = [tree]

            # Traverse deep into the forest...

            for path in paths:

                try:

                    obj = self.repository._repo[tree[path][1]]

                    if isinstance(obj, objects.Tree):

                        trees.append(obj)

                        tree = obj

                except KeyError:

                    break

            # Cut down the blob and all rotten trees on the way back...

            for path, tree in reversed(zip(paths, trees)):

                del tree[path]

                if tree:

                    # This tree still has elements - don't remove it or any

                    # of it's parents

                    break

        object_store.add_object(commit_tree)

        # Create commit

        commit = objects.Commit()

        commit.tree = commit_tree.id

        commit.parents = [p._commit.id for p in self.parents if p]

        commit.author = commit.committer = safe_str(author)

        commit.encoding = ENCODING

        commit.message = safe_str(message)

        # Compute date

        if date is None:

            date = time.time()

        elif isinstance(date, datetime.datetime):

            date = time.mktime(date.timetuple())

        author_time = kwargs.pop('author_time', date)

        commit.commit_time = int(date)

        commit.author_time = int(author_time)

        tz = time.timezone

        author_tz = kwargs.pop('author_timezone', tz)

        commit.commit_timezone = tz

        commit.author_timezone = author_tz

        object_store.add_object(commit)

        ref = 'refs/heads/%s' % branch

        repo.refs[ref] = commit.id

        repo.refs.set_symbolic_ref('HEAD', ref)

        # Update vcs repository object & recreate dulwich repo

        self.repository.revisions.append(commit.id)

        # invalidate parsed refs after commit

        self.repository._parsed_refs = self.repository._get_parsed_refs()

        tip = self.repository.get_changeset()

        self.reset()

        return tip

    def _get_missing_trees(self, path, root_tree):

        """

        Creates missing ``Tree`` objects for the given path.

        :param path: path given as a string. It may be a path to a file node

          (i.e. ``foo/bar/baz.txt``) or directory path - in that case it must

          end with slash (i.e. ``foo/bar/``).

        :param root_tree: ``dulwich.objects.Tree`` object from which we start

          traversing (should be commit's root tree)

        """

        dirpath = posixpath.split(path)[0]

        dirs = dirpath.split('/')

        if not dirs or dirs == ['']:

            return []

        def get_tree_for_dir(tree, dirname):

            for name, mode, id in tree.iteritems():

                if name == dirname:

                    obj = self.repository._repo[id]

                    if isinstance(obj, objects.Tree):

                        return obj

                    else:

                        raise RepositoryError("Cannot create directory %s "

                        "at tree %s as path is occupied and is not a "

                        "Tree" % (dirname, tree))

            return None

        trees = []

        parent = root_tree

        for dirname in dirs:

            tree = get_tree_for_dir(parent, dirname)

            if tree is None:

                tree = objects.Tree()

                dirmode = 040000

                parent.add(dirmode, dirname, tree.id)

                parent = tree

            # Always append tree

            trees.append(tree)

        return trees

                '4cf116ad5a457530381135e2f4c453e68a1b0105',

                '9a751d84d8e9408e736329767387f41b36935153',

                'cb681fb539c3faaedbcdf5ca71ca413425c18f01',

                '428f81bb652bcba8d631bce926e8834ff49bdcc6',

                '180ab15aebf26f98f714d8c68715e0f05fa6e1c7',

                '2b8e07312a2e89e92b90426ab97f349f4bce2a3a',

                '50e08c506174d8645a4bb517dd122ac946a0f3bf',

                '54000345d2e78b03a99d561399e8e548de3f3203',

            ],

        }

        for path, revs in files.items():

            node = self.repo.get_changeset(revs[0]).get_node(path)

            node_revs = [chset.raw_id for chset in node.history]

            self.assertTrue(set(revs).issubset(set(node_revs)),

                "We assumed that %s is subset of revisions for which file %s "

                "has been changed, and history of that node returned: %s"

                % (revs, path, node_revs))

    def test_file_annotate(self):

        files = {

            'vcs/backends/__init__.py': {

                'c1214f7e79e02fc37156ff215cd71275450cffc3': {

                    'lines_no': 1,

                    'changesets': [

                        'c1214f7e79e02fc37156ff215cd71275450cffc3',

                    ],

                },

                '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647': {

                    'lines_no': 21,

                    'changesets': [

                        '49d3fd156b6f7db46313fac355dca1a0b94a0017',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                    ],

                },

                'e29b67bd158580fc90fc5e9111240b90e6e86064': {

                    'lines_no': 32,

                    'changesets': [

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '5eab1222a7cd4bfcbabc218ca6d04276d4e27378',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '992f38217b979d0b0987d0bae3cc26dac85d9b19',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '54000345d2e78b03a99d561399e8e548de3f3203',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '78c3f0c23b7ee935ec276acb8b8212444c33c396',

                        '992f38217b979d0b0987d0bae3cc26dac85d9b19',

                        '992f38217b979d0b0987d0bae3cc26dac85d9b19',

                        '992f38217b979d0b0987d0bae3cc26dac85d9b19',

                        '992f38217b979d0b0987d0bae3cc26dac85d9b19',

                        '2a13f185e4525f9d4b59882791a2d397b90d5ddc',

                        '992f38217b979d0b0987d0bae3cc26dac85d9b19',

                        '78c3f0c23b7ee935ec276acb8b8212444c33c396',

                        '992f38217b979d0b0987d0bae3cc26dac85d9b19',

                        '992f38217b979d0b0987d0bae3cc26dac85d9b19',

                        '992f38217b979d0b0987d0bae3cc26dac85d9b19',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '992f38217b979d0b0987d0bae3cc26dac85d9b19',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '992f38217b979d0b0987d0bae3cc26dac85d9b19',

                        '992f38217b979d0b0987d0bae3cc26dac85d9b19',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                        '16fba1ae9334d79b66d7afed2c2dfbfa2ae53647',

                    ],

                },

            },

        }

        for fname, revision_dict in files.items():

            for rev, data in revision_dict.items():

                cs = self.repo.get_changeset(rev)

                l2 = files[fname][rev]['changesets']

                self.assertTrue(l1 == l2 , "The lists of revision for %s@rev %s"

                                "from annotation list should match each other, "

                                "got \n%s \nvs \n%s " % (fname, rev, l1, l2))

    def test_files_state(self):

        """

        Tests state of FileNodes.

        """

        node = self.repo\

            .get_changeset('e6ea6d16e2f26250124a1f4b4fe37a912f9d86a0')\

            .get_node('vcs/utils/diffs.py')

        self.assertTrue(node.state, NodeState.ADDED)

        self.assertTrue(node.added)

        self.assertFalse(node.changed)

        self.assertFalse(node.not_changed)

        self.assertFalse(node.removed)

        node = self.repo\

            .get_changeset('33fa3223355104431402a888fa77a4e9956feb3e')\

            .get_node('.hgignore')

        self.assertTrue(node.state, NodeState.CHANGED)

        self.assertFalse(node.added)

        self.assertTrue(node.changed)

        self.assertFalse(node.not_changed)

        self.assertFalse(node.removed)

        node = self.repo\

            .get_changeset('e29b67bd158580fc90fc5e9111240b90e6e86064')\

            .get_node('setup.py')

        self.assertTrue(node.state, NodeState.NOT_CHANGED)

        self.assertFalse(node.added)

        self.assertFalse(node.changed)

        self.assertTrue(node.not_changed)

        self.assertFalse(node.removed)

        # If node has REMOVED state then trying to fetch it would raise

        # ChangesetError exception

        chset = self.repo.get_changeset(

            'fa6600f6848800641328adbf7811fd2372c02ab2')

        path = 'vcs/backends/BaseRepository.py'

        self.assertRaises(NodeDoesNotExistError, chset.get_node, path)

        # but it would be one of ``removed`` (changeset's attribute)

        self.assertTrue(path in [rf.path for rf in chset.removed])

        chset = self.repo.get_changeset(

            '54386793436c938cff89326944d4c2702340037d')

        changed = ['setup.py', 'tests/test_nodes.py', 'vcs/backends/hg.py',

            'vcs/nodes.py']

        self.assertEqual(set(changed), set([f.path for f in chset.changed]))

    def test_commit_message_is_unicode(self):

        for cs in self.repo:

            self.assertEqual(type(cs.message), unicode)

    def test_changeset_author_is_unicode(self):

        for cs in self.repo:

            self.assertEqual(type(cs.author), unicode)

    def test_repo_files_content_is_unicode(self):

        changeset = self.repo.get_changeset()

        for node in changeset.get_node('/'):

            if node.is_file():

                self.assertEqual(type(node.content), unicode)

    def test_wrong_path(self):

        # There is 'setup.py' in the root dir but not there:

        path = 'foo/bar/setup.py'

        tip = self.repo.get_changeset()

        self.assertRaises(VCSError, tip.get_node, path)

    def test_author_email(self):

        self.assertEqual('marcin@python-blog.com',

          self.repo.get_changeset('c1214f7e79e02fc37156ff215cd71275450cffc3')\

          .author_email)

        self.assertEqual('lukasz.balcerzak@python-center.pl',

          self.repo.get_changeset('ff7ca51e58c505fec0dd2491de52c622bb7a806b')\

          .author_email)

        self.assertEqual('none@none',

          self.repo.get_changeset('8430a588b43b5d6da365400117c89400326e7992')\

          .author_email)

    def test_author_username(self):

        self.assertEqual('Marcin Kuzminski',

          self.repo.get_changeset('c1214f7e79e02fc37156ff215cd71275450cffc3')\

          .author_name)

        self.assertEqual('Lukasz Balcerzak',

          self.repo.get_changeset('ff7ca51e58c505fec0dd2491de52c622bb7a806b')\

          .author_name)

        self.assertEqual('marcink',

          self.repo.get_changeset('8430a588b43b5d6da365400117c89400326e7992')\

          .author_name)

class GitSpecificTest(unittest.TestCase):

        docs = root.get_node('docs')

        self.assertTrue(docs is chset.get_node('docs'))

        api = docs.get_node('api')

        self.assertTrue(api is chset.get_node('docs/api'))

        index = api.get_node('index.rst')

        self.assertTrue(index is chset.get_node('docs/api/index.rst'))

        self.assertTrue(index is chset.get_node('docs')\

            .get_node('api')\

            .get_node('index.rst'))

    def test_branch_and_tags(self):

        chset0 = self.repo.get_changeset(0)

        self.assertEqual(chset0.branch, 'default')

        self.assertEqual(chset0.tags, [])

        chset10 = self.repo.get_changeset(10)

        self.assertEqual(chset10.branch, 'default')

        self.assertEqual(chset10.tags, [])

        chset44 = self.repo.get_changeset(44)

        self.assertEqual(chset44.branch, 'web')

        tip = self.repo.get_changeset('tip')

        self.assertTrue('tip' in tip.tags)

    def _test_file_size(self, revision, path, size):

        node = self.repo.get_changeset(revision).get_node(path)

        self.assertTrue(node.is_file())

        self.assertEqual(node.size, size)

    def test_file_size(self):

        to_check = (

            (10, 'setup.py', 1068),

            (20, 'setup.py', 1106),

            (60, 'setup.py', 1074),

            (10, 'vcs/backends/base.py', 2921),

            (20, 'vcs/backends/base.py', 3936),

            (60, 'vcs/backends/base.py', 6189),

        )

        for revision, path, size in to_check:

            self._test_file_size(revision, path, size)

    def test_file_history(self):

        # we can only check if those revisions are present in the history

        # as we cannot update this test every time file is changed

        files = {

            'setup.py': [7, 18, 45, 46, 47, 69, 77],

            'vcs/nodes.py': [7, 8, 24, 26, 30, 45, 47, 49, 56, 57, 58, 59, 60,

                61, 73, 76],

            'vcs/backends/hg.py': [4, 5, 6, 11, 12, 13, 14, 15, 16, 21, 22, 23,

                26, 27, 28, 30, 31, 33, 35, 36, 37, 38, 39, 40, 41, 44, 45, 47,

                48, 49, 53, 54, 55, 58, 60, 61, 67, 68, 69, 70, 73, 77, 78, 79,

                82],

        }

        for path, revs in files.items():

            tip = self.repo.get_changeset(revs[-1])

            node = tip.get_node(path)

            node_revs = [chset.revision for chset in node.history]

            self.assertTrue(set(revs).issubset(set(node_revs)),

                "We assumed that %s is subset of revisions for which file %s "

                "has been changed, and history of that node returned: %s"

                % (revs, path, node_revs))

    def test_file_annotate(self):

        files = {

                 'vcs/backends/__init__.py':

                  {89: {'lines_no': 31,

                        'changesets': [32, 32, 61, 32, 32, 37, 32, 32, 32, 44,

                                       37, 37, 37, 37, 45, 37, 44, 37, 37, 37,

                                       32, 32, 32, 32, 37, 32, 37, 37, 32,

                                       32, 32]},

                   20: {'lines_no': 1,

                        'changesets': [4]},

                   55: {'lines_no': 31,

                        'changesets': [32, 32, 45, 32, 32, 37, 32, 32, 32, 44,

                                       37, 37, 37, 37, 45, 37, 44, 37, 37, 37,

                                       32, 32, 32, 32, 37, 32, 37, 37, 32,

                                       32, 32]}},

                 'vcs/exceptions.py':

                 {89: {'lines_no': 18,

                       'changesets': [16, 16, 16, 16, 16, 16, 16, 16, 16, 16,

                                      16, 16, 17, 16, 16, 18, 18, 18]},

                  20: {'lines_no': 18,

                       'changesets': [16, 16, 16, 16, 16, 16, 16, 16, 16, 16,

                                      16, 16, 17, 16, 16, 18, 18, 18]},

                  55: {'lines_no': 18, 'changesets': [16, 16, 16, 16, 16, 16,

                                                      16, 16, 16, 16, 16, 16,

                                                      17, 16, 16, 18, 18, 18]}},

                 'MANIFEST.in': {89: {'lines_no': 5,

                                      'changesets': [7, 7, 7, 71, 71]},

                                 20: {'lines_no': 3,

                                      'changesets': [7, 7, 7]},

                                 55: {'lines_no': 3,

                                     'changesets': [7, 7, 7]}}}

        for fname, revision_dict in files.items():

            for rev, data in revision_dict.items():

                cs = self.repo.get_changeset(rev)

                l2 = files[fname][rev]['changesets']

                self.assertTrue(l1 == l2 , "The lists of revision for %s@rev%s"

                                "from annotation list should match each other,"

                                "got \n%s \nvs \n%s " % (fname, rev, l1, l2))

    def test_changeset_state(self):

        """

        Tests which files have been added/changed/removed at particular revision

        """

        # rev 46ad32a4f974:

        # hg st --rev 46ad32a4f974

        #    changed: 13

        #    added:   20

        #    removed: 1

        changed = set(['.hgignore'

            , 'README.rst' , 'docs/conf.py' , 'docs/index.rst' , 'setup.py'

            , 'tests/test_hg.py' , 'tests/test_nodes.py' , 'vcs/__init__.py'

            , 'vcs/backends/__init__.py' , 'vcs/backends/base.py'

            , 'vcs/backends/hg.py' , 'vcs/nodes.py' , 'vcs/utils/__init__.py'])

        added = set(['docs/api/backends/hg.rst'

            , 'docs/api/backends/index.rst' , 'docs/api/index.rst'

            , 'docs/api/nodes.rst' , 'docs/api/web/index.rst'

            , 'docs/api/web/simplevcs.rst' , 'docs/installation.rst'

            , 'docs/quickstart.rst' , 'setup.cfg' , 'vcs/utils/baseui_config.py'

            , 'vcs/utils/web.py' , 'vcs/web/__init__.py' , 'vcs/web/exceptions.py'

            , 'vcs/web/simplevcs/__init__.py' , 'vcs/web/simplevcs/exceptions.py'

            , 'vcs/web/simplevcs/middleware.py' , 'vcs/web/simplevcs/models.py'

            , 'vcs/web/simplevcs/settings.py' , 'vcs/web/simplevcs/utils.py'

            , 'vcs/web/simplevcs/views.py'])

        removed = set(['docs/api.rst'])

        chset64 = self.repo.get_changeset('46ad32a4f974')

        self.assertEqual(set((node.path for node in chset64.added)), added)

        self.assertEqual(set((node.path for node in chset64.changed)), changed)

        self.assertEqual(set((node.path for node in chset64.removed)), removed)

        # rev b090f22d27d6:

        # hg st --rev b090f22d27d6

        #    changed: 13

        #    added:   20

        #    removed: 1

        chset88 = self.repo.get_changeset('b090f22d27d6')

        self.assertEqual(set((node.path for node in chset88.added)), set())

        self.assertEqual(set((node.path for node in chset88.changed)),

            set(['.hgignore']))

        self.assertEqual(set((node.path for node in chset88.removed)), set())

#

        # 85:

        #    added:   2 ['vcs/utils/diffs.py', 'vcs/web/simplevcs/views/diffs.py']

        #    changed: 4 ['vcs/web/simplevcs/models.py', ...]

        #    removed: 1 ['vcs/utils/web.py']

        chset85 = self.repo.get_changeset(85)

        self.assertEqual(set((node.path for node in chset85.added)), set([

            'vcs/utils/diffs.py',

            'vcs/web/simplevcs/views/diffs.py']))

        self.assertEqual(set((node.path for node in chset85.changed)), set([

            'vcs/web/simplevcs/models.py',

            'vcs/web/simplevcs/utils.py',

            'vcs/web/simplevcs/views/__init__.py',

            'vcs/web/simplevcs/views/repository.py',

            ]))

        self.assertEqual(set((node.path for node in chset85.removed)),

            set(['vcs/utils/web.py']))

    def test_files_state(self):

        """

        Tests state of FileNodes.

        """

        chset = self.repo.get_changeset(85)

        node = chset.get_node('vcs/utils/diffs.py')

        self.assertTrue(node.state, NodeState.ADDED)

        self.assertTrue(node.added)

        self.assertFalse(node.changed)

        self.assertFalse(node.not_changed)

        self.assertFalse(node.removed)

        chset = self.repo.get_changeset(88)

        node = chset.get_node('.hgignore')

        self.assertTrue(node.state, NodeState.CHANGED)

        self.assertFalse(node.added)

        self.assertTrue(node.changed)

        self.assertFalse(node.not_changed)

        self.assertFalse(node.removed)

        chset = self.repo.get_changeset(85)

        node = chset.get_node('setup.py')

        self.assertTrue(node.state, NodeState.NOT_CHANGED)

        self.assertFalse(node.added)

        self.assertFalse(node.changed)

        self.assertTrue(node.not_changed)

        self.assertFalse(node.removed)