/brz/remove-bazaar : revision 0.246.9

1

2

3

#

4

# This program is free software; you can redistribute it and/or modify

5

# it under the terms of the GNU General Public License as published by

35

from bzrlib.decorators import (

36

needs_read_lock,

37

)

38

from bzrlib.revision import (

39

NULL_REVISION,

40

)

41

38

from bzrlib.trace import (

42

39

is_quiet,

43

40

mutter,

44

41

)

45

42

43

from bzrlib.plugins.git import (

44

get_rich_root_format,

45

)

46

from bzrlib.plugins.git.config import (

47

GitBranchConfig,

48

)

50

NoPushSupport,

51

NoSuchRef,

52

)

53

from bzrlib.plugins.git.refs import (

54

ref_to_branch_name,

55

extract_tags,

56

tag_name_to_ref,

57

)

58

53

59

54

from bzrlib.foreign import ForeignBranch

60

55

61

56

57

def extract_tags(refs):

58

ret = {}

59

for k,v in refs.iteritems():

60

if k.startswith("refs/tags/") and not k.endswith("^{}"):

61

v = refs.get(k+"^{}", v)

62

ret[k[len("refs/tags/"):]] = v

63

return ret

64

65

62

66

class GitPullResult(branch.PullResult):

63

"""Result of a pull from a Git branch."""

64

67

65

68

def _lookup_revno(self, revid):

66

69

assert isinstance(revid, str), "was %r" % revid

98

101

mutter("Tag %s points at object %r that is not a commit, "

99

102

"ignoring", k, obj)

100

103

continue

101

ret[k] = self.branch.lookup_foreign_revision_id(v)

104

ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)

102

105

return ret

103

106

104

107

def _set_tag_dict(self, to_dict):

105

108

extra = set(self.repository._git.get_refs().keys())

106

109

for k, revid in to_dict.iteritems():

107

name = tag_name_to_ref(k)

110

name = "refs/tags/%s" % k

108

111

if name in extra:

109

112

extra.remove(name)

110

113

self.set_tag(k, revid)

111

114

for name in extra:

112

115

if name.startswith("refs/tags/"):

113

116

del self.repository._git[name]

114

117

115

118

def set_tag(self, name, revid):

116

self.repository._git.refs[tag_name_to_ref(name)], _ = \

117

self.branch.lookup_bzr_revision_id(revid)

119

self.repository._git.refs["refs/tags/%s" % name], _ = \

120

self.branch.mapping.revision_id_bzr_to_foreign(revid)

118

121

119

122

120

123

class DictTagDict(LocalGitTagDict):

121

124

125

122

126

def __init__(self, branch, tags):

123

127

super(DictTagDict, self).__init__(branch)

124

128

self._tags = tags

127

131

return self._tags

128

132

129

133

134

130

135

class GitBranchFormat(branch.BranchFormat):

131

136

132

137

def get_format_description(self):

150

155

return LocalGitTagDict(branch)

151

156

152

157

153

class GitReadLock(object):

154

155

def __init__(self, unlock):

156

self.unlock = unlock

157

158

159

class GitWriteLock(object):

160

161

def __init__(self, unlock):

162

self.unlock = unlock

163

164

165

158

class GitBranch(ForeignBranch):

166

159

"""An adapter to git repositories for bzr Branch objects."""

167

160

168

def __init__(self, bzrdir, repository, ref, lockfiles, tagsdict=None):

161

def __init__(self, bzrdir, repository, name, lockfiles, tagsdict=None):

169

162

self.repository = repository

170

163

self._format = GitBranchFormat()

171

164

self.control_files = lockfiles

173

166

super(GitBranch, self).__init__(repository.get_mapping())

174

167

if tagsdict is not None:

175

168

self.tags = DictTagDict(self, tagsdict)

176

self.ref = ref

177

self.name = ref_to_branch_name(ref)

169

self.name = name

178

170

