~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/shelf_tests.py

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

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

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 command

11

 

from bzrlib.plugins.bzrtools.command_classes import cmd_shelf1

12

 

 

 

5

import os.path

13

6

 

14

7

class ShelfTests(bzrlib.tests.TestCaseWithTransport):

15

8

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

33

26

+hello test world

34

27

 

35

28

"""

36

 

    def setUp(self):

37

 

        bzrlib.tests.TestCaseWithTransport.setUp(self)

38

 

        command._testing = True

39

 

        self.addCleanup(command._stop_testing)

40

 

 

41

29

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

42

30

        old_tree = self.tree.basis_tree()

43

 

        old_tree.lock_read()

44

 

        self.tree.lock_read()

45

 

        try:

46

 

            old_date = _patch_header_date(old_tree,

47

 

                                          old_tree.inventory.path2id(filename),

48

 

                                          filename)

49

 

            new_date = _patch_header_date(self.tree,

50

 

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

51

 

        finally:

52

 

            self.tree.unlock()

53

 

            old_tree.unlock()

54

 

        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, 

55

38

                 'new_date': new_date}

56

39

        hdr  = self.DIFF_HEADER % keys

57

40

        diff = diff % keys

58

 

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

 

41

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

59

42

 

60

43

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

61

44

                     new_date=None):

62

45

        old_tree = self.tree.basis_tree()

63

 

        old_tree.lock_read()

64

 

        try:

65

 

            old_date = _patch_header_date(old_tree,

66

 

                                          old_tree.inventory.path2id(filename),

67

 

                                          filename)

68

 

        finally:

69

 

            old_tree.unlock()

 

46

        old_date = _patch_header_date(old_tree, 

 

47

                                      old_tree.inventory.path2id(filename),

 

48

                                      filename)

70

49

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

71

50

                        'new_date': new_date}

72

51

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

83

62

    def __test_loop(self, count):

84

63

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

85

64

        self.__create_and_add_test_file()

86

 

        for counter in range(count):

 

65

 

 

66

        while count > 0:

 

67

            count -= 1

 

68

 

87

69

            # Modify the test file

88

 

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

89

 

            # LF

 

70

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

90

71

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

91

72

            f.write(self.MODIFIED)

92

73

            f.close()

93

74

 

94

75

            self._check_diff()

95

 

 

96

 

            self.tree.lock_write()

97

 

            try:

98

 

                new_date = _patch_header_date(self.tree,

99

 

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

100

 

            finally:

101

 

                self.tree.unlock()

 

76

            

 

77

            new_date = _patch_header_date(self.tree, 

 

78

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

102

79

 

103

80

            # Shelve the changes

104

 

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

 

81

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

105

82

 

106

83

            # Make sure there is no diff anymore

107

 

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

 

84

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

108

85

 

109

86

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

110

87

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

112

89

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

113

90

 

114

91

            # Unshelve

115

 

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

 

92

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

116

93

 

117

94

            self._check_diff()

118

95

 

128

105

        self.__create_and_add_test_file()

129

106

 

130

107

        # Shelve the changes

131

 

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

 

108

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

132

109

 

133

110

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

134

111

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

152

129

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

153

130

 

154

131

        # Shelve the changes

155

 

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

 

132

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

156

133

 

157

134

        self._check_diff(self.DIFF_2)

158

135

 

160

137

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

161

138

 

162

139

        # Unshelve

163

 

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

 

140

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

164

141

 

165

142

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

166

143

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

168

145

    def test_shelf_with_two_revisions(self):

169

146

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

170

147

 

171

 

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

 

148

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

 

149

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

172

150

 

173

151

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

174

152

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

183

161

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

184

162

 

185

163

        # Shelve the changes

186

 

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

 

164

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

187

165

 

188

166

        # Make sure there is no diff anymore

189

 

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

 

167

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

190

168

 

191

169

        # Check the shelf is right

192

170

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

194

172

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

195

173

 

196

174

        # Check the shown output is right

197

 

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

 

175

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

198

176

        self.assertEqual(shown, shelf)

199

177

 

200

178

    def test_shelf_show_multi(self):

210

188

        self.assertTrue('patch 00' in shelf)

211

189

 

212

190

        # Check the shown output is right

213

 

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

 

191

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

214

192

        self.assertEqual(shown, shelf)

215

193

 

216

194

    def test_shelf_show_unspecified(self):

226

204

        self.assertTrue('patch 02' in shelf)

227

205

 

228

206

        # Check the shown output is right

229

 

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

 

207

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

230

208

        self.assertEqual(shown, shelf)

231

209

 

232

210

    def test_shelf_show_with_no_patch(self):

233

211

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

234

 

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

 

212

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

235

213

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

236

214

 

237

215

    def test_shelf_unshelve_failure(self):

243

221

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

244

222

 

245

223

        # Shelve the changes

246

 

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

 

224

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

247

225

 

248

226

        # Write an unapplyable patch into the shelf

249

227

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

252

230

        shelf.close()

253

231

 

254

232

        # Unshelve, should fail

255

 

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

 

233

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

256

234

 

257

235

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

258

236

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

260

238

        self.assertEqual(shelf, self.DIFF_2)

261

239

 

262

240

        # Working tree should be unchanged

263

 

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

 

241

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

264

242

        self.assertEqual(diff, '')

265

243

 

266

244

    def test_shelf_unshelve_failure_two_hunks(self):

274

252

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

275

253

 

276

254

        # Shelve the changes

277

 

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

 

255

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

278

256

 

279

257

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

280

258

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

281

259

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

282

260

 

283

261

        # Unshelve, should fail

284

 

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

 

262

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

285

263

 

286

264

        # Working tree should be unchanged

287

 

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

 

265

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

288

266

        self.assertEqual(diff, '')

289

267

 

290

268

        # Force should succeed and modify test_file2, but leave shelf

291

 

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

 

269

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

292

270

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

293

271

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

294

272

 

303

281

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

304

282

 

305

283

        # Shelve the changes

306

 

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

307

 

        self.run_bzr('shelve1 --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)

308

286

 

309

287

        # Unshelve

310

 

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

 

288

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

311

289

 

312

290

        # We should now have 00 and 01~

313

291

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

314

292

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

315

293

 

316

294

        # Check ls works

317

 

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

 

295

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

318

296

        for line in lines:

319

297

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

320

298

 

321

299

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

322

 

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

 

300

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

323

301

 

324

302

    def test_shelf_delete(self):

325

303

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

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.inventory.path2id('test_file'), 'test_file')

341

 

        finally:

342

 

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

343

318

 

344

319

        # Shelve the changes

345

 

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

346

 

        self.run_bzr('shelve1 --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)

347

322

 

348

323

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

349

324

 

350

325

        # Delete 00

351

 

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

 

326

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

352

327

 

353

328

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

354

329

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

359

334

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

360

335

 

361

336

        # Check ls works

362

 

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

 

337

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

363

338

        for line in lines:

364

339

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

365

340

 

366

341

        # Unshelve should unshelve 01

367

 

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

 

342

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

368

343

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

369

344

 

370

345

    def test_shelf_gaps(self):

371

346

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

372

347

        self.__create_and_add_test_file()

373

348

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

374

 

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

 

349

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

375

350

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

376

 

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

 

351

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

377

352

 

378

353

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

379

 

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

 

354

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

380

355

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

381

356

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

382

357

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

383

 

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

 

358

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

384

359

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

385

360

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

386

361

 

391

366

 

392

367

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

393

368

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

394

 

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

 

369

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

395

370

 

396

371

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

397

372

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

399

374

 

400

375

        # shelve and unshelve should bitch and do nothing

401

376

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

402

 

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

 

377

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

403

378

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

404

379

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

405

 

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

 

380

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

406

381

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

407

382

 

408

383

        # Upgrade, make sure it worked

409

 

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

 

384

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

410

385

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

411

386

                'First old shelf')

412

387

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

423

398

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

424

399

 

425

400

        # Shelve should work now

426

 

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

 

401

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

427

402

 

428

403

    def test_shelf_p1_patch(self):

429

404

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

431

406

        self.__create_and_add_test_file()

432

407

 

433

408

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

434

 

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

 

409

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

435

410

 

436

411

        old_tree = self.tree.basis_tree()

437

 

        old_tree.lock_read()

438

 

        self.tree.lock_read()

439

 

        try:

440

 

            old_date = _patch_header_date(old_tree,

441

 

                old_tree.inventory.path2id('test_file'),

442

 

                                          'test_file')

443

 

            new_date = _patch_header_date(self.tree,

444

 

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

445

 

        finally:

446

 

            old_tree.unlock()

447

 

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

448

418

        # Fake a -p0 shelved patch

449

419

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

450

420

                               'new_date' : new_date}

453

423

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

454

424

 

455

425

        # This should work

456

 

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

 

426

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

457

427

 

458

428

        self._check_diff()

459

429

 

474

444

        f.close()

475

445

 

476

446

        # Shelve the changes

477

 

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

 

447

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

478

448

 

479

449

        # Working tree should be unchanged

480

 

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

 

450

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

481

451

        self.assertEqual(diff, '')

482

452

 

483

453

        # Unshelve, should succeed

484

 

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

 

454

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

485

455

 

486

456

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

487

457

 

488

458

        # Make sure relative filenames work ok

489

 

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

 

459

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

490

460

 

491

461

    def test_shelf_shelf_bogus_subcommand(self):

492

462

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

493

 

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

 

463

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

494

464

 

495

465

    def test_shelf_OOO_unshelve(self):

496

466

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

504

474

 

505

475

        # Shelve the changes

506

476

        for i in range(1, 5):

507

 

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

 

477

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

508

478

 

509

479

        # Check shelving worked

510

480

        for i in range(1, 5):

515

485

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

516

486

 

517

487

        # Unshelve 00

518

 

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

 

488

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

519

489

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

520

490

 

521

491

        # Check ls works

522

 

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

 

492

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

523

493

        for line in lines:

524

494

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

525

495

 

526

496

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

527

497

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

528

 

        self.run_bzr('shelve1 --all')

 

498

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

529

499

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

530

500

 

531

501

        # Check ls works

532

 

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

 

502

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

533

503

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

534

504

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

535

505

 

536

506

        # We now have 01,02,03,04

537

507

        # Unshelve 02

538

 

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

 

508

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

539

509

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

540

510

 

541

511

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

542

 

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

 

512

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

543

513

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

544

514

 

545

515

    def test_shelf_switch_basic(self):

548

518

 

549

519

        # This should go to "default"

550

520

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

551

 

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

 

521

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

552

522

 

553

523

        # Switch to "other"

554

 

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

 

524

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

555

525

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

556

 

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

 

526

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

557

527

 

558

528

        # Check it worked

559

529

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

561

531

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

562

532

 

563

533

        # Switch back

564

 

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

 

534

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

565

535

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

566

 

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

 

536

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

567

537

 

568

538

        # Check that worked

569

539

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

570

540

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

571

541

 

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

 

 

578

542

    def test_shelf_bad_patch_arg(self):

579

543

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

580

544

 

581

545

        # Check the bad arg handling

582

 

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

 

546

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

583

547

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

584

548

 

585

 

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

 

549

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

586

550

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

587

551

 

588

552

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

589

 

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

 

553

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

590

554

        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