~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/shelf_tests.py

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

• reverse the comparison (401 to 618)
• stop comparing with revision 618

Show diffs side-by-side

added

removed

tests/shelf_tests.py

1

 

import os.path

 

1

#!/usr/bin/python

 

2

 

2

3

from bzrlib.diff import _patch_header_date

3

4

import bzrlib.tests

4

 

 

5

 

from bzrlib.plugins.bzrtools.hunk_selector import (

6

 

    ShelveHunkSelector,

7

 

    UnshelveHunkSelector,

8

 

    )

9

 

from bzrlib.plugins.bzrtools.errors import NoColor

10

 

from bzrlib.plugins.bzrtools import cmd_shelf

11

 

 

 

5

import os.path

12

6

 

13

7

class ShelfTests(bzrlib.tests.TestCaseWithTransport):

14

8

    ORIGINAL = '\n\nhello test world\n\n'

34

28

"""

35

29

    def _check_diff(self, diff=DIFF_1, filename='test_file'):

36

30

        old_tree = self.tree.basis_tree()

37

 

        old_tree.lock_read()

38

 

        self.tree.lock_read()

39

 

        try:

40

 

            old_date = _patch_header_date(old_tree,

41

 

                                          old_tree.inventory.path2id(filename),

42

 

                                          filename)

43

 

            new_date = _patch_header_date(self.tree,

44

 

                self.tree.inventory.path2id(filename), filename)

45

 

        finally:

46

 

            self.tree.unlock()

47

 

            old_tree.unlock()

48

 

        keys = { 'filename' : filename , 'old_date': old_date,

 

31

        old_date = _patch_header_date(old_tree, 

 

32

                                      old_tree.inventory.path2id(filename),

 

33

                                      filename)

 

34

        new_date = _patch_header_date(self.tree, 

 

35

                                      self.tree.inventory.path2id(filename),

 

36

                                      filename)

 

37

        keys = { 'filename' : filename , 'old_date': old_date, 

49

38

                 'new_date': new_date}

50

39

        hdr  = self.DIFF_HEADER % keys

51

40

        diff = diff % keys

52

 

        self.assertEqual(self.run_bzr('diff', retcode=1)[0], hdr + diff + '\n')

 

41

        self.assertEqual(self.capture('diff', retcode=1), hdr + diff + '\n')

53

42

 

54

43

    def _check_shelf(self, idx, diff=DIFF_1, filename='test_file',

55

44

                     new_date=None):

56

45

        old_tree = self.tree.basis_tree()

57

 

        old_tree.lock_read()

58

 

        try:

59

 

            old_date = _patch_header_date(old_tree,

60

 

                                          old_tree.inventory.path2id(filename),

61

 

                                          filename)

62

 

        finally:

63

 

            old_tree.unlock()

 

46

        old_date = _patch_header_date(old_tree, 

 

47

                                      old_tree.inventory.path2id(filename),

 

48

                                      filename)

64

49

        diff = diff % { 'filename' : filename, 'old_date': old_date,

65

50

                        'new_date': new_date}

66

51

        shelf = open(os.path.join(self.tree.basedir,

77

62

    def __test_loop(self, count):

78

63

        self.tree = self.make_branch_and_tree('.')

79

64

        self.__create_and_add_test_file()

80

 

        for counter in range(count):

 

65

 

 

66

        while count > 0:

 

67

            count -= 1

 

68

 

81

69

            # Modify the test file

82

 

            # write in binary mode because on win32 line-endings should be

83

 

            # LF

84

 

            f = file('test_file', 'wb')

85

 

            f.write(self.MODIFIED)

86

 

            f.close()

 

70

            file('test_file', 'w').write(self.MODIFIED)

87

71

 

88

72

            self._check_diff()

89

 

 

90

 

            self.tree.lock_write()

91

 

            try:

92

 

                new_date = _patch_header_date(self.tree,

93

 

                    self.tree.inventory.path2id('test_file'), 'test_file')

94

 

            finally:

95

 

                self.tree.unlock()

 

73

            

 

74

            new_date = _patch_header_date(self.tree, 

 

75

                self.tree.inventory.path2id('test_file'), 'test_file')

96

76

 

97

77

            # Shelve the changes

98

 

            self.run_bzr('shelve --all', retcode=0)

 

78

            self.run_bzr('shelve', '--all', retcode=0)

99

79

 

100

80

            # Make sure there is no diff anymore

101

 

            self.assertEqual(self.run_bzr('diff', retcode=0)[0], '')

 

81

            self.assertEqual(self.capture('diff', retcode=0), '')

102

82

 

103

83

            # Make sure the file is actually back the way it was

104

84

            self.assertEqual(file('test_file').read(), self.ORIGINAL)

106

86

            self._check_shelf('00', new_date=new_date)

107

87

 

108

88

            # Unshelve

109

 

            self.run_bzr('unshelve --all', retcode=0)

 

89

            self.run_bzr('unshelve', '--all', retcode=0)

110

90

 

111

91

            self._check_diff()

112

92

 

122

102

        self.__create_and_add_test_file()

123

103

 

124

104

        # Shelve the changes

125

 

        self.run_bzr('shelve --all', retcode=3)

 

105

        self.run_bzr('shelve', '--all', retcode=3)

126

106

 

127

107

        if os.path.exists(os.path.join(self.tree.branch.base,

128

108

                '.shelf/shelves/default/00')):

129

109

            self.fail("Shelf exists, but it shouldn't")

130

110

 

131

111

    def __create_and_add_test_file(self, filename='test_file'):

132

 

        # write in binary mode because on win32 line-endings should be LF

133

 

        f = open(filename, 'wb')

 

112

        f = open(filename, 'w')

134

113

        f.write(self.ORIGINAL)

135

114

        f.close()

136

115

        self.tree.add(self.tree.relpath(os.path.join(os.getcwd(), filename)))

146

125

        self.tree.commit(message='update test_file')

147

126

 

148

127

        # Shelve the changes

149

 

        self.run_bzr('shelve --all -r 1', retcode=0)

 

128

        self.run_bzr('shelve', '--all', '-r', '1', retcode=0)

150

129

 

151

130

        self._check_diff(self.DIFF_2)

152

131

 

154

133

        self.assertEqual(file('test_file').read(), self.ORIGINAL)

155

134

 

156

135

        # Unshelve

157

 

        self.run_bzr('unshelve --all', retcode=0)

 

136

        self.run_bzr('unshelve', '--all', retcode=0)

158

137

 

159

138

        # Make sure the file is back the way it should be

160

139

        self.assertEqual(file('test_file').read(), self.MODIFIED)

162

141

    def test_shelf_with_two_revisions(self):

163

142

        self.tree = self.make_branch_and_tree('.')

164

143

 

165

 

        stdout, stderr = self.run_bzr('shelve --all -r 1..2', retcode=None)

 

144

        cmd = 'shelve --all -r 1..2'

 

145

        (stdout, stderr) = self.run_bzr_captured(cmd.split(), retcode=None)

166

146

 

167

147

        self.assertEqual(stderr.split('\n')[0],

168

148

            'bzr: ERROR: shelve only accepts a single revision parameter.')

177

157

        self.build_tree_contents([('test_file', 'patch %s\n' % patch)])

178

158

 

179

159

        # Shelve the changes

180

 

        self.run_bzr('shelve --all', retcode=0)

 

160

        self.run_bzr('shelve', '--all', retcode=0)

181

161

 

182

162

        # Make sure there is no diff anymore

183

 

        self.assertEqual(self.run_bzr('diff', retcode=0)[0], '')

 

163

        self.assertEqual(self.capture('diff', retcode=0), '')

184

164

 

185

165

        # Check the shelf is right

186

166

        shelf = open(os.path.join(self.tree.basedir,

188

168

        self.assertTrue('patch %s' % patch in shelf)

189

169

 

190

170

        # Check the shown output is right

191

 

        shown = self.run_bzr('shelf show %s' % patch, retcode=0)[0]

 

171

        shown = self.capture('shelf show %s' % patch, retcode=0)

192

172

        self.assertEqual(shown, shelf)

193

173

 

194

174

    def test_shelf_show_multi(self):

204

184

        self.assertTrue('patch 00' in shelf)

205

185

 

206

186

        # Check the shown output is right

207

 

        shown = self.run_bzr('shelf show 00', retcode=0)[0]

 

187

        shown = self.capture('shelf show 00', retcode=0)

208

188

        self.assertEqual(shown, shelf)

209

189

 

210

190

    def test_shelf_show_unspecified(self):

220

200

        self.assertTrue('patch 02' in shelf)

221

201

 

222

202

        # Check the shown output is right

223

 

        shown = self.run_bzr('shelf show', retcode=0)[0]

 

203

        shown = self.capture('shelf show', retcode=0)

224

204

        self.assertEqual(shown, shelf)

225

205

 

226

206

    def test_shelf_show_with_no_patch(self):

227

207

        self.tree = self.make_branch_and_tree('.')

228

 

        stderr = self.run_bzr('shelf show 00', retcode=None)[1]

 

208

        stderr = self.run_bzr_captured(['shelf', 'show', '00'], retcode=None)[1]

229

209

        self.assertTrue("Patch '00' doesn't exist on shelf default!" in stderr)

230

210

 

231

211

    def test_shelf_unshelve_failure(self):

237

217

        file('test_file', 'w').write(self.MODIFIED)

238

218

 

239

219

        # Shelve the changes

240

 

        self.run_bzr('shelve --all', retcode=0)

 

220

        self.run_bzr('shelve', '--all', retcode=0)

241

221

 

242

222

        # Write an unapplyable patch into the shelf

243

223

        shelf = open(os.path.join(self.tree.basedir,

246

226

        shelf.close()

247

227

 

248

228

        # Unshelve, should fail

249

 

        self.run_bzr('unshelve --all', retcode=3)

 

229

        self.run_bzr('unshelve', '--all', retcode=3)

250

230

 

251

231

        # Make sure the patch is still there, eventhough it's broken

252

232

        shelf = open(os.path.join(self.tree.basedir,

254

234

        self.assertEqual(shelf, self.DIFF_2)

255

235

 

256

236

        # Working tree should be unchanged

257

 

        diff = self.run_bzr('diff', retcode=0)[0]

 

237

        diff = self.capture('diff', retcode=0)

258

238

        self.assertEqual(diff, '')

259

239

 

260

240

    def test_shelf_unshelve_failure_two_hunks(self):

268

248

        file('test_file2', 'w').write(self.MODIFIED)

269

249

 

270

250

        # Shelve the changes

271

 

        self.run_bzr('shelve --all', retcode=0)

 

251

        self.run_bzr('shelve', '--all', retcode=0)

272

252

 

273

253

        # Put the changes to test_file back, the shelved patch won't apply now

274

254

        file('test_file', 'w').write(self.MODIFIED)

275

255

        self.tree.commit(message='screw up test_file')

276

256

 

277

257

        # Unshelve, should fail

278

 

        self.run_bzr('unshelve --all', retcode=3)

 

258

        self.run_bzr('unshelve', '--all', retcode=3)

279

259

 

280

260

        # Working tree should be unchanged

281

 

        diff = self.run_bzr('diff', retcode=0)[0]

 

261

        diff = self.capture('diff', retcode=0)

282

262

        self.assertEqual(diff, '')

283

263

 

284

264

        # Force should succeed and modify test_file2, but leave shelf

285

 

        self.run_bzr('unshelve --force --all', retcode=0)

 

265

        self.run_bzr('unshelve', '--force', '--all', retcode=0)

286

266

        self.assertEqual(open('test_file2').read(), self.MODIFIED)

287

267

        self.assertTrue(os.path.exists('.shelf/shelves/default/00'))

288

268

 

297

277

        file('test_file2', 'w').write(self.MODIFIED)

298

278

 

299

279

        # Shelve the changes

300

 

        self.run_bzr('shelve --all test_file', retcode=0)

301

 

        self.run_bzr('shelve --all test_file2', retcode=0)

 

280

        self.run_bzr('shelve', '--all', 'test_file', retcode=0)

 

281

        self.run_bzr('shelve', '--all', 'test_file2', retcode=0)

302

282

 

303

283

        # Unshelve

304

 

        self.run_bzr('unshelve --all', retcode=0)

 

284

        self.run_bzr('unshelve', '--all', retcode=0)

305

285

 

306

286

        # We should now have 00 and 01~

307

287

        self.assertTrue(os.path.exists('.shelf/shelves/default/00'))

308

288

        self.assertTrue(os.path.exists('.shelf/shelves/default/01~'))

309

289

 

310

290

        # Check ls works

311

 

        lines = self.run_bzr('shelf ls', retcode=0)[0].split('\n')

 

291

        lines = self.capture('shelf ls', retcode=0).split('\n')

312

292

        for line in lines:

313

293

            self.assertFalse(line.startswith(' 01'))

314

294

 

315

295

        # Unshelve, if unshelve is confused by the backup it will fail

316

 

        self.run_bzr('unshelve --all', retcode=0)

 

296

        self.run_bzr('unshelve', '--all', retcode=0)

317

297

 

318

298

    def test_shelf_delete(self):

319

299

        self.tree = self.make_branch_and_tree('.')

320

 

        self.tree.lock_write()

321

 

        try:

322

 

            self.__create_and_add_test_file()

323

 

            self.__create_and_add_test_file(filename='test_file2')

324

 

 

325

 

            # Modify the test files

326

 

            # write in binary mode because on win32 line-endings should be LF

327

 

            f = file('test_file', 'wb')

328

 

            f.write(self.MODIFIED)

329

 

            f.close()

330

 

            f = file('test_file2', 'wb')

331

 

            f.write(self.MODIFIED)

332

 

            f.close()

333

 

            new_date = _patch_header_date(self.tree,

334

 

                self.tree.inventory.path2id('test_file'), 'test_file')

335

 

        finally:

336

 

            self.tree.unlock()

 

300

 

 

301

        self.__create_and_add_test_file()

 

302

        self.__create_and_add_test_file(filename='test_file2')

 

303

 

 

304

        # Modify the test files

 

305

        file('test_file', 'w').write(self.MODIFIED)

 

306

        file('test_file2', 'w').write(self.MODIFIED)

 

307

        new_date = _patch_header_date(self.tree, 

 

308

            self.tree.inventory.path2id('test_file'), 'test_file')

337

309

 

338

310

        # Shelve the changes

339

 

        self.run_bzr('shelve --all test_file', retcode=0)

340

 

        self.run_bzr('shelve --all test_file2', retcode=0)

 

311

        self.run_bzr('shelve', '--all', 'test_file', retcode=0)

 

312

        self.run_bzr('shelve', '--all', 'test_file2', retcode=0)

341

313

 

342

314

        self._check_shelf('00', new_date=new_date)

343

315

 

344

316

        # Delete 00

345

 

        self.run_bzr('shelf delete 00', retcode=0)

 

317

        self.run_bzr('shelf', 'delete', '00', retcode=0)

346

318

 

347

319

        # We should now have 01 but not 00, but we should have 00~

348

320

        self.assertFalse(os.path.exists('.shelf/shelves/default/00'))

353

325

        self._check_shelf('00~', new_date=new_date)

354

326

 

355

327

        # Check ls works

356

 

        lines = self.run_bzr('shelf ls', retcode=0)[0].split('\n')

 

328

        lines = self.capture('shelf ls', retcode=0).split('\n')

357

329

        for line in lines:

358

330

            self.assertFalse(line.startswith(' 00'))

359

331

 

360

332

        # Unshelve should unshelve 01

361

 

        self.run_bzr('unshelve --all', retcode=0)

 

333

        self.run_bzr('unshelve', '--all', retcode=0)

362

334

        self.assertEqual(file('test_file2').read(), self.MODIFIED)

363

335

 

364

336

    def test_shelf_gaps(self):

365

337

        self.tree = self.make_branch_and_tree('.')

366

338

        self.__create_and_add_test_file()

367

339

        file('test_file', 'w').write(self.MODIFIED)

368

 

        self.run_bzr('shelve --all test_file', retcode=0)

 

340

        self.run_bzr('shelve', '--all', 'test_file', retcode=0)

369

341

        file('test_file', 'w').write(self.MODIFIED)

370

 

        self.run_bzr('shelve --all test_file', retcode=0)

 

342

        self.run_bzr('shelve', '--all', 'test_file', retcode=0)

371

343

 

372

344

        # Now delete 00, leaving 01, next shelve should go into 02

373

 

        self.run_bzr('shelf delete 0', retcode=0)

 

345

        self.run_bzr('shelf', 'delete', '0', retcode=0)

374

346

        self.assertFalse(os.path.exists('.shelf/shelves/default/00'))

375

347

        self.assertFalse(os.path.exists('.shelf/shelves/default/02'))

376

348

        file('test_file', 'w').write(self.MODIFIED)

377

 

        self.run_bzr('shelve --all test_file', retcode=0)

 

349

        self.run_bzr('shelve', '--all', 'test_file', retcode=0)

378

350

        self.assertFalse(os.path.exists('.shelf/shelves/default/00'))

379

351

        self.assertTrue(os.path.exists('.shelf/shelves/default/02'))

380

352

 

385

357

 

386

358

        # Modify then shelve, so we're not upgrading to 00, just for kicks

387

359

        file('test_file', 'w').write(self.MODIFIED)

388

 

        self.run_bzr('shelve --all test_file', retcode=0)

 

360

        self.run_bzr('shelve', '--all', 'test_file', retcode=0)

389

361

 

390

362

        open('.bzr-shelf', 'w').write('First old shelf')

391

363

        open('.bzr-shelf-1', 'w').write('Second old shelf')

393

365

 

394

366

        # shelve and unshelve should bitch and do nothing

395

367

        file('test_file', 'w').write('blah blah blah')

396

 

        self.run_bzr('shelve --all', retcode=3)

 

368

        self.run_bzr('shelve', '--all', retcode=3)

397

369

        self.assertFalse(os.path.exists('.shelf/shelves/default/01'))

398

370

        self.assertEqual(file('test_file').read(), 'blah blah blah')

399

 

        self.run_bzr('unshelve --all', retcode=3)

 

371

        self.run_bzr('unshelve', '--all', retcode=3)

400

372

        self.assertTrue(os.path.exists('.shelf/shelves/default/00'))

401

373

 

402

374

        # Upgrade, make sure it worked

403

 

        self.run_bzr('shelf upgrade', retcode=0)

 

375

        self.run_bzr('shelf', 'upgrade', retcode=0)

404

376

        self.assertEqual(open('.shelf/shelves/default/01').read(),

405

377

                'First old shelf')

406

378

        self.assertEqual(open('.shelf/shelves/default/02').read(),

417

389

        self.assertFalse(os.path.exists('.bzr-shelf-3'))

418

390

 

419

391

        # Shelve should work now

420

 

        self.run_bzr('shelve --all', retcode=0)

 

392

        self.run_bzr('shelve', '--all', retcode=0)

421

393

 

422

394

    def test_shelf_p1_patch(self):

423

395

        self.tree = self.make_branch_and_tree('.')

425

397

        self.__create_and_add_test_file()

426

398

 

427

399

        # Run a benign shelf command to setup .shelf for us

428

 

        self.run_bzr('shelf ls', retcode=0)

 

400

        self.run_bzr('shelf', 'ls', retcode=0)

429

401

 

430

402

        old_tree = self.tree.basis_tree()

431

 

        old_tree.lock_read()

432

 

        self.tree.lock_read()

433

 

        try:

434

 

            old_date = _patch_header_date(old_tree,

435

 

                old_tree.inventory.path2id('test_file'),

436

 

                                          'test_file')

437

 

            new_date = _patch_header_date(self.tree,

438

 

                self.tree.inventory.path2id('test_file'), 'test_file')

439

 

        finally:

440

 

            old_tree.unlock()

441

 

            self.tree.unlock()

 

403

        old_date = _patch_header_date(old_tree, 

 

404

                                      old_tree.inventory.path2id('test_file'),

 

405

                                      'test_file')

 

406

        new_date = _patch_header_date(self.tree, 

 

407

                                      self.tree.inventory.path2id('test_file'),

 

408

                                      'test_file')

442

409

        # Fake a -p0 shelved patch

443

410

        diff = self.DIFF_1 % { 'filename' : 'test_file', 'old_date': old_date,

444

411

                               'new_date' : new_date}

447

414

        open('.shelf/shelves/default/00', 'w').write(diff)

448

415

 

449

416

        # This should work

450

 

        self.run_bzr('unshelve --all', retcode=0)

 

417

        self.run_bzr('unshelve', '--all', retcode=0)

451

418

 

452

419

        self._check_diff()

453

420

 

462

429

        self.__create_and_add_test_file()

463

430

 

464

431

        # Modify the test file

465

 

        # write in binary mode because on win32 line-endings should be LF

466

 

        f = file('test_file', 'wb')

467

 

        f.write(self.MODIFIED)

468

 

        f.close()

 

432

        file('test_file', 'w').write(self.MODIFIED)

469

433

 

470

434

        # Shelve the changes

471

 

        self.run_bzr('shelve --all', retcode=0)

 

435

        self.run_bzr('shelve', '--all', retcode=0)

472

436

 

473

437

        # Working tree should be unchanged

474

 

        diff = self.run_bzr('diff', retcode=0)[0]

 

438

        diff = self.capture('diff', retcode=0)

475

439

        self.assertEqual(diff, '')

476

440

 

477

441

        # Unshelve, should succeed

478

 

        self.run_bzr('unshelve --all', retcode=0)

 

442

        self.run_bzr('unshelve', '--all', retcode=0)

479

443

 

480

444

        self._check_diff(filename='subdir/test_file')

481

445

 

482

446

        # Make sure relative filenames work ok

483

 

        self.run_bzr('shelve test_file --all', retcode=0)

 

447

        self.run_bzr('shelve', 'test_file', '--all', retcode=0)

484

448

 

485

449

    def test_shelf_shelf_bogus_subcommand(self):

486

450

        self.tree = self.make_branch_and_tree('.')

487

 

        self.run_bzr('shelf foo', retcode=3) # <- retcode == 3

 

451

        self.run_bzr('shelf', 'foo', retcode=3) # <- retcode == 3

488

452

 

489

453

    def test_shelf_OOO_unshelve(self):

490

454

        self.tree = self.make_branch_and_tree('.')

498

462

 

499

463

        # Shelve the changes

500

464

        for i in range(1, 5):

501

 

            self.run_bzr(['shelve', '--all', 'test_file%d' % i], retcode=0)

 

465

            self.run_bzr('shelve', '--all', 'test_file%d' % i, retcode=0)

502

466

 

503

467

        # Check shelving worked

504

468

        for i in range(1, 5):

509

473

            self.assertTrue(os.path.exists('.shelf/shelves/default/0%d' % i))

510

474

 

511

475

        # Unshelve 00

512

 

        self.run_bzr('unshelve --all 00', retcode=0)

 

476

        self.run_bzr('unshelve', '--all', '00', retcode=0)

513

477

        self.assertEqual(file('test_file1').read(), self.MODIFIED)

514

478

 

515

479

        # Check ls works

516

 

        lines = self.run_bzr('shelf ls', retcode=0)[0].split('\n')

 

480

        lines = self.capture('shelf ls', retcode=0).split('\n')

517

481

        for line in lines:

518

482

            self.assertFalse(line.startswith(' 00'))

519

483

 

520

484

        # Check we can reshelve once we've unshelved out of order, should be 04

521

485

        self.assertFalse(os.path.exists('.shelf/shelves/default/04'))

522

 

        self.run_bzr('shelve --all')

 

486

        self.run_bzr('shelve', '--all')

523

487

        self.assertTrue(os.path.exists('.shelf/shelves/default/04'))

524

488

 

525

489

        # Check ls works

526

 

        text = self.run_bzr('shelf ls', retcode=0)[0]

 

490

        text = self.capture('shelf ls', retcode=0)

527

491

        for line in text.split('\n'):

528

492

            self.assertFalse(line.startswith(' 00'))

529

493

 

530

494

        # We now have 01,02,03,04

531

495

        # Unshelve 02

532

 

        self.run_bzr('unshelve --all 02', retcode=0)

 

496

        self.run_bzr('unshelve', '--all', '02', retcode=0)

533

497

        self.assertEqual(file('test_file3').read(), self.MODIFIED)

534

498

 

535

499

        # Unshelve the default, this is the reshelved 00, hence modifies file 1

536

 

        self.run_bzr('unshelve --all', retcode=0)

 

500

        self.run_bzr('unshelve', '--all', retcode=0)

537

501

        self.assertEqual(file('test_file1').read(), self.MODIFIED)

538

502

 

539

503

    def test_shelf_switch_basic(self):

542

506

 

543

507

        # This should go to "default"

544

508

        file('test_file', 'w').write(self.MODIFIED)

545

 

        self.run_bzr('shelve --all test_file', retcode=0)

 

509

        self.run_bzr('shelve', '--all', 'test_file', retcode=0)

546

510

 

547

511

        # Switch to "other"

548

 

        self.run_bzr('shelf switch other', retcode=0)

 

512

        self.run_bzr('shelf', 'switch', 'other', retcode=0)

549

513

        file('test_file', 'w').write(self.MODIFIED)

550

 

        self.run_bzr('shelve --all test_file', retcode=0)

 

514

        self.run_bzr('shelve', '--all', 'test_file', retcode=0)

551

515

 

552

516

        # Check it worked

553

517

        self.assertTrue(os.path.exists('.shelf/shelves/default/00'))

555

519

        self.assertTrue(os.path.exists('.shelf/shelves/other/00'))

556

520

 

557

521

        # Switch back

558

 

        self.run_bzr('shelf switch default', retcode=0)

 

522

        self.run_bzr('shelf', 'switch', 'default', retcode=0)

559

523

        file('test_file', 'w').write(self.MODIFIED)

560

 

        self.run_bzr('shelve --all test_file', retcode=0)

 

524

        self.run_bzr('shelve', '--all', 'test_file', retcode=0)

561

525

 

562

526

        # Check that worked

563

527

        self.assertTrue(os.path.exists('.shelf/shelves/default/01'))

564

528

        self.assertFalse(os.path.exists('.shelf/shelves/other/01'))

565

529

 

566

 

    def test_shelf_binary(self):

567

 

        self.tree = self.make_branch_and_tree('.')

568

 

        self.build_tree_contents([('file', '\x00')])

569

 

        self.tree.add('file')

570

 

        self.run_bzr_error(['Changes involve binary files.'], 'shelve --all')

571

 

 

572

530

    def test_shelf_bad_patch_arg(self):

573

531

        self.tree = self.make_branch_and_tree('.')

574

532

 

575

533

        # Check the bad arg handling

576

 

        stdout, error = self.run_bzr('unshelve 01', retcode=3)

 

534

        stdout, error = self.run_bzr_captured(['unshelve', '01'], retcode=3)

577

535

        self.assertTrue("Patch '01' doesn't exist on shelf" in error)

578

536

 

579

 

        stdout, error = self.run_bzr('unshelve foo', retcode=3)

 

537

        stdout, error = self.run_bzr_captured(['unshelve', 'foo'], retcode=3)

580

538

        self.assertTrue("Invalid patch name 'foo'" in error)

581

539

 

582

540

        # Hex and is cracky, so it shouldn't work

583

 

        stdout, error = self.run_bzr(['unshelve', '0x00'], retcode=3)

 

541

        stdout, error = self.run_bzr_captured(['unshelve', '0x00'], retcode=3)

584

542

        self.assertTrue("Invalid patch name '0x00'" in error)

585

 

 

586

 

    def test_color_hunk_selector(self):

587

 

        """Make sure NoColor is raised iff terminal.has_ansi_colors is False"""

588

 

        hs = ShelveHunkSelector([])

589

 

        hs = UnshelveHunkSelector([])

590

 

        try:

591

 

            from bzrlib.plugins.bzrtools import terminal

592

 

        except ImportError:

593

 

            from bzrtools import terminal

594

 

        old_has_ansi_colors = terminal.has_ansi_colors

595

 

        terminal.has_ansi_colors = lambda: False

596

 

        try:

597

 

            self.assertRaises(NoColor, ShelveHunkSelector, [], True)

598

 

            self.assertRaises(NoColor, UnshelveHunkSelector, [], True)

599

 

            terminal.has_ansi_colors = lambda: True

600

 

            hs = ShelveHunkSelector([], color=True)

601

 

            hs = UnshelveHunkSelector([], color=True)

602

 

        finally:

603

 

            terminal.has_ansi_colors = old_has_ansi_colors

604

 

 

605

 

    def test_no_color(self):

606

 

        """Ensure --no-color switch can be passed"""

607

 

        self.tree = self.make_branch_and_tree('.')

608

 

 

609

 

        subdir = 'subdir'

610

 

        os.mkdir(subdir)

611

 

        self.tree.add(subdir)

612

 

        os.chdir(subdir)

613

 

 

614

 

        self.__create_and_add_test_file()

615

 

 

616

 

        # Modify the test file

617

 

        # write in binary mode because on win32 line-endings should be LF

618

 

        f = file('test_file', 'wb')

619

 

        f.write(self.MODIFIED)

620

 

        f.close()

621

 

        stdout, error = self.run_bzr('shelve --all --no-color')

622

 

        stdout, error = self.run_bzr('unshelve --all --no-color')

623

 

 

624

 

    def test_shelf_help(self):

625

 

        self.assertContainsRe(cmd_shelf().help(),

626

 

                              'list\n.*List the patches on the current shelf')

627

 

 

628

 

    def test_show_empty_shelf(self):

629

 

        self.tree = self.make_branch_and_tree('.')

630

 

        self.run_bzr_error(('No patches on shelf.',), 'shelf show')

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1