( )⚙ D11433 dirstatE: stop using `_normallookup` in the adddrop extension

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11433

dirstatE: stop using `_normallookup` in the adddrop extension
ClosedPublic

Authored by marmoute on Sep 16 2021, 10:44 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGeb1f8d6e9419: dirstate: stop using `_normallookup` in the adddrop extension
Summary

That extensions is just trying to produce "corrupted" dirstate.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Sep 16 2021, 10:44 AM
Alphare accepted this revision.Sep 20 2021, 9:44 AM
This revision is now accepted and ready to land.Sep 20 2021, 9:44 AM
Alphare added a comment.Sep 20 2021, 9:54 AM

Also "dirstatE": will amend on-the-fly

Revision Contents
Changeset List

PathPackages
Mtests/test-rebuildstate.t (8 lines)

Diff 30271

tests/test-rebuildstate.t

> drop = opts.get('drop') > drop = opts.get('drop')
> nl = opts.get('normal_lookup') > nl = opts.get('normal_lookup')
> if nl and drop: > if nl and drop:
> raise error.Abort('drop and normal-lookup are mutually exclusive') > raise error.Abort('drop and normal-lookup are mutually exclusive')
> wlock = repo.wlock() > wlock = repo.wlock()
> try: > try:
> for file in pats: > for file in pats:
> if opts.get('normal_lookup'): > if opts.get('normal_lookup'):
> repo.dirstate._normallookup(file) > with repo.dirstate.parentchange():
> repo.dirstate.update_file(
> file,
> p1_tracked=True,
> wc_tracked=True,
> possibly_dirty=True,
> )
> else: > else:
> repo.dirstate._map.dropfile(file) > repo.dirstate._map.dropfile(file)
> repo.dirstate._dirty = True > repo.dirstate._dirty = True
> >
> repo.dirstate.write(repo.currenttransaction()) > repo.dirstate.write(repo.currenttransaction())
> finally: > finally:
> wlock.release() > wlock.release()
> EOF > EOF