/brz/remove-bazaar : revision 0.239.2

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, mapping):

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/"):]] = mapping.revision_id_foreign_to_bzr(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

85

88

86

89

def get_tag_dict(self):

87

90

ret = {}

88

for k,v in extract_tags(self.repository._git.get_refs()).iteritems():

89

try:

90

obj = self.repository._git[v]

91

except KeyError:

92

mutter("Tag %s points at unknown object %s, ignoring", v, obj)

93

continue

91

for k,v in self.repository._git.refs.as_dict("refs/tags").iteritems():

92

obj = self.repository._git.get_object(v)

94

93

while isinstance(obj, Tag):

95

94

v = obj.object[1]

96

obj = self.repository._git[v]

95

obj = self.repository._git.get_object(v)

97

96

if not isinstance(obj, Commit):

98

97

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

99

98

"ignoring", k, obj)

100

99

continue

101

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

100

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

102

101

return ret

103

102

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

103

def set_tag(self, name, revid):

116

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

117

self.branch.lookup_bzr_revision_id(revid)

104

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

105

self.branch.mapping.revision_id_bzr_to_foreign(revid)

118

106

119

107

120

108

class DictTagDict(LocalGitTagDict):

121

109

110

122

111

def __init__(self, branch, tags):

123

112

super(DictTagDict, self).__init__(branch)

124

113

self._tags = tags

127

116

return self._tags

128

117

129

118

119

130

120

class GitBranchFormat(branch.BranchFormat):

131

121

132

122

def get_format_description(self):

133

123

return 'Git Branch'

134

124

135

def network_name(self):

136

return "git"

137

138

125

def supports_tags(self):

139

126

return True

140

127

141

def get_foreign_tests_branch_factory(self):

142

from bzrlib.plugins.git.tests.test_branch import ForeignTestsBranchFactory

143

return ForeignTestsBranchFactory()

144

145

128

def make_tags(self, branch):

146

129

if getattr(branch.repository, "get_refs", None) is not None:

147

130

from bzrlib.plugins.git.remote import RemoteGitTagDict

150

133

return LocalGitTagDict(branch)

151

134

152

135

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

136

class GitBranch(ForeignBranch):

166

137

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

167

138

168

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

139

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

169

140

self.repository = repository

170

141

self._format = GitBranchFormat()

171

142

self.control_files = lockfiles

173

144

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

174

145

if tagsdict is not None:

175

146

self.tags = DictTagDict(self, tagsdict)

176

self.ref = ref

177

self.name = ref_to_branch_name(ref)

147

self.name = name

178

148

self._head = None

179

self.base = bzrdir.root_transport.base

180

181

def _get_checkout_format(self):

182

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

183

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

184

"""

185

return bzrdir.format_registry.make_bzrdir("default")

149

self.base = bzrdir.transport.base

186

150

187

151

def get_child_submit_format(self):

188

152

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

196

160

197

161

:return: Branch nick

198

162

"""

199

return self.name or "HEAD"

163

return self.name

200

164

201

165

def _set_nick(self, nick):

202

166

raise NotImplementedError

204

168

nick = property(_get_nick, _set_nick)

205

169

206

170

def __repr__(self):

207

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

208

self.ref or "HEAD")

171

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

209

172

210

173

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

211

174

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

214

177

215

178

def lock_write(self):

216

179

self.control_files.lock_write()

217

return GitWriteLock(self.unlock)

218

180

219

181

def get_stacked_on_url(self):

220

182

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

221

raise errors.UnstackableBranchFormat(self._format, self.base)

183

return None

222

184

223

185

def get_parent(self):

224

186

"""See Branch.get_parent()."""

231

193

232

194

def lock_read(self):

233

195

self.control_files.lock_read()

234

return GitReadLock(self.unlock)

235

196

236

197

def is_locked(self):

237

198

return self.control_files.is_locked()

247

208

# perhaps should escape this ?

248

209

if self.head is None:

249

210

return revision.NULL_REVISION

250

return self.lookup_foreign_revision_id(self.head)

211

return self.mapping.revision_id_foreign_to_bzr(self.head)

251

212

252

213

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

253

214

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

254

215

overwrite, stop_revision)

255

216

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

217

265

218

class LocalGitBranch(GitBranch):

