This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Abandoned	marmoute	D11556 dirstate: push back the future a bit in the test
Abandoned	marmoute	D11555 dirstate-item: point out that `merged` is set only with p1_tracked
Abandoned	marmoute	D11554 dirstate-item: update the attribute documentation
Abandoned	marmoute	D11553 dirstate-item: use `any_tracked` more
Abandoned	marmoute	D11552 dirstate-item: drop an outdated comments
Abandoned	marmoute	D11551 dirstate: remove a update_file's special case for `merged` file
Abandoned	marmoute	D11550 dirstate: remove a update_file's special case for tracked file with p2 data
Closed	marmoute	D11544 dirstate: deprecate `__getitem__` access
Closed	marmoute	D11543 dirstate-item: use item's property instead of `state` in largefile
Closed	marmoute	D11542 dirstate-item: use `added` instead of `state` when moving dirstate
Closed	marmoute	D11541 dirstate-item: use item's property instead of `state` in revert
Closed	marmoute	D11540 dirstate-item: use item's property when computing a copies
Closed	marmoute	D11539 dirstate-item: use item's property instead of `state` in copy
Closed	marmoute	D11538 dirstate-item: use `added` in debugrebuilddirstate
Closed	marmoute	D11537 dirstate-item: use `maybe_clean` instead of `state` in record
Closed	marmoute	D11536 dirstate-item: use `any_tracked` instead of `state` to apply patches
Closed	marmoute	D11535 dirstate-item: use item's property instead of `state` in addremove
Closed	marmoute	D11534 dirstate-item: use `tracked` instead of `state` during copy detection
Closed	marmoute	D11533 dirstate-item: use `maybe_clean` instead of `state` in `strip`
Closed	marmoute	D11532 dirstate-item: use `tracked` instead of `state` in context.matches
Closed	marmoute	D11531 dirstate-item: use `tracked` instead of the `state` in context's iter
Closed	marmoute	D11530 dirstate-item: use `tracked` instead of the `state` in context
Closed	marmoute	D11529 dirstate-item: use item's property to deal with hgsubstate in mq
Closed	marmoute	D11528 dirstate-item: use `added` instead of the `state` in the `mq` extension
Closed	marmoute	D11527 dirstate-item: use maybe_clean instead of `state` in the eol extension
Closed	marmoute	D11526 dirstate: move verification code within the dirstate itself
Closed	marmoute	D11525 dirstate-entry: use `?` for the state of entry without any tracking
Closed	marmoute	D11524 dirstate-item: introduce a `any_tracked` property
Closed	marmoute	D11523 dirstate-item: introduce a `maybe_clean` property
Closed	marmoute	D11522 dirstate: add a `get_entry` method to the dirstate
Closed	marmoute	D11521 dirstate-item: Make constructor parameters optional

Diff 30537

mercurial/patch.py

	super(workingbackend, self).__init__(ui, repo.root)			super(workingbackend, self).__init__(ui, repo.root)
	self.repo = repo			self.repo = repo
	self.similarity = similarity			self.similarity = similarity
	self.removed = set()			self.removed = set()
	self.changed = set()			self.changed = set()
	self.copied = []			self.copied = []

	def _checkknown(self, fname):			def _checkknown(self, fname):
	if self.repo.dirstate[fname] == b'?' and self.exists(fname):			if not self.repo.dirstate.get_entry(fname).any_tracked and self.exists(
				fname
				):
	raise PatchError(_(b'cannot patch %s: file is not tracked') % fname)			raise PatchError(_(b'cannot patch %s: file is not tracked') % fname)

	def setfile(self, fname, data, mode, copysource):			def setfile(self, fname, data, mode, copysource):
	self._checkknown(fname)			self._checkknown(fname)
	super(workingbackend, self).setfile(fname, data, mode, copysource)			super(workingbackend, self).setfile(fname, data, mode, copysource)
	if copysource is not None:			if copysource is not None:
	self.copied.append((copysource, fname))			self.copied.append((copysource, fname))
	self.changed.add(fname)			self.changed.add(fname)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30463		Oct 1 2021, 5:39 AM	★	★
Diff 2	30537	rHGe0d566f3ffce92ff66bae7c3ff2b7cf17f68e2b2	Sep 29 2021, 9:40 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate-item: use `any_tracked` instead of `state` to apply patchesClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30537

mercurial/patch.py

dirstate-item: use `any_tracked` instead of `state` to apply patches
ClosedPublic

Revision Contents
Changeset List