This is an archive of the discontinued Mercurial Phabricator instance.

marmoute retitled this revision from status: adapt largefile to gather stats at lookup time to status: adapt the "keyword" extensions to gather stats at lookup time.Nov 30 2021, 6:53 PM

marmoute edited the summary of this revision. (Show Details)

Alphare accepted this revision.Dec 1 2021, 5:12 AM

This revision is now accepted and ready to land.Dec 1 2021, 5:12 AM

marmoute added a commit: rHG4237be881bb6: status: adapt the "keyword" extensions to gather stats at lookup time.Dec 1 2021, 10:21 AM

Closed by commit rHG4237be881bb6: status: adapt the "keyword" extensions to gather stats at lookup time (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/keyword.py (9 lines)

Commit	Parents	Author	Summary	Date
f0edaebf9fd5	22acc6a595fe	Pierre-Yves David		Nov 18 2021, 4:49 PM

Status	Author	Revision
Closed	marmoute	D11800 largefile: use the proper "mtime boundary" logic during fixup
Closed	marmoute	D11799 status: move the boundary comparison logic within the timestamp module
Closed	marmoute	D11798 tests: remove potential mtime ambiguity in a dirstate test
Closed	marmoute	D11797 dirstate: cleanup remaining of "now" during write
Closed	marmoute	D11796 dirstate: remove need_delay logic
Closed	marmoute	D11795 dirstate: remove `lastnormaltime` mechanism
Closed	marmoute	D11794 status: use filesystem time boundary to invalidate racy mtime
Closed	marmoute	D11793 test: use a different timestamp for the updated file
Closed	marmoute	D11792 win32text: drop associated dirstate cache information on revert
Closed	marmoute	D11791 dirstate: stop gathering parentfiledata in update_file
Closed	marmoute	D11790 dirstate: stop gathering parentfiledata in update_file_p1
Closed	marmoute	D11789 dirstate: make it mandatory to provide parentfiledata in `set_clean`
Closed	marmoute	D11788 dirstate: do no use `set_clean` in revert
Closed	marmoute	D11787 status: adapt the "keyword" extensions to gather stats at lookup time
Closed	marmoute	D11786 status: adapt largefile to gather stats at lookup time
Closed	marmoute	D11785 status: gather fixup info at comparison time
Closed	marmoute	D11784 update: filter the ambiguous mtime in update directly
Closed	marmoute	D11783 dirstate: move "get fs now" in the timestamp utility module
Closed	marmoute	D11782 dirstate-item: allow mtime to be None in "parentdata"
Closed	marmoute	D11781 dirstate: add a comment about a racy piece of code during updates
Closed	marmoute	D11780 tests: add missing `head` for when things go wrong
Closed	marmoute	D11779 tests: ensure a status will have non ambiguous mtime in some race test
Closed	marmoute	D11778 tests: make sure no ambiguities remains after the commit
Closed	marmoute	D11777 dirstate: clarify a `hg update` invocation in a test
Closed	marmoute	D11833 test: mark rhg output as flaky

Diff 31109

hgext/keyword.py

	templatefilters,			templatefilters,
	templateutil,			templateutil,
	util,			util,
	)			)
	from mercurial.utils import (			from mercurial.utils import (
	dateutil,			dateutil,
	stringutil,			stringutil,
	)			)
				from mercurial.dirstateutils import timestamp

	cmdtable = {}			cmdtable = {}
	command = registrar.command(cmdtable)			command = registrar.command(cmdtable)
	# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for			# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
	# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should			# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
	# be specifying the version(s) of Mercurial they are tested with, or			# be specifying the version(s) of Mercurial they are tested with, or
	# leave the attribute unspecified.			# leave the attribute unspecified.
	testedwith = b'ships-with-hg-core'			testedwith = b'ships-with-hg-core'
	if self.restrict or rekw:			if self.restrict or rekw:
	re_kw = self.rekw			re_kw = self.rekw
	else:			else:
	re_kw = self.rekwexp			re_kw = self.rekwexp
	if expand:			if expand:
	msg = _(b'overwriting %s expanding keywords\n')			msg = _(b'overwriting %s expanding keywords\n')
	else:			else:
	msg = _(b'overwriting %s shrinking keywords\n')			msg = _(b'overwriting %s shrinking keywords\n')
				wctx = self.repo[None]
	for f in candidates:			for f in candidates:
	if self.restrict:			if self.restrict:
	data = self.repo.file(f).read(mf[f])			data = self.repo.file(f).read(mf[f])
	else:			else:
	data = self.repo.wread(f)			data = self.repo.wread(f)
	if stringutil.binary(data):			if stringutil.binary(data):
	continue			continue
	if expand:			if expand:
	else:			else:
	data, found = _shrinktext(data, re_kw.subn)			data, found = _shrinktext(data, re_kw.subn)
	if found:			if found:
	self.ui.note(msg % f)			self.ui.note(msg % f)
	fp = self.repo.wvfs(f, b"wb", atomictemp=True)			fp = self.repo.wvfs(f, b"wb", atomictemp=True)
	fp.write(data)			fp.write(data)
	fp.close()			fp.close()
	if kwcmd:			if kwcmd:
	self.repo.dirstate.set_clean(f)			s = wctx[f].lstat()
				mode = s.st_mode
				size = s.st_size
				mtime = timestamp.mtime_of(s)
				cache_data = (mode, size, mtime)
				self.repo.dirstate.set_clean(f, cache_data)
	elif self.postcommit:			elif self.postcommit:
	self.repo.dirstate.update_file_p1(f, p1_tracked=True)			self.repo.dirstate.update_file_p1(f, p1_tracked=True)

	def shrink(self, fname, text):			def shrink(self, fname, text):
	'''Returns text with all keyword substitutions removed.'''			'''Returns text with all keyword substitutions removed.'''
	if self.match(fname) and not stringutil.binary(text):			if self.match(fname) and not stringutil.binary(text):
	return _shrinktext(text, self.rekwexp.sub)			return _shrinktext(text, self.rekwexp.sub)
	return text			return text

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	31109		Nov 24 2021, 6:11 AM	★	★
Diff 2	31249	rHG4237be881bb6f3f1334c9f4f31625da1fd6a8173	Nov 18 2021, 4:49 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

status: adapt the "keyword" extensions to gather stats at lookup timeClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 31109

hgext/keyword.py

status: adapt the "keyword" extensions to gather stats at lookup time
ClosedPublic

Revision Contents
Changeset List