self._head = None

179

171

self.base = bzrdir.root_transport.base

180

172

182

174

"""Return the most suitable metadir for a checkout of this branch.

183

175

Weaves are used if this branch's repository uses weaves.

184

176

"""

185

return bzrdir.format_registry.make_bzrdir("default")

177

return get_rich_root_format()

186

178

187

179

def get_child_submit_format(self):

188

180

"""Return the preferred format of submissions to this branch."""

196

188

197

189

:return: Branch nick

198

190

"""

199

return self.name or "HEAD"

191

return self.name

200

192

201

193

def _set_nick(self, nick):

202

194

raise NotImplementedError

204

196

nick = property(_get_nick, _set_nick)

205

197

206

198

def __repr__(self):

207

return "<%s(%r, %r)>" % (self.__class__.__name__, self.repository.base,

208

self.ref or "HEAD")

199

return "%s(%r, %r)" % (self.__class__.__name__, self.repository.base, self.name)

209

200

210

201

def generate_revision_history(self, revid, old_revid=None):

211

202

# FIXME: Check that old_revid is in the ancestry of revid

214

205

215

206

def lock_write(self):

216

207

self.control_files.lock_write()

217

return GitWriteLock(self.unlock)

218

208

219

209

def get_stacked_on_url(self):

220

210

# Git doesn't do stacking (yet...)

231

221

232

222

def lock_read(self):

233

223

self.control_files.lock_read()

234

return GitReadLock(self.unlock)

235

224

236

225

def is_locked(self):

237

226

return self.control_files.is_locked()

247

236

# perhaps should escape this ?

248

237

if self.head is None:

249

238

return revision.NULL_REVISION

250

return self.lookup_foreign_revision_id(self.head)

239

return self.mapping.revision_id_foreign_to_bzr(self.head)

251

240

252

241

def _basic_push(self, target, overwrite=False, stop_revision=None):

253

242

return branch.InterBranch.get(self, target)._basic_push(

254

243

overwrite, stop_revision)

255

244

256

def lookup_foreign_revision_id(self, foreign_revid):

257

return self.repository.lookup_foreign_revision_id(foreign_revid,

258

self.mapping)

259

260

def lookup_bzr_revision_id(self, revid):

261

return self.repository.lookup_bzr_revision_id(

262

revid, mapping=self.mapping)

263

264

245

265

246

class LocalGitBranch(GitBranch):

266

247

"""A local Git branch."""

267

248

268

def __init__(self, bzrdir, repository, name, lockfiles, tagsdict=None):

269

super(LocalGitBranch, self).__init__(bzrdir, repository, name,

270

lockfiles, tagsdict)

271

refs = repository._git.get_refs()

272

if not (name in refs.keys() or "HEAD" in refs.keys()):

273

raise errors.NotBranchError(self.base)

274

275

249

def create_checkout(self, to_location, revision_id=None, lightweight=False,

276

250

accelerator_tree=None, hardlink=False):

277

251

if lightweight:

286

260

return tree

287

261

else:

288

262

return self._create_heavyweight_checkout(to_location, revision_id,

289

hardlink)

263

hardlink)

290

264

291

265

def _create_heavyweight_checkout(self, to_location, revision_id=None,

292

266

hardlink=False):

298

272

:return: WorkingTree object of checkout.

299

273

"""

300

274

checkout_branch = bzrdir.BzrDir.create_branch_convenience(

301

to_location, force_new_tree=False)

275

to_location, force_new_tree=False, format=get_rich_root_format())

302

276

checkout = checkout_branch.bzrdir

303

277

checkout_branch.bind(self)

304

278

# pull up to the specified revision_id to set the initial

316

290

317

291

def _get_head(self):

318

292

try:

319

return self.repository._git.ref(self.ref or "HEAD")

293

return self.repository._git.ref(self.name)

320

294

except KeyError:

321

295

return None

322

296

324

298

