~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/shelf_tests.py

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

• reverse the comparison (785 to 473)
• stop comparing with revision 473

Show diffs side-by-side

added

removed

tests/shelf_tests.py

 

1

import os.path

1

2

from bzrlib.diff import _patch_header_date

2

3

import bzrlib.tests

3

 

import os.path

4

4

 

5

 

try:

6

 

    from bzrlib.plugins.bzrtools.hunk_selector import (

7

 

        ShelveHunkSelector,

8

 

        UnshelveHunkSelector,

9

 

        )

10

 

    from bzrlib.plugins.bzrtools.errors import NoColor

11

 

except ImportError:

12

 

    from bzrtools.hunk_selector import (

13

 

        ShelveHunkSelector,

14

 

        UnshelveHunkSelector,

15

 

        )

16

 

    from bzrtools.errors import NoColor

 

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

17

12

 

18

13

 

19

14

class ShelfTests(bzrlib.tests.TestCaseWithTransport):

38

33

+hello test world

39

34

 

40

35

"""

 

36

    def setUp(self):

 

37

        bzrlib.tests.TestCaseWithTransport.setUp(self)

 

38

        command._testing = True

 

39

        self.addCleanup(command._stop_testing)

 

40

 

41

41

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

42

42

        old_tree = self.tree.basis_tree()

43

 

        old_date = _patch_header_date(old_tree, 

44

 

                                      old_tree.inventory.path2id(filename),

45

 

                                      filename)

46

 

        new_date = _patch_header_date(self.tree, 

47

 

                                      self.tree.inventory.path2id(filename),

48

 

                                      filename)

49

 

        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.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,

50

55

                 'new_date': new_date}

51

56

        hdr  = self.DIFF_HEADER % keys

52

57

        diff = diff % keys

53

 

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

 

58

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

54

59

 

55

60

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

56

61

                     new_date=None):

57

62

        old_tree = self.tree.basis_tree()

58

 

        old_date = _patch_header_date(old_tree, 

59

 

                                      old_tree.inventory.path2id(filename),

60

 

                                      filename)

 

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

61

70

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

62

71

                        'new_date': new_date}

63

72

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

74

83

    def __test_loop(self, count):

75

84

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

76

85

        self.__create_and_add_test_file()

77

 

 

78

 

        while count > 0:

79

 

            count -= 1

80

 

 

 

86

        for counter in range(count):

81

87

            # Modify the test file

82

 

            # 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

83

90

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

84

91

            f.write(self.MODIFIED)

85

92

            f.close()

86

93

 

87

94

            self._check_diff()

88

 

            

89

 

            new_date = _patch_header_date(self.tree, 

90

 

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

 

100

            finally:

 

101

                self.tree.unlock()

91

102

 

92

103

            # Shelve the changes

93

 

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

 

104

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

94

105

 

95

106

            # Make sure there is no diff anymore

96

 

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

 

107

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

97

108

 

98

109

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

99

110

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

101

112

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

102

113

 

103

114

            # Unshelve

104

 

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

 

115

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

105

116

 

106

117

            self._check_diff()

107

118

 

117

128

        self.__create_and_add_test_file()

118

129

 

119

130

        # Shelve the changes

120

 

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

 

131

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

121

132

 

122

133

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

123

134

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

141

152

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

142

153

 

143

154

        # Shelve the changes

144

 

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

 

155

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

145

156

 

146

157

        self._check_diff(self.DIFF_2)

147

158

 

149

160

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

150

161

 

151

162

        # Unshelve

152

 

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

 

163

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

153

164

 

154

165

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

155

166

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

157

168

    def test_shelf_with_two_revisions(self):

158

169

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

159

170

 

160

 

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

161

 

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

 

171

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

162

172

 

163

173

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

164

174

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

173

183

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

174

184

 

175

185

        # Shelve the changes

176

 

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

 

186

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

177

187

 

178

188

        # Make sure there is no diff anymore

179

 

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

 

189

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

180

190

 

181

191

        # Check the shelf is right

182

192

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

184

194

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

185

195

 

186

196

        # Check the shown output is right

187

 

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

 

197

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

188

198

        self.assertEqual(shown, shelf)

189

199

 

190

200

    def test_shelf_show_multi(self):

200

210

        self.assertTrue('patch 00' in shelf)

201

211

 

202

212

        # Check the shown output is right

203

 

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

 

213

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

204

214

        self.assertEqual(shown, shelf)

205

215

 

206

216

    def test_shelf_show_unspecified(self):

216

226

        self.assertTrue('patch 02' in shelf)

217

227

 

218

228

        # Check the shown output is right

219

 

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

 

229

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

220

230

        self.assertEqual(shown, shelf)

221

231

 

222

232

    def test_shelf_show_with_no_patch(self):

223

233

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

224

 

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

 

234

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

225

235

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

226

236

 

227

237

    def test_shelf_unshelve_failure(self):

233

243

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

234

244

 

235

245

        # Shelve the changes

236

 

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

 

246

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

237

247

 

238

248

        # Write an unapplyable patch into the shelf

239

249

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

242

252

        shelf.close()

243

253

 

244

254

        # Unshelve, should fail

245

 

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

 

255

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

246

256

 

247

257

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

248

258

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

250

260

        self.assertEqual(shelf, self.DIFF_2)

251

261

 

252

262

        # Working tree should be unchanged

253

 

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

 

263

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

254

264

        self.assertEqual(diff, '')

255

265

 

256

266

    def test_shelf_unshelve_failure_two_hunks(self):

264

274

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

265

275

 

266

276

        # Shelve the changes

267

 

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

 

277

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

268

278

 

269

279

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

270

280

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

271

281

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

272

282

 

273

283

        # Unshelve, should fail

274

 

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

 

284

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

275

285

 

276

286

        # Working tree should be unchanged

277

 

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

 

287

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

278

288

        self.assertEqual(diff, '')

279

289

 

280

290

        # Force should succeed and modify test_file2, but leave shelf

281

 

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

 

291

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

282

292

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

283

293

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

284

294

 

293

303

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

294

304

 

295

305

        # Shelve the changes

296

 

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

297

 

        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)

298

308

 

299

309

        # Unshelve

300

 

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

 

310

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

301

311

 

302

312

        # We should now have 00 and 01~

303

313

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

304

314

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

305

315

 

306

316

        # Check ls works

307

 

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

 

317

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

308

318

        for line in lines:

309

319

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

310

320

 

311

321

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

312

 

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

 

322

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

313

323

 

314

324

    def test_shelf_delete(self):

315

325

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

316

 

 

317

 

        self.__create_and_add_test_file()

318

 

        self.__create_and_add_test_file(filename='test_file2')

319

 

 

320

 

        # Modify the test files

321

 

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

322

 

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

323

 

        f.write(self.MODIFIED)

324

 

        f.close()

325

 

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

326

 

        f.write(self.MODIFIED)

327

 

        f.close()

328

 

        new_date = _patch_header_date(self.tree, 

329

 

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

 

341

        finally:

 

342

            self.tree.unlock()

330

343

 

331

344

        # Shelve the changes

332

 

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

333

 

        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)

334

347

 

335

348

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

336

349

 

337

350

        # Delete 00

338

 

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

 

351

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

339

352

 

340

353

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

341

354

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

346

359

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

347

360

 

348

361

        # Check ls works

349

 

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

 

362

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

350

363

        for line in lines:

351

364

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

352

365

 

353

366

        # Unshelve should unshelve 01

354

 

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

 

367

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

355

368

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

356

369

 

357

370

    def test_shelf_gaps(self):

358

371

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

359

372

        self.__create_and_add_test_file()

360

373

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

361

 

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

 

374

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

362

375

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

363

 

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

 

376

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

364

377

 

365

378

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

366

 

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

 

379

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

367

380

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

368

381

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

369

382

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

370

 

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

 

383

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

371

384

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

372

385

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

373

386

 

378

391

 

379

392

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

380

393

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

381

 

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

 

394

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

382

395

 

383

396

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

384

397

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

386

399

 

387

400

        # shelve and unshelve should bitch and do nothing

388

401

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

389

 

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

 

402

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

390

403

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

391

404

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

392

 

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

 

405

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

393

406

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

394

407

 

395

408

        # Upgrade, make sure it worked

396

 

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

 

409

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

397

410

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

398

411

                'First old shelf')

399

412

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

410

423

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

411

424

 

412

425

        # Shelve should work now

413

 

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

 

426

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

414

427

 

415

428

    def test_shelf_p1_patch(self):

416

429

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

418

431

        self.__create_and_add_test_file()

419

432

 

420

433

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

421

 

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

 

434

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

422

435

 

423

436

        old_tree = self.tree.basis_tree()

424

 

        old_date = _patch_header_date(old_tree, 

425

 

                                      old_tree.inventory.path2id('test_file'),

426

 

                                      'test_file')

427

 

        new_date = _patch_header_date(self.tree, 

428

 

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

429

 

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

430

448

        # Fake a -p0 shelved patch

431

449

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

432

450

                               'new_date' : new_date}

435

453

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

436

454

 

437

455

        # This should work

438

 

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

 

456

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

439

457

 

440

458

        self._check_diff()

441

459

 

456

474

        f.close()

457

475

 

458

476

        # Shelve the changes

459

 

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

 

477

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

460

478

 

461

479

        # Working tree should be unchanged

462

 

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

 

480

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

463

481

        self.assertEqual(diff, '')

464

482

 

465

483

        # Unshelve, should succeed

466

 

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

 

484

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

467

485

 

468

486

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

469

487

 

470

488

        # Make sure relative filenames work ok

471

 

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

 

489

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

472

490

 

473

491

    def test_shelf_shelf_bogus_subcommand(self):

474

492

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

475

 

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

 

493

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

476

494

 

477

495

    def test_shelf_OOO_unshelve(self):

478

496

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

486

504

 

487

505

        # Shelve the changes

488

506

        for i in range(1, 5):

489

 

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

 

507

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

490

508

 

491

509

        # Check shelving worked

492

510

        for i in range(1, 5):

497

515

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

498

516

 

499

517

        # Unshelve 00

500

 

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

 

518

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

501

519

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

502

520

 

503

521

        # Check ls works

504

 

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

 

522

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

505

523

        for line in lines:

506

524

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

507

525

 

508

526

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

509

527

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

510

 

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

 

528

        self.run_bzr('shelve1 --all')

511

529

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

512

530

 

513

531

        # Check ls works

514

 

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

 

532

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

515

533

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

516

534

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

517

535

 

518

536

        # We now have 01,02,03,04

519

537

        # Unshelve 02

520

 

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

 

538

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

521

539

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

522

540

 

523

541

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

524

 

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

 

542

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

525

543

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

526

544

 

527

545

    def test_shelf_switch_basic(self):

530

548

 

531

549

        # This should go to "default"

532

550

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

533

 

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

 

551

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

534

552

 

535

553

        # Switch to "other"

536

 

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

 

554

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

537

555

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

538

 

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

 

556

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

539

557

 

540

558

        # Check it worked

541

559

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

543

561

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

544

562

 

545

563

        # Switch back

546

 

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

 

564

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

547

565

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

548

 

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

 

566

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

549

567

 

550

568

        # Check that worked

551

569

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

552

570

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

553

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

 

554

578

    def test_shelf_bad_patch_arg(self):

555

579

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

556

580

 

557

581

        # Check the bad arg handling

558

 

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

 

582

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

559

583

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

560

584

 

561

 

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

 

585

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

562

586

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

563

587

 

564

588

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

565

 

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

 

589

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

566

590

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

567

591

 

568

592

    def test_color_hunk_selector(self):

600

624

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

601

625

        f.write(self.MODIFIED)

602

626

        f.close()

603

 

        stdout, error = self.run_bzr_captured(['shelve', '--all', 

604

 

                                               '--no-color'])

605

 

        stdout, error = self.run_bzr_captured(['unshelve', '--all', 

606

 

                                               '--no-color'])

 

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