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
69883775b27dyuja
root: add template variables pointing to repository directories 
Jun 4
9803323048b6yuja
root: add support for -Tformatter option 
Jun 4
a97b12f726e4D6438pulkit
narrow: pass the bundle to bundle2.widen_bundle() instead of generating there 
May 22
8381b7067f17D6437pulkit
narrow: refactor code around widening complicated by previous patch 
May 22
c767e655ffdaD6436pulkit
narrow: use narrow_widen wireproto command to widen in case of ellipses 
May 21
127937874395D6476av6
merge: correct argument name in docstring 
Jun 4
4738c292a520D6468martinvonz
narrowspec: replace one recursion-avoidance hack with another 
May 31
a5b5ecff5f37D6472martinvonz
merge: simplify initialization of "pas" 
Mar 10
72522fe7fb95D6471martinvonz
merge: reorder some initialization to make more sense 
Mar 10
4e4fa3a95406D6473gracinet
rust-dirstate: architecture independence fix 
May 22
7f22b45ab36cD6473'Georges Racinet <georges.racinet@octobus.net>'
rust-dirstate: architecture independence fix 
May 22
602469a91550D6417martinvonz
context: get filesadded() and filesremoved() from changeset if configured 
May 15
f385ba70e4afD6416martinvonz
changelog: optionally store added and removed files in changeset extras 
May 15
0c72eddb4be5D6369martinvonz
templatekw: make {file_*} compare to both merge parents (issue4292) 
Apr 18
0c0a22f5b0b5D6465martinvonz
narrowspec: use vfs.tryread() instead of reimplementing 
May 31
4ce7cdd78da3D6466martinvonz
help: remove a superfluous "the" in revlogs text 
May 31
5b34972a0094D2647martinvonz
setdiscovery: make progress on most connected groups each roundtrip 
Mar 8 2018
bfd65b5e070bD6449ngoldbaum
help: clarify overlap of revlog header and first revlog entry 
May 28
c004340dc687D6458pulkit
py3: fix test-convert-svn-sink.t 
May 29
64ed405dd342D6464spectral
commit: respect --no-edit in combination with --amend 
May 30
060ff3396589D6463spectral
commit: add test showing that commit --amend --no-edit still shows editor 
May 30
7752cd3a2f83D6461av6
githelp: translate git stash show and clear actions and --patch flag 
May 30
37ff80505dfdD6460av6
githelp: add --dry-run for mv 
May 30
eddff539f5beD6459av6
githelp: translate --directory of git apply to --prefix 
May 30
ad55a0a5894fD6442ngoldbaum
help: include subtopic in error message if passed 
May 23
a84564b1a0b1D6441ngoldbaum
help: check if a subtopic exists and raise an error if it doesn't (issue6145) 
May 23
4372d56112c9D6457durin42
perf: fix some missing b prefixes 
May 29
c2deb2512823D6456durin42
testparseutil: fix doctest to use str instead of bytes 
May 29
37f38e1dea44D6455durin42
testparseutil: stop extracting using std* streams as bytes on py3 
May 29
055687fe4c47D6454durin42
tests: sort some imports that were previously missed 
May 29
04eb3c5607afD6453durin42
contrib: fix import-checker to operate on str instead of bytes 
May 29
91452f62dd53D6451spectral
verify: use self._err not self.err, it changed in 7eaf4b1ac2a3 
May 28
15d5a2de44aaD6452spectral
tests: make run-tests exit non-zero if there are "errors" 
May 29
21c436a3a4e8marmoute
perf: add a `perfhelper-mergecopies` command 
May 23
f5f0a9490c05marmoute
perf: add a new `perfmergecopies` command 
May 23
3a3592b40a95marmoute
perf: factor selection of revisions involved in the merge out 
May 23
f0bcbbb6541cmarmoute
perf: allow to specify the base of the merge in perfmergecalculate 
May 23
e3ee707d42admarmoute
perf: add a --from flag to perfmergecalculate 
May 23
12bd4e2d4d06durin42
merge with stable 
May 28
e2e507573c7cD6447pulkit
py3: fix test-narrow* which started failing because of recent changes 
May 25
7a64ad3f325dD6368martinvonz
tests: add test for {file_mods}, {file_adds}, {file_dels} on merge commit 
May 11
65fa61ca20afD6367martinvonz
context: add ctx.files{modified,added,removed}() methods 
Apr 18
f3d06d37e194D6418martinvonz
copies: split up _chain() in naive chaining and filtering steps 
May 9
ba6ca4e80607D6446martinvonz
relnotes: document changed behavior of ui.origbackuppath pointing to file 
May 24
b47e9712000bD6370martinvonz
templatekw: move showfileadds() close to showfile{mods,dels}() 
May 11
c2d10506725cD6443pulkit
py3: use range() instead of xrange() 
May 24
343b3ed35cb8D6445pulkit
narrow: move heads close to common as they are closely related 
May 24
f66628c15e6fD6444pulkit
narrow: pass binary nodeids to generateellipsesbundle2() 
May 24
96fc696a9cb2marmoute
match: stabilize _rootsdirsandparents doctest 
May 24
21e77ede77abD6435pulkit
narrow: factor out logic to build ellipses related b2parts in separate fn 
May 20