This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11343

dirstate: also wrap the new method in `dirstatenonnormalcheck`
ClosedPublic

Authored by marmoute on Aug 26 2021, 10:20 AM.

Download Raw Diff

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

rHG74a8d5c6fdc6: dirstate: also wrap the new method in `dirstatenonnormalcheck`

Summary

The goal of this is to make sure we set the data right, so we need to make sure
it run after the new method, that we actually call, in addition to the old one,
that we no longer call.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

marmoute created this revision.Aug 26 2021, 10:20 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptAug 26 2021, 10:20 AM

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

marmoute added a child revision: D11344: dirstate: drop the deprecated `normal` method.Aug 26 2021, 10:20 AM

Alphare accepted this revision.Aug 27 2021, 5:47 AM

This revision is now accepted and ready to land.Aug 27 2021, 5:47 AM

marmoute added a commit: rHG74a8d5c6fdc6: dirstate: also wrap the new method in `dirstatenonnormalcheck`.Aug 27 2021, 8:39 AM

Closed by commit rHG74a8d5c6fdc6: dirstate: also wrap the new method in `dirstatenonnormalcheck` (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			contrib/dirstatenonnormalcheck.py (9 lines)

Commit	Parents	Author	Summary	Date
c7be1fb4e487	c87a88b121ad	Pierre-Yves David		Aug 24 2021, 4:07 PM

Status	Author	Revision
Closed	marmoute	D11353 dirstate: drop the `_otherparent` method
Closed	marmoute	D11352 dirstate: drop the `_normal` method
Closed	marmoute	D11351 dirstate: drop the `_merge` method
Closed	marmoute	D11350 dirstate: drop the deprecated `drop` method
Closed	marmoute	D11349 dirstate: drop the deprecated `merge` method
Closed	marmoute	D11348 dirstate: drop the deprecated `remove` method
Closed	marmoute	D11347 dirstate: drop the deprecated `add` method
Closed	marmoute	D11346 dirstate: drop the deprecated `otherparent` method
Closed	marmoute	D11345 dirstate: drop the deprecated `normallookup` method
Closed	marmoute	D11344 dirstate: drop the deprecated `normal` method
Closed	marmoute	D11343 dirstate: also wrap the new method in `dirstatenonnormalcheck`
Closed	marmoute	D11332 dirstatemap: also discard item from sets
Closed	marmoute	D11331 dirstatemap: drop unused internal constant definition
Closed	marmoute	D11330 dirstate-item: add dedicated "legacy" constructor for `addfile` case
Closed	marmoute	D11329 dirstatemap: use the default code to handle "merged" case
Closed	marmoute	D11328 dirstatemap: use the default code to handle "added" case
Closed	marmoute	D11327 dirstatemap: use the default code to handle "removed" case
Closed	marmoute	D11326 dirstatemap: use the default code to handle "clean-p2" case
Closed	marmoute	D11325 dirstatemap: use the default code to handle "p2-tracked" case
Closed	marmoute	D11324 dirstatemap: use the default code to handle "possibly_dirty" case
Closed	marmoute	D11323 dirstatemap: use the default code to handle normal entry
Closed	marmoute	D11322 dirstatemap: conclude `reset_state` with logic using the new __init__
Closed	marmoute	D11321 dirstatemap: temporarily return early in `reset_state`
Closed	marmoute	D11320 dirstate-item: feed more information to `__init__`
Closed	marmoute	D11319 rust-dirstatemap: temporarily use `from_v1_data` in `addfile`
Closed	marmoute	D11318 dirstatemap: temporarily use `from_v1_data` in `addfile`
Closed	marmoute	D11317 dirstate-item: fix the declaration of the Cext `from_v1_meth`
Closed	marmoute	D11316 dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent
Closed	marmoute	D11315 dirstatemap: replace `removefile` by an explicit `entry.set_untracked()`
Closed	marmoute	D11314 dirstate: forward `remove` call to newer `API`
Closed	marmoute	D11313 dirstate: directly call the dirstatemap in `set_untracked`

Diff 30059

contrib/dirstatenonnormalcheck.py

	extensions.wrapfunction(dirstatecl, 'normallookup', _checkdirstate)			extensions.wrapfunction(dirstatecl, 'normallookup', _checkdirstate)
	extensions.wrapfunction(dirstatecl, 'otherparent', _checkdirstate)			extensions.wrapfunction(dirstatecl, 'otherparent', _checkdirstate)
	extensions.wrapfunction(dirstatecl, 'normal', _checkdirstate)			extensions.wrapfunction(dirstatecl, 'normal', _checkdirstate)
	extensions.wrapfunction(dirstatecl, 'write', _checkdirstate)			extensions.wrapfunction(dirstatecl, 'write', _checkdirstate)
	extensions.wrapfunction(dirstatecl, 'add', _checkdirstate)			extensions.wrapfunction(dirstatecl, 'add', _checkdirstate)
	extensions.wrapfunction(dirstatecl, 'remove', _checkdirstate)			extensions.wrapfunction(dirstatecl, 'remove', _checkdirstate)
	extensions.wrapfunction(dirstatecl, 'merge', _checkdirstate)			extensions.wrapfunction(dirstatecl, 'merge', _checkdirstate)
	extensions.wrapfunction(dirstatecl, 'drop', _checkdirstate)			extensions.wrapfunction(dirstatecl, 'drop', _checkdirstate)
				extensions.wrapfunction(dirstatecl, 'set_tracked', _checkdirstate)
				extensions.wrapfunction(dirstatecl, 'set_untracked', _checkdirstate)
				extensions.wrapfunction(
				dirstatecl, 'set_possibly_dirty', _checkdirstate
				)
				extensions.wrapfunction(
				dirstatecl, 'update_file_p1', _checkdirstate
				)
				extensions.wrapfunction(dirstatecl, 'update_file', _checkdirstate)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30059		Aug 26 2021, 10:20 AM	★	★
Diff 2	30100	rHG74a8d5c6fdc6db20cf7da9cc8ec8eac0688cee49	Aug 24 2021, 4:07 PM	★	★