changing-files: add a "salvaged" set to track file that were not removed
ClosedPublic

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22913		Sep 29 2020, 6:36 AM	★	★
Diff 2	22940		Sep 30 2020, 9:10 AM	★	★
Diff 3	22982		Oct 2 2020, 3:14 AM	★	★
Diff 4	22990		Oct 2 2020, 5:09 AM	★	★
Diff 5	23009		Oct 2 2020, 12:39 PM	★	★
Diff 6	23083	rHG5156c5e46431af527534d6a3d346a8185e1d1a3e	Sep 14 2020, 5:46 PM	★	★

Commit	Parents	Author	Summary	Date
46a69352b67a	08da919a6fc8	Pierre-Yves David		Sep 14 2020, 5:46 PM

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 22982

mercurial/metadata.py

	class ChangingFiles(object):			class ChangingFiles(object):
	"""A class recording the changes made to files by a changeset			"""A class recording the changes made to files by a changeset

	Actions performed on files are gathered into 3 sets:			Actions performed on files are gathered into 3 sets:

	- added: files actively added in the changeset.			- added: files actively added in the changeset.
	- merged: files whose history got merged			- merged: files whose history got merged
	- removed: files removed in the revision			- removed: files removed in the revision
				- salvaged: files that might have been deleted by a merge but were not
	- touched: files affected by the merge			- touched: files affected by the merge

	and copies information is held by 2 mappings			and copies information is held by 2 mappings

	- copied_from_p1: {"<new-name>": "<source-name-in-p1>"} mapping for copies			- copied_from_p1: {"<new-name>": "<source-name-in-p1>"} mapping for copies
	- copied_from_p2: {"<new-name>": "<source-name-in-p2>"} mapping for copies			- copied_from_p2: {"<new-name>": "<source-name-in-p2>"} mapping for copies

	See their inline help for details.			See their inline help for details.
	"""			"""

	def __init__(			def __init__(
	self,			self,
	touched=None,			touched=None,
	added=None,			added=None,
	removed=None,			removed=None,
	merged=None,			merged=None,
				salvaged=None,
	p1_copies=None,			p1_copies=None,
	p2_copies=None,			p2_copies=None,
	):			):
	self._added = set(() if added is None else added)			self._added = set(() if added is None else added)
	self._merged = set(() if merged is None else merged)			self._merged = set(() if merged is None else merged)
	self._removed = set(() if removed is None else removed)			self._removed = set(() if removed is None else removed)
	self._touched = set(() if touched is None else touched)			self._touched = set(() if touched is None else touched)
				self._salvaged = set(() if salvaged is None else salvaged)
	self._touched.update(self._added)			self._touched.update(self._added)
	self._touched.update(self._merged)			self._touched.update(self._merged)
	self._touched.update(self._removed)			self._touched.update(self._removed)
	self._p1_copies = dict(() if p1_copies is None else p1_copies)			self._p1_copies = dict(() if p1_copies is None else p1_copies)
	self._p2_copies = dict(() if p2_copies is None else p2_copies)			self._p2_copies = dict(() if p2_copies is None else p2_copies)

	def __eq__(self, other):			def __eq__(self, other):
	return (			return (
	self.added == other.added			self.added == other.added
	and self.merged == other.merged			and self.merged == other.merged
	and self.removed == other.removed			and self.removed == other.removed
				and self.salvaged == other.salvaged
	and self.touched == other.touched			and self.touched == other.touched
	and self.copied_from_p1 == other.copied_from_p1			and self.copied_from_p1 == other.copied_from_p1
	and self.copied_from_p2 == other.copied_from_p2			and self.copied_from_p2 == other.copied_from_p2
	)			)

	@util.propertycache			@util.propertycache
	def added(self):			def added(self):
	"""files actively added in the changeset			"""files actively added in the changeset
	self._removed.add(filename)			self._removed.add(filename)
	self.mark_touched(filename)			self.mark_touched(filename)

	def update_removed(self, filenames):			def update_removed(self, filenames):
	for f in filenames:			for f in filenames:
	self.mark_removed(f)			self.mark_removed(f)

	@util.propertycache			@util.propertycache
				def salvaged(self):
				"""files that might had been deleted by a merge, but were not

				During a merge, the manifest merging might select some file for
				AlphareUnsubmitted Not Done Please fix the typos and punctuation, I am having trouble understanding this docstring. Alphare: Please fix the typos and punctuation, I am having trouble understanding this docstring.
				AlphareUnsubmitted Not Done Merge the two last sentences with a comma and we have a deal! Alphare: Merge the two last sentences with a comma and we have a deal!
				removal, or for a removed/changed conflict. If at commit time the file
				still exist in the final result. It the removal is "reverted" and the
				file is "salvaged"
				"""
				return frozenset(self._salvaged)

				def mark_salvaged(self, filename):
				if "salvaged" in vars(self):
				del self.salvaged
				self._salvaged.add(filename)
				self.mark_touched(filename)

				def update_salvaged(self, filenames):
				for f in filenames:
				self.mark_salvaged(f)

				@util.propertycache
	def touched(self):			def touched(self):
	"""files either actively modified, added or removed"""			"""files either actively modified, added or removed"""
	return frozenset(self._touched)			return frozenset(self._touched)

	def mark_touched(self, filename):			def mark_touched(self, filename):
	if 'touched' in vars(self):			if 'touched' in vars(self):
	del self.touched			del self.touched
	self._touched.add(filename)			self._touched.add(filename)

This is an archive of the discontinued Mercurial Phabricator instance.

changing-files: add a "salvaged" set to track file that were not removedClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 22982

mercurial/metadata.py

changing-files: add a "salvaged" set to track file that were not removed
ClosedPublic

Revision Contents
Changeset List