/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/per_workingtree/test_commit.py

  • Committer: Jelmer Vernooij
  • Date: 2017-08-02 22:46:47 UTC
  • mfrom: (6745.1.1 trunk)
  • Revision ID: jelmer@jelmer.uk-20170802224647-qwo8u8gti5xtt6ya
Merge lp:~jelmer/brz/test-file-ids.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_commit.py
43
43
    def test_autodelete_renamed(self):
44
44
        tree_a = self.make_branch_and_tree('a')
45
45
        self.build_tree(['a/dir/', 'a/dir/f1', 'a/dir/f2'])
46
 
        tree_a.add(['dir', 'dir/f1', 'dir/f2'], ['dir-id', 'f1-id', 'f2-id'])
 
46
        tree_a.add(['dir', 'dir/f1', 'dir/f2'])
47
47
        rev_id1 = tree_a.commit('init')
48
48
        # Start off by renaming entries,
49
49
        # but then actually auto delete the whole tree
375
375
        wt.commit('first')
376
376
        wt2 = wt.controldir.sprout('second').open_workingtree()
377
377
        self.build_tree(['second/name1'])
378
 
        wt2.add('name1', 'name1-id')
 
378
        wt2.add('name1')
379
379
        wt2.commit('second')
380
380
        wt.merge_from_branch(wt2.branch)
381
381
        wt.rename_one('name1', 'name2')
382
382
        wt.commit('third')
383
 
        wt.path2id('name1-id')
 
383
        wt.path2id('name1')
384
384
 
385
385
    def test_nested_commit(self):
386
386
        """Commit in multiply-nested trees"""
429
429
        subtree = self.make_branch_and_tree('subtree')
430
430
        tree.add(['subtree'])
431
431
        self.build_tree(['subtree/file'])
432
 
        subtree.add(['file'], ['file-id'])
 
432
        subtree.add(['file'])
433
433
        rev_id = tree.commit('added reference', allow_pointless=False)
434
434
        tree.get_reference_revision(tree.path2id('subtree'))
435
435
        child_revid = subtree.last_revision()