This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22914		Sep 29 2020, 6:37 AM	★	★
Diff 2	23011		Oct 2 2020, 12:40 PM	★	★
Diff 3	23085	rHG2286fcfad4992cf3d1a8b36bd7fffef74615ef41	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 23085

mercurial/merge.py

	# - ma is the same as m1 or m2, which we're just going to diff again later			# - ma is the same as m1 or m2, which we're just going to diff again later
	# - The caller specifically asks for a full diff, which is useful during bid			# - The caller specifically asks for a full diff, which is useful during bid
	# merge.			# merge.
	# - we are tracking salvaged files specifically hence should process all			# - we are tracking salvaged files specifically hence should process all
	# files			# files
	if (			if (
	pa not in ([wctx, p2] + wctx.parents())			pa not in ([wctx, p2] + wctx.parents())
	and not forcefulldiff			and not forcefulldiff
	and not repo.ui.configbool(b'experimental', b'merge-track-salvaged')			and not (
				repo.ui.configbool(b'experimental', b'merge-track-salvaged')
				or repo.filecopiesmode == b'changeset-sidedata'
				)
	):			):
	# Identify which files are relevant to the merge, so we can limit the			# Identify which files are relevant to the merge, so we can limit the
	# total m1-vs-m2 diff to just those files. This has significant			# total m1-vs-m2 diff to just those files. This has significant
	# performance benefits in large repositories.			# performance benefits in large repositories.
	relevantfiles = set(ma.diff(m2).keys())			relevantfiles = set(ma.diff(m2).keys())

	# For copied and moved files, we need to add the source file too.			# For copied and moved files, we need to add the source file too.
	for copykey, copyvalue in pycompat.iteritems(branch_copies1.copy):			for copykey, copyvalue in pycompat.iteritems(branch_copies1.copy):

This is an archive of the discontinued Mercurial Phabricator instance.

salvaged: track removal-candidates in more casesClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 23085

mercurial/merge.py

salvaged: track removal-candidates in more cases
ClosedPublic

Revision Contents
Changeset List