HomePhabricator

merge stable in default

Authored by pulkit.

Description

merge stable in default

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
e0bfde04f957D8849joerg.sonnenberger
dirstate: revert change to Rust binding 
Jul 29
13814622b3b1marmoute
commitctx: extract all the file preparation logic in a new function 
Jul 23
bd7515273fd6marmoute
commitctx: gather more preparation code within the lock context 
Jul 23
39f4ec4039a8marmoute
commitctx: move a special case about files earlier 
Jul 23
0c468fef09b3marmoute
commitctx: extract all the manual logic to process the files 
Jul 23
b65b4b09859cmarmoute
commitctx: treat `filesadded` more like `filesremoved` 
Jul 23
595307e14140marmoute
commitctx: move `writechangesetcopy` business at the end a code section 
Jul 23
ada51c1b6916marmoute
commitctx: move copy meta config reading in a dedicated function 
Jul 23
4eb6466e6889marmoute
commitctx: no longer use the `writecopiesto` variable in the function 
Jul 23
f0d4d1343cb4marmoute
commitctx: extract the function that commit a new manifest 
Jul 23
5d0998ccedbbmarmoute
commitctx: stop using weakref proxy for transaction 
Jul 24
d056a131c93fmarmoute
commitctx: document the None return for "touched" value 
Jul 22
f512708a9ea8D8800martinvonz
tests: add tests trying to use dir as style, as %include, and as __base__ 
Jul 24
be1ab47d90f1D8802martinvonz
tests: fix mistaken copy&paste from commit 4489e9a22763 
Jul 24
ff59af8395a5D8766joerg.sonnenberger
manifest: kill one more instance of the old merge hash hack 
Jul 6
4f0e03d980f3D8815joerg.sonnenberger
dirstate: isolate node len dependency for the pure version 
Jul 24
3ea3b85df03fD8808martinvonz
fix: update documentation to reflect preference for --source over --rev 
Jul 24
4e5da64d5549D8814spectral
tests: make check-py3-compat.py actually load the specified files correctly 
Jul 24
357d8415aa27D8812spectral
tests: virtualenv is only used on py2, rename and conditionalize 
Jul 24
a253ded5b03dD8811spectral
morestatus: mention --stop even if not using --verbose 
Jul 23
d5ccc059fbcdD8810martinvonz
templater: handle None returned from templatedir() 
Jul 24
4ccd5ec565c2D8792martinvonz
templater: do search for include of unqualified builtin outside of config code 
Jul 22
8ec3062b7047D8791martinvonz
templater: switch to lower-level config.parse() in _readmapfile() 
Jul 22
f7f142d74df3D8790martinvonz
config: pass both relative and absolute paths to `include` callback 
Jul 22
4489e9a22763D8798martinvonz
tests: add test for bad template %include and __base__ 
Jul 23
db0be4678399D8797martinvonz
tests: add test for unqualified include of a built-in template map 
Jul 22
4b923da0cb86durin42
merge with stable 
Jul 22
7bac4e750f76D8770mjacob
relnotes: add release notes for relevant changes I did since the 5.4 release 
Jul 20
4d5b11970e75D8769mjacob
relnotes: fix indentation 
Jul 20
383cbbbd4137D8768mjacob
relnotes: make spacing before new section consistent 
Jul 20
52589bee4412pulkit
tests: make one of 'worker process exited' line option in test-chg.t 
Jul 22
a098db54bd94D8781sheehan
infinitepush: fix `{get,put}_args` formatting on Python 3 
Apr 22
18606cf29c33D8780sheehan
infinitepush: replace `NamedTemporaryFile` with `pycompat.namedtempfile` 
Apr 22
ce9ee81df9ffD8710marmoute
commitctx: extract _filecommit too 
Jul 6
ae5c1a3bc339D8709marmoute
commitctx: extract the function in a dedicated module 
Jul 6
31393ec06cefD8700marmoute
commitctx: document a fast path in _filecommit 
Jul 6
86f9b25d750bD8788martinvonz
hgweb: simplify now that we always have a single path 
Jul 21
4e9b39033d3fD8787martinvonz
templater: simplify stylemap() now that templatedir() returns a single path 
Jul 21
91aa9bba3dc9D8786martinvonz
templater: make templatepaths() return a single path, or None 
Jul 21
e2ec36167151D8785martinvonz
templater: simplify templatepaths() to avoid iterating a singleton list 
Jul 21
4254689a3773pulkit
tests: make one of 'worker process exited' line option in test-chg.t 
Jul 22
55464c0b3a89D8708marmoute
commitctx: move a tiny else clause above the very long one 
Jul 6
c068e355cd71D8707marmoute
commitctx: consider removed as touched 
Jul 6
025ee25b5b23D8706marmoute
commitctx: rename "changed" to touched 
Jul 6
6979a20ff004D8704marmoute
commitctx: more filesremoved assignment closer to removed computation 
Jul 7
e64c35dfc6cbD8703marmoute
commitctx: compute files added from _filecommit returns 
Jul 6
509f5b6c0b7eD8702marmoute
commitctx: return "touched" status from _filecommit 
Jul 6
1386a2292d93D8708marmoute
commitctx: move a tiny else clause above the very long one 
Jul 6
d167f9fbb61dD8707marmoute
commitctx: consider removed as touched 
Jul 6
765c3b4e2176D8706marmoute
commitctx: rename "changed" to touched 
Jul 6