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
b3fc78c028efD6354martinvonz
absorb: be more specific when erroring out on merge commit 
May 9
65f3a77223e0D6353durin42
remotefilelog: log when we're about to fetch files 
May 8
6bc1245cd598yuja
revset: populate wdir() by its hash or revision number 
Apr 30
a0c5e06e9b1ayuja
revset: extract private constant of {nullrev, wdirrev} set 
Apr 30
96bc1ef4a302yuja
help: suggest merge() revset instead of -m/--only-merges 
Apr 30
d5b35d6972a5D6351martinvonz
tests: update annotate tests to work around simplemerge bug 
May 7
d1c7446d0c58D6352martinvonz
copies: delete misplaced comment 
May 7
231334c1ee96D6302Kwan
phabricator: include branch in the phabread output 
Apr 22
a4f7dceb07bfD6301Kwan
phabricator: fallback to reading metadata from diff for phabread 
Apr 22
9421d7e12888D6298Kwan
phabricator: include commit (node) and parent in the local:commits metadata 
Apr 20
00e065fb1469D6344martinvonz
copies: remove redundant filtering of ping-pong renames in _chain() 
Apr 18
d811f17090a3D6339durin42
repair: reword comments that I noticed while working on source formatting 
May 3
a42cc325b682D6329Sietse
gendoc: nest command headers under category headers 
Apr 26
f9cdd732cb58D6328Sietse
minirst: support subsubsubsubsections (header level 5) with marker '''' 
Apr 26
037a97d62625D6327Sietse
gendoc: guarantee that all commands were processed 
May 3
3816e361e3d8D6326Sietse
gendoc: group commands by category in man page and HTML help 
Apr 26
0786b791b3b5D6325Sietse
gendoc: indent loop to make next patch more legible 
Apr 25
970aaf38c3fcD6341durin42
contrib: have byteify-strings explode if run in Python 2 
May 3
e10b8058da84D6340durin42
repair: reword comment about bookmarks logic 
May 3
d26bfbf419f9D6338durin42
monotone: fix a bogus _() wrapper that was caught when formatting code 
May 3
0f01394457a0av6
commit: add ability to print file status after each successful invocation 
May 3
165b1aad43daav6
tests: flatten repo structure in test-commit.t 
May 3
1756859a65famharbison72
lfs: add a TODO file 
May 4
c74226916c8cD6335martinvonz
copies: make "limit" argument to _tracefile() mandatory 
Apr 28
39b63f9d7464D6336martinvonz
localrepo: don't use defaults arguments that will never be overridden 
May 3
6770df6e4365D6337martinvonz
tags: avoid double-reversing a list 
May 3
32338e27bb9dmarmoute
updatecaches: also warm hgtagsfnodescache 
Mar 10
9f45d3d526f9marmoute
hgtagsfnodescache: inherit fnode from parent when possible 
Mar 10
2930b31383afmarmoute
hgtagsfnodescache: handle nullid lookup 
Mar 10
ade02721d3faD6324Sietse
help: register the 'gpg' command category and give it a description 
Apr 26
c4a50e863ee2feyu@google.com
histedit: Speed up scrolling in patch view mode 
Apr 25
4ad191041be2Yu Feng
histedit: Show file names in multiple line format 
May 2
d345627d104bmarmoute
repoview: introduce a `experimental.extra-filter-revs` config 
Apr 6
fdbeacb9d456D6277martinvonz
copies: filter out copies from non-existent source later in _chain() 
Apr 18
5a3979529740D6276martinvonz
copies: clarify mutually exclusive cases in _chain() with a s/if/elif/ 
Apr 18
df7ad90edbd4D6275martinvonz
copies: delete a redundant cleanup step in _chain() 
Apr 18
d1c2688eda80D6274martinvonz
copies: document cases in _chain() 
Apr 18
a6be3af3a397D6269martinvonz
copies: ignore heuristics copytracing when using changeset-centric algos 
Apr 17
d8ca7b99fc51D6268martinvonz
copies: move check for experimental.copytrace==<falsy> earlier 
Apr 17
a20d7c6abff2D6266martinvonz
copies: replace .items() by .values() where appropriate 
Apr 17
d69bc8ffbe6fD6256martinvonz
copies: inline _computenonoverlap() in mergecopies() 
Apr 12
57203e0210f8D6255martinvonz
copies: calculate mergecopies() based on pathcopies() 
Apr 12
c83c08cf02b7D6330martinvonz
tests: add test where copy source is deleted and added back 
Apr 29
e64d8d73a98ddurin42
merge with stable 
May 1
ca762c2bbe6bmharbison72
obsolete: drop the legacy `_enabled` variable 
Apr 29
d0e773ad9077D6314pulkit
discovery: only calculate closed branches if required 
Apr 27
9893d7aa7420D6311pulkit
branchcache: store the maximum tip in a variable inside for loop 
Apr 26
618b9ffefa87D6323martinvonz
tests: demonstrate that rename is followed to wrong parent from merge 
Apr 28
7bb2f358a13bD6322martinvonz
test: demonstrate failure to follow rename with shadowed linkrev 
Apr 28
20fce2742399D6321martinvonz
tests: slightly modify a linkrev test to prepare for expanding it 
Apr 28