This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22972		Oct 1 2020, 10:09 AM	★	★
Diff 2	22999		Oct 2 2020, 5:10 AM	★	★
Diff 3	23110	rHGb76e949dccb437f3f735b889813b07689c8f6066	Oct 1 2020, 3:45 AM	★	★

Status	Author	Revision
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	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	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 23110

mercurial/copies.py

	):			):
	pass			pass
	elif (			elif (
	changes is not None			changes is not None
	and other[1] is None			and other[1] is None
	and dest in changes.salvaged			and dest in changes.salvaged
	):			):
	minor[dest] = value			minor[dest] = value
	elif not isancestor(new_tt, other_tt):
	minor[dest] = value
	elif changes is not None and dest in changes.merged:			elif changes is not None and dest in changes.merged:
	minor[dest] = value			minor[dest] = value
				elif not isancestor(new_tt, other_tt):
				minor[dest] = value


	def _revinfo_getter_extra(repo):			def _revinfo_getter_extra(repo):
	"""return a function that return multiple data given a <rev>"i			"""return a function that return multiple data given a <rev>"i

	* p1: revision number of first parent			* p1: revision number of first parent
	* p2: revision number of first parent			* p2: revision number of first parent
	* p1copies: mapping of copies from p1			* p1copies: mapping of copies from p1

This is an archive of the discontinued Mercurial Phabricator instance.

copies: move `merged` testing soonerClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 23110

mercurial/copies.py

copies: move `merged` testing sooner
ClosedPublic

Revision Contents
Changeset List