← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_dirstate.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-02-23 17:00:36 UTC
  • mfrom: (4032.1.4 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090223170036-3q1v68ewdt8i0to5
(Marius Kruger) Remove all trailing whitespace and add tests to
        enforce this.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_dirstate.py
639
639
                state2.unlock()
640
640
        finally:
641
641
            state.unlock()
642
 
        
 
642
 
643
643
        # The file on disk should not be modified.
644
644
        state = dirstate.DirState.on_file('dirstate')
645
645
        state.lock_read()
745
745
        # https://bugs.launchpad.net/bzr/+bug/146176
746
746
        # set_state_from_inventory should preserve the stat and hash value for
747
747
        # workingtree files that are not changed by the inventory.
748
 
       
 
748
 
749
749
        tree = self.make_branch_and_tree('.')
750
750
        # depends on the default format using dirstate...
751
751
        tree.lock_write()
752
752
        try:
753
 
            # make a dirstate with some valid hashcache data 
 
753
            # make a dirstate with some valid hashcache data
754
754
            # file on disk, but that's not needed for this test
755
755
            foo_contents = 'contents of foo'
756
756
            self.build_tree_contents([('foo', foo_contents)])
776
776
                (('', 'foo', 'foo-id',),
777
777
                 [('f', foo_sha, foo_size, False, foo_packed)]),
778
778
                tree._dirstate._get_entry(0, 'foo-id'))
779
 
           
 
779
 
780
780
            # extract the inventory, and add something to it
781
781
            inv = tree._get_inventory()
782
782
            # should see the file we poked in...
1455
1455
        There is one parent tree, which has the same shape with the following variations:
1456
1456
        b/g in the parent is gone.
1457
1457
        b/h in the parent has a different id
1458
 
        b/i is new in the parent 
 
1458
        b/i is new in the parent
1459
1459
        c is renamed to b/j in the parent
1460
1460
 
1461
1461
        :return: The dirstate, still write-locked.
2214
2214
 
2215
2215
    def test_unicode_symlink(self):
2216
2216
        # In general, the code base doesn't support a target that contains
2217
 
        # non-ascii characters. So we just assert tha 
 
2217
        # non-ascii characters. So we just assert tha
2218
2218
        inv_entry = inventory.InventoryLink('link-file-id', 'name',
2219
2219
                                            'link-parent-id')
2220
2220
        inv_entry.revision = 'link-revision-id'