self.set_last_revision(revid)

325

299

326

300

def set_last_revision(self, revid):

327

(newhead, self.mapping) = self.repository.lookup_bzr_revision_id(revid)

301

(newhead, self.mapping) = self.mapping.revision_id_bzr_to_foreign(

302

revid)

328

303

self.head = newhead

329

304

330

305

def _set_head(self, value):

331

306

self._head = value

332

self.repository._git.refs[self.ref or "HEAD"] = self._head

307

self.repository._git.refs[self.name] = self._head

333

308

self._clear_cached_state()

334

309

335

310

head = property(_get_head, _set_head)

353

328

354

329

class GitBranchPullResult(branch.PullResult):

355

330

356

def __init__(self):

357

super(GitBranchPullResult, self).__init__()

358

self.new_git_head = None

359

self._old_revno = None

360

self._new_revno = None

361

362

331

def report(self, to_file):

363

332

if not is_quiet():

364

333

if self.old_revid == self.new_revid:

365

334

to_file.write('No revisions to pull.\n')

366

elif self.new_git_head is not None:

335

else:

367

336

to_file.write('Now on revision %d (git sha: %s).\n' %

368

337

(self.new_revno, self.new_git_head))

369

else:

370

to_file.write('Now on revision %d.\n' % (self.new_revno,))

371

338

self._show_tag_conficts(to_file)

372

339

373

def _lookup_revno(self, revid):

374

assert isinstance(revid, str), "was %r" % revid

375

# Try in source branch first, it'll be faster

376

try:

377

return self.source_branch.revision_id_to_revno(revid)

378

except errors.NoSuchRevision:

379

# FIXME: Check using graph.find_distance_to_null() ?

380

return self.target_branch.revision_id_to_revno(revid)

381

382

def _get_old_revno(self):

383

if self._old_revno is not None:

384

return self._old_revno

385

return self._lookup_revno(self.old_revid)

386

387

def _set_old_revno(self, revno):

388

self._old_revno = revno

389

390

old_revno = property(_get_old_revno, _set_old_revno)

391

392

def _get_new_revno(self):

393

if self._new_revno is not None:

394

return self._new_revno

395

return self._lookup_revno(self.new_revid)

396

397

def _set_new_revno(self, revno):

398

self._new_revno = revno

399

400

new_revno = property(_get_new_revno, _set_new_revno)

401

402

340

403

341

class GitBranchPushResult(branch.BranchPushResult):

404

342

423

361

class InterFromGitBranch(branch.GenericInterBranch):

424

362

"""InterBranch implementation that pulls from Git into bzr."""

425

363

426

@staticmethod

427

def _get_branch_formats_to_test():

428

return []

429

430

364

@classmethod

431

365

def _get_interrepo(self, source, target):

432

366

return repository.InterRepository.get(source.repository,

438

372

not isinstance(target, GitBranch) and

439

373

(getattr(cls._get_interrepo(source, target), "fetch_objects", None) is not None))

440

374

441

def _update_revisions(self, stop_revision=None, overwrite=False,

442

graph=None, limit=None):

443

"""Like InterBranch.update_revisions(), but with additions.

444

445

Compared to the `update_revisions()` below, this function takes a

446

`limit` argument that limits how many git commits will be converted

447

and returns the new git head.

448

"""

375

def update_revisions(self, stop_revision=None, overwrite=False,

376

graph=None):

377

"""See InterBranch.update_revisions()."""

449

378

interrepo = self._get_interrepo(self.source, self.target)

379

self._head = None

380

self._last_revid = None

450

381

def determine_wants(heads):

451

if self.source.ref is not None and not self.source.ref in heads:

452

raise NoSuchRef(self.source.ref, heads.keys())

382

if not self.source.name in heads:

383

raise NoSuchRef(self.source.name, heads.keys())

453

384

if stop_revision is not None:

454

385

self._last_revid = stop_revision

455

