/brz/remove-bazaar

« back to all changes in this revision

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

• browse files at revision 1963.2.6
• compare with another revision
• download diff
• download tarball
• view history from revision 1963.2.6

• reverse the comparison (1963.2.6 to 1663)
• stop comparing with revision 1663

Show diffs side-by-side

added

removed

bzrlib/tests/blackbox/test_diff.py

1

1

# Copyright (C) 2005, 2006 by Canonical Ltd

2

 

 

 

2

#

3

3

# This program is free software; you can redistribute it and/or modify

4

4

# it under the terms of the GNU General Public License as published by

5

5

# the Free Software Foundation; either version 2 of the License, or

6

6

# (at your option) any later version.

7

 

 

 

7

#

8

8

# This program is distributed in the hope that it will be useful,

9

9

# but WITHOUT ANY WARRANTY; without even the implied warranty of

10

10

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

11

11

# GNU General Public License for more details.

12

 

 

 

12

#

13

13

# You should have received a copy of the GNU General Public License

14

14

# along with this program; if not, write to the Free Software

15

15

# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

19

19

"""

20

20

 

21

21

import os

 

22

import re

22

23

 

23

24

import bzrlib

 

25

from bzrlib import workingtree

24

26

from bzrlib.branch import Branch

 

27

from bzrlib.tests import TestSkipped

25

28

from bzrlib.tests.blackbox import ExternalBase

26

29

 

27

30

 

 

31

def subst_dates(string):

 

32

    """Replace date strings with constant values."""

 

33

    return re.sub(r'\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [-\+]\d{4}',

 

34

                  'YYYY-MM-DD HH:MM:SS +ZZZZ', string)

 

35

 

 

36

 

28

37

class TestDiff(ExternalBase):

29

38

 

30

 

    def make_example_branch(test):

 

39

    def make_example_branch(self):

31

40

        # FIXME: copied from test_too_much -- share elsewhere?

32

 

        test.runbzr('init')

33

 

        file('hello', 'wt').write('foo')

34

 

        test.runbzr('add hello')

35

 

        test.runbzr('commit -m setup hello')

36

 

        file('goodbye', 'wt').write('baz')

37

 

        test.runbzr('add goodbye')

38

 

        test.runbzr('commit -m setup goodbye')

 

41

        tree = self.make_branch_and_tree('.')

 

42

        open('hello', 'wb').write('foo\n')

 

43

        tree.add(['hello'])

 

44

        tree.commit('setup')

 

45

        open('goodbye', 'wb').write('baz\n')

 

46

        tree.add(['goodbye'])

 

47

        tree.commit('setup')

39

48

 

40

49

    def test_diff(self):

41

50

        self.make_example_branch()

50

59

        os.unlink('moo')

51

60

        self.runbzr('diff')

52

61

 

 

62

    def test_diff_prefix(self):

 

63

        """diff --prefix appends to filenames in output"""

 

64

        self.make_example_branch()

 

65

        file('hello', 'wb').write('hello world!\n')

 

66

        out, err = self.runbzr('diff --prefix old/:new/', retcode=1)

 

67

        self.assertEquals(err, '')

 

68

        self.assertEqualDiff(subst_dates(out), '''\

 

69

=== modified file 'hello'

 

70

--- old/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ

 

71

+++ new/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ

 

72

@@ -1,1 +1,1 @@

 

73

-foo

 

74

+hello world!

 

75

 

 

76

''')

 

77

 

 

78

    def test_diff_p1(self):

 

79

        """diff -p1 produces lkml-style diffs"""

 

80

        self.make_example_branch()

 

81

        file('hello', 'wb').write('hello world!\n')

 

82

        out, err = self.runbzr('diff -p1', retcode=1)

 

83

        self.assertEquals(err, '')

 

84

        self.assertEqualDiff(subst_dates(out), '''\

 

85

=== modified file 'hello'

 

86

--- old/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ

 

87

+++ new/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ

 

88

@@ -1,1 +1,1 @@

 

89

-foo

 

90

+hello world!

 

91

 

 

92

''')

 

93

 

 

94

    def test_diff_p0(self):

 

95

        """diff -p0 produces diffs with no prefix"""

 

96

        self.make_example_branch()

 

97

        file('hello', 'wb').write('hello world!\n')

 

98

        out, err = self.runbzr('diff -p0', retcode=1)

 

99

        self.assertEquals(err, '')

 

100

        self.assertEqualDiff(subst_dates(out), '''\

 

101

=== modified file 'hello'

 

102

--- hello\tYYYY-MM-DD HH:MM:SS +ZZZZ

 

103

+++ hello\tYYYY-MM-DD HH:MM:SS +ZZZZ

 

104

@@ -1,1 +1,1 @@

 

105

-foo

 

106

+hello world!

 

107

 

 

108

''')

 

109

 

53

110

    def test_diff_nonexistent(self):

54

111

        # Get an error from a file that does not exist at all

55

112

        # (Malone #3619)

79

136

    def test_diff_branches(self):

80

137

        self.example_branches()

81

138

        # should open branch1 and diff against branch2, 

82

 

        output = self.run_bzr_captured(['diff', '-r', 'branch:branch2', 

83

 

                                        'branch1'],

84

 

                                       retcode=1)

85

 

        self.assertEquals(("=== modified file 'a/file'\n"

86

 

                           "--- a/file\t\n"

87

 

                           "+++ b/file\t\n"

88

 

                           "@@ -1,1 +1,1 @@\n"

89

 

                           "-new content\n"

90

 

                           "+contents of branch1/file\n"

91

 

                           "\n", ''), output)

92

 

        output = self.run_bzr_captured(['diff', 'branch2', 'branch1'],

93

 

                                       retcode=1)

94

 

        self.assertEqualDiff(("=== modified file 'a/file'\n"

95

 

                              "--- a/file\t\n"

96

 

                              "+++ b/file\t\n"

97

 

                              "@@ -1,1 +1,1 @@\n"

98

 

                              "-new content\n"

99

 

                              "+contents of branch1/file\n"

100

 

                              "\n", ''), output)

 

139

        out, err = self.run_bzr_captured(['diff', '-r', 'branch:branch2', 

 

140

                                          'branch1'],

 

141

                                         retcode=1)

 

142

        self.assertEquals('', err)

 

143

        self.assertEquals("=== modified file 'file'\n"

 

144

                          "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"

 

145

                          "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"

 

146

                          "@@ -1,1 +1,1 @@\n"

 

147

                          "-new content\n"

 

148

                          "+contents of branch1/file\n"

 

149

                          "\n", subst_dates(out))

 

150

        out, err = self.run_bzr_captured(['diff', 'branch2', 'branch1'],

 

151

                                         retcode=1)

 

152

        self.assertEquals('', err)

 

153

        self.assertEqualDiff("=== modified file 'file'\n"

 

154

                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"

 

155

                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"

 

156

                              "@@ -1,1 +1,1 @@\n"

 

157

                              "-new content\n"

 

158

                              "+contents of branch1/file\n"

 

159

                              "\n", subst_dates(out))

 

160

 

 

161

    def test_diff_revno_branches(self):

 

162

        self.example_branches()

 

163

        print >> open('branch2/file', 'wb'), 'even newer content'

 

164

        self.run_bzr_captured(['commit', '-m', 

 

165

                               'update file once more', 'branch2'])

 

166

 

 

167

        out, err = self.run_bzr_captured(['diff', '-r',

 

168

                                          'revno:1:branch2..revno:1:branch1'],

 

169

                                         retcode=0)

 

170

        self.assertEquals('', err)

 

171

        self.assertEquals('', out)

 

172

        out, err = self.run_bzr_captured(['diff', '-r', 

 

173

                                          'revno:2:branch2..revno:1:branch1'],

 

174

                                         retcode=1)

 

175

        self.assertEquals('', err)

 

176

        self.assertEqualDiff("=== modified file 'file'\n"

 

177

                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"

 

178

                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"

 

179

                              "@@ -1,1 +1,1 @@\n"

 

180

                              "-new content\n"

 

181

                              "+contents of branch1/file\n"

 

182

                              "\n", subst_dates(out))

101

183

 

102

184

    def example_branch2(self):

103

185

        self.build_tree(['branch1/', 'branch1/file1'], line_endings='binary')

113

195

        self.example_branch2()

114

196

        

115

197

        print >> open('branch1/file1', 'wb'), 'new line'

116

 

        output = self.run_bzr_captured(['diff', '-r', '1..', 'branch1'], retcode=1)

 

198

        output = self.run_bzr_captured(['diff', '-r', '1..', 'branch1'],

 

199

                                       retcode=1)

117

200

        self.assertTrue('\n-original line\n+new line\n' in output[0])

118

201

 

 

202

    def test_diff_across_rename(self):

 

203

        """The working tree path should always be considered for diffing"""

 

204

        self.make_example_branch()

 

205

        self.run_bzr('diff', '-r', '0..1', 'hello', retcode=1)

 

206

        wt = workingtree.WorkingTree.open_containing('.')[0]

 

207

        wt.rename_one('hello', 'hello1')

 

208

        self.run_bzr('diff', 'hello1', retcode=1)

 

209

        self.run_bzr('diff', '-r', '0..1', 'hello1', retcode=1)

 

210

 

119

211

 

120

212

class TestCheckoutDiff(TestDiff):

121

213

 

144

236

        super(TestDiffLabels, self).make_example_branch()

145

237

        self.runbzr('remove hello')

146

238

        diff = self.run_bzr_captured(['diff'], retcode=1)

147

 

        self.assertTrue("=== removed file 'a/hello'" in diff[0])

 

239

        self.assertTrue("=== removed file 'hello'" in diff[0])

148

240

 

149

241

    def test_diff_label_added(self):

150

242

        super(TestDiffLabels, self).make_example_branch()

151

243

        file('barbar', 'wt').write('barbar')

152

244

        self.runbzr('add barbar')

153

245

        diff = self.run_bzr_captured(['diff'], retcode=1)

154

 

        self.assertTrue("=== added file 'b/barbar'" in diff[0])

 

246

        self.assertTrue("=== added file 'barbar'" in diff[0])

155

247

 

156

248

    def test_diff_label_modified(self):

157

249

        super(TestDiffLabels, self).make_example_branch()

158

250

        file('hello', 'wt').write('barbar')

159

251

        diff = self.run_bzr_captured(['diff'], retcode=1)

160

 

        self.assertTrue("=== modified file 'a/hello'" in diff[0])

 

252

        self.assertTrue("=== modified file 'hello'" in diff[0])

161

253

 

162

254

    def test_diff_label_renamed(self):

163

255

        super(TestDiffLabels, self).make_example_branch()

164

256

        self.runbzr('rename hello gruezi')

165

257

        diff = self.run_bzr_captured(['diff'], retcode=1)

166

 

        self.assertTrue("=== renamed file 'a/hello' => 'b/gruezi'" in diff[0])

 

258

        self.assertTrue("=== renamed file 'hello' => 'gruezi'" in diff[0])

 

259

 

 

260

 

 

261

class TestExternalDiff(TestDiff):

 

262

 

 

263

    def test_external_diff(self):

 

264

        """Test that we can spawn an external diff process"""

 

265

        # We have to use run_bzr_subprocess, because we need to

 

266

        # test writing directly to stdout, (there was a bug in

 

267

        # subprocess.py that we had to workaround).

 

268

        # However, if 'diff' may not be available

 

269

        self.make_example_branch()

 

270

        orig_progress = os.environ.get('BZR_PROGRESS_BAR')

 

271

        try:

 

272

            os.environ['BZR_PROGRESS_BAR'] = 'none'

 

273

            out, err = self.run_bzr_subprocess('diff', '-r', '1',

 

274

                                               '--diff-options', '-ub',

 

275

                                               retcode=None)

 

276

        finally:

 

277

            if orig_progress is None:

 

278

                del os.environ['BZR_PROGRESS_BAR']

 

279

            else:

 

280

                os.environ['BZR_PROGRESS_BAR'] = orig_progress

 

281

            

 

282

        if 'Diff is not installed on this machine' in err:

 

283

            raise TestSkipped("No external 'diff' is available")

 

284

        self.assertEqual('', err)

 

285

        # We have to skip the stuff in the middle, because it depends

 

286

        # on time.time()

 

287

        self.assertStartsWith(out, "=== added file 'goodbye'\n"

 

288

                                   "--- goodbye\t1970-01-01 00:00:00 +0000\n"

 

289

                                   "+++ goodbye\t")

 

290

        self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"

 

291

                                 "+baz\n\n")

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0