266

219

"""A local Git branch."""

267

220

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)

221

def _get_checkout_format(self):

222

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

223

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

224

"""

225

format = self.repository.bzrdir.checkout_metadir()

226

format.set_branch_format(self._format)

227

return format

274

228

275

229

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

276

230

accelerator_tree=None, hardlink=False):

279

233

t.ensure_base()

280

234

format = self._get_checkout_format()

281

235

checkout = format.initialize_on_transport(t)

282

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

236

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

283

237

self)

284

238

tree = checkout.create_workingtree(revision_id,

285

239

from_branch=from_branch, hardlink=hardlink)

286

240

return tree

287

241

else:

288

242

return self._create_heavyweight_checkout(to_location, revision_id,

289

hardlink)

243

hardlink)

290

244

291

def _create_heavyweight_checkout(self, to_location, revision_id=None,

245

def _create_heavyweight_checkout(self, to_location, revision_id=None,

292

246

hardlink=False):

293

247

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

294

248

298

252

:return: WorkingTree object of checkout.

299

253

"""

300

254

checkout_branch = bzrdir.BzrDir.create_branch_convenience(

301

to_location, force_new_tree=False)

255

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

302

256

checkout = checkout_branch.bzrdir

303

257

checkout_branch.bind(self)

304

# pull up to the specified revision_id to set the initial

258

# pull up to the specified revision_id to set the initial

305

259

# branch tip correctly, and seed it with history.

306

260

checkout_branch.pull(self, stop_revision=revision_id)

307

261

return checkout.create_workingtree(revision_id, hardlink=hardlink)

316

270

317

271

def _get_head(self):

318

272

try:

319

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

273

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

320

274

except KeyError:

321

275

return None

322

276

324

278

self.set_last_revision(revid)

325

279

326

280

def set_last_revision(self, revid):

327

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

281

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

282

revid)

328

283

self.head = newhead

329

284

330

285

def _set_head(self, value):

331

286

self._head = value

332

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

287

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

333

288

self._clear_cached_state()

334

289

335

290

head = property(_get_head, _set_head)

353

308

354

309

class GitBranchPullResult(branch.PullResult):

355

310

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

311

def report(self, to_file):

363

312

if not is_quiet():

364

313

if self.old_revid == self.new_revid:

365

314

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

315

else:

316

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

368

317

(self.new_revno, self.new_git_head))

369

else:

370

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

371

318

self._show_tag_conficts(to_file)

372

319

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

320

403

321

class GitBranchPushResult(branch.BranchPushResult):

404

322

423

341

class InterFromGitBranch(branch.GenericInterBranch):

424

342

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

425

343

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)

344

@classmethod

345

def is_compatible(self, source, target):

346

return (isinstance(source, GitBranch) and

347

not isinstance(target, GitBranch))

348

349

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

350

graph=None):

351

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

352

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

353

self.target.repository)

354

self._head = None

355

self._last_revid = None

450

356

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

357

if not self.source.name in heads:

358

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

453

359

if stop_revision is not None:

454

360

self._last_revid = stop_revision

455

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

361

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

456

362

stop_revision)

457

363

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)

364

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

365

self._last_revid = \

366

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

463

367

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

464

368

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)

369

return [self._head]

370

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

473

371

if overwrite:

474

372

prev_last_revid = None

475

373

else:

476

374

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)

375

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

485

376

486

377

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

487

378

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

488

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

379

_override_hook_target=None, local=False):

489

380

"""See Branch.pull.

490

381

491

382

:param _hook_master: Private parameter - set the branch to

495

386

so it should not run its hooks.

496

387

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

497

388

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

389

"""

501

390

# This type of branch can't be bound.

502

391

if local:

512

401

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

513

402

# the source one.

514

403

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

515

(result.old_revno, result.old_revid) = \

404

result.old_revno, result.old_revid = \

516

405

self.target.last_revision_info()

517

result.new_git_head = self._update_revisions(

518

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

406

self.update_revisions(stop_revision, overwrite=overwrite,

407

graph=graph)

408

result.new_git_head = self._head

519

409

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

520

410

overwrite)

521

(result.new_revno, result.new_revid) = \

522

self.target.last_revision_info()

411

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

523

412

if _hook_master:

