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
dc283bc7e033D8772pulkit
localrepo: abort creating a shared repo if the source does not have store 
Jul 21 2020
dc457177dbc1D8771pulkit
localrepo: only use 'bookmarksinstore' requirement if we have 'store' 
Jul 21 2020
e98f7c5babd7D8837pulkit
mergeresult: make actionmapping a dict of dict instead of dict of lists 
Jul 24 2020
a3cd63d6005bD8836pulkit
largefiles: introduce a constant for 'lfmr' action 
Jul 25 2020
ab57793dec5bD8835pulkit
largefiles: override merge.emptyactions() to include `lfmr` 
Jul 25 2020
cb0cd87e16b4D8834pulkit
merge: unify logic of couple of if-else's in manifestmerge() 
Jul 24 2020
6a8eafaeff3bD8833pulkit
sparse: add comment for an if condition which I tried to refactor 
Jul 24 2020
30f3e278c5d7D8832pulkit
mergeactions: use action constants instead of string values 
Jul 24 2020
4e6a2889dd1dD8831pulkit
merge: use the new action based mapping introduced in mergeresult obj 
Aug 2 2020
69691c5b8ce4D8830pulkit
mergeresult: introduce action -> (filename, data, msg) mapping and related API 
Jul 24 2020
26fa2eebc291D8829pulkit
mergeresult: rename _actions to _filemapping 
Aug 2 2020
d70c972cec74D8828pulkit
sparse: pass mergeresult obj in sparse.filterupdatesactions() (API) 
Jul 24 2020
1d1f112da75cD8827pulkit
merge: filter actions before calling _resolvetrivial() 
Jul 24 2020
3f5ac87ae10fD8826pulkit
merge: introduce mergeresult.updateactions() and use it 
Jul 24 2020
4ad6c4e9e35fD8825pulkit
merge: pass mergeresult instead of actions in _checkunknownfiles() (API) 
Jul 24 2020
00e9c5edcd58D8824pulkit
merge: pass mergeresult obj instead of actions dict in _resolvetrivial() 
Jul 24 2020
e7196f1da2b1D8823pulkit
merge: pass mergeresult obj instead of actions in _filternarrowactions() 
Jul 24 2020
31c454a5f1a8D8822pulkit
merge: pass mergeresult in checkpassconflicts() instead of actions (API) 
Jul 24 2020
f1fb9a079131D8821pulkit
merge: add removefile() to mergeresult object 
Jul 24 2020
b442920ab1deD8820pulkit
merge: introduce mergeresult.addfile() and use it 
Jul 24 2020
fe2040abb183D8819pulkit
merge: make mergeresult constructor initialize empty object 
Jul 24 2020
98218c83242fD8818pulkit
merge: improve documentation of fbid dict used for merge bid 
Jul 24 2020
f4a2b329717bD8817pulkit
merge: move conversion of file-key dict to action-key dict in mergeresult 
Jul 24 2020
0c849f0166c2D8816pulkit
merge: introduce hasconflicts() on mergeresult object 
Aug 2 2020
c515c54f6530D8744pulkit
merge: remove no longer required ACTION_GET_OTHER_AND_STORE 
Jul 14 2020
cb6a72dc0511D8743pulkit
merge: pass commitinfo to applyupdates() and get it stored in mergestate 
Jul 14 2020
8e8d513941b4D8742pulkit
merge: introduce 'commitinfo' in mergeresult 
Jul 14 2020
0e18861f96abD8799pulkit
merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) 
Jul 23 2020
c8655782ef19D8857martinvonz
packaging: delete unnecessary updating of `dirs` list 
Jul 31 2020
8bc9d045005aD8856martinvonz
packaging: make "mercurial.defaultrc" a key in package_data 
Aug 2 2020
a102f61a917eD8857martinvonz
packaging: delete unnecessary updating of `dirs` list 
Jul 31 2020
967c81d1b465D8856martinvonz
packaging: make "mercurial.defaultrc" a key in package_data 
Jul 31 2020
3c2fae87bd5aD8853martinvonz
templatespec: use new factory functions in hooklib 
Jul 30 2020
c1915cfa8080D8848martinvonz
templatespec: use new factory functions in logcmdutil 
Jul 21 2020
215f08c8006cD8847martinvonz
templatespec: move check for non-unicode to lower-level function 
Jul 21 2020
dfb67cd1da7fD8846martinvonz
templatespec: logcmdutil.templatespec() gets either template or mapfile 
Jul 21 2020
8cce9f77ca73D8845martinvonz
templatespec: create a factory function for each type there is 
Jul 16 2020
b7444cfc2c05D8844martinvonz
templater: stop accepting a single style to stylemap() 
Jul 29 2020
22eafb16f1c5D8807martinvonz
formatter: inline a variable assigned from `templater.templater.frommapfile` 
Jul 23 2020
28840ef52f71D8806martinvonz
templater: don't normalize path separators to '/' when interacting with OS 
Jul 23 2020
653b2a439412D8805martinvonz
formatter: remove now-unnecessary check for file-ness 
Jul 24 2020
9a308336fe41D8804martinvonz
templater: make templatepath() not return directory paths 
Jul 24 2020
46c8db8d4e03D8803martinvonz
tests: show unusual error message for `hg log --style coal` 
Jul 24 2020
668af67bfd18D8796martinvonz
config: remove now-unused `abs` argument from `include` callback 
Jul 22 2020
83ca8d6f3206D8795martinvonz
config: re-calculate absolute %include path in `include` callback 
Jul 22 2020
0323972f78f3D8794martinvonz
subrepoutil: use relative path for looking up config `%include`s 
Jul 22 2020
3f54242781e9D8793martinvonz
config: remove now-unused support for "includepaths" 
Jul 22 2020
0041a42c6f28marmoute
commitctx: gather more code dealing with copy-in-extra 
Jul 25 2020
efe8a67793b6marmoute
commitctx: rename files to touched in a couple of place 
Jul 25 2020
b3040b6739cemarmoute
commitctx: extract copy information encoding into extra into commit.py 
Jul 25 2020