This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7976

copies: avoid calculating debug-only stuff without --debug
ClosedPublic

Authored by martinvonz on Jan 23 2020, 1:44 AM.

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHG782e0d9c3b74: copies: avoid calculating debug-only stuff without --debug

Summary

renamedeleteset and divergeset is only used with
repo.ui.debugflag, so let's avoid calculating them otherwise. While
at it, I also added a del renamedeleteset for consistency.

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

martinvonz created this revision.Jan 23 2020, 1:44 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJan 23 2020, 1:44 AM

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

martinvonz added a child revision: D7977: copies: extract function for finding directory renames.Jan 23 2020, 1:44 AM

martinvonz updated this revision to Diff 19561.Jan 24 2020, 5:00 PM

pulkit accepted this revision.Jan 24 2020, 5:22 PM

This revision is now accepted and ready to land.Jan 24 2020, 5:22 PM

martinvonz added a commit: rHG782e0d9c3b74: copies: avoid calculating debug-only stuff without --debug.Jan 24 2020, 6:26 PM

Closed by commit rHG782e0d9c3b74: copies: avoid calculating debug-only stuff without --debug (authored by martinvonz). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	19528		Jan 23 2020, 1:44 AM	★	★
Diff 2	19561		Jan 24 2020, 5:00 PM	★	★
Diff 3	19574	rHG782e0d9c3b7467d18838580b0670d44f2bd29259	Jan 22 2020, 6:23 PM	★	★

Status	Author	Revision
Closed	martinvonz	D7974 merge: when rename was made on both sides, use ancestor as merge base
Closed	martinvonz	D7990 merge: start using the per-side copy dicts
Closed	martinvonz	D7989 copies: define a type to return from mergecopies()
Closed	martinvonz	D7988 merge: move initialization of copy dicts to one place
Closed	martinvonz	D7987 copies: print debug information about copies per side/branch
Closed	martinvonz	D7986 copies: make mergecopies() distinguish between copies on each side
Closed	martinvonz	D7977 copies: extract function for finding directory renames
Closed	martinvonz	D7976 copies: avoid calculating debug-only stuff without --debug
Closed	martinvonz	D7975 copies: move early return in mergecopies() earlier
Closed	martinvonz	D7985 tests: test merge of renames of different sources to same target

Diff 19574

mercurial/copies.py

	src, dsts1, m1, m2, mb, c2, base, copy, renamedelete			src, dsts1, m1, m2, mb, c2, base, copy, renamedelete
	)			)
	elif dsts2:			elif dsts2:
	# copied/renamed only on side 2			# copied/renamed only on side 2
	_checksinglesidecopies(			_checksinglesidecopies(
	src, dsts2, m2, m1, mb, c1, base, copy, renamedelete			src, dsts2, m2, m1, mb, c1, base, copy, renamedelete
	)			)

	renamedeleteset = set()
	divergeset = set()
	for dsts in diverge.values():
	divergeset.update(dsts)
	for dsts in renamedelete.values():
	renamedeleteset.update(dsts)

	# find interesting file sets from manifests			# find interesting file sets from manifests
	addedinm1 = m1.filesnotin(mb, repo.narrowmatch())			addedinm1 = m1.filesnotin(mb, repo.narrowmatch())
	addedinm2 = m2.filesnotin(mb, repo.narrowmatch())			addedinm2 = m2.filesnotin(mb, repo.narrowmatch())
	u1 = sorted(addedinm1 - addedinm2)			u1 = sorted(addedinm1 - addedinm2)
	u2 = sorted(addedinm2 - addedinm1)			u2 = sorted(addedinm2 - addedinm1)

	header = b" unmatched files in %s"			header = b" unmatched files in %s"
	if u1:			if u1:
	repo.ui.debug(b"%s:\n %s\n" % (header % b'local', b"\n ".join(u1)))			repo.ui.debug(b"%s:\n %s\n" % (header % b'local', b"\n ".join(u1)))
	if u2:			if u2:
	repo.ui.debug(b"%s:\n %s\n" % (header % b'other', b"\n ".join(u2)))			repo.ui.debug(b"%s:\n %s\n" % (header % b'other', b"\n ".join(u2)))

	fullcopy = copies1.copy()			fullcopy = copies1.copy()
	fullcopy.update(copies2)			fullcopy.update(copies2)

	if repo.ui.debugflag:			if repo.ui.debugflag:
				renamedeleteset = set()
				divergeset = set()
				for dsts in diverge.values():
				divergeset.update(dsts)
				for dsts in renamedelete.values():
				renamedeleteset.update(dsts)

	repo.ui.debug(			repo.ui.debug(
	b" all copies found (* = to merge, ! = divergent, "			b" all copies found (* = to merge, ! = divergent, "
	b"% = renamed and deleted):\n"			b"% = renamed and deleted):\n"
	)			)
	for f in sorted(fullcopy):			for f in sorted(fullcopy):
	note = b""			note = b""
	if f in copy:			if f in copy:
	note += b"*"			note += b"*"
	if f in divergeset:			if f in divergeset:
	note += b"!"			note += b"!"
	if f in renamedeleteset:			if f in renamedeleteset:
	note += b"%"			note += b"%"
	repo.ui.debug(			repo.ui.debug(
	b" src: '%s' -> dst: '%s' %s\n" % (fullcopy[f], f, note)			b" src: '%s' -> dst: '%s' %s\n" % (fullcopy[f], f, note)
	)			)
				del renamedeleteset
	del divergeset			del divergeset

	repo.ui.debug(b" checking for directory renames\n")			repo.ui.debug(b" checking for directory renames\n")

	# generate a directory move map			# generate a directory move map
	d1, d2 = c1.dirs(), c2.dirs()			d1, d2 = c1.dirs(), c2.dirs()
	invalid = set()			invalid = set()
	dirmove = {}			dirmove = {}