/brz/remove-bazaar : revision 0.200.665

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

def _set_tag_dict(self, to_dict):

105

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

106

for k, revid in to_dict.iteritems():

107

name = tag_name_to_ref(k)

108

if name in extra:

109

extra.remove(name)

110

self.set_tag(k, revid)

111

for name in extra:

112

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

113

del self.repository._git[name]

114

115

107

def set_tag(self, name, revid):

116

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

117

self.branch.lookup_bzr_revision_id(revid)

108

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

109

self.branch.mapping.revision_id_bzr_to_foreign(revid)

118

110

119

111

120

112

class DictTagDict(LocalGitTagDict):

121

113

114

122

115

def __init__(self, branch, tags):

123

116

super(DictTagDict, self).__init__(branch)

124

117

self._tags = tags

127

120

return self._tags

128

121

129

122

123

130

124

class GitBranchFormat(branch.BranchFormat):

131

125

132

126

def get_format_description(self):

150

144

return LocalGitTagDict(branch)

151

145

152

146

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

147

class GitBranch(ForeignBranch):

166

148

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

167

149

168

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

150

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

169

151

self.repository = repository

170

152

self._format = GitBranchFormat()

171

153

self.control_files = lockfiles

173

155

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

174

156

if tagsdict is not None:

175

157

self.tags = DictTagDict(self, tagsdict)

176

self.ref = ref

177

self.name = ref_to_branch_name(ref)

158

self.name = name

178

159

self._head = None

179

160

self.base = bzrdir.root_transport.base

180

161

182

163

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

183

164

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

184

165

"""

185

return bzrdir.format_registry.make_bzrdir("default")

166

return get_rich_root_format()

186

167

187

168

def get_child_submit_format(self):

188

169

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

196

177

197

178

:return: Branch nick

198

179

"""

199

return self.name or "HEAD"

180

return self.name

200

181

201

182

def _set_nick(self, nick):

202

183

raise NotImplementedError

204

185

nick = property(_get_nick, _set_nick)

205

186

206

187

def __repr__(self):

207

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

208

self.ref or "HEAD")

188

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

209

189

210

190

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

211

191

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

214

194

215

195

def lock_write(self):

216

196

self.control_files.lock_write()

217

return GitWriteLock(self.unlock)

218

197

219

198

def get_stacked_on_url(self):

220

199

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

231

210

232

211

def lock_read(self):

233

212

self.control_files.lock_read()

234

return GitReadLock(self.unlock)

235

213

236

214

def is_locked(self):

237

215

return self.control_files.is_locked()

247

225

# perhaps should escape this ?

248

226

if self.head is None:

249

227

return revision.NULL_REVISION

250

return self.lookup_foreign_revision_id(self.head)

228

return self.mapping.revision_id_foreign_to_bzr(self.head)

251

229

252

230

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

253

231

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

254

232

overwrite, stop_revision)

255

233

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

234

265

235

class LocalGitBranch(GitBranch):

266

236

"""A local Git branch."""

267

237

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

238

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

276

239

accelerator_tree=None, hardlink=False):

277

240

if lightweight:

279

242

t.ensure_base()

280

243

format = self._get_checkout_format()

281

244

checkout = format.initialize_on_transport(t)

282

from_branch = branch.BranchReferenceFormat().initialize(checkout,

245

from_branch = branch.BranchReferenceFormat().initialize(checkout,

283

246

self)

284

247

tree = checkout.create_workingtree(revision_id,

285

248

from_branch=from_branch, hardlink=hardlink)

286

249

return tree

287

250

else:

288

251

return self._create_heavyweight_checkout(to_location, revision_id,

289

hardlink)

252

hardlink)

290

253

291