head, mapping = self.source.repository.lookup_bzr_revision_id(

386

self._head, mapping = self.source.repository.lookup_bzr_revision_id(

456

387

stop_revision)

457

388

else:

458

if self.source.ref is not None:

459

head = heads[self.source.ref]

460

else:

461

head = heads["HEAD"]

462

self._last_revid = self.source.lookup_foreign_revision_id(head)

389

self._head = heads[self.source.name]

390

self._last_revid = \

391

self.source.mapping.revision_id_foreign_to_bzr(self._head)

463

392

if self.target.repository.has_revision(self._last_revid):

464

393

return []

465

return [head]

466

pack_hint, head, refs = interrepo.fetch_objects(

467

determine_wants, self.source.mapping, limit=limit)

468

if (pack_hint is not None and

469

self.target.repository._format.pack_compresses):

470

self.target.repository.pack(hint=pack_hint)

471

if head is not None:

472

self._last_revid = self.source.lookup_foreign_revision_id(head)

394

return [self._head]

395

interrepo.fetch_objects(determine_wants, self.source.mapping)

473

396

if overwrite:

474

397

prev_last_revid = None

475

398

else:

476

399

prev_last_revid = self.target.last_revision()

477

self.target.generate_revision_history(self._last_revid,

478

prev_last_revid)

479

return head

480

481

def update_revisions(self, stop_revision=None, overwrite=False,

482

graph=None):

483

"""See InterBranch.update_revisions()."""

484

self._update_revisions(stop_revision, overwrite, graph)

400

self.target.generate_revision_history(self._last_revid, prev_last_revid)

485

401

486

402

def pull(self, overwrite=False, stop_revision=None,

487

403

possible_transports=None, _hook_master=None, run_hooks=True,

488

_override_hook_target=None, local=False, limit=None):

404

_override_hook_target=None, local=False):

489

405

"""See Branch.pull.

490

406

491

407

:param _hook_master: Private parameter - set the branch to

495

411

so it should not run its hooks.

496

412

:param _override_hook_target: Private parameter - set the branch to be

497

413

supplied as the target_branch to pull hooks.

498

:param limit: Only import this many revisons. `None`, the default,

499

means import all revisions.

500

414

"""

501

415

# This type of branch can't be bound.

502

416

if local:

512

426

# We assume that during 'pull' the target repository is closer than

513

427

# the source one.

514

428

graph = self.target.repository.get_graph(self.source.repository)

515

(result.old_revno, result.old_revid) = \

429

result.old_revno, result.old_revid = \

516

430

self.target.last_revision_info()

517

result.new_git_head = self._update_revisions(

518

stop_revision, overwrite=overwrite, graph=graph, limit=limit)

431

self.update_revisions(stop_revision, overwrite=overwrite,

432

graph=graph)

433

result.new_git_head = self._head

519

434

result.tag_conflicts = self.source.tags.merge_to(self.target.tags,

520

435

overwrite)

521

(result.new_revno, result.new_revid) = \

522

self.target.last_revision_info()

436

result.new_revno, result.new_revid = self.target.last_revision_info()

523

437

if _hook_master:

524

438

result.master_branch = _hook_master

525

439

result.local_branch = result.target_branch

539

453

result.target_branch = self.target

540

454

graph = self.target.repository.get_graph(self.source.repository)

541

455

result.old_revno, result.old_revid = self.target.last_revision_info()

542

result.new_git_head = self._update_revisions(

543

stop_revision, overwrite=overwrite, graph=graph)

456

self.update_revisions(stop_revision, overwrite=overwrite, graph=graph)

457

result.new_git_head = self._head

544

458

result.tag_conflicts = self.source.tags.merge_to(self.target.tags,

545

459

overwrite)

546

460

result.new_revno, result.new_revid = self.target.last_revision_info()

554

468

class InterGitLocalRemoteBranch(InterGitBranch):

555

469

