HomePhabricator

merge with default for 5.6rc0

Authored by pulkit.

Description

merge with default for 5.6rc0

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
3aa7b0c1b97cD9153joerg.sonnenberger
unbundle: free temporary objects after use 
Oct 5
b76e949dccb4D9141marmoute
copies: move `merged` testing sooner 
Oct 1
1720d843d6cbD9140marmoute
copies: return None instead of ChangingFiles when relevant 
Oct 1
c398c7982424D9139marmoute
copies: add a HASCOPIESINFO flag to highlight rev with useful data 
Oct 1
ef52dedd6c66D9130marmoute
salvaged: properly deal with salvaged file during copy tracing 
Sep 16
e1f5a2328b76D9129marmoute
salvaged: persist the salvaged set on disk 
Sep 15
c005c29f0810D9128marmoute
changing-files: add clean computation of changed file for merges 
Sep 29
8b7dbf153157D9127marmoute
changing-files: add clean computation of changed files for linear changesets 
Sep 29
38613f6faa32D9126marmoute
changing-files: add clean computation of changed files for roots 
Sep 29
f74c370c2a36D9125marmoute
changing-files: add a debug command display changed files 
Sep 30
4645f4938c28D9124marmoute
side-data: add a test to check sidedata upgrade 
Sep 29
d79c2c71a0a9D9123marmoute
changing-files: split the changing files computation from encoding 
Sep 29
751d9436141bD9120marmoute
salvaged: record salvaged in ChangingFiles at commit time 
Sep 14
bb61352e59f5D9119marmoute
salvaged: track removal-candidates in more cases 
Sep 14
3bfa7c7ffb6eD9122marmoute
salvaged: explicitly skip salvaged file while encoding 
Sep 30
07c00c2046b4D9118marmoute
changing-files: add a "salvaged" set to track file that were not removed 
Sep 14
50b33650fb69D9130marmoute
salvaged: properly deal with salvaged file during copy tracing 
Sep 16
55c7edda2c5bD9129marmoute
salvaged: persist the salvaged set on disk 
Sep 15
0c171327bc11D9128marmoute
changing-files: add clean computation of changed file for merges 
Sep 29
fc1b2b98762cD9127marmoute
changing-files: add clean computation of changed files for linear changesets 
Sep 29
876df4613aa1D9126marmoute
changing-files: add clean computation of changed files for roots 
Sep 29
6922260a9100D9125marmoute
changing-files: add a debug command display changed files 
Sep 30
a193945816feD9124marmoute
side-data: add a test to check sidedata upgrade 
Sep 29
b63e5c1e2c44D9123marmoute
changing-files: split the changing files computation from encoding 
Sep 29
8d6d7040ac47D9120marmoute
salvaged: record salvaged in ChangingFiles at commit time 
Sep 14
2286fcfad499D9119marmoute
salvaged: track removal-candidates in more cases 
Sep 14
9835dde69c16D9122marmoute
salvaged: explicitly skip salvaged file while encoding 
Sep 30
5156c5e46431D9118marmoute
changing-files: add a "salvaged" set to track file that were not removed 
Sep 14
2748f837e192D9065martinvonz
merge: make low-level update() private (API) 
Sep 21
6ab56f9b39d9D9080Alphare
rust: update Cargo.lock 
Sep 24
6ce7d549e98cD9079Alphare
rust-tests: add test to check if `Cargo.lock` is up-to-date 
Sep 24
5a16798ab57fD8981pulkit
scmutil: introduce function to check whether repo uses treemanifest or not 
Sep 1
50fa4f631ef6D9006valentin.gatienbaron
chg: make is possible to call by default an hg binary located next to chg 
Sep 3
c30359a7b960D9080Alphare
rust: update Cargo.lock 
Sep 24
e4580da9a993D9079Alphare
rust-tests: add test to check if `Cargo.lock` is up-to-date 
Sep 24
dfe585655c3bD8981pulkit
scmutil: introduce function to check whether repo uses treemanifest or not 
Sep 1
eb443f7cbc2cD9006valentin.gatienbaron
chg: make is possible to call by default an hg binary located next to chg 
Sep 3
497271da24c9D9072joerg.sonnenberger
phases: fix performance regression with Python 2 
Sep 23
2517df770648D8973sebhtml
log: add support for bookmarks 
Sep 24
2951c0fe9d16D9024Antoine cezar
run-test: allow relative path in `--blacklist` and `--whitelist` (issue6351) 
Sep 16
0d7ec06c1cdeD9004durin42
hgdemandimport: bypass demandimport for _ast module (issue6407) 
Sep 9
ec5974500acdyuja
grep: fix hash(linestate) to not include linenum 
Sep 8
038aaad433a7yuja
test-grep: document that trivially moved lines might not be detected 
Sep 8
48965a73ca58yuja
revset: remove indirect indexing of status tuple 
Sep 8
0babbc33baecD8951mharbison72
rewriteutil: relax the sha1 hash references to handle future hash types 
Aug 25
68bfd9e415b5D8950mharbison72
phabricator: update the hashes in commit messages as they get submitted 
Aug 24
b65a3d50aa7bD8949mharbison72
rewriteutil: also consider pending obsoletes when updating hashes in messages 
Aug 24
2b89313a2263D8948mharbison72
rewriteutil: extract evolve code used to replace obsolete hashes in commits 
Aug 24
8e997c5da2f3D8999durin42
git: fix index handling of removed files during commit (issue6398) 
Sep 7
b30c182e7c07D8998durin42
git: make dirstate actually support listclean parameter 
Sep 7