HomePhabricator

branching: merge with stable

Authored by martinvonz.

Description

branching: merge with stable

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
90a15199cbc6D12582martinvonz
rust-repo: make `Send` by not storing functions in `LazyCell` 
Apr 21
3cd3aaba5b03D12609durin42
obsolete: remove two unused constants 
May 5
34decbaf4da3D12608durin42
node: manually implement Debug 
May 5
3f86ee422095D12607aalekseyev
censor: make rhg fall back to python when encountering a censored node 
May 5
90f7d8276e26D12606mharbison72
contrib: migrate off of a couple of bitbucket URLs 
May 4
5ad37b5bfb31D12605mharbison72
diff: add help text to highlight the ability to do "merge diffs" 
May 4
5376efe0314aD12582martinvonz
rust-repo: make `Send` by not storing functions in `LazyCell` 
Apr 21
0eaba2ca2e2dD12609durin42
obsolete: remove two unused constants 
May 5
312e01ef6d77D12608durin42
node: manually implement Debug 
May 5
80dfb8fe095aD12607aalekseyev
censor: make rhg fall back to python when encountering a censored node 
May 5
783c8eb9c000D12606mharbison72
contrib: migrate off of a couple of bitbucket URLs 
May 4
a6cfc09dcb81D12605mharbison72
diff: add help text to highlight the ability to do "merge diffs" 
May 4
4c00c166da18D12598av6
tests: make sure .js files stay in ASCII encoding (issue6559) 
May 2
2c0570a6d5aeD12597av6
followlines: don't put Unicode directly into the .js file (issue6559) 
May 2
df3e9d98951bD12596mharbison72
wix: bump the minimum Windows required to 8.1 
Apr 28
06107198f95bD12595mharbison72
wix: drop python2 conditionals 
Apr 28
5996640fc6feD12589av6
tests: fix misspelling of supersede 
Apr 27
7af798e497f5D12588martinvonz
filemerge: add configs to disable some or all partial merge tools 
Apr 26
a932cad26d37Alphare
branching: merge stable into default 
May 4
9d1e9689a68fdurin42
merge: with stable 
May 4
2b1d4e0baca6D12578Alphare
rhg: use `Command::exec` instead of `Command::status` 
Apr 19
9b2fa18e0b28D12585martinvonz
commit: don't use hard-coded `.hg/last-message.txt` path in error message 
Apr 22
10b9f11daf15Alphare
branching: merge stable into default 
Apr 25
22fc694572eaD12579valentin.gatienbaron
chg: make `chg --cwd $anything -R $relativepath` behave better 
Apr 20
f45e1618cbf6D12576spectral
amend: move "return None for removed files" into block handling filestoamend 
Apr 19
e55ce61891e3D12541Alphare
rust-dirstatemap: remove unused helper from the old API 
Apr 12
c4ccd0346f5cD12540Alphare
rust-status: stop using `state()` in the dispatch logic 
Apr 12
126d253eb274D12539Alphare
rust-status: stop using `state()` in `handle_normal_file` 
Apr 12
748ac6400eaaD12538Alphare
rust-dirstatemap: stop using `state()` in the cache logic 
Apr 12
7241b3721ba5D12537Alphare
rust-dirstatemap: stop using `.state` in `is_from_other_parent` 
Apr 12
c6c1caf28349D12536Alphare
rust-dirstate-entry: add `modified` method 
Apr 12
66e22a4d856bD12535Alphare
rust: remove use of `EntryState` in `DirsMultiset` 
Apr 12
3f5e207f78beD12534Alphare
rust: use `entry.tracked()` directly 
Apr 12
a1fce5003ff4D12533Alphare
rust-hg-cpython: remove use of `EntryState` 
Apr 12
8c59d8adcf5bD12532Alphare
rust-dirstatemap: use a checked sub instead of a potentially underflowing one 
Apr 8
23a5659125c8D12531Alphare
rust-dirstatemap: add simpler version of `get_node_mut` 
Apr 8
7276a6007573D12530Alphare
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node` 
Apr 8
fcf6f943a142D12529Alphare
rust-dirstatemap: add `each_ancestor` argument to `get_node_mut` 
Apr 8
3926bfef28e4D12528Alphare
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case 
Apr 8
74c996f84958D12527Alphare
rust-dirstatemap: inline the last `get_or_insert` call 
Apr 8
464747faef14D12526Alphare
rust-dirstatemap: add `set_cached_mtime` helper method 
Apr 8
f3e8b0b0a8c2D12525Alphare
rust-dirstatemap: add `clear_cached_mtime` helper method 
Apr 8
e7b74bb602a4D12524Alphare
rust-dirstatemap: add unit tests 
Mar 29
28a6178a07a2D12523Alphare
rust: add `Debug` trait to a bunch of structs 
Mar 29
d9a66d62c604D12522Alphare
rust-dirstatemap: use `&HgPath` instead of `HgPathBuf` in `copy_map_insert` 
Mar 30
afe60def963dD12521Alphare
rust-dirstatemap: use `DirstateEntry::tracked` directly 
Mar 29
861dd252e2dcD12520Alphare
rust-cpython: remove unused API to `drop_entry_and_copy_source` 
Mar 28
10edc54d18f1D12519Alphare
rust-dirstatemap: remove `set_dirstate_entry`/`set_entry` methods 
Mar 28
3df46f3a3d6cD12518Alphare
rust-dirstatemap: implement part of the `setparents` logic 
Mar 28
4c75f00b199eD12517Alphare
dirstate-item: add missing bit of docstring 
Mar 28