524

413

result.master_branch = _hook_master

525

414

result.local_branch = result.target_branch

539

428

result.target_branch = self.target

540

429

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

541

430

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)

431

self.update_revisions(stop_revision, overwrite=overwrite,

432

graph=graph)

433

result.new_git_head = self._head

544

434

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

545

435

overwrite)

546

436

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

554

444

class InterGitLocalRemoteBranch(InterGitBranch):

555

445

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

556

446

557

@staticmethod

558

def _get_branch_formats_to_test():

559

return []

560

561

447

@classmethod

562

448

def is_compatible(self, source, target):

563

449

from bzrlib.plugins.git.remote import RemoteGitBranch

564

return (isinstance(source, LocalGitBranch) and

450

return (isinstance(source, LocalGitBranch) and

565

451

isinstance(target, RemoteGitBranch))

566

452

567

453

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

568

from dulwich.protocol import ZERO_SHA

569

454

result = GitBranchPushResult()

570

455

result.source_branch = self.source

571

456

result.target_branch = self.target

573

458

stop_revision = self.source.last_revision()

574

459

# FIXME: Check for diverged branches

575

460

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

461

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

462

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

578

463

result.new_revid = stop_revision

579

464

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

580

refs[tag_name_to_ref(name)] = sha

465

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

581

466

return refs

582

self.target.repository.send_pack(get_changed_refs,

583

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

467

self.target.repository.send_pack(get_changed_refs,

468

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

584

469

return result

585

470

586

471

587

472

class InterGitRemoteLocalBranch(InterGitBranch):

588

473

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

589

474

590

@staticmethod

591

def _get_branch_formats_to_test():

592

return []

593

594

475

@classmethod

595

476

def is_compatible(self, source, target):

596

477

from bzrlib.plugins.git.remote import RemoteGitBranch

597

return (isinstance(source, RemoteGitBranch) and

478

return (isinstance(source, RemoteGitBranch) and

598

479

isinstance(target, LocalGitBranch))

599

480

600

481

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

609

490

return result

610

491

611

492

def update_tags(self, refs):

612

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

613

revid = self.target.lookup_foreign_revision_id(v)

493

for name, revid in extract_tags(refs, self.target.mapping).iteritems():

614

494

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

615

495

616

496

def update_refs(self, stop_revision=None):

617

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

497

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

618

498

self.target.repository)

619

499

if stop_revision is None:

620

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

621

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

500

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

501

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

622

502

else:

623

refs = interrepo.fetch(revision_id=stop_revision)

503

refs = interrepo.fetch_refs(revision_id=stop_revision)

624

504

return refs, stop_revision

625

505

626

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

627

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

506

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

507

possible_transports=None, local=False):

628

508

# This type of branch can't be bound.

629

509

if local:

630

510

raise errors.LocalRequiresBoundBranch()

638

518

result.new_revid = self.target.last_revision()

639

519

return result

640

520

641

642

class InterToGitBranch(branch.GenericInterBranch):

521

522

class InterToGitBranch(branch.InterBranch):

643

523

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

644

524

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

@staticmethod

651

def _get_branch_formats_to_test():

652

return []

653

654

525

@classmethod

655

526

def is_compatible(self, source, target):

656

return (not isinstance(source, GitBranch) and

527

return (not isinstance(source, GitBranch) and

657

528

isinstance(target, GitBranch))

658

529

659

530

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

660

531

raise NoPushSupport()

661

532

662

def _get_new_refs(self, stop_revision=None):

533

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

534

_override_hook_source_branch=None):

535

raise NoPushSupport()

536

537

def lossy_push(self, stop_revision=None):

538

result = GitBranchPushResult()

539

result.source_branch = self.source

540

result.target_branch = self.target

541

result.old_revid = self.target.last_revision()

663

542

if stop_revision is None:

664

543

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

544

# FIXME: Check for diverged branches

545

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

668

546

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

669

547

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]

548

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

549

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

550

self.source.repository, refs)

551

if revidmap != {}:

552

self.target.generate_revision_history(revidmap[stop_revision])

553

result.new_revid = revidmap[stop_revision]

554

else:

555

result.new_revid = result.old_revid

556

result.revidmap = revidmap

724

557

return result

725

558

726

559