← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_diff.py

  • Committer: Robert Collins
  • Date: 2006-03-28 14:29:13 UTC
  • mto: (1626.2.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1628.
  • Revision ID: robertc@robertcollins.net-20060328142913-ac5afb37075719c6
Convert log to use the new tsort.merge_sort routine.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
1
 
# Copyright (C) 2005, 2006 by Canonical Ltd
 
1
# Copyright (C) 2005 by Canonical Ltd
 
2
# -*- coding: utf-8 -*-
2
3
 
3
4
# This program is free software; you can redistribute it and/or modify
4
5
# it under the terms of the GNU General Public License as published by
26
27
 
27
28
 
28
29
class TestDiff(ExternalBase):
29
 
 
30
 
    def make_example_branch(test):
 
30
    def 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.make_example_branch()
 
41
        self.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_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
53
    def example_branches(self):
71
54
        self.build_tree(['branch1/', 'branch1/file'], line_endings='binary')
72
55
        self.capture('init branch1')
119
102
 
120
103
class TestCheckoutDiff(TestDiff):
121
104
 
122
 
    def make_example_branch(self):
123
 
        super(TestCheckoutDiff, self).make_example_branch()
 
105
    def example_branch(self):
 
106
        super(TestCheckoutDiff, self).example_branch()
124
107
        self.runbzr('checkout . checkout')
125
108
        os.chdir('checkout')
126
109
 
137
120
        self.runbzr('checkout branch2 checkouts/branch2')
138
121
        os.chdir('checkouts')
139
122
 
140
 
 
141
123
class TestDiffLabels(TestDiff):
142
124
 
143
125
    def test_diff_label_removed(self):
144
 
        super(TestDiffLabels, self).make_example_branch()
 
126
        super(TestDiffLabels, self).example_branch()
145
127
        self.runbzr('remove hello')
146
128
        diff = self.run_bzr_captured(['diff'], retcode=1)
147
129
        self.assertTrue("=== removed file 'a/hello'" in diff[0])
148
130
 
149
131
    def test_diff_label_added(self):
150
 
        super(TestDiffLabels, self).make_example_branch()
 
132
        super(TestDiffLabels, self).example_branch()
151
133
        file('barbar', 'wt').write('barbar')
152
134
        self.runbzr('add barbar')
153
135
        diff = self.run_bzr_captured(['diff'], retcode=1)
154
136
        self.assertTrue("=== added file 'b/barbar'" in diff[0])
155
137
 
156
138
    def test_diff_label_modified(self):
157
 
        super(TestDiffLabels, self).make_example_branch()
 
139
        super(TestDiffLabels, self).example_branch()
158
140
        file('hello', 'wt').write('barbar')
159
141
        diff = self.run_bzr_captured(['diff'], retcode=1)
160
142
        self.assertTrue("=== modified file 'a/hello'" in diff[0])
161
143
 
162
144
    def test_diff_label_renamed(self):
163
 
        super(TestDiffLabels, self).make_example_branch()
 
145
        super(TestDiffLabels, self).example_branch()
164
146
        self.runbzr('rename hello gruezi')
165
147
        diff = self.run_bzr_captured(['diff'], retcode=1)
166
148
        self.assertTrue("=== renamed file 'a/hello' => 'b/gruezi'" in diff[0])