def _create_heavyweight_checkout(self, to_location, revision_id=None,

254

def _create_heavyweight_checkout(self, to_location, revision_id=None,

292

255

hardlink=False):

293

256

"""Create a new heavyweight checkout of this branch.

294

257

298

261

:return: WorkingTree object of checkout.

299

262

"""

300

263

checkout_branch = bzrdir.BzrDir.create_branch_convenience(

301

to_location, force_new_tree=False)

264

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

302

265

checkout = checkout_branch.bzrdir

303

266

checkout_branch.bind(self)

304

# pull up to the specified revision_id to set the initial

267

# pull up to the specified revision_id to set the initial

305

268

# branch tip correctly, and seed it with history.

306

269

checkout_branch.pull(self, stop_revision=revision_id)

307

270

return checkout.create_workingtree(revision_id, hardlink=hardlink)

316

279

317

280

def _get_head(self):

318

281

try:

319

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

282

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

320

283

except KeyError:

321

284

return None

322

285

324

287

self.set_last_revision(revid)

325

288

326

289

def set_last_revision(self, revid):

327

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

290

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

291

revid)

328

292

self.head = newhead

329

293

330

294

def _set_head(self, value):

331

295

self._head = value

332

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

296

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

333

297

self._clear_cached_state()

334

298

335

299

head = property(_get_head, _set_head)

353

317

354

318

class GitBranchPullResult(branch.PullResult):

355

319

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

320

def report(self, to_file):

363

321

if not is_quiet():

364

322

if self.old_revid == self.new_revid:

365

323

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

366

elif self.new_git_head is not None:

367

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

324

else:

325

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

368

326

(self.new_revno, self.new_git_head))

369

else:

370

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

371

327

self._show_tag_conficts(to_file)

372

328

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

329

403

330

class GitBranchPushResult(branch.BranchPushResult):

404

331

423

350

class InterFromGitBranch(branch.GenericInterBranch):

424

351

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

425

352

426

@staticmethod

427

def _get_branch_formats_to_test():

428

return []

429

430

@classmethod

431

def _get_interrepo(self, source, target):

432

return repository.InterRepository.get(source.repository,

433

target.repository)

434

435

@classmethod

436

def is_compatible(cls, source, target):

437

