← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_diff.py

remove all trailing whitespace from bzr source

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_diff.py
184
184
                              StringIO(), diff_opts=['-u'])
185
185
        finally:
186
186
            os.environ['PATH'] = orig_path
187
 
        
 
187
 
188
188
    def test_internal_diff_default(self):
189
189
        # Default internal diff encoding is utf8
190
190
        output = StringIO()
355
355
+file2 contents at rev 3
356
356
 
357
357
''')
358
 
        
 
358
 
359
359
    def test_diff_add_files(self):
360
360
        tree1 = self.b.repository.revision_tree(_mod_revision.NULL_REVISION)
361
361
        tree2 = self.b.repository.revision_tree('rev-1')
397
397
        self.wt.rename_one('file1', 'file1b')
398
398
        old_tree = self.b.repository.revision_tree('rev-1')
399
399
        new_tree = self.b.repository.revision_tree('rev-4')
400
 
        out = self.get_diff(old_tree, new_tree, specific_files=['file1b'], 
 
400
        out = self.get_diff(old_tree, new_tree, specific_files=['file1b'],
401
401
                            working_tree=self.wt)
402
402
        self.assertContainsRe(out, 'file1\t')
403
403
 
409
409
        self.wt.rename_one('file1', 'dir1/file1')
410
410
        old_tree = self.b.repository.revision_tree('rev-1')
411
411
        new_tree = self.b.repository.revision_tree('rev-4')
412
 
        out = self.get_diff(old_tree, new_tree, specific_files=['dir1'], 
 
412
        out = self.get_diff(old_tree, new_tree, specific_files=['dir1'],
413
413
                            working_tree=self.wt)
414
414
        self.assertContainsRe(out, 'file1\t')
415
 
        out = self.get_diff(old_tree, new_tree, specific_files=['dir2'], 
 
415
        out = self.get_diff(old_tree, new_tree, specific_files=['dir2'],
416
416
                            working_tree=self.wt)
417
417
        self.assertNotContainsRe(out, 'file1\t')
418
418
 
787
787
        self.assertEquals(unique_lcs('ab', 'ab'), [(0,0), (1,1)])
788
788
        self.assertEquals(unique_lcs('abcde', 'cdeab'), [(2,0), (3,1), (4,2)])
789
789
        self.assertEquals(unique_lcs('cdeab', 'abcde'), [(0,2), (1,3), (2,4)])
790
 
        self.assertEquals(unique_lcs('abXde', 'abYde'), [(0,0), (1,1), 
 
790
        self.assertEquals(unique_lcs('abXde', 'abYde'), [(0,0), (1,1),
791
791
                                                         (3,3), (4,4)])
792
792
        self.assertEquals(unique_lcs('acbac', 'abc'), [(2,1)])
793
793
 
808
808
        test_one('abcdbce', 'afbcgdbce', [(0,0), (1, 2), (2, 3), (3, 5),
809
809
                                          (4, 6), (5, 7), (6, 8)])
810
810
 
811
 
        # recurse_matches doesn't match non-unique 
 
811
        # recurse_matches doesn't match non-unique
812
812
        # lines surrounded by bogus text.
813
813
        # The update has been done in patiencediff.SequenceMatcher instead
814
814
 
951
951
                 ('delete', 1,2, 1,1),
952
952
                 ('equal',  2,3, 1,2),
953
953
                ])
954
 
        chk_ops('aBccDe', 'abccde', 
 
954
        chk_ops('aBccDe', 'abccde',
955
955
                [('equal',   0,1, 0,1),
956
956
                 ('replace', 1,5, 1,5),
957
957
                 ('equal',   5,6, 5,6),
958
958
                ])
959
 
        chk_ops('aBcDec', 'abcdec', 
 
959
        chk_ops('aBcDec', 'abcdec',
960
960
                [('equal',   0,1, 0,1),
961
961
                 ('replace', 1,2, 1,2),
962
962
                 ('equal',   2,3, 2,3),
963
963
                 ('replace', 3,4, 3,4),
964
964
                 ('equal',   4,6, 4,6),
965
965
                ])
966
 
        chk_ops('aBcdEcdFg', 'abcdecdfg', 
 
966
        chk_ops('aBcdEcdFg', 'abcdecdfg',
967
967
                [('equal',   0,1, 0,1),
968
968
                 ('replace', 1,8, 1,8),
969
969
                 ('equal',   8,9, 8,9)
970
970
                ])
971
 
        chk_ops('aBcdEeXcdFg', 'abcdecdfg', 
 
971
        chk_ops('aBcdEeXcdFg', 'abcdecdfg',
972
972
                [('equal',   0,1, 0,1),
973
973
                 ('replace', 1,2, 1,2),
974
974
                 ('equal',   2,4, 2,4),
1034
1034
    """
1035
1035
    gnxrf_netf = ['svyr*']
1036
1036
    gnxrf_bcgvbaf = ['ab-erphefr']
1037
 
  
 
1037
 
1038
1038
    qrs eha(frys, svyr_yvfg, ab_erphefr=Snyfr):
1039
1039
        sebz omeyvo.nqq vzcbeg fzneg_nqq, nqq_ercbegre_cevag, nqq_ercbegre_ahyy
1040
1040
        vs vf_dhvrg():
1048
1048
'''.splitlines(True), '''\
1049
1049
    trg nqqrq jura lbh nqq n svyr va gur qverpgbel.
1050
1050
 
1051
 
    --qel-eha jvyy fubj juvpu svyrf jbhyq or nqqrq, ohg abg npghnyyl 
 
1051
    --qel-eha jvyy fubj juvpu svyrf jbhyq or nqqrq, ohg abg npghnyyl
1052
1052
    nqq gurz.
1053
1053
    """
1054
1054
    gnxrf_netf = ['svyr*']