/brz/remove-bazaar : revision 0.200.832

1

2

#

3

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

4

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

53

from bzrlib.revision import (

54

NULL_REVISION,

55

)

56

from bzrlib.revisiontree import (

57

RevisionTree,

58

)

59

from bzrlib.testament import (

60

StrictTestament3,

61

)

62

56

from bzrlib.tsort import (

63

57

topo_sort,

64

58

)

68

62

69

63

from bzrlib.plugins.git.mapping import (

70

64

DEFAULT_FILE_MODE,

65

inventory_to_tree_and_blobs,

71

66

mode_is_executable,

72

67

mode_kind,

68

squash_revision,

73

69

warn_unusual_mode,

74

70

)

75

71

from bzrlib.plugins.git.object_store import (

76

72

BazaarObjectStore,

77

LRUTreeCache,

78

_tree_to_objects,

73

LRUInventoryCache,

79

74

)

80

75

from bzrlib.plugins.git.remote import (

81

76

RemoteGitRepository,

88

83

89

84

90

85

def import_git_blob(texts, mapping, path, name, (base_hexsha, hexsha),

91

base_inv, parent_id, revision_id,

92

parent_invs, lookup_object, (base_mode, mode), store_updater,

93

lookup_file_id):

86

base_inv, base_inv_shamap, parent_id, revision_id,

87

parent_invs, lookup_object, (base_mode, mode)):

94

88

"""Import a git blob object into a bzr repository.

95

89

96

90

:param texts: VersionedFiles to add to

98

92

:param blob: A git blob

99

93

:return: Inventory delta for this file

100

94

"""

101

if mapping.is_control_file(path):

102

return []

103

95

if base_hexsha == hexsha and base_mode == mode:

104

96

# If nothing has changed since the base revision, we're done

105

return []

106

file_id = lookup_file_id(path)

97

return [], []

98

file_id = mapping.generate_file_id(path)

107

99

if stat.S_ISLNK(mode):

108

100

cls = InventoryLink

109

101

else:

110

102

cls = InventoryFile

111

103

ie = cls(file_id, name.decode("utf-8"), parent_id)

112

if ie.kind == "file":

113

ie.executable = mode_is_executable(mode)

104

ie.executable = mode_is_executable(mode)

114

105

if base_hexsha == hexsha and mode_kind(base_mode) == mode_kind(mode):

115

106

base_ie = base_inv[base_inv.path2id(path)]

116

107

ie.text_size = base_ie.text_size

117

108

ie.text_sha1 = base_ie.text_sha1

118

if ie.kind == "symlink":

119

ie.symlink_target = base_ie.symlink_target

109

ie.symlink_target = base_ie.symlink_target

120

110

if ie.executable == base_ie.executable:

121

111

ie.revision = base_ie.revision

122

112

else:

126

116

if ie.kind == "symlink":

127

117

ie.revision = None

128

118

ie.symlink_target = blob.data

119

ie.text_size = None

120

ie.text_sha1 = None

129

121

else:

130

122

ie.text_size = sum(imap(len, blob.chunked))

131

123

ie.text_sha1 = osutils.sha_strings(blob.chunked)

132

124

# Check what revision we should store

133

125

parent_keys = []

134

for pinv in parent_invs:

126

for pinv in parent_invs[1:]:

135

127

try:

136

128

pie = pinv[file_id]

137

129

except NoSuchId:

138

130

continue

139

if (pie.text_sha1 == ie.text_sha1 and

140

pie.executable == ie.executable and

141

pie.symlink_target == ie.symlink_target):

131

if pie.text_sha1 == ie.text_sha1 and pie.executable == ie.executable and pie.symlink_target == ie.symlink_target:

142

132

# found a revision in one of the parents to use

143

133

ie.revision = pie.revision

144

134

break

145

parent_key = (file_id, pie.revision)

146

if not parent_key in parent_keys:

147

parent_keys.append(parent_key)

135

parent_keys.append((file_id, pie.revision))

148

136

if ie.revision is None:

149

137

# Need to store a new revision

150

138

ie.revision = revision_id

153

141

chunks = []

154

142

else:

155

143

chunks = blob.chunked

156

