/brz/remove-bazaar

« back to all changes in this revision

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

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

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

Show diffs side-by-side

added

removed

bzrlib/tests/blackbox/test_diff.py

1

 

# Copyright (C) 2005, 2006 by Canonical Ltd

2

 

 

 

1

# Copyright (C) 2005, 2006 Canonical Ltd

 

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

 

28

 

class TestDiff(ExternalBase):

29

 

 

30

 

    def make_example_branch(test):

 

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

 

 

37

class DiffBase(ExternalBase):

 

38

    """Base class with common setup method"""

 

39

 

 

40

    def make_example_branch(self):

31

41

        # 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')

 

42

        tree = self.make_branch_and_tree('.')

 

43

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

 

44

        tree.add(['hello'])

 

45

        tree.commit('setup')

 

46

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

 

47

        tree.add(['goodbye'])

 

48

        tree.commit('setup')

 

49

 

 

50

 

 

51

class TestDiff(DiffBase):

39

52

 

40

53

    def test_diff(self):

41

54

        self.make_example_branch()

50

63

        os.unlink('moo')

51

64

        self.runbzr('diff')

52

65

 

 

66

    def test_diff_prefix(self):

 

67

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

 

68

        self.make_example_branch()

 

69

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

 

70

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

 

71

        self.assertEquals(err, '')

 

72

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

 

73

=== modified file 'hello'

 

74

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

 

75

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

 

76

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

 

77

-foo

 

78

+hello world!

 

79

 

 

80

''')

 

81

 

 

82

    def test_diff_p1(self):

 

83

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

 

84

        self.make_example_branch()

 

85

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

 

86

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

 

87

        self.assertEquals(err, '')

 

88

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

 

89

=== modified file 'hello'

 

90

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

 

91

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

 

92

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

 

93

-foo

 

94

+hello world!

 

95

 

 

96

''')

 

97

 

 

98

    def test_diff_p0(self):

 

99

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

 

100

        self.make_example_branch()

 

101

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

 

102

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

 

103

        self.assertEquals(err, '')

 

104

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

 

105

=== modified file 'hello'

 

106

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

 

107

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

 

108

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

 

109

-foo

 

110

+hello world!

 

111

 

 

112

''')

 

113

 

53

114

    def test_diff_nonexistent(self):

54

115

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

55

116

        # (Malone #3619)

79

140

    def test_diff_branches(self):

80

141

        self.example_branches()

81

142

        # 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)

 

143

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

 

144

                                          'branch1'],

 

145

                                         retcode=1)

 

146

        self.assertEquals('', err)

 

147

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

 

148

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

 

149

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

 

150

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

 

151

                          "-new content\n"

 

152

                          "+contents of branch1/file\n"

 

153

                          "\n", subst_dates(out))

 

154

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

 

155

                                         retcode=1)

 

156

        self.assertEquals('', err)

 

157

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

 

158

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

 

159

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

 

160

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

 

161

                              "-new content\n"

 

162

                              "+contents of branch1/file\n"

 

163

                              "\n", subst_dates(out))

 

164

 

 

165

    def test_diff_revno_branches(self):

 

166

        self.example_branches()

 

167

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

 

168

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

 

169

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

 

170

 

 

171

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

 

172

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

 

173

                                         retcode=0)

 

174

        self.assertEquals('', err)

 

175

        self.assertEquals('', out)

 

176

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

 

177

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

 

178

                                         retcode=1)

 

179

        self.assertEquals('', err)

 

180

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

 

181

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

 

182

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

 

183

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

 

184

                              "-new content\n"

 

185

                              "+contents of branch1/file\n"

 

186

                              "\n", subst_dates(out))

101

187

 

102

188

    def example_branch2(self):

103

189

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

113

199

        self.example_branch2()

114

200

        

115

201

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

116

 

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

 

202

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

 

203

                                       retcode=1)

117

204

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

118

205

 

 

206

    def test_diff_across_rename(self):

 

207

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

 

208

        self.make_example_branch()

 

209

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

 

210

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

 

211

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

 

212

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

 

213

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

 

214

 

119

215

 

120

216

class TestCheckoutDiff(TestDiff):

121

217

 

138

234

        os.chdir('checkouts')

139

235

 

140

236

 

141

 

class TestDiffLabels(TestDiff):

 

237

class TestDiffLabels(DiffBase):

142

238

 

143

239

    def test_diff_label_removed(self):

144

240

        super(TestDiffLabels, self).make_example_branch()

145

241

        self.runbzr('remove hello')

146

242

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

147

 

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

 

243

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

148

244

 

149

245

    def test_diff_label_added(self):

150

246

        super(TestDiffLabels, self).make_example_branch()

151

247

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

152

248

        self.runbzr('add barbar')

153

249

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

154

 

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

 

250

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

155

251

 

156

252

    def test_diff_label_modified(self):

157

253

        super(TestDiffLabels, self).make_example_branch()

158

254

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

159

255

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

160

 

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

 

256

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

161

257

 

162

258

    def test_diff_label_renamed(self):

163

259

        super(TestDiffLabels, self).make_example_branch()

164

260

        self.runbzr('rename hello gruezi')

165

261

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

166

 

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

 

262

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

 

263

 

 

264

 

 

265

class TestExternalDiff(DiffBase):

 

266

 

 

267

    def test_external_diff(self):

 

268

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

 

269

        # We have to use run_bzr_subprocess, because we need to

 

270

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

 

271

        # subprocess.py that we had to workaround).

 

272

        # However, if 'diff' may not be available

 

273

        self.make_example_branch()

 

274

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

 

275

        try:

 

276

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

 

277

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

 

278

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

 

279

                                               universal_newlines=True,

 

280

                                               retcode=None)

 

281

        finally:

 

282

            if orig_progress is None:

 

283

                del os.environ['BZR_PROGRESS_BAR']

 

284

            else:

 

285

                os.environ['BZR_PROGRESS_BAR'] = orig_progress

 

286

            

 

287

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

 

288

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

 

289

        self.assertEqual('', err)

 

290

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

 

291

        # on time.time()

 

292

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

 

293

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

 

294

                                   "+++ goodbye\t")

 

295

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

 

296

                                 "+baz\n\n")

• Older »

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