~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/shelf_tests.py

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

• reverse the comparison (787 to 419.1.1)
• stop comparing with revision 419.1.1

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 command

 

11

from bzrlib.plugins.bzrtools.command_classes import cmd_shelf1

 

12

 

6

13

 

7

14

class ShelfTests(bzrlib.tests.TestCaseWithTransport):

8

15

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

26

33

+hello test world

27

34

 

28

35

"""

 

36

    def setUp(self):

 

37

        bzrlib.tests.TestCaseWithTransport.setUp(self)

 

38

        command._testing = True

 

39

        self.addCleanup(command._stop_testing)

 

40

 

29

41

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

30

42

        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, 

 

43

        old_tree.lock_read()

 

44

        self.tree.lock_read()

 

45

        try:

 

46

            old_date = _patch_header_date(old_tree,

 

47

                                          old_tree.path2id(filename),

 

48

                                          filename)

 

49

            new_date = _patch_header_date(self.tree,

 

50

                self.tree.path2id(filename), filename)

 

51

        finally:

 

52

            self.tree.unlock()

 

53

            old_tree.unlock()

 

54

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

38

55

                 'new_date': new_date}

39

56

        hdr  = self.DIFF_HEADER % keys

40

57

        diff = diff % keys

41

 

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

 

58

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

42

59

 

43

60

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

44

61

                     new_date=None):

45

62

        old_tree = self.tree.basis_tree()

46

 

        old_date = _patch_header_date(old_tree, 

47

 

                                      old_tree.inventory.path2id(filename),

48

 

                                      filename)

 

63

        old_tree.lock_read()

 

64

        try:

 

65

            old_date = _patch_header_date(old_tree,

 

66

                                          old_tree.path2id(filename),

 

67

                                          filename)

 

68

        finally:

 

69

            old_tree.unlock()

49

70

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

50

71

                        'new_date': new_date}

51

72

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

62

83

    def __test_loop(self, count):

63

84

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

64

85

        self.__create_and_add_test_file()

65

 

 

66

 

        while count > 0:

67

 

            count -= 1

68

 

 

 

86

        for counter in range(count):

69

87

            # Modify the test file

70

 

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

 

88

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

 

89

            # LF

71

90

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

72

91

            f.write(self.MODIFIED)

73

92

            f.close()

74

93

 

75

94

            self._check_diff()

76

 

            

77

 

            new_date = _patch_header_date(self.tree, 

78

 

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

 

95

 

 

96

            self.tree.lock_write()

 

97

            try:

 

98

                new_date = _patch_header_date(self.tree,

 

99

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

 

100

            finally:

 

101

                self.tree.unlock()

79

102

 

80

103

            # Shelve the changes

81

 

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

 

104

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

82

105

 

83

106

            # Make sure there is no diff anymore

84

 

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

 

107

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

85

108

 

86

109

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

87

110

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

89

112

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

90

113

 

91

114

            # Unshelve

92

 

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

 

115

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

93

116

 

94

117

            self._check_diff()

95

118

 

105

128

        self.__create_and_add_test_file()

106

129

 

107

130

        # Shelve the changes

108

 

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

 

131

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

109

132

 

110

133

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

111

134

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

129

152

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

130

153

 

131

154

        # Shelve the changes

132

 

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

 

155

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

133

156

 

134

157

        self._check_diff(self.DIFF_2)

135

158

 

137

160

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

138

161

 

139

162

        # Unshelve

140

 

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

 

163

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

141

164

 

142

165

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

143

166

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

145

168

    def test_shelf_with_two_revisions(self):

146

169

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

147

170

 

148

 

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

149

 

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

 

171

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

150

172

 

151

173

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

152

174

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

161

183

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

162

184

 

163

185

        # Shelve the changes

164

 

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

 

186

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

165

187

 

166

188

        # Make sure there is no diff anymore

167

 

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

 

189

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

168

190

 

169

191

        # Check the shelf is right

170

192

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

172

194

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

173

195

 

174

196

        # Check the shown output is right

175

 

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

 

197

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

176

198

        self.assertEqual(shown, shelf)

177

199

 

178

200

    def test_shelf_show_multi(self):

188

210

        self.assertTrue('patch 00' in shelf)

189

211

 

190

212

        # Check the shown output is right

191

 

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

 

213

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

192

214

        self.assertEqual(shown, shelf)

193

215

 

194

216

    def test_shelf_show_unspecified(self):

204

226

        self.assertTrue('patch 02' in shelf)

205

227

 

206

228

        # Check the shown output is right

207

 

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

 

229

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

208

230

        self.assertEqual(shown, shelf)

209

231

 

210

232

    def test_shelf_show_with_no_patch(self):

211

233

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

212

 

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

 

234

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

213

235

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

214

236

 

215

237

    def test_shelf_unshelve_failure(self):

221

243

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

222

244

 

223

245

        # Shelve the changes

224

 

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

 

246

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

225

247

 

226

248

        # Write an unapplyable patch into the shelf

227

249

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

230

252

        shelf.close()

231

253

 

232

254

        # Unshelve, should fail

233

 

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

 

255

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

234

256

 

235

257

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

236

258

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

238

260

        self.assertEqual(shelf, self.DIFF_2)

239

261

 

240

262

        # Working tree should be unchanged

241

 

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

 

263

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

242

264

        self.assertEqual(diff, '')

243

265

 

244

266

    def test_shelf_unshelve_failure_two_hunks(self):

252

274

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

253

275

 

254

276

        # Shelve the changes

255

 

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

 

277

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

256

278

 

257

279

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

258

280

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

259

281

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

260

282

 

261

283

        # Unshelve, should fail

262

 

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

 

284

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

263

285

 

264

286

        # Working tree should be unchanged

265

 

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

 

287

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

266

288

        self.assertEqual(diff, '')

267

289

 

268

290

        # Force should succeed and modify test_file2, but leave shelf

269

 

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

 

291

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

270

292

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

271

293

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

272

294

 

281

303

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

282

304

 

283

305

        # Shelve the changes

284

 

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

285

 

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

 

306

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

 

307

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

286

308

 

287

309

        # Unshelve

288

 

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

 

310

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

289

311

 

290

312

        # We should now have 00 and 01~

291

313

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

292

314

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

293

315

 

294

316

        # Check ls works

295

 

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

 

317

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

296

318

        for line in lines:

297

319

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

298

320

 

299

321

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

300

 

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

 

322

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

301

323

 

302

324

    def test_shelf_delete(self):

303

325

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

 

326

        self.tree.lock_write()

 

327

        try:

 

328

            self.__create_and_add_test_file()

 

329

            self.__create_and_add_test_file(filename='test_file2')

 

330

 

 

331

            # Modify the test files

 

332

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

 

333

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

 

334

            f.write(self.MODIFIED)

 

335

            f.close()

 

336

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

 

337

            f.write(self.MODIFIED)

 

338

            f.close()

 

339

            new_date = _patch_header_date(self.tree,

 

340

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

 

341

        finally:

 

342

            self.tree.unlock()

318

343

 

319

344

        # Shelve the changes

320

 

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

321

 

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

 

345

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

 

346

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

322

347

 

323

348

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

324

349

 

325

350

        # Delete 00

326

 

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

 

351

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

327

352

 

328

353

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

329

354

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

334

359

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

335

360

 

336

361

        # Check ls works

337

 

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

 

362

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

338

363

        for line in lines:

339

364

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

340

365

 

341

366

        # Unshelve should unshelve 01

342

 

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

 

367

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

343

368

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

344

369

 

345

370

    def test_shelf_gaps(self):

346

371

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

347

372

        self.__create_and_add_test_file()

348

373

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

349

 

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

 

374

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

350

375

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

351

 

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

 

376

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

352

377

 

353

378

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

354

 

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

 

379

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

355

380

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

356

381

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

357

382

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

358

 

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

 

383

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

359

384

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

360

385

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

361

386

 

366

391

 

367

392

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

368

393

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

369

 

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

 

394

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

370

395

 

371

396

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

372

397

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

374

399

 

375

400

        # shelve and unshelve should bitch and do nothing

376

401

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

377

 

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

 

402

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

378

403

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

379

404

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

380

 

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

 

405

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

381

406

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

382

407

 

383

408

        # Upgrade, make sure it worked

384

 

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

 

409

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

385

410

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

386

411

                'First old shelf')

387

412

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

398

423

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

399

424

 

400

425

        # Shelve should work now

401

 

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

 

426

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

402

427

 

403

428

    def test_shelf_p1_patch(self):

404

429

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

406

431

        self.__create_and_add_test_file()

407

432

 

408

433

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

409

 

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

 

434

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

410

435

 

411

436

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

 

437

        old_tree.lock_read()

 

438

        self.tree.lock_read()

 

439

        try:

 

440

            old_date = _patch_header_date(old_tree,

 

441

                old_tree.path2id('test_file'),

 

442

                                          'test_file')

 

443

            new_date = _patch_header_date(self.tree,

 

444

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

 

445

        finally:

 

446

            old_tree.unlock()

 

447

            self.tree.unlock()

418

448

        # Fake a -p0 shelved patch

419

449

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

420

450

                               'new_date' : new_date}

423

453

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

424

454

 

425

455

        # This should work

426

 

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

 

456

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

427

457

 

428

458

        self._check_diff()

429

459

 

444

474

        f.close()

445

475

 

446

476

        # Shelve the changes

447

 

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

 

477

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

448

478

 

449

479

        # Working tree should be unchanged

450

 

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

 

480

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

451

481

        self.assertEqual(diff, '')

452

482

 

453

483

        # Unshelve, should succeed

454

 

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

 

484

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

455

485

 

456

486

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

457

487

 

458

488

        # Make sure relative filenames work ok

459

 

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

 

489

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

460

490

 

461

491

    def test_shelf_shelf_bogus_subcommand(self):

462

492

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

463

 

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

 

493

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

464

494

 

465

495

    def test_shelf_OOO_unshelve(self):

466

496

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

474

504

 

475

505

        # Shelve the changes

476

506

        for i in range(1, 5):

477

 

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

 

507

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

478

508

 

479

509

        # Check shelving worked

480

510

        for i in range(1, 5):

485

515

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

486

516

 

487

517

        # Unshelve 00

488

 

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

 

518

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

489

519

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

490

520

 

491

521

        # Check ls works

492

 

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

 

522

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

493

523

        for line in lines:

494

524

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

495

525

 

496

526

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

497

527

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

498

 

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

 

528

        self.run_bzr('shelve1 --all')

499

529

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

500

530

 

501

531

        # Check ls works

502

 

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

 

532

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

503

533

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

504

534

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

505

535

 

506

536

        # We now have 01,02,03,04

507

537

        # Unshelve 02

508

 

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

 

538

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

509

539

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

510

540

 

511

541

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

512

 

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

 

542

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

513

543

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

514

544

 

515

545

    def test_shelf_switch_basic(self):

518

548

 

519

549

        # This should go to "default"

520

550

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

521

 

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

 

551

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

522

552

 

523

553

        # Switch to "other"

524

 

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

 

554

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

525

555

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

526

 

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

 

556

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

527

557

 

528

558

        # Check it worked

529

559

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

531

561

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

532

562

 

533

563

        # Switch back

534

 

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

 

564

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

535

565

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

536

 

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

 

566

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

537

567

 

538

568

        # Check that worked

539

569

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

540

570

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

541

571

 

 

572

    def test_shelf_binary(self):

 

573

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

 

574

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

 

575

        self.tree.add('file')

 

576

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

 

577

 

542

578

    def test_shelf_bad_patch_arg(self):

543

579

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

544

580

 

545

581

        # Check the bad arg handling

546

 

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

 

582

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

547

583

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

548

584

 

549

 

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

 

585

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

550

586

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

551

587

 

552

588

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

553

 

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

 

589

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

554

590

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

 

591

 

 

592

    def test_color_hunk_selector(self):

 

593

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

 

594

        hs = ShelveHunkSelector([])

 

595

        hs = UnshelveHunkSelector([])

 

596

        try:

 

597

            from bzrlib.plugins.bzrtools import terminal

 

598

        except ImportError:

 

599

            from bzrtools import terminal

 

600

        old_has_ansi_colors = terminal.has_ansi_colors

 

601

        terminal.has_ansi_colors = lambda: False

 

602

        try:

 

603

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

 

604

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

 

605

            terminal.has_ansi_colors = lambda: True

 

606

            hs = ShelveHunkSelector([], color=True)

 

607

            hs = UnshelveHunkSelector([], color=True)

 

608

        finally:

 

609

            terminal.has_ansi_colors = old_has_ansi_colors

 

610

 

 

611

    def test_no_color(self):

 

612

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

 

613

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

 

614

 

 

615

        subdir = 'subdir'

 

616

        os.mkdir(subdir)

 

617

        self.tree.add(subdir)

 

618

        os.chdir(subdir)

 

619

 

 

620

        self.__create_and_add_test_file()

 

621

 

 

622

        # Modify the test file

 

623

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

 

624

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

 

625

        f.write(self.MODIFIED)

 

626

        f.close()

 

627

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

 

628

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

 

629

 

 

630

    def test_shelf_help(self):

 

631

        self.assertContainsRe(cmd_shelf1().help(),

 

632

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

 

633

 

 

634

    def test_show_empty_shelf(self):

 

635

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

 

636

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

• Older »

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