texts.insert_record_stream([

157

ChunkedContentFactory((file_id, ie.revision),

158

tuple(parent_keys), ie.text_sha1, chunks)])

144

texts.insert_record_stream([ChunkedContentFactory((file_id, ie.revision), tuple(parent_keys), ie.text_sha1, chunks)])

159

145

invdelta = []

160

146

if base_hexsha is not None:

161

old_path = path.decode("utf-8") # Renames are not supported yet

147

old_path = path # Renames are not supported yet

162

148

if stat.S_ISDIR(base_mode):

163

149

invdelta.extend(remove_disappeared_children(base_inv, old_path,

164

150

lookup_object(base_hexsha), [], lookup_object))

165

151

else:

166

152

old_path = None

167

new_path = path.decode("utf-8")

168

invdelta.append((old_path, new_path, file_id, ie))

169

if base_hexsha != hexsha:

170

store_updater.add_object(blob, ie, path)

171

return invdelta

153

invdelta.append((old_path, path, file_id, ie))

154

return (invdelta, [(ie.file_id, "blob", hexsha, ie.revision)])

172

155

173

156

174

157

class SubmodulesRequireSubtrees(BzrError):

178

161

179

162

def import_git_submodule(texts, mapping, path, name, (base_hexsha, hexsha),

180

163

base_inv, parent_id, revision_id, parent_invs, lookup_object,

181

(base_mode, mode), store_updater, lookup_file_id):

164

(base_mode, mode)):

182

165

if base_hexsha == hexsha and base_mode == mode:

183

return [], {}

184

file_id = lookup_file_id(path)

166

return [], {}, {}

167

file_id = mapping.generate_file_id(path)

185

168

ie = TreeReference(file_id, name.decode("utf-8"), parent_id)

186

169

ie.revision = revision_id

187

170

if base_hexsha is None:

189

172

else:

190

173

oldpath = path

191

174

ie.reference_revision = mapping.revision_id_foreign_to_bzr(hexsha)

192

texts.insert_record_stream([

193

ChunkedContentFactory((file_id, ie.revision), (), None, [])])

175

texts.insert_record_stream([ChunkedContentFactory((file_id, ie.revision), (), None, [])])

194

176

invdelta = [(oldpath, path, file_id, ie)]

195

return invdelta, {}

177

return invdelta, {}, []

196

178

197

179

198

180

def remove_disappeared_children(base_inv, path, base_tree, existing_children,

199

181

lookup_object):

200

"""Generate an inventory delta for removed children.

201

202

:param base_inv: Base inventory against which to generate the

203

inventory delta.

204

:param path: Path to process (unicode)

205

:param base_tree: Git Tree base object

206

:param existing_children: Children that still exist

207

:param lookup_object: Lookup a git object by its SHA1

208

:return: Inventory delta, as list

209

"""

210

assert type(path) is unicode

211

182

ret = []

212

183

for name, mode, hexsha in base_tree.iteritems():

213

184

if name in existing_children:

214

185

continue

215

186

c_path = posixpath.join(path, name.decode("utf-8"))

216

file_id = base_inv.path2id(c_path)

217

assert file_id is not None

218

ret.append((c_path, None, file_id, None))

187

ret.append((c_path, None, base_inv.path2id(c_path), None))

219

188

if stat.S_ISDIR(mode):

220

189

ret.extend(remove_disappeared_children(

221

190

base_inv, c_path, lookup_object(hexsha), [], lookup_object))

223

192

224

193

225

194

def import_git_tree(texts, mapping, path, name, (base_hexsha, hexsha),

226

base_inv, parent_id, revision_id, parent_invs,

227

lookup_object, (base_mode, mode), store_updater,

228

lookup_file_id, allow_submodules=False):

195

base_inv, base_inv_shamap, parent_id, revision_id, parent_invs,

196

lookup_object, (base_mode, mode), allow_submodules=False):

229

197

"""Import a git tree object into a bzr repository.

230

198

231

199

:param texts: VersionedFiles object to add to

232

:param path: Path in the tree (str)

233

:param name: Name of the tree (str)

200

:param path: Path in the tree

234

201

:param tree: A git tree object

235

202

:param base_inv: Base inventory against which to return inventory delta

236

203

:return: Inventory delta for this subtree

237

204

"""

238

