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
6b52cffd8d0aD10087marmoute
test-copies: add a test updating file content while merging a pure overwrite 
Mar 1
1099ca176ba1D10148pulkit
mergestate: don't pop stateextras when there are no conflicts on filemerge 
Mar 10
6266d19556adD9750joerg.sonnenberger
node: introduce nodeconstants class 
Jan 13
49fd21f32695D10150joerg.sonnenberger
revlog: guarantee that p1 != null if a non-null parent exists 
Mar 10
066b8d8f75b8D10161marmoute
push: allow to specify multiple destinations 
Mar 9
25850879a215D10160marmoute
push: indent the some part of the command 
Mar 17
471cd86c8eb4D9283joerg.sonnenberger
bundle: optional multithreaded compression, ATM zstd-only 
Nov 8 2020
c94fa884240bD10199SimonSapin
rust: Preallocate the returned `Vec` in `utils::files::relativize_path` 
Mar 13
decc3bd3f20dD10185durin42
black: merge config into main pyproject.toml now that we have it 
Dec 1 2020
d13afdd1f6e2D10184durin42
pyproject: add config file 
Dec 1 2020
63a3941d9847D10228marmoute
perf-util: add an helper revset to use the same spec as the case search script 
Mar 16
6b26e6432554D10225marmoute
perf-helpers: add a search-discovery-case script 
Mar 15
b6ac612445e0D10227marmoute
debugdiscovery: add missing byte string marker to some help text 
Mar 16
67a2ecea8bd9D10224marmoute
debugdiscovery: also integrate the discovery output in the json one 
Mar 15
3a8cf5b9c820D10223marmoute
debugdiscovery: add support for Json output 
Mar 15
36b4640ccb6aD10222marmoute
perf-helper: add a new sampling revset based on anti-chain 
Mar 15
cb70dabe5718D10221marmoute
perf-helper: add a small extension with revsets to select repository subset 
Mar 15
62c2857a174bD10197martinvonz
amend: mark commit obsolete after moving working copy 
Feb 26 2019
685383486d0aD10159marmoute
pull: allow to specify multiple sources 
Mar 10
954bad9c32a0D10158marmoute
pull: pre-indent a part of the function 
Mar 10
052ab8d0a538D10157marmoute
command: clarify `postincoming` return and that return handling 
Mar 9
af7535249ea9D10156marmoute
hg: make `clean` return consistent with the `update` function 
Mar 9
bcb5bc2d21e0D10155marmoute
tests: rename `test-pull` to `test-pull-network.t` 
Mar 10
ce42fe36d581D10154marmoute
tests: move a test about update in test-pull-update.t 
Mar 10
7f6c002d7c0aD10164martinvonz
split: close transaction in the unlikely event of a conflict while rebasing 
Mar 12
3c9ddb1986a9D10217Alphare
rust-status: fix issue6456 for the Rust implementation also 
Mar 15
c5912e35d06dD10226joerg.sonnenberger
README: document requirement for builtin zstd 
Mar 15
6b5714479288D10196SimonSapin
ci: Add a job testing with rhg installed as `hg` 
Mar 8
9ba00a9dc6eaD10195marmoute
run-test: install rhg if --rhg is passed 
Mar 10
99c0b03894eeD10194marmoute
makefile: add a install option 
Mar 10
a20674f2055cD10193marmoute
makefile: add a build-rhg option 
Mar 10
a7204958ca21D10192marmoute
makefile: add a install-chg option 
Mar 10
350e7f051e95D10191marmoute
makefile: add a build-chg option 
Mar 10
5a2212d40398D10190SimonSapin
tests: Disable for rhg remaining tests that fail in that mode 
Mar 12
bde90e9b4507D10189SimonSapin
rhg: Remove `rhg.fallback-executable=hg` default configuration 
Mar 12
b1e6265e8336D10145SimonSapin
rhg: Return an error code for `rhg config Section.idontexist` 
Mar 9
eb14264b98e8D10144SimonSapin
rhg: Fall back to Python for --version 
Mar 8
63bfcddddac1D10143SimonSapin
rhg: Exit with an error code if `files` finds nothing 
Mar 8
b1f2c2b336ecD10142SimonSapin
rhg: `cat` command: print error messages for missing files 
Mar 3
84a3deca963aD10141SimonSapin
rhg: Silently ignore missing files in config %include 
Mar 8
91ab5190a3deD10140SimonSapin
rhg: Add support for environment variables in config include paths 
Mar 8
25e3dac511f0D10139SimonSapin
rhg: Add support for the HGRCSKIPREPO environment variable 
Mar 8
97ac588b6d9eD10138SimonSapin
rhg: Don’t make repository path absolute too early 
Mar 8
c184b490da37D10137SimonSapin
rhg: Fall back to Python if ui.relative-paths is configured 
Mar 5
b4ad45f2f648D10136marmoute
tests: clarify some missing output in test-merge-subrepos 
Mar 8
e96a0a53de20D10135SimonSapin
tests: Adapt expected output for minor differences with rhg 
Mar 5
2255e7eb39e5D10134SimonSapin
rhg: Add support for --cwd 
Mar 5
12d59eec7f1dD10133SimonSapin
rhg: Align with Python on some more error messages 
Mar 4
1a036d33bc18D10188SimonSapin
rhg: Add an allow-list of ignored extensions 
Mar 12
1bac7764ceefD10112SimonSapin
rhg: Fall back to Python if unsupported extensions are enabled 
Mar 4