Differential D11851

update: properly overwrite `check` config with `--no-` variants
ClosedPublic
Actions

Authored by marmoute on Dec 3 2021, 9:10 AM.

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

rHG4d59e0f909e0: update: properly overwrite `check` config with `--no-` variants

Summary

Before this change --merge override commands.update.check=abort/noconflict,
and --check "override" commands.update.check=none/linear. However the
--no-merge and --no-check version where not doing anything.

The --no- two flags now behave properly.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

marmoute created this revision.Dec 3 2021, 9:10 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptDec 3 2021, 9:10 AM

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

marmoute added a child revision: D11852: update: reformat the `commands.update.check` help.Dec 3 2021, 9:10 AM

Alphare accepted this revision.Dec 3 2021, 9:17 AM

This revision is now accepted and ready to land.Dec 3 2021, 9:17 AM

marmoute added a commit: rHG4d59e0f909e0: update: properly overwrite `check` config with `--no-` variants.Dec 3 2021, 9:52 AM

Closed by commit rHG4d59e0f909e0: update: properly overwrite `check` config with `--no-` variants (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

marmoute mentioned this in D11680: push: add option to abort on dirty working copy if parent is pushed.Dec 3 2021, 10:00 AM

Revision Contents
Changeset List

			Path	Packages
M			mercurial/commands.py (4 lines)
M			relnotes/next (1 line)
M			tests/test-update-branches.t (10 lines)

Commit	Parents	Author	Summary	Date
224cad011dbf	081c469bfff7	Pierre-Yves David		Dec 3 2021, 6:03 AM

Status	Author	Revision
Closed	marmoute	D11852 update: reformat the `commands.update.check` help
Closed	marmoute	D11851 update: properly overwrite `check` config with `--no-` variants
Closed	marmoute	D11850 update: add a test for `--merge` overriding the "abort" config
Closed	marmoute	D11848 update: use long version of the flag in the test

Diff 31296

View Options

mercurial/commands.py

View Options

relnotes/next

View Options

tests/test-update-branches.t

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	31296		Dec 3 2021, 9:10 AM	★	★
Diff 2	31301	rHG4d59e0f909e02f4e8091263f032badb461b93f61	Dec 3 2021, 6:03 AM	★	★

update: properly overwrite `check` config with `--no-` variantsClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 31296

mercurial/commands.py

relnotes/next

tests/test-update-branches.t

update: properly overwrite `check` config with `--no-` variants
ClosedPublic
Actions

Revision Contents
Changeset List