return (isinstance(source, GitBranch) and

438

not isinstance(target, GitBranch) and

439

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

440

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

"""

449

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

353

@classmethod

354

def is_compatible(self, source, target):

355

return (isinstance(source, GitBranch) and

356

not isinstance(target, GitBranch))

357

358

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

359

graph=None):

360

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

361

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

362

self.target.repository)

363

self._head = None

364

self._last_revid = None

450

365

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

366

if not self.source.name in heads:

367

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

453

368

if stop_revision is not None:

454

369

self._last_revid = stop_revision

455

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

370

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

456

371

stop_revision)

457

372

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)

373

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

374

self._last_revid = \

375

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

463

376

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

464

377

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)

378

return [self._head]

379

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

473

380

if overwrite:

474

381

prev_last_revid = None

475

382

else:

476

383

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)

384

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

485

385

486

386

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

487

387

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

488

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

388

_override_hook_target=None, local=False):

489

389

"""See Branch.pull.

490

390

491

391

:param _hook_master: Private parameter - set the branch to

495

395

so it should not run its hooks.

496

396

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

497

397

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

398

"""

501

399

# This type of branch can't be bound.

502

400

if local:

512

410

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

513

411

# the source one.

514

412

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

515

(result.old_revno, result.old_revid) = \

413

result.old_revno, result.old_revid = \

516

414

self.target.last_revision_info()

517

result.new_git_head = self._update_revisions(

518

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

415

self.update_revisions(stop_revision, overwrite=overwrite,

416

graph=graph)

417

result.new_git_head = self._head

519

418

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

520

419

overwrite)

521

(result.new_revno, result.new_revid) = \

522

self.target.last_revision_info()

420

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

523

421

if _hook_master:

524

422

result.master_branch = _hook_master

525

423

result.local_branch = result.target_branch

539

437

result.target_branch = self.target

540

438

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

541

439

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)

440

self.update_revisions(stop_revision, overwrite=overwrite,

441

graph=graph)

442

result.new_git_head = self._head

544

443

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

545

444

overwrite)

546

445

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

554

453

class InterGitLocalRemoteBranch(InterGitBranch):

555

454

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

556

455

557

@staticmethod

558

def _get_branch_formats_to_test():

559

return []

560

561

456

@classmethod

562

457

def is_compatible(self, source, target):

563

458

from bzrlib.plugins.git.remote import RemoteGitBranch

564

return (isinstance(source, LocalGitBranch) and

459

return (isinstance(source, LocalGitBranch) and

565

460

isinstance(target, RemoteGitBranch))

566

461

567

462

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

568

from dulwich.protocol import ZERO_SHA

569

463

result = GitBranchPushResult()

570

464

result.source_branch = self.source

571

465

result.target_branch = self.target

573

467

stop_revision = self.source.last_revision()

574

468

# FIXME: Check for diverged branches

575

469

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] }

470

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

471

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

578

472

result.new_revid = stop_revision

579

473

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

580

refs[tag_name_to_ref(name)] = sha

474

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

581

475

return refs

582

self.target.repository.send_pack(get_changed_refs,

583

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

476

self.target.repository.send_pack(get_changed_refs,

477

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

584

478

return result

585

479

586

480

587

481

class InterGitRemoteLocalBranch(InterGitBranch):

588

482

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

589

483

590

@staticmethod

591

def _get_branch_formats_to_test():

592

return []

593

594

484

@classmethod

595

485

def is_compatible(self, source, target):

596

486

from bzrlib.plugins.git.remote import RemoteGitBranch

597

return (isinstance(source, RemoteGitBranch) and

487

return (isinstance(source, RemoteGitBranch) and

598

488

isinstance(target, LocalGitBranch))

599

489

600

490

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

610

500

611

501

def update_tags(self, refs):

612

502

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

613

revid = self.target.lookup_foreign_revision_id(v)

503

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

614

504

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

615

505

616

506

def update_refs(self, stop_revision=None):

617

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

507

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

618

508

self.target.repository)

619

509

if stop_revision is None:

620

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

621

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

510

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

511

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

622

512

else:

623

refs = interrepo.fetch(revision_id=stop_revision)

513

refs = interrepo.fetch_refs(revision_id=stop_revision)

624

514

return refs, stop_revision

625

515

626

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

627

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

516

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

517

possible_transports=None, local=False):

628

518

# This type of branch can't be bound.

629

519

if local:

630

520

raise errors.LocalRequiresBoundBranch()

638

528

result.new_revid = self.target.last_revision()

639

529

return result

640

530

641

642

class InterToGitBranch(branch.GenericInterBranch):

531

532

class InterToGitBranch(branch.InterBranch):

643

533

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

644

534

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

535

@staticmethod

651

536

def _get_branch_formats_to_test():

652

return []

537

return None, None

653

538

654

539

@classmethod

655

540

def is_compatible(self, source, target):

656

return (not isinstance(source, GitBranch) and

541

return (not isinstance(source, GitBranch) and

657

542

isinstance(target, GitBranch))

658

543

659

544

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

660

545

raise NoPushSupport()

661

546

662

def _get_new_refs(self, stop_revision=None):

547

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

548

_override_hook_source_branch=None):

549

raise NoPushSupport()

550

551

def lossy_push(self, stop_revision=None):

552

result = GitBranchPushResult()

553

result.source_branch = self.source

554

result.target_branch = self.target

555

try:

556

result.old_revid = self.target.last_revision()

557

except NoSuchRef:

558

result.old_revid = revision.NULL_REVISION

663

559

if stop_revision is None:

664

560

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

561

# FIXME: Check for diverged branches

562

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

668

563

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

669

564

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]

565

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

566

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

567

self.source.repository, refs)

568

if revidmap != {}:

569

self.target.generate_revision_history(revidmap[stop_revision])

570

result.new_revid = revidmap[stop_revision]

571

else:

572

result.new_revid = result.old_revid

573

result.revidmap = revidmap

724

574

return result

725

575

726

576