"""InterBranch that copies from a local to a remote git branch."""

556

470

557

@staticmethod

558

def _get_branch_formats_to_test():

559

return []

560

561

471

@classmethod

562

472

def is_compatible(self, source, target):

563

473

from bzrlib.plugins.git.remote import RemoteGitBranch

565

475

isinstance(target, RemoteGitBranch))

566

476

567

477

def _basic_push(self, overwrite=False, stop_revision=None):

568

from dulwich.protocol import ZERO_SHA

569

478

result = GitBranchPushResult()

570

479

result.source_branch = self.source

571

480

result.target_branch = self.target

573

482

stop_revision = self.source.last_revision()

574

483

# FIXME: Check for diverged branches

575

484

def get_changed_refs(old_refs):

576

result.old_revid = self.target.lookup_foreign_revision_id(old_refs.get(self.target.ref, ZERO_SHA))

577

refs = { self.target.ref: self.source.repository.lookup_bzr_revision_id(stop_revision)[0] }

485

result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(old_refs.get("refs/heads/master", "0" * 40))

486

refs = { "refs/heads/master": self.source.repository.lookup_bzr_revision_id(stop_revision)[0] }

578

487

result.new_revid = stop_revision

579

488

for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():

580

refs[tag_name_to_ref(name)] = sha

489

refs["refs/tags/%s" % name] = sha

581

490

return refs

582

491

self.target.repository.send_pack(get_changed_refs,

583

self.source.repository._git.object_store.generate_pack_contents)

492

self.source.repository._git.object_store.generate_pack_contents)

584

493

return result

585

494

586

495

587

496

class InterGitRemoteLocalBranch(InterGitBranch):

588

497

"""InterBranch that copies from a remote to a local git branch."""

589

498

590

@staticmethod

591

def _get_branch_formats_to_test():

592

return []

593

594

499

@classmethod

595

500

def is_compatible(self, source, target):

596

501

from bzrlib.plugins.git.remote import RemoteGitBranch

610

515

611

516

def update_tags(self, refs):

612

517

for name, v in extract_tags(refs).iteritems():

613

revid = self.target.lookup_foreign_revision_id(v)

518

revid = self.target.mapping.revision_id_foreign_to_bzr(v)

614

519

self.target.tags.set_tag(name, revid)

615

520

616

521

def update_refs(self, stop_revision=None):

617

522

interrepo = repository.InterRepository.get(self.source.repository,

618

523

self.target.repository)

619

524

if stop_revision is None:

620

refs = interrepo.fetch(branches=["HEAD"])

621

stop_revision = self.target.lookup_foreign_revision_id(refs["HEAD"])

525

refs = interrepo.fetch_refs(branches=["HEAD"])

526

stop_revision = self.target.mapping.revision_id_foreign_to_bzr(refs["HEAD"])

622

527

else:

623

refs = interrepo.fetch(revision_id=stop_revision)

528

refs = interrepo.fetch_refs(revision_id=stop_revision)

624

529

return refs, stop_revision

625

530

626

531

def pull(self, stop_revision=None, overwrite=False,

627

possible_transports=None, run_hooks=True,local=False):

532

possible_transports=None, local=False):

628

533

# This type of branch can't be bound.

629

534

if local:

630

535

raise errors.LocalRequiresBoundBranch()

639

544

return result

640

545

641

546

642

class InterToGitBranch(branch.GenericInterBranch):

547

class InterToGitBranch(branch.InterBranch):

643

548

"""InterBranch implementation that pulls from Git into bzr."""

644

549

645

def __init__(self, source, target):

646

super(InterToGitBranch, self).__init__(source, target)

647

self.interrepo = repository.InterRepository.get(source.repository,

648

target.repository)

649

650

550

@staticmethod

651

551

def _get_branch_formats_to_test():

652

return []

552

return None, None

653

553

654

554

@classmethod

655

555

def is_compatible(self, source, target):

