D21349.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D21349.diff
View Options

	diff --git a/support/hg/arc-hg.py b/support/hg/arc-hg.py
	--- a/support/hg/arc-hg.py
	+++ b/support/hg/arc-hg.py
	@@ -159,25 +159,20 @@
	source, branches = hg.parseurl(ui.expandpath(source))
	remote = hg.peer(repo, opts, source)

	- bundle, remotebranches, cleanup = bundlerepo.getremotechanges(
	- ui,
	- repo,
	- remote)
	-
	- try:
	- for n in remotebranches:
	- ctx = bundle[n]
	+ with remote.commandexecutor() as e:
	+ branchmap = e.callcommand('branchmap', {}).result()
	+
	+ for branch_name in branchmap:
	+ for branch_node in branchmap[branch_name]:
	markers.append({
	'type': 'branch',
	- 'name': ctx.branch(),
	- 'node': node.hex(ctx.node()),
	+ 'name': branch_name,
	+ 'node': node.hex(branch_node),
	})
	- finally:
	- cleanup()

	with remote.commandexecutor() as e:
	remotemarks = bookmarks.unhexlifybookmarks(e.callcommand('listkeys', {
	- 'namespace': 'bookmarks',
	+ 'namespace': 'bookmarks',
	}).result())

	for mark in remotemarks: