/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/plugins/git/tests/test_mapping.py

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

Show diffs side-by-side

added

removed

breezy/plugins/git/tests/test_mapping.py

177

177

        self.assertEqual(None, roundtrip_revid)

178

178

        self.assertEqual({}, verifiers)

179

179

        self.assertEqual(u"Authér", rev.properties['author'])

180

 

        self.assertTrue("git-explicit-encoding" not in rev.properties)

181

 

        self.assertTrue("git-implicit-encoding" not in rev.properties)

 

180

        self.assertTrue(u"git-explicit-encoding" not in rev.properties)

 

181

        self.assertTrue(u"git-implicit-encoding" not in rev.properties)

182

182

 

183

183

    def test_unknown_extra(self):

184

184

        c = Commit()

185

 

        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"

186

 

        c.message = "Some message"

187

 

        c.committer = "Committer"

 

185

        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"

 

186

        c.message = b"Some message"

 

187

        c.committer = b"Committer"

188

188

        c.commit_time = 4

189

189

        c.author_time = 5

190

190

        c.commit_timezone = 60 * 5

191

191

        c.author_timezone = 60 * 3

192

 

        c.author = "Author"

193

 

        c._extra.append(("iamextra", "foo"))

 

192

        c.author = b"Author"

 

193

        c._extra.append((b"iamextra", b"foo"))

194

194

        mapping = BzrGitMappingv1()

195

195

        self.assertRaises(UnknownCommitExtra, mapping.import_commit, c,

196

196

            mapping.revision_id_foreign_to_bzr)

197

197

 

198

198

    def test_mergetag(self):

199

199

        c = Commit()

200

 

        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"

201

 

        c.message = "Some message"

202

 

        c.committer = "Committer"

 

200

        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"

 

201

        c.message = b"Some message"

 

202

        c.committer = b"Committer"

203

203

        c.commit_time = 4

204

204

        c.author_time = 5

205

205

        c.commit_timezone = 60 * 5

206

206

        c.author_timezone = 60 * 3

207

 

        c.author = "Author"

 

207

        c.author = b"Author"

208

