This is an archive of the discontinued Mercurial Phabricator instance.

copies: no longer change the sidedata flag
ClosedPublic

Authored by marmoute on Sep 28 2020, 12:32 PM.

Download Raw Diff

Details

Reviewers

Alphare
pulkit

Group Reviewers

hg-reviewers

Commits

rHG7a757e893532: copies: no longer change the sidedata flag

Summary

With the new sidedata storage that include data about all file changes, every
revision has one, so the sidedata flag is not longer a good way to spot
changeset with copy information. So we drop this check to simplify the code

We optimisation itself provided an interesting speedup, so we will likely
reintroduce something similar, with a dedicated flag, in the future.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Sep 28 2020, 12:32 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptSep 28 2020, 12:32 PM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

marmoute added a child revision: D9117: copies: directly pass a changes object to the copy tracing code.Sep 28 2020, 12:32 PM

Alphare accepted this revision.Oct 2 2020, 4:38 AM

pulkit accepted this revision.Oct 6 2020, 4:23 AM

This revision is now accepted and ready to land.Oct 6 2020, 4:23 AM

marmoute added a commit: rHG7a757e893532: copies: no longer change the sidedata flag.Oct 6 2020, 5:03 AM

Closed by commit rHG7a757e893532: copies: no longer change the sidedata flag (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/copies.py (42 lines)

Status	Author	Revision
Closed	marmoute	D9141 copies: move `merged` testing sooner
Closed	marmoute	D9140 copies: return None instead of ChangingFiles when relevant
Closed	marmoute	D9139 copies: add a HASCOPIESINFO flag to highlight rev with useful data
Closed	marmoute	D9130 salvaged: properly deal with salvaged file during copy tracing
Closed	marmoute	D9129 salvaged: persist the salvaged set on disk
Closed	marmoute	D9128 changing-files: add clean computation of changed file for merges
Closed	marmoute	D9127 changing-files: add clean computation of changed files for linear changesets
Closed	marmoute	D9126 changing-files: add clean computation of changed files for roots
Closed	marmoute	D9125 changing-files: add a debug command display changed files
Closed	marmoute	D9124 side-data: add a test to check sidedata upgrade
Closed	marmoute	D9123 changing-files: split the changing files computation from encoding
Closed	marmoute	D9120 salvaged: record salvaged in ChangingFiles at commit time
Closed	marmoute	D9119 salvaged: track removal-candidates in more cases
Closed	marmoute	D9122 salvaged: explicitly skip salvaged file while encoding
Closed	marmoute	D9118 changing-files: add a "salvaged" set to track file that were not removed
Closed	marmoute	D9117 copies: directly pass a changes object to the copy tracing code
Closed	marmoute	D9116 copies: no longer change the sidedata flag
Closed	marmoute	D9115 copies: use dedicated `_revinfo_getter` function and call
Closed	marmoute	D9114 copies: make two version of the changeset centric algorithm
Closed	marmoute	D9113 copies: rename some function to the new naming scheme
Closed	marmoute	D9112 changing-files: cache the various property
Closed	marmoute	D9111 changing-files: always use `mark_touched` to update the touched set
Closed	marmoute	D9092 changing-files: retrieve changelogrevision.files from the sidedata block
Closed	marmoute	D9091 changing-files: drop the now useless changelogrevision argument
Closed	marmoute	D9090 changing-files: rework the way we store changed files in side-data
Closed	marmoute	D9143 changing-files: fix docstring

Diff 23050

mercurial/copies.py

	# copies.py - copy detection for Mercurial			# copies.py - copy detection for Mercurial
	#			#
	# Copyright 2008 Matt Mackall <mpm@selenic.com>			# Copyright 2008 Matt Mackall <mpm@selenic.com>
	#			#
	# This software may be used and distributed according to the terms of the			# This software may be used and distributed according to the terms of the
	# GNU General Public License version 2 or any later version.			# GNU General Public License version 2 or any later version.

	from __future__ import absolute_import			from __future__ import absolute_import

	import collections			import collections
	import os			import os

	from .i18n import _			from .i18n import _


	from .revlogutils.flagutil import REVIDX_SIDEDATA

	from . import (			from . import (
	match as matchmod,			match as matchmod,
	node,			node,
	pathutil,			pathutil,
	pycompat,			pycompat,
	util,			util,
	)			)

	for n in parents:			for n in parents:
	if n != node.nullid:			if n != node.nullid:
	nb_parents += 1			nb_parents += 1
	return nb_parents >= 2			return nb_parents >= 2

	return ismerged			return ismerged

	changelogrevision = cl.changelogrevision			changelogrevision = cl.changelogrevision
	flags = cl.flags

	# A small cache to avoid doing the work twice for merges			# A small cache to avoid doing the work twice for merges
	#			#
	# In the vast majority of cases, if we ask information for a revision			# In the vast majority of cases, if we ask information for a revision
	# about 1 parent, we'll later ask it for the other. So it make sense to			# about 1 parent, we'll later ask it for the other. So it make sense to
	# keep the information around when reaching the first parent of a merge			# keep the information around when reaching the first parent of a merge
	# and dropping it after it was provided for the second parents.			# and dropping it after it was provided for the second parents.
	#			#
	# that case the cache could grow. If this even become an issue one can			# that case the cache could grow. If this even become an issue one can
	# safely introduce a maximum cache size. This would trade extra CPU/IO			# safely introduce a maximum cache size. This would trade extra CPU/IO
	# time to save memory.			# time to save memory.
	merge_caches = {}			merge_caches = {}

	def revinfo(rev):			def revinfo(rev):
	p1, p2 = parents(rev)			p1, p2 = parents(rev)
	value = None			value = None
	if flags(rev) & REVIDX_SIDEDATA:
	e = merge_caches.pop(rev, None)			e = merge_caches.pop(rev, None)
	if e is not None:			if e is not None:
	return e			return e
	c = changelogrevision(rev)			c = changelogrevision(rev)
	p1copies = c.p1copies			p1copies = c.p1copies
	p2copies = c.p2copies			p2copies = c.p2copies
	removed = c.filesremoved			removed = c.filesremoved
	if p1 != node.nullrev and p2 != node.nullrev:			if p1 != node.nullrev and p2 != node.nullrev:
	# XXX some case we over cache, IGNORE			# XXX some case we over cache, IGNORE
	value = merge_caches[rev] = (			value = merge_caches[rev] = (
	p1,			p1,
	p2,			p2,
	p1copies,			p1copies,
	p2copies,			p2copies,
	removed,			removed,
	get_ismerged(rev),			get_ismerged(rev),
	)			)
	else:
	p1copies = {}
	p2copies = {}
	removed = []

	if value is None:			if value is None:
	value = (p1, p2, p1copies, p2copies, removed, get_ismerged(rev))			value = (p1, p2, p1copies, p2copies, removed, get_ismerged(rev))
	return value			return value

	return revinfo			return revinfo

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22905		Sep 28 2020, 12:32 PM	★	★
Diff 2	23050	rHG7a757e89353251840d2bcfd328de4b122772b98c	Sep 25 2020, 8:54 AM	★	★