HomePhabricator

merge with stable

Authored by durin42.

Description

merge with stable

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
a8843eda9a35yuja
share: do not write working-copy requirements twice 
Sep 18 2020
c7fe0dfb5312D9044martinvonz
phabricator: fix loadhgrc() override broken by D8656 
Sep 18 2020
0e75c088f0dcD9043martinvonz
mergestate: move commit() from base class to on-disk subclass 
Sep 18 2020
f2efc44213ecD9042martinvonz
mergestate: make in-memory mergestate not clear on-disk mergestate on reset() 
Sep 18 2020
19590b126764D9040martinvonz
merge: use in-memory mergestate when using in-memory context 
Sep 15 2020
cc5f811b1f15D9039martinvonz
mergestate: extract a base class to be shared by future memmergestate 
Sep 15 2020
e833ff4dd0eaD9038martinvonz
mergestate: extract overridable methods for making/restoring file backups 
Sep 15 2020
ef3273ac5f6eD9037martinvonz
mergestate: initialize all properties in __init__() 
Sep 16 2020
3dd481e11c25D9036martinvonz
mergestate: remove unnecessary clearing of `localctx` and `otherctx` 
Sep 17 2020
9ea4b52ac6bbD9035martinvonz
mergestate: move most of of reset() into start() 
Sep 16 2020
2c10876bb320D9034martinvonz
mergestate: make clean() only be about creating a clean mergestate 
Sep 17 2020
08c6d6962b2aD9033martinvonz
mergestate: split up reset() for its two use cases 
Sep 16 2020
aad11a26a054D9032martinvonz
mergestate: simplify reset(), knowing that `other` and `node` go together 
Sep 16 2020
0ce6af73f481D9031martinvonz
mergestate: make some callers not pass pointless node argument 
Sep 16 2020
a108f7ff7778D9030martinvonz
py3: don't risk passing a None value to error.ManifestLookupError() 
Sep 17 2020
c4f14db3da1dD8983pulkit
merge: move initial handling of mergeactions near to later one 
Sep 3 2020
78f0bb37f52dD8660pulkit
upgrade: support running upgrade if repository has share-safe requirement 
Jun 25 2020
ac7a3da0dbb6D8659pulkit
config: add `--shared` flag to edit config file of shared source 
Sep 17 2020
b71858b42963D8656pulkit
localrepo: load the share source .hg/hgrc also in share-safe mode (API) 
Jul 2 2020
63eb1b5c580dD8914pulkit
helptext: document exp-sharesafe in internals/requirements.txt 
Aug 7 2020
d252f51ab032D8633pulkit
share: introduce config option to store requires in .hg/store 
Apr 14 2020
9a99ab8217bdD8913pulkit
scmutil: introduce filterrequirements() to split reqs into wc and store ones 
Aug 7 2020
bddc4f2ef317D8952pulkit
remotefilelog: acquire lock before writing requirements on clone 
Sep 17 2020
8ceb5b4b2728yuja
grep: make -frREV follow history from the specified revision (BC) 
Sep 10 2020
3dc848d5ec77yuja
cmdutil: make walkchangerevs() gracefully handle wdir parents 
Sep 11 2020
07c424a13811yuja
grep: fix --follow with no --diff nor --rev to not fall back to plain grep 
Sep 10 2020
20dd2a259b0fyuja
test-grep: add tests for --follow with/without --diff and/or paths 
Sep 10 2020
453bc6ca9ab2yuja
grep: clarify that --all works exactly the same way as --diff 
Sep 10 2020
0d119802242bStephane
churn: add an usage example in docstring 
Sep 17 2020
6916e6b81fefpulkit
tests: run test-check-py3-compat only in pure python mode 
Sep 17 2020
5f0eeda2005dyuja
log: make -frREV PATH detect missing files before falling back to slow path 
Sep 11 2020
07324227f6b7yuja
log: fix -fr'wdir()' PATH to follow newly added file 
Sep 11 2020
a03fde1077ceyuja
log: reorganize if-else and for loop in logcmdutil._makematcher() 
Sep 11 2020
6e474eec4be6D8965pulkit
merge: update commitinfo from all mergeresults during bid merge 
Aug 26 2020
49ffaa4f65f6D8941pulkit
merge: add missing ACTION_KEEP when both remote and ancestor are not present 
Aug 24 2020
09edbff6ae8dD8940pulkit
merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally 
Aug 24 2020
bb9888d32601D8974pulkit
merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent 
Sep 1 2020
14b3dbfa4eebpulkit
mergeresult: introduce dedicated tuple for no-op actions 
Sep 14 2020
9bd60ec60601D8939marmoute
tests: add criss cross merging tests whose behavior need to be fixed 
Jun 19 2020
4a0ccbecbaa6D9022spectral
repo: avoid copying/updating a dict on every `repo.__getitem__` 
Sep 11 2020
145cfe84d3e4D8801joerg.sonnenberger
obsstore: refactor v1 logic to fix 32 byte hash support 
Jul 23 2020
c1d6e930ac8aD9021valentin.gatienbaron
fsmonitor: increase the threshold before we recommend it, when using rust 
Sep 14 2020
14be07d5603cmarmoute
copy-tracing: test case where a merge reverted a file deletion 
Jun 19 2020
4b582a93316amarmoute
copy-tracing: test case where we go across a changed/deleted merge 
Jun 19 2020
ccd3bf4490c1D8966pulkit
merge: show list of bids for each file in bid-merge in ui.debug() 
Aug 26 2020
4532e7ebde4dyuja
merge with stable 
Sep 14 2020
d2b5a7659fffyuja
cmdutil: reimplement finddate() without using walkchangerevs() 
Sep 13 2020
65960fe9a769yuja
test-simple-update: add test for -d DATE option 
Sep 13 2020
b0d45612c552yuja
largefiles: walk history in ascending order while downloading all lfiles 
Sep 13 2020
ac7b9ed0a245yuja
largefiles: replace use of walkchangerevs() with simple revset query 
Sep 13 2020