/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 bzrlib/tests/blackbox/test_diff.py

  • Committer: Robert Collins
  • Date: 2006-04-28 11:01:38 UTC
  • mfrom: (1687 +trunk)
  • mto: (1704.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1706.
  • Revision ID: robertc@robertcollins.net-20060428110138-0e69ecb765434f9d
Merge from mainline.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
1
 
# Copyright (C) 2005 by Canonical Ltd
2
 
# -*- coding: utf-8 -*-
 
1
# Copyright (C) 2005, 2006 by Canonical Ltd
3
2
 
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
27
26
 
28
27
 
29
28
class TestDiff(ExternalBase):
30
 
    def example_branch(test):
 
29
 
 
30
    def make_example_branch(test):
31
31
        # FIXME: copied from test_too_much -- share elsewhere?
32
32
        test.runbzr('init')
33
33
        file('hello', 'wt').write('foo')
38
38
        test.runbzr('commit -m setup goodbye')
39
39
 
40
40
    def test_diff(self):
41
 
        self.example_branch()
 
41
        self.make_example_branch()
42
42
        file('hello', 'wt').write('hello world!')
43
43
        self.runbzr('commit -m fixing hello')
44
44
        output = self.runbzr('diff -r 2..3', backtick=1, retcode=1)
50
50
        os.unlink('moo')
51
51
        self.runbzr('diff')
52
52
 
53
 
    def test_diff_branches(self):
 
53
    def test_diff_nonexistent(self):
 
54
        # Get an error from a file that does not exist at all
 
55
        # (Malone #3619)
 
56
        self.make_example_branch()
 
57
        out, err = self.runbzr('diff does-not-exist', retcode=3)
 
58
        self.assertContainsRe(err, 'not versioned.*does-not-exist')
 
59
 
 
60
    def test_diff_unversioned(self):
 
61
        # Get an error when diffing a non-versioned file.
 
62
        # (Malone #3619)
 
63
        self.make_example_branch()
 
64
        self.build_tree(['unversioned-file'])
 
65
        out, err = self.runbzr('diff unversioned-file', retcode=3)
 
66
        self.assertContainsRe(err, 'not versioned.*unversioned-file')
 
67
 
 
68
    # TODO: What should diff say for a file deleted in working tree?
 
69
 
 
70
    def example_branches(self):
54
71
        self.build_tree(['branch1/', 'branch1/file'], line_endings='binary')
55
72
        self.capture('init branch1')
56
73
        self.capture('add branch1/file')
58
75
        self.capture('branch branch1 branch2')
59
76
        print >> open('branch2/file', 'wb'), 'new content'
60
77
        self.run_bzr_captured(['commit', '-m', 'update file', 'branch2'])
 
78
 
 
79
    def test_diff_branches(self):
 
80
        self.example_branches()
61
81
        # should open branch1 and diff against branch2, 
62
82
        output = self.run_bzr_captured(['diff', '-r', 'branch:branch2', 
63
83
                                        'branch1'],
64
84
                                       retcode=1)
65
 
        self.assertEquals(("=== modified file 'file'\n"
66
 
                           "--- file\t\n"
67
 
                           "+++ file\t\n"
 
85
        self.assertEquals(("=== modified file 'a/file'\n"
 
86
                           "--- a/file\t\n"
 
87
                           "+++ b/file\t\n"
68
88
                           "@@ -1,1 +1,1 @@\n"
69
89
                           "-new content\n"
70
90
                           "+contents of branch1/file\n"
71
91
                           "\n", ''), output)
72
92
        output = self.run_bzr_captured(['diff', 'branch2', 'branch1'],
73
93
                                       retcode=1)
74
 
        self.assertEqualDiff(("=== modified file 'file'\n"
75
 
                              "--- file\t\n"
76
 
                              "+++ file\t\n"
 
94
        self.assertEqualDiff(("=== modified file 'a/file'\n"
 
95
                              "--- a/file\t\n"
 
96
                              "+++ b/file\t\n"
77
97
                              "@@ -1,1 +1,1 @@\n"
78
98
                              "-new content\n"
79
99
                              "+contents of branch1/file\n"
80
100
                              "\n", ''), output)
81
101
 
82
 
    def test_diff_to_working_tree(self):
 
102
    def example_branch2(self):
83
103
        self.build_tree(['branch1/', 'branch1/file1'], line_endings='binary')
84
104
        self.capture('init branch1')
85
105
        self.capture('add branch1/file1')
88
108
        
89
109
        print >> open('branch1/file1', 'wb'), 'repo line'
90
110
        self.run_bzr_captured(['commit', '-m', 'second commit', 'branch1'])
 
111
 
 
112
    def test_diff_to_working_tree(self):
 
113
        self.example_branch2()
91
114
        
92
115
        print >> open('branch1/file1', 'wb'), 'new line'
93
116
        output = self.run_bzr_captured(['diff', '-r', '1..', 'branch1'], retcode=1)
94
117
        self.assertTrue('\n-original line\n+new line\n' in output[0])
 
118
 
 
119
 
 
120
class TestCheckoutDiff(TestDiff):
 
121
 
 
122
    def make_example_branch(self):
 
123
        super(TestCheckoutDiff, self).make_example_branch()
 
124
        self.runbzr('checkout . checkout')
 
125
        os.chdir('checkout')
 
126
 
 
127
    def example_branch2(self):
 
128
        super(TestCheckoutDiff, self).example_branch2()
 
129
        os.mkdir('checkouts')
 
130
        self.runbzr('checkout branch1 checkouts/branch1')
 
131
        os.chdir('checkouts')
 
132
 
 
133
    def example_branches(self):
 
134
        super(TestCheckoutDiff, self).example_branches()
 
135
        os.mkdir('checkouts')
 
136
        self.runbzr('checkout branch1 checkouts/branch1')
 
137
        self.runbzr('checkout branch2 checkouts/branch2')
 
138
        os.chdir('checkouts')
 
139
 
 
140
 
 
141
class TestDiffLabels(TestDiff):
 
142
 
 
143
    def test_diff_label_removed(self):
 
144
        super(TestDiffLabels, self).make_example_branch()
 
145
        self.runbzr('remove hello')
 
146
        diff = self.run_bzr_captured(['diff'], retcode=1)
 
147
        self.assertTrue("=== removed file 'a/hello'" in diff[0])
 
148
 
 
149
    def test_diff_label_added(self):
 
150
        super(TestDiffLabels, self).make_example_branch()
 
151
        file('barbar', 'wt').write('barbar')
 
152
        self.runbzr('add barbar')
 
153
        diff = self.run_bzr_captured(['diff'], retcode=1)
 
154
        self.assertTrue("=== added file 'b/barbar'" in diff[0])
 
155
 
 
156
    def test_diff_label_modified(self):
 
157
        super(TestDiffLabels, self).make_example_branch()
 
158
        file('hello', 'wt').write('barbar')
 
159
        diff = self.run_bzr_captured(['diff'], retcode=1)
 
160
        self.assertTrue("=== modified file 'a/hello'" in diff[0])
 
161
 
 
162
    def test_diff_label_renamed(self):
 
163
        super(TestDiffLabels, self).make_example_branch()
 
164
        self.runbzr('rename hello gruezi')
 
165
        diff = self.run_bzr_captured(['diff'], retcode=1)
 
166
        self.assertTrue("=== renamed file 'a/hello' => 'b/gruezi'" in diff[0])