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
7f033a587414yuja
log: extract function that builds (revs, makefilematcher) from walkopts 
Sep 10 2020
224c786f4fceyuja
log: move --graph and topo sort options to walkopts 
Sep 12 2020
8fe09005ed88yuja
log: move miscellaneous filter/matcher options to walkopts 
Sep 12 2020
c11099cc1de4yuja
log: map --removed to walkopts.force_changelog_traversal 
Sep 12 2020
fb000408bca5D9113marmoute
copies: rename some function to the new naming scheme 
Sep 25 2020
d31483377673D9112marmoute
changing-files: cache the various property 
Sep 28 2020
42bb6c4f8106D9111marmoute
changing-files: always use `mark_touched` to update the touched set 
Sep 25 2020
646a676f5365D9143marmoute
changing-files: fix docstring 
Oct 2 2020
426294d06ddcD9142martinvonz
rust: move rustfmt.toml to repo root so it can be used by `hg fix` 
Oct 1 2020
e8078af6af30pulkit
merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED 
Sep 30 2020
29c1d2401823pulkit
tests: fix a typo in `desc()` revset in test-merge-criss-cross.t 
Sep 30 2020
ad984583969apulkit
merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED 
Sep 30 2020
64461b43a7bfpulkit
tests: add newfilenode test case in test-merge-changedelete.t 
Sep 30 2020
d5407b2e7689D9137Alphare
rust: leverage improved match ergonomics 
Oct 1 2020
7bd13bf99d1cD9138Alphare
rust: update minimum supported Rust compiler version 
Sep 28 2020
ddcee0b0fd67D9089marmoute
changing-files: add a utility to compute the merged files post-commit 
Sep 25 2020
094a91a183f1D9088marmoute
changing-files: record merged files at commit time 
Sep 24 2020
e5578dbe36cbD9087marmoute
changing-files: add the ability to track merged files too 
Sep 24 2020
496537c9c1b4D9133Alphare
rust: start plugging the dirstate tree behind a feature gate 
Sep 30 2020
e604a3c03ab9D9132Alphare
rust: introduce `dirstate-tree` cargo feature 
Sep 30 2020
423f17f94f35D9131Alphare
rust: fix formatting 
Sep 30 2020
75f785888a7bD9071Alphare
rust-matchers: make `Matcher` trait object-safe 
Sep 23 2020
2a169781556eD9094Alphare
rust: clippy pass 
Sep 28 2020
00402df57db7D9110martinvonz
updaterepo: add deprecation warning 
Sep 28 2020
db11f8f39cafD9109Antoine cezar
rhg: use `.or(Err(Error))` not `.map_err(|_| Error)` (D9100#inline-15067) 
Sep 28 2020
be951ca95b08D9108Antoine cezar
hg-core: use `.or(Err(Error))` not `.map_err(|_| Error)` (D9100#inline-15067) 
Sep 28 2020
1cef583541c0D9107Antoine cezar
hg-core: return Err if `offset != bytes.len()` 
Sep 28 2020
900b9b79b99cD9106Antoine cezar
hg-core: make `Index` owner of its bytes (D8958#inline-14994 followup 1/2) 
Sep 28 2020
b68b19104d16D9105Antoine cezar
hg-core: renaming of `Chunk` offset methods (D8958#inline-15002 followup) 
Sep 28 2020
cee7a8e37e9cD9104Antoine cezar
hg-core: minor rewording in docstring (D8958#inline-15005 followup) 
Sep 28 2020
412a5827ad02D9103Antoine cezar
hg-core: use anonymous lifetime for `impl Chunk` (D8958#inline-15003 followup) 
Sep 28 2020
d07e4656ff5aD9102Antoine cezar
hg-core: use `u32` instead of `i32` in `Chunk` (D8958#inline-15001 followup) 
Sep 28 2020
bb523bff068bD9101Antoine cezar
hg-core: use the term `chunk` instead of `frag` (D8958#inline-15000 followup) 
Sep 28 2020
497657895b54D9100Antoine cezar
hg-core: return `Err` on decompression error (D8958#inline-15004 followup) 
Sep 28 2020
48438e8968a2D9099Antoine cezar
hg-core: remove useless code (D8958#inline-14988 followup) 
Sep 28 2020
da30e4b553c3D9097Antoine cezar
hg-core: minor docstring update (D8958#inline-14991 followup) 
Sep 28 2020
a886ffd2ffc6D9096Antoine cezar
hg-core: minor code style change (D8958#inline-14986 followup) 
Sep 28 2020
f38adf8b0711D9095Antoine cezar
hg-core: Explain offset override of first revision 
Sep 28 2020
11f3c3f408fdD9083Antoine cezar
hg-core: minor code style change (D8958#inline-14993 followup) 
Sep 28 2020
3d5b2b8e93fdD9086marmoute
changing-files: move default constructor value to None 
Sep 24 2020
c35db907363dD9093Alphare
rust: format with rustfmt 
Sep 28 2020
768412472663D9003pulkit
merge: store cases when a file is absent post merge in commitinfo 
Aug 24 2020
8c02c6262a5eD9029pulkit
tests: add some more debugmergestate calls in `test-merge-criss-cross.t` 
Sep 14 2020
479cce8c9882D8989pulkit
commit: force create a new filenode if it was set in mergestate by merge 
Sep 3 2020
4c8a93ec6908D8988pulkit
merge: store commitinfo if these is a dc or cd conflict 
Sep 3 2020
9f14bb4d59eapulkit
mergestate: update _stateextras instead of reassinging 
Sep 25 2020
463ca8af8c72D9028pulkit
tests: add some debugmergestate calls in `test-merge-criss-cross.t` 
Sep 14 2020
76b69f81629cD8987pulkit
tests: add few debugrevlogindex and a log call to see changes in next test 
Sep 3 2020
76d79b80d953D9027pulkit
merge: disable `m2-vs-ma` optimization if new filenode config is true 
Sep 14 2020
b9d6ab6cdeb4D9026pulkit
configitems: add a new config option to control new filenode functionality 
Sep 14 2020