HomePhabricator

merge with stable

Authored by mharbison72.

Description

merge with stable

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
0c408831b2f1D11908SimonSapin
rhg: Print "bad match" errors in rhg status 
Dec 13 2021
23dfdd43d56dD11908SimonSapin
rhg: Print "bad match" errors in rhg status 
Dec 13 2021
bf2738e03e96D11892marmoute
share: make it possible to control the working copy format variant 
Dec 7 2021
7964a2dbde12D11891marmoute
share: move the requirement initialisation code around 
Dec 7 2021
5e6542143d40D11895marmoute
test: use `hg debugrequires` instead of `cat` in some tests 
Dec 7 2021
880adb2cd147D11894marmoute
test: simplify `debugformat` matching in test-phases.t 
Dec 7 2021
5bc3ce09c872D11893marmoute
test: simplify `debugformat` matching in test-copies-chain-merge 
Dec 7 2021
eaad68294904D11884spectral
status: when extracting arguments from `opts`, use the same default values 
Dec 7 2021
c51408b92b88D11883spectral
directaccess: fix uses of commands.status() that don't go through flag parsing 
Dec 7 2021
bc6547f61310D11749valentin.gatienbaron
test: add test for a former race resulting in bad dirstate 
Nov 7 2021
96ea4db4741bD11882aalekseyev
rhg: fix a crash on non-generaldelta revlogs 
Dec 7 2021
1fb3615dfce2D11881aalekseyev
rhg: centralize index header parsing 
Dec 7 2021
e33d7c39db47D11880aalekseyev
rhg: demonstrate that rhg breaks on non-generaldelta revlogs 
Dec 7 2021
04d756b7c0b5D11900SimonSapin
tests: add a short `sleep` in test-status.t 
Dec 10 2021
473af5cbc209D11899SimonSapin
rhg: Add support for `rhg status --copies` 
Dec 10 2021
9b0e1f64656fD11898SimonSapin
rhg: refactor relativize_path into a struct + method 
Dec 10 2021
2afaa0145584D11897SimonSapin
rhg: refactor display_status_paths with a struct for common arguments 
Dec 10 2021
4a983b69e519D11907SimonSapin
rhg: Add support for ui.ignore and ui.ignore.* config 
Dec 10 2021
b5f8d9e55d42D11896marmoute
doc: remove a spurious ^L in some doc 
Dec 10 2021
2332a1d8e7ebD11896marmoute
doc: remove a spurious ^L in some doc 
Dec 10 2021
dc2ef4b4d9a9D11872marmoute
upgrade: drop some dead code 
Dec 6 2021
62e6222cc5b6D11871marmoute
upgrade: only process revlogs that needs it by default 
Dec 6 2021
8405c1bffacfD11870marmoute
upgrade: issue a message when a revlog type has to be upgraded 
Dec 6 2021
1d0978cfe968D11869marmoute
upgrade: explicitly warn when a `--no-xxx` flag is overwritten 
Dec 6 2021
e7420f75d90dD11868marmoute
upgrade: make the list of explicitly specified revlog a dict 
Dec 6 2021
6e045497b20bD11867marmoute
upgrade: move the revlog selection code lower down the chain 
Dec 6 2021
69546fc7b5cdD11890SimonSapin
rhg: Add support for ui.ignore and ui.ignore.* config 
Dec 9 2021
112184713852D11889SimonSapin
rhg: Set second_ambiguous as needed in post-status fixup 
Dec 9 2021
c8ca21962ff4D11888SimonSapin
dirstate: Document Timestamp.second_ambiguous 
Dec 9 2021
9cf5ac8c7109D11874Alphare
rhg: support the new extension suboptions syntax 
Dec 7 2021
715e4e81e39aAlphare
branching: merge stable into default 
Dec 8 2021
082bac54da80Alphare
branching: merge stable into default 
Dec 8 2021
d46cf894f586marmoute
touches_wc_requirements 
Dec 7 2021
0994125a31e5D11863martinvonz
filemerge: remove `premerge` argument from `_makebackup()` 
Dec 6 2021
f45a4a47f6a8D11860martinvonz
filemerge: inline `_filemerge()` into `filemerge()` 
Dec 4 2021
6b1049d71c3eD11859martinvonz
filemerge: make `_filemerge()` do both premerge and merge 
Dec 4 2021
921853391276D11858martinvonz
filemerge: merge `premerge()` into `filemerge()` 
Dec 3 2021
f9bc36863923D11857martinvonz
mergestate: inline `_resolve()` into `resolve()` 
Dec 3 2021
c25a67cfc291D11856martinvonz
mergestate: make `_resolve()` do both preresolve and resolve 
Dec 3 2021
38941a28406aD11855martinvonz
mergestate: merge `preresolve()` into `resolve()` 
Dec 3 2021
de8181c5414dD11854martinvonz
tests: remove unnecessary explicit args from `failfilemerge.py` 
Dec 4 2021
9e1f174d305bD11853martinvonz
simplemerge: set `conflicts` earlier for :union tool 
Nov 30 2021
fff5942d445fD11807Alphare
typo: s/unkown/unknown across the codebase 
Nov 26 2021
000130cfafb6D11840SimonSapin
rhg: Update the dirstate on disk after status 
Nov 25 2021
2097f63575a5D11839SimonSapin
rhg: Add Repo::write_dirstate 
Dec 2 2021
c7c23bb036c9D11838SimonSapin
rhg: Add lazy/cached dirstate data file ID parsing on Repo 
Dec 2 2021
c8659e61073dD11837SimonSapin
rhg: Make Repo::dirstate_parents a LazyCell 
Nov 29 2021
abeae090ce67D11836SimonSapin
rust: Add Vfs::write_atomic 
Nov 29 2021
5734b03ecf3eD11835SimonSapin
rhg: Initial repository locking 
Mar 22 2021
c1b633db67fcD11834SimonSapin
rust: Serializing a DirstateMap does not mutate it anymore 
Nov 29 2021