~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/shelf_tests.py

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

• reverse the comparison (415 to 650)
• stop comparing with revision 650

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

 

70

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

84

71

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

85

72

            f.write(self.MODIFIED)

86

73

            f.close()

87

74

 

88

75

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

 

76

            

 

77

            new_date = _patch_header_date(self.tree, 

 

78

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

96

79

 

97

80

            # Shelve the changes

98

 

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

 

81

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

99

82

 

100

83

            # Make sure there is no diff anymore

101

 

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

 

84

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

102

85

 

103

86

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

104

87

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

106

89

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

107

90

 

108

91

            # Unshelve

109

 

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

 

92

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

110

93

 

111

94

            self._check_diff()

112

95

 

122

105

        self.__create_and_add_test_file()

123

106

 

124

107

        # Shelve the changes

125

 

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

 

108

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

126

109

 

127

110

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

128

111

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

146

129

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

147

130

 

148

131

        # Shelve the changes

149

 

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

 

132

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

150

133

 

151

134

        self._check_diff(self.DIFF_2)

152

135

 

154

137

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

155

138

 

156

139

        # Unshelve

157

 

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

 

140

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

158

141

 

159

142

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

160

143

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

162

145

    def test_shelf_with_two_revisions(self):

163

146

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

164

147

 

165

 

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

 

148

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

 

149

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

166

150

 

167

151

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

168

152

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

177

161

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

178

162

 

179

163

        # Shelve the changes

180

 

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

 

164

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

181

165

 

182

166

        # Make sure there is no diff anymore

183

 

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

 

167

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

184

168

 

185

169

        # Check the shelf is right

186

170

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

188

172

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

189

173

 

190

174

        # Check the shown output is right

191

 

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

 

175

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

192

176

        self.assertEqual(shown, shelf)

193

177

 

194

178

    def test_shelf_show_multi(self):

204

188

        self.assertTrue('patch 00' in shelf)

205

189

 

206

190

        # Check the shown output is right

207

 

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

 

191

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

208

192

        self.assertEqual(shown, shelf)

209

193

 

210

194

    def test_shelf_show_unspecified(self):

220

204

        self.assertTrue('patch 02' in shelf)

221

205

 

222

206

        # Check the shown output is right

223

 

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

 

207

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

224

208

        self.assertEqual(shown, shelf)

225

209

 

226

210

    def test_shelf_show_with_no_patch(self):

227

211

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

228

 

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

 

212

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

229

213

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

230

214

 

231

215

    def test_shelf_unshelve_failure(self):

237

221

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

238

222

 

239

223

        # Shelve the changes

240

 

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

 

224

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

241

225

 

242

226

        # Write an unapplyable patch into the shelf

243

227

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

246

230

        shelf.close()

247

231

 

248

232

        # Unshelve, should fail

249

 

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

 

233

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

250

234

 

251

235

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

252

236

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

254

238

        self.assertEqual(shelf, self.DIFF_2)

255

239

 

256

240

        # Working tree should be unchanged

257

 

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

 

241

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

258

242

        self.assertEqual(diff, '')

259

243

 

260

244

    def test_shelf_unshelve_failure_two_hunks(self):

268

252

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

269

253

 

270

254

        # Shelve the changes

271

 

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

 

255

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

272

256

 

273

257

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

274

258

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

275

259

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

276

260

 

277

261

        # Unshelve, should fail

278

 

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

 

262

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

279

263

 

280

264

        # Working tree should be unchanged

281

 

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

 

265

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

282

266

        self.assertEqual(diff, '')

283

267

 

284

268

        # Force should succeed and modify test_file2, but leave shelf

285

 

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

 

269

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

286

270

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

287

271

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

288

272

 

297

281

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

298

282

 

299

283

        # Shelve the changes

300

 

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

301

 

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

 

284

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

 

285

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

302

286

 

303

287

        # Unshelve

304

 

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

 

288

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

305

289

 

306

290

        # We should now have 00 and 01~

307

291

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

308

292

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

309

293

 

310

294

        # Check ls works

311

 

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

 

295

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

312

296

        for line in lines:

313

297

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

314

298

 

315

299

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

316

 

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

 

300

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

317

301

 

318

302

    def test_shelf_delete(self):

319

303

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

 

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

337

318

 

338

319

        # Shelve the changes

339

 

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

340

 

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

 

320

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

 

321

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

341

322

 

342

323

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

343

324

 

344

325

        # Delete 00

345

 

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

 

326

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

346

327

 

347

328

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

348

329

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

353

334

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

354

335

 

355

336

        # Check ls works

356

 

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

 

337

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

357

338

        for line in lines:

358

339

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

359

340

 

360

341

        # Unshelve should unshelve 01

361

 

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

 

342

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

362

343

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

363

344

 

364

345

    def test_shelf_gaps(self):

365

346

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

366

347

        self.__create_and_add_test_file()

367

348

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

368

 

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

 

349

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

369

350

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

370

 

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

 

351

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

371

352

 

372

353

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

373

 

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

 

354

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

374

355

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

375

356

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

376

357

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

377

 

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

 

358

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

378

359

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

379

360

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

380

361

 

385

366

 

386

367

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

387

368

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

388

 

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

 

369

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

389

370

 

390

371

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

391

372

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

393

374

 

394

375

        # shelve and unshelve should bitch and do nothing

395

376

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

396

 

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

 

377

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

397

378

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

398

379

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

399

 

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

 

380

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

400

381

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

401

382

 

402

383

        # Upgrade, make sure it worked

403

 

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

 

384

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

404

385

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

405

386

                'First old shelf')