assert type(path) is str

239

assert type(name) is str

240

205

if base_hexsha == hexsha and base_mode == mode:

241

206

# If nothing has changed since the base revision, we're done

242

return [], {}

207

return [], {}, []

243

208

invdelta = []

244

file_id = lookup_file_id(path)

209

file_id = mapping.generate_file_id(path)

245

210

# We just have to hope this is indeed utf-8:

246

211

ie = InventoryDirectory(file_id, name.decode("utf-8"), parent_id)

247

212

tree = lookup_object(hexsha)

250

215

old_path = None # Newly appeared here

251

216

else:

252

217

base_tree = lookup_object(base_hexsha)

253

old_path = path.decode("utf-8") # Renames aren't supported yet

254

new_path = path.decode("utf-8")

218

old_path = path # Renames aren't supported yet

255

219

if base_tree is None or type(base_tree) is not Tree:

256

220

ie.revision = revision_id

257

invdelta.append((old_path, new_path, ie.file_id, ie))

258

texts.insert_record_stream([

259

ChunkedContentFactory((ie.file_id, ie.revision), (), None, [])])

221

invdelta.append((old_path, path, ie.file_id, ie))

222

texts.insert_record_stream([ChunkedContentFactory((ie.file_id, ie.revision), (), None, [])])

260

223

# Remember for next time

261

224

existing_children = set()

262

225

child_modes = {}

226

shamap = [(ie.file_id, "tree", hexsha, revision_id)]

263

227

for child_mode, name, child_hexsha in tree.entries():

264

228

existing_children.add(name)

265

229

child_path = posixpath.join(path, name)

273

237

child_base_hexsha = None

274

238

child_base_mode = 0

275

239

if stat.S_ISDIR(child_mode):

276

subinvdelta, grandchildmodes = import_git_tree(texts, mapping,

277

child_path, name, (child_base_hexsha, child_hexsha), base_inv,

278

file_id, revision_id, parent_invs, lookup_object,

279

(child_base_mode, child_mode), store_updater, lookup_file_id,

280

allow_submodules=allow_submodules)

240

subinvdelta, grandchildmodes, subshamap = import_git_tree(

241

texts, mapping, child_path, name,

242

(child_base_hexsha, child_hexsha),

243

base_inv, base_inv_shamap,

244

file_id, revision_id, parent_invs, lookup_object,

245

(child_base_mode, child_mode),

246

allow_submodules=allow_submodules)

281

247

elif S_ISGITLINK(child_mode): # submodule

282

248

if not allow_submodules:

283

249

raise SubmodulesRequireSubtrees()

284

subinvdelta, grandchildmodes = import_git_submodule(texts, mapping,

285

child_path, name, (child_base_hexsha, child_hexsha), base_inv,

286

file_id, revision_id, parent_invs, lookup_object,

287

(child_base_mode, child_mode), store_updater, lookup_file_id)

250

subinvdelta, grandchildmodes, subshamap = import_git_submodule(

251

texts, mapping, child_path, name,

252

(child_base_hexsha, child_hexsha),

253

base_inv, file_id, revision_id, parent_invs, lookup_object,

254

(child_base_mode, child_mode))

288

255

else:

289

subinvdelta = import_git_blob(texts, mapping, child_path, name,

290

(child_base_hexsha, child_hexsha), base_inv, file_id,

291

revision_id, parent_invs, lookup_object,

292

(child_base_mode, child_mode), store_updater, lookup_file_id)

256

subinvdelta, subshamap = import_git_blob(texts, mapping,

257

child_path, name, (child_base_hexsha, child_hexsha),

258

base_inv, base_inv_shamap,

259

file_id,

260

revision_id, parent_invs, lookup_object,

261

(child_base_mode, child_mode))

293

262

grandchildmodes = {}

294

263

child_modes.update(grandchildmodes)

295

264

invdelta.extend(subinvdelta)

265

shamap.extend(subshamap)

296

266

if child_mode not in (stat.S_IFDIR, DEFAULT_FILE_MODE,

297

267

stat.S_IFLNK, DEFAULT_FILE_MODE|0111):

298

268

child_modes[child_path] = child_mode

299

269

# Remove any children that have disappeared

300

270