659

559

def update_revisions(self, *args, **kwargs):

660

560

raise NoPushSupport()

661

561

662

def _get_new_refs(self, stop_revision=None):

562

def push(self, overwrite=True, stop_revision=None,

563

_override_hook_source_branch=None):

564

raise NoPushSupport()

565

566

def lossy_push(self, stop_revision=None):

567

result = GitBranchPushResult()

568

result.source_branch = self.source

569

result.target_branch = self.target

570

try:

571

result.old_revid = self.target.last_revision()

572

except NoSuchRef:

573

result.old_revid = revision.NULL_REVISION

663

574

if stop_revision is None:

664

575

stop_revision = self.source.last_revision()

665

assert type(stop_revision) is str

666

main_ref = self.target.ref or "refs/heads/master"

667

refs = { main_ref: (None, stop_revision) }

576

# FIXME: Check for diverged branches

577

refs = { "refs/heads/master": stop_revision }

668

578

for name, revid in self.source.tags.get_tag_dict().iteritems():

669

579

if self.source.repository.has_revision(revid):

670

refs[tag_name_to_ref(name)] = (None, revid)

671

return refs, main_ref

672

673

def pull(self, overwrite=False, stop_revision=None, local=False,

674

possible_transports=None):

675

from dulwich.protocol import ZERO_SHA

676

result = GitBranchPullResult()

677

result.source_branch = self.source

678

result.target_branch = self.target

679

new_refs, main_ref = self._get_new_refs(stop_revision)

680

def update_refs(old_refs):

681

refs = dict(old_refs)

682

# FIXME: Check for diverged branches

683

refs.update(new_refs)

684

return refs

685

old_refs, new_refs = self.interrepo.fetch_refs(update_refs)

686

result.old_revid = self.target.lookup_foreign_revision_id(

687

old_refs.get(main_ref, ZERO_SHA))

688

result.new_revid = new_refs[main_ref]

689

return result

690

691

def push(self, overwrite=False, stop_revision=None,

692

_override_hook_source_branch=None):

693

from dulwich.protocol import ZERO_SHA

694

result = GitBranchPushResult()

695

result.source_branch = self.source

696

result.target_branch = self.target

697

new_refs, main_ref = self._get_new_refs(stop_revision)

698

def update_refs(old_refs):

699

refs = dict(old_refs)

700

# FIXME: Check for diverged branches

701

refs.update(new_refs)

702

return refs

703

old_refs, new_refs = self.interrepo.fetch_refs(update_refs)

704

(result.old_revid, old_sha1) = old_refs.get(main_ref, (ZERO_SHA, NULL_REVISION))

705

if result.old_revid is None:

706

result.old_revid = self.target.lookup_foreign_revision_id(old_sha1)

707

result.new_revid = new_refs[main_ref]

708

return result

709

710

def lossy_push(self, stop_revision=None):

711

result = GitBranchPushResult()

712

result.source_branch = self.source

713

result.target_branch = self.target

714

new_refs, main_ref = self._get_new_refs(stop_revision)

715

def update_refs(old_refs):

716

refs = dict(old_refs)

717

# FIXME: Check for diverged branches

718

refs.update(new_refs)

719

return refs

720

result.revidmap, old_refs, new_refs = self.interrepo.dfetch_refs(

721

update_refs)

722

result.old_revid = old_refs.get(self.target.ref, (None, NULL_REVISION))[1]

723

result.new_revid = new_refs[main_ref][1]

580

refs["refs/tags/%s" % name] = revid

581

revidmap, new_refs = self.target.repository.dfetch_refs(

582

self.source.repository, refs)

583

if revidmap != {}:

584

self.target.generate_revision_history(revidmap[stop_revision])

585

result.new_revid = revidmap[stop_revision]

586

else:

587

result.new_revid = result.old_revid

588

result.revidmap = revidmap

724

589

return result

725

590

726

591