This is an archive of the discontinued Mercurial Phabricator instance.

dirstate-item: point out that `merged` is set only with p1_tracked
AbandonedPublic

Authored by marmoute on Oct 1 2021, 2:40 PM.

Download Raw Diff

Details

Reviewers

Alphare
pulkit

Group Reviewers

hg-reviewers

Summary

This is currently True, and we will use this fact to simplify the API in the
next commit. However, we add this assertion first to validate that this is
True in the whole test-suite.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

marmoute created this revision.Oct 1 2021, 2:40 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptOct 1 2021, 2:40 PM

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

marmoute added a child revision: D11556: dirstate: push back the future a bit in the test.Oct 1 2021, 2:40 PM

Alphare accepted this revision.Oct 1 2021, 4:27 PM

This revision is now accepted and ready to land.Oct 1 2021, 4:27 PM

pulkit accepted this revision.Oct 12 2021, 9:29 AM

apparently already queued but phabricator is confused.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/pure/parsers.py (1 line)

Commit	Parents	Author	Summary	Date
d98ee56e59b5	8986fd5c4af5	Pierre-Yves David		Sep 30 2021, 12:07 PM

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 30512

mercurial/pure/parsers.py

	clean_p2=False,			clean_p2=False,
	possibly_dirty=False,			possibly_dirty=False,
	parentfiledata=None,			parentfiledata=None,
	):			):
	if merged and (clean_p1 or clean_p2):			if merged and (clean_p1 or clean_p2):
	msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`'			msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`'
	raise error.ProgrammingError(msg)			raise error.ProgrammingError(msg)

				assert not (merged and not p1_tracked)
	self._wc_tracked = wc_tracked			self._wc_tracked = wc_tracked
	self._p1_tracked = p1_tracked			self._p1_tracked = p1_tracked
	self._p2_tracked = p2_tracked			self._p2_tracked = p2_tracked
	self._merged = merged			self._merged = merged
	self._clean_p1 = clean_p1			self._clean_p1 = clean_p1
	self._clean_p2 = clean_p2			self._clean_p2 = clean_p2
	self._possibly_dirty = possibly_dirty			self._possibly_dirty = possibly_dirty
	if parentfiledata is None:			if parentfiledata is None:

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	30512			Oct 1 2021, 2:40 PM	★	★