if base_tree is not None and type(base_tree) is Tree:

301

invdelta.extend(remove_disappeared_children(base_inv, old_path,

271

invdelta.extend(remove_disappeared_children(base_inv, old_path,

302

272

base_tree, existing_children, lookup_object))

303

store_updater.add_object(tree, ie, path)

304

return invdelta, child_modes

305

306

307

def verify_commit_reconstruction(target_git_object_retriever, lookup_object,

308

o, rev, ret_tree, parent_trees, mapping, unusual_modes):

309

new_unusual_modes = mapping.export_unusual_file_modes(rev)

310

if new_unusual_modes != unusual_modes:

311

raise AssertionError("unusual modes don't match: %r != %r" % (

312

unusual_modes, new_unusual_modes))

313

# Verify that we can reconstruct the commit properly

314

rec_o = target_git_object_retriever._reconstruct_commit(rev, o.tree, True)

315

if rec_o != o:

316

raise AssertionError("Reconstructed commit differs: %r != %r" % (

317

rec_o, o))

318

diff = []

319

new_objs = {}

320

for path, obj, ie in _tree_to_objects(ret_tree, parent_trees,

321

target_git_object_retriever._cache.idmap, unusual_modes, mapping.BZR_DUMMY_FILE):

322

old_obj_id = tree_lookup_path(lookup_object, o.tree, path)[1]

323

new_objs[path] = obj

324

if obj.id != old_obj_id:

325

diff.append((path, lookup_object(old_obj_id), obj))

326

for (path, old_obj, new_obj) in diff:

327

while (old_obj.type_name == "tree" and

328

new_obj.type_name == "tree" and

329

sorted(old_obj) == sorted(new_obj)):

330

for name in old_obj:

331

if old_obj[name][0] != new_obj[name][0]:

332

raise AssertionError("Modes for %s differ: %o != %o" %

333

(path, old_obj[name][0], new_obj[name][0]))

334

if old_obj[name][1] != new_obj[name][1]:

335

# Found a differing child, delve deeper

336

path = posixpath.join(path, name)

337

old_obj = lookup_object(old_obj[name][1])

338

new_obj = new_objs[path]

339

break

340

raise AssertionError("objects differ for %s: %r != %r" % (path,

341

old_obj, new_obj))

273

return invdelta, child_modes, shamap

342

274

343

275

344

276

def import_git_commit(repo, mapping, head, lookup_object,

345

target_git_object_retriever, trees_cache):

277

target_git_object_retriever, parent_invs_cache):

346

278

o = lookup_object(head)

347

rev, roundtrip_revid, verifiers = mapping.import_commit(o,

348

lambda x: target_git_object_retriever.lookup_git_sha(x)[1][0])

279

rev = mapping.import_commit(o)

349

280

# We have to do this here, since we have to walk the tree and

350

281

# we need to make sure to import the blobs / trees with the right

351

282

# path; this may involve adding them more than once.

352

parent_trees = trees_cache.revision_trees(rev.parent_ids)

353

if parent_trees == []:

283

parent_invs = parent_invs_cache.get_inventories(rev.parent_ids)

284

if parent_invs == []:

354

285

base_inv = Inventory(root_id=None)

286

base_inv_shamap = None # Should never be accessed

355

287

base_tree = None

356

288

base_mode = None

357

289

else:

358

base_inv = parent_trees[0].inventory

290

base_inv = parent_invs[0]

291

base_inv_shamap = target_git_object_retriever._idmap.get_inventory_sha_map(base_inv.revision_id)

359

292

base_tree = lookup_object(o.parents[0]).tree

360

293

base_mode = stat.S_IFDIR

361

store_updater = target_git_object_retriever._get_updater(rev)

362

fileid_map = mapping.get_fileid_map(lookup_object, o.tree)

363

inv_delta, unusual_modes = import_git_tree(repo.texts,

364

mapping, "", "", (base_tree, o.tree), base_inv,

365

None, rev.revision_id, [p.inventory for p in parent_trees],

366

lookup_object, (base_mode, stat.S_IFDIR), store_updater,

367

fileid_map.lookup_file_id,

294

inv_delta, unusual_modes, entries = import_git_tree(repo.texts,

295

mapping, "", u"", (base_tree, o.tree), base_inv, base_inv_shamap,

296

None, rev.revision_id, parent_invs, lookup_object,

297

(base_mode, stat.S_IFDIR),

368

298

allow_submodules=getattr(repo._format, "supports_tree_reference", False))

299

target_git_object_retriever._idmap.add_entries(rev.revision_id,

300

rev.parent_ids, head, o.tree, entries)

369

301

if unusual_modes != {}:

370

302

for path, mode in unusual_modes.iteritems():

371

303

warn_unusual_mode(rev.foreign_revid, path, mode)

376

308

basis_id = NULL_REVISION

377

309

base_inv = None

378

310

rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,

379

inv_delta, rev.revision_id, rev.parent_ids, base_inv)

380

# FIXME: Check verifiers

381

testament = StrictTestament3(rev, inv)

382

calculated_verifiers = { "testament3-sha1": testament.as_sha1() }

383

if roundtrip_revid is not None:

384

original_revid = rev.revision_id

385

rev.revision_id = roundtrip_revid

386

if calculated_verifiers != verifiers:

387

trace.mutter("Testament SHA1 %r for %r did not match %r.",

388

calculated_verifiers["testament3-sha1"],

389

rev.revision_id, verifiers["testament3-sha1"])

390

rev.revision_id = original_revid

391

store_updater.add_object(o, calculated_verifiers, None)

392

store_updater.finish()

393

ret_tree = RevisionTree(repo, inv, rev.revision_id)

394

trees_cache.add(ret_tree)

311

inv_delta, rev.revision_id, rev.parent_ids,

312

base_inv)