406

387

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

417

398

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

418

399

 

419

400

        # Shelve should work now

420

 

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

 

401

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

421

402

 

422

403

    def test_shelf_p1_patch(self):

423

404

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

425

406

        self.__create_and_add_test_file()

426

407

 

427

408

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

428

 

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

 

409

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

429

410

 

430

411

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

 

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

442

418

        # Fake a -p0 shelved patch

443

419

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

444

420

                               'new_date' : new_date}

447

423

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

448

424

 

449

425

        # This should work

450

 

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

 

426

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

451

427

 

452

428

        self._check_diff()

453

429

 

468

444

        f.close()

469

445

 

470

446

        # Shelve the changes

471

 

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

 

447

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

472

448

 

473

449

        # Working tree should be unchanged

474

 

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

 

450

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

475

451

        self.assertEqual(diff, '')

476

452

 

477

453

        # Unshelve, should succeed

478

 

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

 

454

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

479

455

 

480

456

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

481

457

 

482

458

        # Make sure relative filenames work ok

483

 

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

 

459

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

484

460

 

485

461

    def test_shelf_shelf_bogus_subcommand(self):

486

462

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

487

 

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

 

463

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

488

464

 

489

465

    def test_shelf_OOO_unshelve(self):

490

466

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

498

474

 

499

475

        # Shelve the changes

500

476

        for i in range(1, 5):

501

 

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

 

477

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

502

478

 

503

479

        # Check shelving worked

504

480

        for i in range(1, 5):

509

485

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

510

486

 

511

487

        # Unshelve 00

512

 

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

 

488

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

513

489

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

514

490

 

515

491

        # Check ls works

516

 

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

 

492

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

517

493

        for line in lines:

518

494

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

519

495

 

520

496

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

521

497

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

522

 

        self.run_bzr('shelve --all')

 

498

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

523

499

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

524

500

 

525

501

        # Check ls works

526

 

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

 

502

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

527

503

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

528

504

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

529

505

 

530

506

        # We now have 01,02,03,04

531

507

        # Unshelve 02

532

 

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

 

508

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

533

509

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

534

510

 

535

511

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

536

 

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

 

512

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

537

513

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

538

514

 

539

515

    def test_shelf_switch_basic(self):

542

518

 

543

519

        # This should go to "default"

544

520

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

545

 

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

 

521

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

546

522

 

547

523

        # Switch to "other"

548

 

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

 

524

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

549

525

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

550

 

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

 

526

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

551

527

 

552

528

        # Check it worked

553

529

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

555

531

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

556

532

 

557

533

        # Switch back

558

 

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

 

534

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

559

535

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

560

 

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

 

536

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

561

537

 

562

538

        # Check that worked

563

539

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

564

540

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

565

541

 

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

542

    def test_shelf_bad_patch_arg(self):

573

543

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

574

544

 

575

545

        # Check the bad arg handling

576

 

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

 

546

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

577

547

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

578

548

 

579

 

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

 

549

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

580

550

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

581

551

 

582

552

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

583

 

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

 

553

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

584

554

        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