dirstate: add a `set_untracked` method for "hg remove"-like usage
ClosedPublic

marmoute retitled this revision from dirstate: add a set_untracked method for "hg remove"-like usage to dirstate: add a `set_untracked` method for "hg remove"-like usage.Jul 10 2021, 5:02 PM

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

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHGcce51119bfe6: dirstate: add a `set_untracked` method for "hg remove"-like usage.Jul 15 2021, 12:55 PM

Closed by commit rHGcce51119bfe6: dirstate: add a `set_untracked` method for "hg remove"-like usage (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/largefiles/lfutil.py (3 lines)
M			hgext/narrow/narrowdirstate.py (4 lines)
M			hgext/sparse.py (1 line)
M			mercurial/dirstate.py (21 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	28956		Jul 8 2021, 3:33 AM	★	★
Diff 2	28963		Jul 8 2021, 4:16 AM	★	★
Diff 3	29164		Jul 11 2021, 7:16 AM	★	★
Diff 4	29255		Jul 15 2021, 12:04 PM	★	★
Diff 5	29277	rHGcce51119bfe64a5ad8c0367d5196bf448f8f5577	Jul 7 2021, 6:54 PM	★	★

Commit	Parents	Author	Summary	Date
c6a3d8c10f05	0e95ed8a0cfb	Pierre-Yves David		Jul 7 2021, 6:54 PM

Status	Author	Revision
Closed	marmoute	D10935 dirstate: document the dirstatetuple content
Closed	marmoute	D10982 dirstate-item: rename the class to DirstateItem
Closed	marmoute	D10981 dirstate-entry: add a `mtime` property
Closed	marmoute	D10980 dirstate-entry: add a `size` property
Closed	marmoute	D10979 dirstate-entry: add a `mode` property
Closed	marmoute	D10978 dirstate: no longer pass `oldstate` to the `dropfile`
Closed	marmoute	D10987 dirstate-item: use the properties in fakedirstatewritetime
Closed	marmoute	D10986 dirstate-item: use the properties in dirstatemap
Closed	marmoute	D10985 dirstate-item: use the properties in pathutil
Closed	marmoute	D10984 dirstate-item: use need_delay when packing dirstate
Closed	marmoute	D10991 dirstate-item: use the properties in `contrib/dirstatenonnormalcheck.py`
Closed	marmoute	D10990 dirstate-item: use the properties in largefiles
Closed	marmoute	D10989 dirstate-item: use the `state` property in debugpathcomplete
Closed	marmoute	D11077 mergestate: use dirstate.update_file API in recordupdates()
Closed	marmoute	D11076 dirstate: add dedicated function for updating data of a file
Closed	marmoute	D11075 dirstate: add a `update_file` function
Closed	marmoute	D11074 resolve: use the `parentchange` context manager to apply merge action
Closed	marmoute	D11033 sparse: adjust the temporary includes within a `parentchange` context
Closed	marmoute	D11032 amend: adjust the dirstate within a `parentchange` context
Closed	marmoute	D11031 dirstate: use the right internal API in a test script
Closed	marmoute	D11029 sparse: clear rules in the context of a `parentchanges` context
Closed	marmoute	D11028 sparse: make sure we adjust the dirstate at the same time as the parent
Closed	marmoute	D11027 narrow: update narrow spec within a dirstate.parentchange context
Closed	marmoute	D11026 revert: use `set_untracked` instead of `drop` when applicable
Closed	marmoute	D11022 revert: use `set_untracked` when performing a revert
Closed	marmoute	D11021 mq: use `set_untracked` in `qrename`
Closed	marmoute	D11020 context: use `dirstate.set_untracked` in `context.forget`
Closed	marmoute	D11019 dirstate: add a `set_untracked` method for "hg remove"-like usage
Closed	marmoute	D11018 mq: use `set_tracked` in `qrename`
Closed	marmoute	D11017 mq: update the dirstate and its parent within a `parentchange` context
Closed	marmoute	D11016 context: use `dirstate.set_tracked` for `revert`
Closed	marmoute	D11015 context: use `dirstate.set_tracked` in context.copy
Closed	marmoute	D11014 context: use `dirstate.set_tracked` in `context.add`
Closed	marmoute	D11013 dirstate: add a `set_tracked` method for "hg add"-like usage
Closed	marmoute	D11012 dirstate: add a function to update tracking status while "moving" parents
Closed	marmoute	D11023 dirstate: introduce an internal `_drop` method
Closed	marmoute	D11011 dirstate: introduce an internal `_remove` method
Closed	marmoute	D11010 dirstate: introduce an internal `_add` method
Closed	marmoute	D10993 dirstatenonnormalcheck: fix some bytes formating on python3
Closed	marmoute	D10992 dirstate-item: deprecate tuple access on the class
Closed	marmoute	D10988 dirstate-item: use the v1_serialization method in debugstate
Closed	marmoute	D10983 dirstate-item: also build DistateItem in dirstate.directories()
Closed	marmoute	D10977 dirstate: drop the last explicit `state` usage in the module
Closed	marmoute	D10976 dirstate: drop last explicite `state` usage in status
Closed	marmoute	D10975 dirstate: reorder "state" checking conditional
Closed	marmoute	D10974 dirstate-entry: add a `need_delay` method
Closed	marmoute	D10973 dirstate-entry: add a `tracked` property
Closed	marmoute	D10972 dirstate: drop `state` to `_addpath`
Closed	marmoute	D10971 dirstate: infer the 'n' state from `from_p2`
Closed	marmoute	D10970 dirstate: infer the 'n' state from `possibly_dirty`
Closed	marmoute	D10969 dirstate: use a `merged` parameter to _addpath
Closed	marmoute	D10968 dirstate-entry: add a `added` property
Closed	marmoute	D10967 dirstate: use a `added` parameter to _addpath
Closed	marmoute	D10966 dirstate: no longer pass the `oldstate` value to the dirstatemap
Closed	marmoute	D10965 dirstate: stop using `oldstate` in `dirstate._addpath`
Closed	marmoute	D10964 dirstate: drop the now unused magic constants for the dirstate module
Closed	marmoute	D10963 dirstate: move the handling of special case within the dirstatemap
Closed	marmoute	D10962 rust: bump rust-cpython version for 0.6.0
Closed	marmoute	D10961 rust-dirstate: make the MTIME_UNSET public
Closed	marmoute	D10960 rust-dirstatemap: expand the wrapping code a bit
Closed	marmoute	D10959 dirstate-entry: restrict `from_p2` property to tracked file
Closed	marmoute	D10958 dirstate-entry: `merged_removed` and `from_p2_removed` properties
Closed	marmoute	D10957 dirstate-entry: add a `removed` property
Closed	marmoute	D10956 dirstate-entry: add a `from_p2` property
Closed	marmoute	D10955 dirstate-entry: add a `merged` property
Closed	marmoute	D10954 dirstate-entry: add a `state` property (and use it)
Closed	marmoute	D10953 dirstate: move most of the `remove` logic with dirstatemap `removefile`
Closed	marmoute	D10952 dirstate: add a `in_merge` property
Closed	marmoute	D10951 dirstate-entry: introduce dedicated accessors for v1 serialization
Closed	marmoute	D10950 dirstate-entry: goes through the `dirstatetuple` constructor in all cases
Closed	marmoute	D10949 dirstate-entry: turn dirstate tuple into a real object (like in C)
Closed	marmoute	D10934 dirstate: split dirstatemap in its own file
Closed	marmoute	D10933 dirstate: explicitely deal with the `added` case in `_addpath`
Closed	marmoute	D10932 dirstate: add an explicit `possibly_dirty` parameter to `_addpath`
Closed	marmoute	D10931 dirstate: add an explicit `from_p2` parameter to `_addpath`
Closed	marmoute	D10930 dirstate: add default value to _addpath
Closed	marmoute	D10929 dirstate: move the _rangemask filtering closer to its storage
Closed	marmoute	D10928 dirstate: introduce a symbolic constant for the AMBIGUOUS_TIME marker
Closed	marmoute	D10927 dirstate: introduce a symbolic constant for the NONNORMAL marker
Closed	marmoute	D10926 dirstate: introduce a symbolic constant for the FROM_P2 marker
Closed	marmoute	D10925 dirstate: split a not-so-one-liner
Closed	marmoute	D10924 dirstate: split a not-so-one-liner
Closed	marmoute	D10923 dirstate: split a not-so-one-liner

Diff 28963

hgext/largefiles/lfutil.py


	class largefilesdirstate(dirstate.dirstate):			class largefilesdirstate(dirstate.dirstate):
	def __getitem__(self, key):			def __getitem__(self, key):
	return super(largefilesdirstate, self).__getitem__(unixpath(key))			return super(largefilesdirstate, self).__getitem__(unixpath(key))

	def set_tracked(self, f):			def set_tracked(self, f):
	return super(largefilesdirstate, self).set_tracked(unixpath(f))			return super(largefilesdirstate, self).set_tracked(unixpath(f))

				def set_untracked(self, f):
				return super(largefilesdirstate, self).set_untracked(unixpath(f))

	def normal(self, f):			def normal(self, f):
	return super(largefilesdirstate, self).normal(unixpath(f))			return super(largefilesdirstate, self).normal(unixpath(f))

	def remove(self, f):			def remove(self, f):
	return super(largefilesdirstate, self).remove(unixpath(f))			return super(largefilesdirstate, self).remove(unixpath(f))

	def add(self, f):			def add(self, f):
	return super(largefilesdirstate, self).add(unixpath(f))			return super(largefilesdirstate, self).add(unixpath(f))

hgext/narrow/narrowdirstate.py

	def normal(self, args, *kwargs):			def normal(self, args, *kwargs):
	return super(narrowdirstate, self).normal(args, *kwargs)			return super(narrowdirstate, self).normal(args, *kwargs)

	@_editfunc			@_editfunc
	def set_tracked(self, *args):			def set_tracked(self, *args):
	return super(narrowdirstate, self).set_tracked(*args)			return super(narrowdirstate, self).set_tracked(*args)

	@_editfunc			@_editfunc
				def set_untracked(self, *args):
				return super(narrowdirstate, self).set_untracked(*args)

				@_editfunc
	def add(self, *args):			def add(self, *args):
	return super(narrowdirstate, self).add(*args)			return super(narrowdirstate, self).add(*args)

	@_editfunc			@_editfunc
	def normallookup(self, *args):			def normallookup(self, *args):
	return super(narrowdirstate, self).normallookup(*args)			return super(narrowdirstate, self).normallookup(*args)

	@_editfunc			@_editfunc

hgext/sparse.py

	return orig(self, parent, allfiles, changedfiles)			return orig(self, parent, allfiles, changedfiles)

	extensions.wrapfunction(dirstate.dirstate, b'rebuild', _rebuild)			extensions.wrapfunction(dirstate.dirstate, b'rebuild', _rebuild)

	# Prevent adding files that are outside the sparse checkout			# Prevent adding files that are outside the sparse checkout
	editfuncs = [			editfuncs = [
	b'normal',			b'normal',
	b'set_tracked',			b'set_tracked',
				b'set_untracked',
	b'add',			b'add',
	b'normallookup',			b'normallookup',
	b'copy',			b'copy',
	b'remove',			b'remove',
	b'merge',			b'merge',
	]			]
	hint = _(			hint = _(
	b'include file with `hg debugsparse --include <pattern>` or use '			b'include file with `hg debugsparse --include <pattern>` or use '

mercurial/dirstate.py

	if entry is None:			if entry is None:
	self._add(filename)			self._add(filename)
	return True			return True
	elif not entry.tracked:			elif not entry.tracked:
	self.normallookup(filename)			self.normallookup(filename)
	return True			return True
	return False			return False

				def set_untracked(self, filename):
				"""a "public" method for generic code to mark a file as untracked

				This function is to be called outside of "update/merge" case. For
				example by a command like `hg remove X`.

				return True the file was previously tracked, False otherwise.
				"""
				if self._parentwriters > 0:
				msg = b'calling set_tracked inside a parentchange context'
				raise error.ProgrammingError(msg)
				entry = self._map.get(filename)
				if entry is None:
				return False
				elif entry.added:
				self._drop(filename)
				return True
				else:
				self._remove(filename)
				return True

	def update_file_reference(			def update_file_reference(
	self,			self,
	filename,			filename,
	p1_tracked,			p1_tracked,
	):			):
	"""Set a file as tracked in the parent (or not)			"""Set a file as tracked in the parent (or not)

	Thi is to be called when adjust the dirstate to a new parent after an history			Thi is to be called when adjust the dirstate to a new parent after an history

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate: add a `set_untracked` method for "hg remove"-like usageClosedPublic

Details

Diff Detail

Event Timeline