313

parent_invs_cache.add(rev.revision_id, inv)

395

314

repo.add_revision(rev.revision_id, rev)

396

315

if "verify" in debug.debug_flags:

397

verify_commit_reconstruction(target_git_object_retriever,

398

lookup_object, o, rev, ret_tree, parent_trees, mapping,

399

unusual_modes)

316

new_unusual_modes = mapping.export_unusual_file_modes(rev)

317

if new_unusual_modes != unusual_modes:

318

raise AssertionError("unusual modes don't match: %r != %r" % (unusual_modes, new_unusual_modes))

319

objs = inventory_to_tree_and_blobs(inv, repo.texts, mapping, unusual_modes)

320

for newsha1, newobj, path in objs:

321

assert path is not None

322

if path == "":

323

oldsha1 = o.tree

324

else:

325

(oldmode, oldsha1) = tree_lookup_path(lookup_object, o.tree, path)

326

if oldsha1 != newsha1:

327

raise AssertionError("%r != %r in %s" % (oldsha1, newsha1, path))

400

328

401

329

402

330

def import_git_objects(repo, mapping, object_iter,

416

344

graph = []

417

345

checked = set()

418

346

heads = list(set(heads))

419

trees_cache = LRUTreeCache(repo)

347

parent_invs_cache = LRUInventoryCache(repo)

420

348

# Find and convert commit objects

421

349

while heads:

422

350

if pb is not None:

428

356

except KeyError:

429

357

continue

430

358

if isinstance(o, Commit):

431

rev, roundtrip_revid, verifiers = mapping.import_commit(o,

432

lambda x: None)

433

if (repo.has_revision(rev.revision_id) or

434

(roundtrip_revid and repo.has_revision(roundtrip_revid))):

359

rev = mapping.import_commit(o)

360

if repo.has_revision(rev.revision_id):

435

361

continue

362

squash_revision(repo, rev)

436

363

graph.append((o.id, o.parents))

437

364

heads.extend([p for p in o.parents if p not in checked])

438

365

elif isinstance(o, Tag):

451

378

revision_ids = revision_ids[:limit]

452

379

last_imported = None

453

380

for offset in range(0, len(revision_ids), batch_size):

454

target_git_object_retriever.start_write_group()

381

target_git_object_retriever.start_write_group() # FIXME: try/finally

455

382

try:

456

383

repo.start_write_group()

457

384

try:

461

388

pb.update("fetching revisions", offset+i,

462

389

len(revision_ids))

463

390

import_git_commit(repo, mapping, head, lookup_object,

464

target_git_object_retriever, trees_cache)

391

target_git_object_retriever,

392

parent_invs_cache)