208

        tag = make_object(Tag,

209

209

                tagger=b'Jelmer Vernooij <jelmer@samba.org>',

210

210

                name=b'0.1', message=None,

214

214

        mapping = BzrGitMappingv1()

215

215

        rev, roundtrip_revid, verifiers = mapping.import_commit(

216

216

                c, mapping.revision_id_foreign_to_bzr)

217

 

        self.assertEqual(rev.properties['git-mergetag-0'], tag.as_raw_string())

 

217

        self.assertEqual(rev.properties[u'git-mergetag-0'], tag.as_raw_string())

218

218

 

219

219

 

220

220

class RoundtripRevisionsFromBazaar(tests.TestCase):

245

245

            self.assertEqual({}, verifiers)

246

246

 

247

247

    def test_simple_commit(self):

248

 

        r = Revision(self.mapping.revision_id_foreign_to_bzr("edf99e6c56495c620f20d5dacff9859ff7119261"))

249

 

        r.message = "MyCommitMessage"

 

248

        r = Revision(self.mapping.revision_id_foreign_to_bzr(b"edf99e6c56495c620f20d5dacff9859ff7119261"))

 

249

        r.message = b"MyCommitMessage"

250

250

        r.parent_ids = []

251

251

        r.committer = "Jelmer Vernooij <jelmer@apache.org>"

252

252

        r.timestamp = 453543543

255

255

        self.assertRoundtripRevision(r)

256

256

 

257

257

    def test_revision_id(self):

258

 

        r = Revision("myrevid")

259

 

        r.message = "MyCommitMessage"

 

258

        r = Revision(b"myrevid")

 

259

        r.message = b"MyCommitMessage"

260

260

        r.parent_ids = []

261

261

        r.committer = "Jelmer Vernooij <jelmer@apache.org>"

262

262

        r.timestamp = 453543543

265

265

        self.assertRoundtripRevision(r)

266

266

 

267

267

    def test_ghost_parent(self):

268

 

        r = Revision("myrevid")

269

 

        r.message = "MyCommitMessage"

270

 

        r.parent_ids = ["iamaghost"]

 

268

        r = Revision(b"myrevid")

 

269

        r.message = u"MyCommitMessage"

 

270

        r.parent_ids = [b"iamaghost"]

271

271

        r.committer = "Jelmer Vernooij <jelmer@apache.org>"

272

272

        r.timestamp = 453543543

273

273

        r.timezone = 0

275

275

        self.assertRoundtripRevision(r)

276

276

 

277

277

    def test_custom_property(self):

278

 

        r = Revision("myrevid")

279

 

        r.message = "MyCommitMessage"

 

278

        r = Revision(b"myrevid")

 

279

        r.message = u"MyCommitMessage"

280

280

        r.parent_ids = []

281

 

        r.properties = {"fool": "bar"}

 

281

        r.properties = {u"fool": "bar"}

282

282

        r.committer = "Jelmer Vernooij <jelmer@apache.org>"

283

283

        r.timestamp = 453543543

284

284

        r.timezone = 0

313

313

 

314

314

    def test_commit(self):

315

315

        c = Commit()

316

 

        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"

317

 

        c.message = "Some message"

318

 

        c.committer = "Committer <Committer>"

 

316

        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"

 

317

        c.message = b"Some message"

 

318

        c.committer = b"Committer <Committer>"

319

319

        c.commit_time = 4

320

320

        c.commit_timezone = -60 * 3

321

321

        c.author_time = 5

322

322

        c.author_timezone = 60 * 2

323

 

        c.author = "Author <author>"

 

323

        c.author = b"Author <author>"

324

324

        self.assertRoundtripCommit(c)

325

325

 

326

326

    def test_commit_double_negative_timezone(self):

327

327

        c = Commit()

328

 

        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"

329

 

        c.message = "Some message"

330

 

        c.committer = "Committer <Committer>"

 

328

        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"

 

329

        c.message = b"Some message"

 

330

        c.committer = b"Committer <Committer>"

331

331

        c.commit_time = 4

332

332

        (c.commit_timezone, c._commit_timezone_neg_utc) = parse_timezone("--700")

333

333

        c.author_time = 5

334

334

        c.author_timezone = 60 * 2

335

 

        c.author = "Author <author>"

 

335

        c.author = b"Author <author>"

336

336

        self.assertRoundtripCommit(c)

337

337

 

338

338

    def test_commit_zero_utc_timezone(self):

339

339

        c = Commit()

340

 

        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"

341

 

        c.message = "Some message"

342

 

        c.committer = "Committer <Committer>"

 

340

        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"

 

341

        c.message = b"Some message"

 

342

        c.committer = b"Committer <Committer>"

343

343

        c.commit_time = 4

344

344

        c.commit_timezone = 0

345

345

        c._commit_timezone_neg_utc = True

346

346

        c.author_time = 5

347

347

        c.author_timezone = 60 * 2

348

 

        c.author = "Author <author>"

 

348

        c.author = b"Author <author>"

349

349

        self.assertRoundtripCommit(c)

350

350

 

351

351

    def test_commit_encoding(self):

352

352

        c = Commit()

353

 

        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"

354

 

        c.message = "Some message"

355

 

        c.committer = "Committer <Committer>"

356

 

        c.encoding = 'iso8859-1'

 

353

        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"

 

354

        c.message = b"Some message"

 

355

        c.committer = b"Committer <Committer>"

 

356

        c.encoding = b'iso8859-1'

357

357

        c.commit_time = 4

358

358

        c.commit_timezone = -60 * 3

359

359

        c.author_time = 5

360

360

        c.author_timezone = 60 * 2

361

 

        c.author = "Author <author>"

 

361

        c.author = b"Author <author>"

362

362

        self.assertRoundtripCommit(c)

363

363

 

364

364

    def test_commit_extra(self):

365

365

        c = Commit()

366

 

        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"

367

 

        c.message = "Some message"

368

 

        c.committer = "Committer <Committer>"

 

366

        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"

 

367

        c.message = b"Some message"

 

368

        c.committer = b"Committer <Committer>"

369

369

        c.commit_time = 4

370

370

        c.commit_timezone = -60 * 3

371

371

        c.author_time = 5

372

372

        c.author_timezone = 60 * 2

373

 

        c.author = "Author <author>"

374

 

        c._extra = [("HG:rename-source", "hg")]

 

373

        c.author = b"Author <author>"

 

374

        c._extra = [(b"HG:rename-source", b"hg")]

375

375

        self.assertRoundtripCommit(c)

376

376

 

377

377

    def test_commit_mergetag(self):

378

378

        c = Commit()

379

 

        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"

380

 

        c.message = "Some message"

381

 

        c.committer = "Committer <Committer>"

 

379

        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"

 

380

        c.message = b"Some message"

 

381

        c.committer = b"Committer <Committer>"

382

382

        c.commit_time = 4

383

383

        c.commit_timezone = -60 * 3

384

384

        c.author_time = 5

385

385

        c.author_timezone = 60 * 2

386

 

        c.author = "Author <author>"

 

386

        c.author = b"Author <author>"

387

387

        tag = make_object(Tag,

388

388

                tagger=b'Jelmer Vernooij <jelmer@samba.org>',

389

389

                name=b'0.1', message=None,

396

396

class FixPersonIdentifierTests(tests.TestCase):

397

397

 

398

398

    def test_valid(self):

399

 

        self.assertEqual("foo <bar@blah.nl>",

400

 

                         fix_person_identifier("foo <bar@blah.nl>"))

401

 

        self.assertEqual("bar@blah.nl <bar@blah.nl>",

402

 

                         fix_person_identifier("bar@blah.nl"))

 

399

        self.assertEqual(b"foo <bar@blah.nl>",

 

400

                         fix_person_identifier(b"foo <bar@blah.nl>"))

 

401

        self.assertEqual(b"bar@blah.nl <bar@blah.nl>",

 

402

                         fix_person_identifier(b"bar@blah.nl"))

403

403

 

404

404

    def test_fix(self):

405

 

        self.assertEqual("person <bar@blah.nl>",

406

 

                         fix_person_identifier("somebody <person <bar@blah.nl>>"))

407

 

        self.assertEqual("person <bar@blah.nl>",

408

 

                         fix_person_identifier("person<bar@blah.nl>"))

 

405

        self.assertEqual(b"person <bar@blah.nl>",

 

406

                         fix_person_identifier(b"somebody <person <bar@blah.nl>>"))

 

407

        self.assertEqual(b"person <bar@blah.nl>",

 

408

                         fix_person_identifier(b"person<bar@blah.nl>"))

409

409

        self.assertRaises(ValueError,

410

 

                         fix_person_identifier, "person >bar@blah.nl<")

 

410

                         fix_person_identifier, b"person >bar@blah.nl<")

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0