HomePhabricator

merge with stable

Authored by martinvonz.

Description

merge with stable

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
d52e3826cd4byuja
pathutil: resurrect comment about path auditing order 
Jan 31
bed8d08cfcb2D7119Alphare
rust-dirstatemap: remove additional lookup in dirstate.matches 
Oct 16 2019
d2da8667125bD7795gracinet
rust-nodemap: insert method 
Dec 31 2019
7a4e1d245f19D7972valentin.gatienbaron
recover: don't verify by default 
Jan 22
2e2cfc3bea0bD8109durin42
context: use manifest.find() instead of two separate calls 
Feb 11
54d185eb24b5D7914Alphare
rust-matchers: implement `visit_children_set` for `FileMatcher` 
Jan 16
0bf3b5e80d30D8085durin42
manifest: move matches method to be outside the interface 
Feb 5
8ec186c1ccfeD8108durin42
tags: use modern // operator for division 
Feb 10
e80da7a63264D8107durin42
tags: fix some type confusion exposed in python 3 
Feb 10
cd43cae79f25D7829martinvonz
rebase: remove some now-unused parent arguments 
Jan 10
8082a77cc3a2D7828martinvonz
rebase: remove some redundant setting of dirstate parents 
Jan 11
9c9cfecd4600D7827martinvonz
rebase: don't use rebased node as dirstate p2 (BC) 
Jan 10
b42ce825308eD7826martinvonz
rebase: stop relying on having two parents to resume rebase 
Jan 10
14d0e89520a2D8043martinvonz
graphlog: use '%' for other context in merge conflict 
Jan 29
ab632e27f296D8042martinvonz
tests: add `hg log -G` output when there are merge conflicts 
Jan 29
8561ad49915dD8041martinvonz
revset: add a revset for parents in merge state 
Jan 29
7f7c8521e9bdD7824martinvonz
tests: add test of rebase with conflict in merge commit 
Jan 10
77bb38be00eaD7907martinvonz
rebase: always be graft-like, not merge-like, also for merges 
Jan 16
0ef6e90d52f8D8106martinvonz
tests: accept new bzr message about switching branches 
Feb 10
6ecc34b31137D7893marmoute
nodemap: update the index with the newly written data (when appropriate) 
Jan 15
c7eebdb15139D7892marmoute
nodemap: never read more than the expected data amount 
Jan 15
2ea6a67ff502D7891marmoute
nodemap: write new data from the expected current data length 
Jan 15
1d2b37def017D7890marmoute
nodemap: double check the source docket when doing incremental update 
Jan 15
8374b69aef75D7889marmoute
nodemap: track the total and unused amount of data in the rawdata file 
Jan 15
e41a164db7a9D7888marmoute
nodemap: track the maximum revision tracked in the nodemap 
Jan 15
6614b301ea58D7887marmoute
nodemap: add a flag to dump the details of the docket 
Jan 15
50ad851efd9bD7886marmoute
nodemap: introduce append-only incremental update of the persistent data 
Jan 15
76a96e3a2bbbD7885marmoute
nodemap: keep track of the docket for loaded data 
Jan 15
72c15641c8b4D7884marmoute
nodemap: introduce an explicit class/object for the docket 
Jan 15
f0862ee1a31eD7883marmoute
nodemap: keep track of the ondisk id of nodemap blocks 
Jan 15
671f9479af0eD7847marmoute
nodemap: provide the on disk data to indexes who support it 
Jan 15
d58206b70199D7846marmoute
nodemap: all check that revision and nodes match in the nodemap 
Jan 15
20e125cdd719D7845marmoute
nodemap: add basic checking of the on disk nodemap content 
Jan 15
78721bbdb2abD7844marmoute
nodemap: code to parse the persistent binary nodemap data 
Jan 15
55b12f2593c1D7843marmoute
nodemap: move the iteratio inside the Block object 
Jan 15
7762a295fd4dD7842marmoute
nodemap: use an explicit "Block" object in the reference implementation 
Jan 15
7f4f7ef3133eD7841marmoute
nodemap: add a optional `nodemap_add_full` method on indexes 
Jan 15
6f9e8e142ceaD7840marmoute
nodemap: add a (python) index class for persistent nodemap testing 
Jan 15
563dfdfd01a4D7839marmoute
nodemap: delete older raw data file when creating a new ones 
Jan 15
2b72c4ff8ed1D7838marmoute
nodemap: use an intermediate "docket" file to carry small metadata 
Jan 15
daad3aace942D7837marmoute
nodemap: only use persistent nodemap for non-inlined revlog 
Jan 15
6c07480d6659D7836marmoute
nodemap: add a function to read the data from disk 
Jan 15
5962fd0d1045D7835marmoute
nodemap: write nodemap data on disk 
Jan 15
c577bb4a04d4D7834marmoute
nodemap: have some python code writing a nodemap in persistent binary form 
Jan 15
a0ec05d93c8eD8104durin42
cleanup: re-run black on the codebase 
Feb 10
d8d4fa9a7f18D7910Alphare
rust-re2: add wrapper for calling Re2 from Rust 
Jan 16
2fe89bec8011D7909Alphare
rust-filepatterns: add support for `include` and `subinclude` patterns 
Jan 16
d42eea9a0494D7908Alphare
rust-filepatterns: improve API and robustness for pattern files parsing 
Jan 16
4caac36c66bcD7871Alphare
rust-utils: add util for canonical path 
Jan 14
cdf3e49a0572D7910Alphare
rust-re2: add wrapper for calling Re2 from Rust 
Jan 16