465

393

last_imported = head

466

394

except:

467

395

repo.abort_write_group()

490

418

"""See InterRepository.copy_content."""

491

419

self.fetch(revision_id, pb, find_ghosts=False)

492

420

421

def fetch(self, revision_id=None, pb=None, find_ghosts=False,

422

mapping=None, fetch_spec=None):

423

self.fetch_refs(revision_id=revision_id, pb=pb,

424

find_ghosts=find_ghosts, mapping=mapping, fetch_spec=fetch_spec)

425

493

426

494

427

class InterGitNonGitRepository(InterGitRepository):

495

428

"""Base InterRepository that copies revisions from a Git into a non-Git

496

429

repository."""

497

430

498

def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):

499

"""Fetch objects from a remote server.

500

501

:param determine_wants: determine_wants callback

502

:param mapping: BzrGitMapping to use

503

:param pb: Optional progress bar

504

:param limit: Maximum number of commits to import.

505

:return: Tuple with pack hint, last imported revision id and remote refs

506

"""

507

raise NotImplementedError(self.fetch_objects)

508

509

def fetch(self, revision_id=None, pb=None, find_ghosts=False,

431

def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False,

510

432

mapping=None, fetch_spec=None):

511

433

if mapping is None:

512

434

mapping = self.source.get_mapping()

516

438

interesting_heads = fetch_spec.heads

517

439

else:

518

440

interesting_heads = None

441

self._refs = {}

519

442

def determine_wants(refs):

443

self._refs = refs

520

444

if interesting_heads is None:

521

445

ret = [sha for (ref, sha) in refs.iteritems() if not ref.endswith("^{}")]

522

446

else:

523

ret = [self.source.lookup_bzr_revision_id(revid)[0] for revid in interesting_heads if revid not in (None, NULL_REVISION)]

524

return [rev for rev in ret if not self.target.has_revision(self.source.lookup_foreign_revision_id(rev))]

525

(pack_hint, _, remote_refs) = self.fetch_objects(determine_wants, mapping, pb)

447

ret = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in interesting_heads if revid not in (None, NULL_REVISION)]

448

return [rev for rev in ret if not self.target.has_revision(mapping.revision_id_foreign_to_bzr(rev))]

449

(pack_hint, _) = self.fetch_objects(determine_wants, mapping, pb)

526

450

if pack_hint is not None and self.target._format.pack_compresses:

527

451

self.target.pack(hint=pack_hint)

528

return remote_refs

452

if interesting_heads is not None:

453

present_interesting_heads = self.target.has_revisions(interesting_heads)

454

missing_interesting_heads = set(interesting_heads) - present_interesting_heads

455

if missing_interesting_heads:

456

raise AssertionError("Missing interesting heads: %r" % missing_interesting_heads)

457

return self._refs

529

458

530

459

531

460

_GIT_PROGRESS_RE = re.compile(r"(.*?): +(\d+)% \((\d+)/(\d+)\)")

539

468

pb.update(text, 0, 0)

540

469

541

470

542

class DetermineWantsRecorder(object):

543

544

def __init__(self, actual):

545

self.actual = actual

546

self.wants = []

547

self.remote_refs = {}

548

549

def __call__(self, refs):

550

self.remote_refs = refs

551

self.wants = self.actual(refs)

552

return self.wants

553

554

555

471

class InterRemoteGitNonGitRepository(InterGitNonGitRepository):

556

472

"""InterRepository that copies revisions from a remote Git into a non-Git

557

473

repository."""

565

481

return set(all_revs) - all_parents

566

482

567

483

def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):

568

"""See `InterGitNonGitRepository`."""

569

484

def progress(text):

570

485

report_git_progress(pb, text)

571

486

store = BazaarObjectStore(self.target, mapping)

574

489

heads = self.get_target_heads()

575

490

graph_walker = store.get_graph_walker(

576

491

[store._lookup_revision_sha1(head) for head in heads])

577

wants_recorder = DetermineWantsRecorder(determine_wants)

492

recorded_wants = []

493

494

def record_determine_wants(heads):

495

wants = determine_wants(heads)

496

recorded_wants.extend(wants)

497

return wants

578

498

579

499

create_pb = None

580

500

if pb is None:

581

