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
81d7cbbcd234D11261marmoute
ci: backed out changeset 2fb4bd5f773f 
Aug 5
190596e58295D11260marmoute
vfs: always use / as file separator (issue6546) 
Aug 5
0bb4c97d8ac6D11259marmoute
subrepo: compare normalised vfs path 
Aug 5
f799a4b64b76D11256Alphare
windows-ci: run Windows CI automatically alongside the others 
Jul 23
570cbb3dc65eD11257Alphare
pager: account for flakiness in Windows output 
Aug 5
cc36f1169624D11261marmoute
ci: backed out changeset 2fb4bd5f773f 
Aug 5
8f6f22f2ecb2D11260marmoute
vfs: always use / as file separator (issue6546) 
Aug 5
11c2bd973659D11259marmoute
subrepo: compare normalised vfs path 
Aug 5
c63e457652cbD11256Alphare
windows-ci: run Windows CI automatically alongside the others 
Jul 23
89f64fd17f45D11257Alphare
pager: account for flakiness in Windows output 
Aug 5
2fb4bd5f773fD11255Alphare
windows-ci: temporarily disable test-censor.t 
Aug 5
de2e04fe4897D11204gracinet
hgwebdir: avoid systematic full garbage collection 
Jul 20
b1e1559f5a45D11223av6
obsolete: disable other evolution config options if createmarkers is off 
Jul 28
82c87566bfc0D11222av6
fix: use obsolete.isenabled() to check for experimental.allowdivergence 
Jul 28
0044a7ad9f2fD11221av6
rebase: use obsolete.isenabled() to check for experimental.allowdivergence 
Jul 28
460e479be66eD11235mharbison72
typing: add several assertions to dirstatemap to appease pytype 
Jul 30
d8226861a3d8D11053marmoute
run-tests: rely on an actual executable in PATH instead of alias for `hg` 
Jul 9
c5e5937e64daD11052marmoute
tests: blacklist a handful of test with `rhg` or `chg` 
Jul 9
63e7423d3937D11051marmoute
run-tests: use more explicit signaling for `chg` 
Jul 9
9f7a6e6711ecD11050marmoute
run-tests: drop the `rhg` flag for `hghave.py` if unset 
Jul 9
7f7f57ceffa6D11049marmoute
run-tests: introduce a `HGTEST_REAL_HG` variable for test 
Jul 9
aa92c5d702ceD10936dploch
cmdutil: fix newandmodified file accounting for --interactive commits 
Jul 2
0e4c5030d4d2D10995marmoute
corruption: backout changeset 49fd21f32695 (issue6528) 
Jul 6
48f797013846D10996marmoute
corruption: add a test for issue6528 
Jul 6
6765602a4e3dD10916martinvonz
tests: add test case for issue 6262 
Jun 29
f97fc3c6f7e4D10916martinvonz
tests: add test case for issue 6262 
Jun 29
69b35ea9d5f9D10917martinvonz
rewriteutil: look up common predecessor on unfiltered repo 
Jun 29
19e740216161D11009martinvonz
tests: demonstrate crash when common predecessor of divergence is hidden 
Jul 7
e2888ebbb63cD11008durin42
shallowutil: dedent code after the previous change 
Jul 7
c0830cbfe674D11007durin42
shallowutil: narrow scope of try/except block 
Jul 7
e68a15c304c2D11006durin42
remotefilelog: stop using RuntimeError for control flow 
Jul 7
adb9d79a4be4D10905marmoute
stream: double check that self.vfs is *not* in the vfsmap 
Jun 23
65a8d60e74fbD10918Mathias De Mare
contrib: backed out changeset 9b8f326731ac 
Jun 30
2733cdf8c818marmoute
censor: implement censoring for revlogv2 
May 30
651ae41a5747marmoute
revlog: add docket method to request new content files 
May 28
9b3a28ad2a09marmoute
revlog: add a way to keep track of older uids in the docket 
May 20
165addb19772D10831marmoute
index: use an explicit constant for INDEX_HEADER format and use it for docket 
Jun 1
14e76fd80a59D10822marmoute
verify: use some intermediate variables instead of a multi-liner 
Jun 1
00c29e28a984D10776marmoute
revlog: close the index file handle after the data one 
May 26
904961167938D10775marmoute
revlog: simplify the try nesting in the `_writing` context 
May 26
f8ba1bb0672eD10774marmoute
revlogv2: add a `get_data` helper to grab the next piece of docket 
May 20
3f218413696dD10773marmoute
revlogv2: simplify and clarify the processing of each entry 
May 20
5035d31e764bD10772marmoute
revlogv2: use a unique filename for data 
May 19
ce0e8971f7eeD10771marmoute
revlogv2: use a unique filename for index 
May 18
8969e4c33342D10766SimonSapin
rhg: A missing .hg/dirstate file is not an error 
May 22
83cb1700c150D10765SimonSapin
rhg: Sort `rhg status` output correctly 
May 22
7587bdf39b84D10769SimonSapin
dirstate-v2: Add `hg debugupgraderepo` command support 
May 19
b3e2ae9e6d42D10768SimonSapin
upgrade: Use `improvement` subclasses everywhere, not instances 
May 21
a30d5cd1c45eD10756mharbison72
exewrapper: avoid directly linking against python3X.dll 
May 11
f2e346c306e7D10734charlesetc
narrow: widen when files are excluded by sparse and not included by narrow 
May 18