merge with stable

Authored by yuja.

Description

merge with stable

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
78027e7bc544D6033pulkit
py3: convert return values of inspect.getabsfile() to bytes 
Feb 27
c7fc463b8e8eD6032pulkit
py3: add two new passing tests found by buildbot 
Feb 27
b10bbbe995ebD6031pulkit
py3: make contrib/debugshell.py work with Python 3 
Feb 27
b38c7304974fD6036martinvonz
absorb: let scmutil.cleanupnodes() take care of setting phase 
Feb 27
c91321e86071D6035martinvonz
absorb: use scmutil.cleanupnodes() also when obsmarkers are disabled 
Feb 27
a008e0af892eD6034martinvonz
absorb: use scmutil.cleanupnodes() so operation gets set 
Feb 27
00c909de1143lothiraldan
test: follow-up on 1c4d6ab2ecb8, stabilize test-remotefilelog-bgprefetch.t 
Feb 25
e0a3ee3fdb33mharbison72
tests: add more wildcards to test-extdiff.t 
Feb 25
8ad46ac6728eD6028pulkit
branchmap: prevent reading the file twice through different iterators 
Feb 26
941685500125D6025spectral
remotefilelog: fix format str, blobsize isn't always a #, can be "(missing)" 
Feb 25
118c1ec4f31bD6024spectral
remotefilelog: do not specify an explicit version for repack 
Feb 22
090a41251f09marmoute
test: generate the `test-sparse-revlog` artifact when slow-test is allowed 
Feb 24
4cbccb50df46marmoute
runtest: also update slow test timeout during `#if` clauses 
Feb 24
bc1c1435a874marmoute
runtest: move slow timeout process earlier in the `_hghave` method 
Feb 24
7eb4e62d4760marmoute
runtest: extract the logic that update timeout for slow tests 
Feb 24
9f53a4e2e193marmoute
tests: increase timeout for slow test 
Feb 24
5f198b690301indygreg
merge with stable 
Feb 25
64de5f44eec3lothiraldan
rewriting: add an option for rewrite commands to use the archived phase 
Jan 1
8c42b4a3d447lothiraldan
strip: introduce a soft strip option 
Oct 16 2018
68bbcc70e274D6023pulkit
branchcache: move loading of branch names and nodes into it's own function 
Feb 25
2d835c42ab41D5985mplamann
bundle2: don't send "shared" requirement when cloning from a share 
Feb 20
a62ad1be1671D5984mplamann
tests: demonstrate failure when cloning from a share via bundle2 
Feb 20
4d21ebc4cb47D5997navaneeth.suresh
mq: disable qrecord during histedit (issue5981) 
Feb 21
2ba96fca8528D5996martinvonz
committablectx: move status-related methods closer together 
Feb 21
19979b8b87e2D6003durin42
tests: add test for hg-test-mode emacs code 
Feb 21
2a6ca0d94b70D6002durin42
hghave: add check for GNU emacs 
Feb 21
b6c062bb4be3D6001durin42
contrib: also linkify tracebacks in compilation output when using hg-test-mode 
Feb 21
b6a757de2fffD6000durin42
contrib: add compilation-mode linking for our test output 
Feb 21
251332dbf33dD6007pulkit
diff: make sure we output stat even when --git is not passed (issue4037) (BC) 
Feb 21
7b04b1154c15D6006pulkit
tests: add test to demonstrate issue4037 
Feb 22
cecdf7418cf1D6022martinvonz
grep: reuse getrenamedfn() from scmutil 
Jan 18
e9b9ee9af4a9D6021martinvonz
templatekw: move getrenamedfn() to scmutil (API) 
Feb 21
18f619d3b1bbD6020martinvonz
mq: get copy source from context object instead of from filelog 
Feb 23
6ed520c3e932D6019martinvonz
mq: slightly modernize by using context object 
Feb 23
8843bc1fc14dD6018martinvonz
absorb: migrate to new method for getting copy info 
Feb 23
c3a249c2b6b3D6017martinvonz
fix: migrate to new method for getting copy info 
Feb 11
322ce0bca19dD6016martinvonz
memfilefromctx: migrate to new method for getting copy info 
Mar 26 2018
a86e22007b54D6015martinvonz
largefiles: migrate to new method for getting copy info 
Dec 28 2017
2e2076c8c25fD6014martinvonz
commit: migrate to new method for getting copy info 
Dec 28 2017
151cc149b17fD6013martinvonz
tests: migrate to new method for getting copy info 
Dec 28 2017
52d4cb162902D6012martinvonz
templatekw: migrate to new method for getting copy info 
Mar 26 2018
1312afae2d51D6011martinvonz
convert: migrate to new method for getting copy source 
Dec 28 2017
c7a843aa4b42D6010martinvonz
context: move equivalent renamed() implementations to superclass 
Mar 26 2018
e9413a3be093D6009martinvonz
context: rewrite renamed() in terms of new copysource() where appropriate 
Mar 26 2018
041d829575edD6008martinvonz
context: add specialized way of getting copy source file only 
Mar 26 2018
1c1c4ef8b72eD6004martinvonz
changegroup: move non-pruning of non-ellipsis manifests to _prunemanifests() 
Feb 22
cd7059d17cb2D5999spectral
context: use includematcher when checking dir/file conflicts 
Feb 21
0b2361c2c493D5998spectral
tests: change the paths slightly in test-rebase-inmemory.t 
Feb 21
37ead13fb3d4gracinet
rust-cpython: using rustext.dagop.headrevs in revlog 
Jan 16
6843379bf99egracinet
changelog: prefilter in headrevs() 
Feb 20