501

create_pb = pb = ui.ui_factory.nested_progress_bar()

582

502

try:

583

503

objects_iter = self.source.fetch_objects(

584

wants_recorder, graph_walker, store.get_raw,

585

progress)

586

(pack_hint, last_rev) = import_git_objects(self.target, mapping,

587

objects_iter, store, wants_recorder.wants, pb, limit)

588

return (pack_hint, last_rev, wants_recorder.remote_refs)

504

record_determine_wants, graph_walker,

505

store.get_raw, progress)

506

return import_git_objects(self.target, mapping,

507

objects_iter, store, recorded_wants, pb, limit)

589

508

finally:

590

509

if create_pb:

591

510

create_pb.finished()

595

514

@staticmethod

596

515

def is_compatible(source, target):

597

516

"""Be compatible with GitRepository."""

517

# FIXME: Also check target uses VersionedFile

598

518

return (isinstance(source, RemoteGitRepository) and

599

519

target.supports_rich_root() and

600

not isinstance(target, GitRepository) and

601

target.texts is not None)

520

not isinstance(target, GitRepository))

602

521

603

522

604

523

class InterLocalGitNonGitRepository(InterGitNonGitRepository):

606

525

repository."""

607

526

608

527

def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):

609

"""See `InterGitNonGitRepository`."""

610

remote_refs = self.source._git.get_refs()

611

wants = determine_wants(remote_refs)

528

"""Fetch objects.

529

"""

530

wants = determine_wants(self.source._git.get_refs())

612

531

create_pb = None

613

532

if pb is None:

614

533

create_pb = pb = ui.ui_factory.nested_progress_bar()

616

535

try:

617

536

self.target.lock_write()

618

537

try:

619

(pack_hint, last_rev) = import_git_objects(self.target, mapping,

538

return import_git_objects(self.target, mapping,

620

539

self.source._git.object_store,

621

540

target_git_object_retriever, wants, pb, limit)

622

return (pack_hint, last_rev, remote_refs)

623

541

finally:

624

542

self.target.unlock()

625

543

finally:

629

547

@staticmethod

630

548

def is_compatible(source, target):

631

549

"""Be compatible with GitRepository."""

550

# FIXME: Also check target uses VersionedFile

632

551

return (isinstance(source, LocalGitRepository) and

633

552

target.supports_rich_root() and

634

not isinstance(target, GitRepository) and

635

target.texts is not None)

553

not isinstance(target, GitRepository))

636

554

637

555

638

556

class InterGitGitRepository(InterGitRepository):

644

562

graphwalker = self.target._git.get_graph_walker()

645

563

if (isinstance(self.source, LocalGitRepository) and

646

564

isinstance(self.target, LocalGitRepository)):

647

refs = self.source._git.fetch(self.target._git, determine_wants,

565

return self.source._git.fetch(self.target._git, determine_wants,

648

566

progress)

649

return (None, None, refs)

650

567

elif (isinstance(self.source, LocalGitRepository) and

651

568

isinstance(self.target, RemoteGitRepository)):

652

569

raise NotImplementedError

654

571

isinstance(self.target, LocalGitRepository)):

655

572

f, commit = self.target._git.object_store.add_thin_pack()

656

573

try:

657

refs = self.source.bzrdir.root_transport.fetch_pack(

658

determine_wants, graphwalker, f.write, progress)

574

refs = self.source._git.fetch_pack(determine_wants,

575

graphwalker, f.write, progress)

659

576

commit()

660

return (None, None, refs)

577

return refs

661

578

except:

662

579

f.close()

663

580

raise

664

581

else:

665

582

raise AssertionError

666

583

667

def fetch(self, revision_id=None, pb=None, find_ghosts=False,

584

def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False,

668

585

mapping=None, fetch_spec=None, branches=None):

669

586

if mapping is None:

670

587

mapping = self.source.get_mapping()

679

596

determine_wants = r.object_store.determine_wants_all

680

597

else:

681

598

determine_wants = lambda x: [y for y in args if not y in r.object_store]

682

self.fetch_objects(determine_wants, mapping)

599

return self.fetch_objects(determine_wants, mapping)[0]

600

683

601

684

602

@staticmethod

685

603

def is_compatible(source, target):