~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/shelf_tests.py

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

• reverse the comparison (642 to 420)
• stop comparing with revision 420

Show diffs side-by-side

added

removed

tests/shelf_tests.py

1

 

#!/usr/bin/python

2

 

 

 

1

import os.path

3

2

from bzrlib.diff import _patch_header_date

4

3

import bzrlib.tests

5

 

import os.path

 

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

 

6

12

 

7

13

class ShelfTests(bzrlib.tests.TestCaseWithTransport):

8

14

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

28

34

"""

29

35

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

30

36

        old_tree = self.tree.basis_tree()

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, 

 

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,

38

49

                 'new_date': new_date}

39

50

        hdr  = self.DIFF_HEADER % keys

40

51

        diff = diff % keys

41

 

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

 

52

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

42

53

 

43

54

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

44

55

                     new_date=None):

45

56

        old_tree = self.tree.basis_tree()

46

 

        old_date = _patch_header_date(old_tree, 

47

 

                                      old_tree.inventory.path2id(filename),

48

 

                                      filename)

 

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

49

64

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

50

65

                        'new_date': new_date}

51

66

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

62

77

    def __test_loop(self, count):

63

78

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

64

79

        self.__create_and_add_test_file()

65

 

 

66

 

        while count > 0:

67

 

            count -= 1

68

 

 

 

80

        for counter in range(count):

69

81

            # Modify the test file

70

 

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

 

82

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

 

83

            # LF

71

84

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

72

85

            f.write(self.MODIFIED)

73

86

            f.close()

74

87

 

75

88

            self._check_diff()

76

 

            

77

 

            new_date = _patch_header_date(self.tree, 

78

 

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

 

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

79

96

 

80

97

            # Shelve the changes

81

 

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

 

98

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

82

99

 

83

100

            # Make sure there is no diff anymore

84

 

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

 

101

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

85

102

 

86

103

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

87

104

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

89

106

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

90

107

 

91

108

            # Unshelve

92

 

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

 

109

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

93

110

 

94

111

            self._check_diff()

95

112

 

105

122

        self.__create_and_add_test_file()

106

123

 

107

124

        # Shelve the changes

108

 

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

 

125

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

109

126

 

110

127

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

111

128

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

129

146

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

130

147

 

131

148

        # Shelve the changes

132

 

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

 

149

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

133

150

 

134

151

        self._check_diff(self.DIFF_2)

135

152

 

137

154

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

138

155

 

139

156

        # Unshelve

140

 

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

 

157

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

141

158

 

142

159

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

143

160

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

145

162

    def test_shelf_with_two_revisions(self):

146

163

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

147

164

 

148

 

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

149

 

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

 

165

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

150

166

 

151

167

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

152

168

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

161

177

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

162

178

 

163

179

        # Shelve the changes

164

 

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

 

180

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

165

181

 

166

182

        # Make sure there is no diff anymore

167

 

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

 

183

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

168

184

 

169

185

        # Check the shelf is right

170

186

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

172

188

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

173

189

 

174

190

        # Check the shown output is right

175

 

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

 

191

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

176

192

        self.assertEqual(shown, shelf)

177

193

 

178

194

    def test_shelf_show_multi(self):

188

204

        self.assertTrue('patch 00' in shelf)

189

205

 

190

206

        # Check the shown output is right

191

 

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

 

207

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

192

208

        self.assertEqual(shown, shelf)

193

209

 

194

210

    def test_shelf_show_unspecified(self):

204

220

        self.assertTrue('patch 02' in shelf)

205

221

 

206

222

        # Check the shown output is right

207

 

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

 

223

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

208

224

        self.assertEqual(shown, shelf)

209

225

 

210

226

    def test_shelf_show_with_no_patch(self):

211

227

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

212

 

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

 

228

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

213

229

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

214

230

 

215

231

    def test_shelf_unshelve_failure(self):

221

237

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

222

238

 

223

239

        # Shelve the changes

224

 

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

 

240

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

225

241

 

226

242

        # Write an unapplyable patch into the shelf

227

243

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

230

246

        shelf.close()

231

247

 

232

248

        # Unshelve, should fail

233

 

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

 

249

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

234

250

 

235

251

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

236

252

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

238

254

        self.assertEqual(shelf, self.DIFF_2)

239

255

 

240

256

        # Working tree should be unchanged

241

 

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

 

257

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

242

258

        self.assertEqual(diff, '')

243

259

 

244

260

    def test_shelf_unshelve_failure_two_hunks(self):

252

268

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

253

269

 

254

270

        # Shelve the changes

255

 

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

 

271

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

256

272

 

257

273

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

258

274

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

259

275

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

260

276

 

261

277

        # Unshelve, should fail

262

 

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

 

278

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

263

279

 

264

280

        # Working tree should be unchanged

265

 

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

 

281

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

266

282

        self.assertEqual(diff, '')

267

283

 

268

284

        # Force should succeed and modify test_file2, but leave shelf

269

 

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

 

285

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

270

286

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

271

287

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

272

288

 

281

297

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

282

298

 

283

299

        # Shelve the changes

284

 

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

285

 

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

 

300

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

 

301

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

286

302

 

287

303

        # Unshelve

288

 

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

 

304

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

289

305

 

290

306

        # We should now have 00 and 01~

291

307

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

292

308

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

293

309

 

294

310

        # Check ls works

295

 

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

 

311

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

296

312

        for line in lines:

297

313

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

298

314

 

299

315

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

300

 

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

 

316

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

301

317

 

302

318

    def test_shelf_delete(self):

303

319

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

304

 

 

305

 

        self.__create_and_add_test_file()

306

 

        self.__create_and_add_test_file(filename='test_file2')

307

 

 

308

 

        # Modify the test files

309

 

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

310

 

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

311

 

        f.write(self.MODIFIED)

312

 

        f.close()

313

 

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

314

 

        f.write(self.MODIFIED)

315

 

        f.close()

316

 

        new_date = _patch_header_date(self.tree, 

317

 

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

 

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

318

337

 

319

338

        # Shelve the changes

320

 

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

321

 

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

 

339

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

 

340

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

322

341

 

323

342

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

324

343

 

325

344

        # Delete 00

326

 

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

 

345

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

327

346

 

328

347

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

329

348

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

334

353

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

335

354

 

336

355

        # Check ls works

337

 

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

 

356

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

338

357

        for line in lines:

339

358

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

340

359

 

341

360

        # Unshelve should unshelve 01

342

 

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

 

361

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

343

362

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

344

363

 

345

364

    def test_shelf_gaps(self):

346

365

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

347

366

        self.__create_and_add_test_file()

348

367

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

349

 

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

 

368

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

350

369

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

351

 

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

 

370

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

352

371

 

353

372

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

354

 

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

 

373

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

355

374

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

356

375

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

357

376

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

358

 

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

 

377

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

359

378

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

360

379

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

361

380

 

366

385

 

367

386

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

368

387

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

369

 

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

 

388

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

370

389

 

371

390

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

372

391

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

374

393

 

375

394

        # shelve and unshelve should bitch and do nothing

376

395

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

377

 

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

 

396

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

378

397

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

379

398

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

380

 

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

 

399

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

381

400

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

382

401

 

383

402

        # Upgrade, make sure it worked

384

 

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

 

403

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

385

404

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

386

405

                'First old shelf')

387

406

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

398

417

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

399

418

 

400

419

        # Shelve should work now

401

 

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

 

420

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

402

421

 

403

422

    def test_shelf_p1_patch(self):

404

423

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

406

425

        self.__create_and_add_test_file()

407

426

 

408

427

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

409

 

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

 

428

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

410

429

 

411

430

        old_tree = self.tree.basis_tree()

412

 

        old_date = _patch_header_date(old_tree, 

413

 

                                      old_tree.inventory.path2id('test_file'),

414

 

                                      'test_file')

415

 

        new_date = _patch_header_date(self.tree, 

416

 

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

417

 

                                      'test_file')

 

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

418

442

        # Fake a -p0 shelved patch

419

443

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

420

444

                               'new_date' : new_date}

423

447

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

424

448

 

425

449

        # This should work

426

 

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

 

450

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

427

451

 

428

452

        self._check_diff()

429

453

 

444

468

        f.close()

445

469

 

446

470

        # Shelve the changes

447

 

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

 

471

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

448

472

 

449

473

        # Working tree should be unchanged

450

 

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

 

474

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

451

475

        self.assertEqual(diff, '')

452

476

 

453

477

        # Unshelve, should succeed

454

 

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

 

478

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

455

479

 

456

480

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

457

481

 

458

482

        # Make sure relative filenames work ok

459

 

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

 

483

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

460

484

 

461

485

    def test_shelf_shelf_bogus_subcommand(self):

462

486

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

463

 

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

 

487

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

464

488

 

465

489

    def test_shelf_OOO_unshelve(self):

466

490

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

474

498

 

475

499

        # Shelve the changes

476

500

        for i in range(1, 5):

477

 

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

 

501

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

478

502

 

479

503

        # Check shelving worked

480

504

        for i in range(1, 5):

485

509

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

486

510

 

487

511

        # Unshelve 00

488

 

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

 

512

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

489

513

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

490

514

 

491

515

        # Check ls works

492

 

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

 

516

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

493

517

        for line in lines:

494

518

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

495

519

 

496

520

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

497

521

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

498

 

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

 

522

        self.run_bzr('shelve --all')

499

523

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

500

524

 

501

525

        # Check ls works

502

 

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

 

526

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

503

527

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

504

528

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

505

529

 

506

530

        # We now have 01,02,03,04

507

531

        # Unshelve 02

508

 

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

 

532

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

509

533

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

510

534

 

511

535

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

512

 

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

 

536

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

513

537

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

514

538

 

515

539

    def test_shelf_switch_basic(self):

518

542

 

519

543

        # This should go to "default"

520

544

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

521

 

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

 

545

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

522

546

 

523

547

        # Switch to "other"

524

 

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

 

548

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

525

549

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

526

 

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

 

550

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

527

551

 

528

552

        # Check it worked

529

553

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

531

555

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

532

556

 

533

557

        # Switch back

534

 

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

 

558

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

535

559

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

536

 

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

 

560

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

537

561

 

538

562

        # Check that worked

539

563

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

540

564

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

541

565

 

 

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

 

542

572

    def test_shelf_bad_patch_arg(self):

543

573

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

544

574

 

545

575

        # Check the bad arg handling

546

 

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

 

576

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

547

577

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

548

578

 

549

 

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

 

579

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

550

580

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

551

581

 

552

582

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

553

 

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

 

583

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

554

584

        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