Differential D8913

scmutil: introduce filterrequirements() to split reqs into wc and store ones
ClosedPublic
Actions

Authored by pulkit on Aug 7 2020, 8:45 AM.

Details

Reviewers

indygreg

Group Reviewers

hg-reviewers

Commits

rHG9a99ab8217bd: scmutil: introduce filterrequirements() to split reqs into wc and store ones

Summary

In upcoming patches where we try to implement requirements in store, we will
need a mechanism to split all requirements on some basis and decide which one
goes to .hg/requires and which one goes to .hg/store/requires.

This patch introduce a separate function for that. Filtering logic for now is
put under an if False:. In upcoming patches it will be removed.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Aug 7 2020, 8:45 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptAug 7 2020, 8:45 AM

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

pulkit added a child revision: D8633: share: introduce config option to store requires in .hg/store.Aug 7 2020, 8:49 AM

I'm going to approve but will hold off landing until the following patch solidifies a bit.

This revision is now accepted and ready to land.Aug 8 2020, 1:17 PM

pulkit edited parent revisions, added: D8924: requirements: introduce a set of working directory specific requirements; removed: D8912: repository: introduce constant for internal phase repo requirement and use it.Aug 10 2020, 11:25 AM

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

pulkit updated this revision to Diff 22380.

pulkit edited parent revisions, added: D8926: requirements: introduce constants for `shared` and `relshared` requirements; removed: D8924: requirements: introduce a set of working directory specific requirements.Aug 11 2020, 5:05 AM

indygreg requested changes to this revision.Aug 24 2020, 8:42 PM

indygreg added inline comments.

mercurial/scmutil.py
1501	Since the presence or lack thereof of the `requires` file is important, I think we should change this to `if x is not None` so an empty file is written out if appropriate. This should happen, of course. But semantically it is the more correct behavior.

This revision now requires changes to proceed.Aug 24 2020, 8:42 PM

pulkit updated this revision to Diff 22443.Aug 25 2020, 7:38 AM

pulkit marked an inline comment as done.Aug 25 2020, 7:49 AM

indygreg accepted this revision.Aug 25 2020, 9:12 PM

This revision is now accepted and ready to land.Aug 25 2020, 9:12 PM

pulkit edited parent revisions, added: D8952: remotefilelog: acquire lock before writing requirements on clone; removed: D8926: requirements: introduce constants for `shared` and `relshared` requirements.Aug 26 2020, 6:05 AM

pulkit added a commit: rHG9a99ab8217bd: scmutil: introduce filterrequirements() to split reqs into wc and store ones.Sep 17 2020, 10:04 PM

Closed by commit rHG9a99ab8217bd: scmutil: introduce filterrequirements() to split reqs into wc and store ones (authored by pulkit). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/scmutil.py (26 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22327		Aug 7 2020, 8:45 AM	★	★
Diff 2	22380		Aug 10 2020, 11:24 AM	★	★
Diff 3	22443		Aug 25 2020, 7:38 AM	★	★
Diff 4	22690	rHG9a99ab8217bd7f6ee073ba9f2a82a794bafaf31d	Aug 7 2020, 6:41 AM	★	★

Status	Author	Revision
Closed	pulkit	D8660 upgrade: support running upgrade if repository has share-safe requirement
Closed	pulkit	D8659 config: add `--shared` flag to edit config file of shared source
Abandoned	pulkit	D8655 localrepo: unify share checking and related code
Abandoned	pulkit	D8764 localrepo: deduplicate code around reading requires file
Closed	pulkit	D8658 commands: use any() instead of `if a or b or c`
Closed	pulkit	D8656 localrepo: load the share source .hg/hgrc also in share-safe mode (API)
Closed	pulkit	D8633 share: introduce config option to store requires in .hg/store
Closed	pulkit	D8913 scmutil: introduce filterrequirements() to split reqs into wc and store ones
Closed	pulkit	D8952 remotefilelog: acquire lock before writing requirements on clone

Diff 22690

View Options

scmutil: introduce filterrequirements() to split reqs into wc and store onesClosedPublicActions