HomePhabricator

merge: forgot to pull before release

Authored by durin42.

Description

merge: forgot to pull before release

These two changes should be part of 5.0, but we are fine
leaving them out of the RC.

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
e76eb64d7f71durin42
Added signature for changeset 4a8d9ed86475 
Apr 17
807a6ca6d096durin42
Added tag 5.0rc0 for changeset 4a8d9ed86475 
Apr 17
4a8d9ed86475durin42
merge: default into stable for release candidate 
Apr 17
6b94f8249eafD6182joerg.sonnenberger
bundle2: handle compression in _forwardchunks 
Apr 2
c2165551eed6D6186martinvonz
changelog: parse copy metadata if available in extras 
Dec 28 2017
36d70c14ed25D6183martinvonz
copies: add config option for writing copy metadata to file and/or changset 
Dec 27 2017
0cfd1f9fb02bD6186martinvonz
changelog: parse copy metadata if available in extras 
Dec 28 2017
0fdf45cb3dc6D6183martinvonz
copies: add config option for writing copy metadata to file and/or changset 
Dec 27 2017
69b4426d288bD6258durin42
packaging: coerce paths to strings 
Apr 16
9d5692d64e18marmoute
revsetbenchmark: add some simpler revset for heads and roots 
Apr 4
eebf78724d94marmoute
repoview: flag `server.view` as experimental 
Apr 12
890f450f848fmarmoute
repoview: move subsettable in a dedicated module 
Apr 12
2003f0bffcb1D6241pulkit
narrow: drop unrequired if conditionals 
Apr 16
8a37c9b6cf0aD6218pulkit
narrow: send specs as bundle2 data instead of param (issue5952) (issue6019) 
Apr 8
e3c572e371f7JordiGH
revset: short docstring for checkstatus 
Apr 5
7cfd20bc0721mharbison72
py3: write out hgextindex as bytes in setup.py 
Apr 5
a975821d0938philpep
setup: fix a possible NameError on rust build 
Apr 4
6308aa828cf4D6058khanchi97
patch: include flag-only file changes in "special" while filtering patch… 
Mar 3
914533269611martinvonz
merge with stable 
Feb 20
2d562af6014bD5991martinvonz
copies: do copy tracing based on ctx.p[12]copies() if configured 
Feb 19
456ad0fd8e18D5990martinvonz
context: introduce p[12]copies() methods and debugp[12]copies commands 
Jan 18
58d50c697dc7D5989martinvonz
copies: filter out copies when target is not in destination manifest 
Feb 15
3f94deee167cD5988martinvonz
copies: make _backwardrenames() filter out copies by destination 
Feb 19
fd973639f5e9D5987martinvonz
copies: respect narrowmatcher in "parent -> working dir" case 
Feb 19
4711f3a2ca47D5986martinvonz
tests: add tests of pathcopies() 
Feb 20
8980b5d6d9d9D5970martinvonz
uncommit: add config option to keep commit by default 
Feb 15
f044d7832e10D5983martinvonz
debugpathcopies: sort output so it's deterministic 
Feb 14
4fecf4f6524fD5978martinvonz
subrepo: use root-repo-relative path from `hg files` with ui.relative-paths=no 
Feb 17
61cb59d0ddc8D5977martinvonz
subrepo: demonstrate broken `hg files` with ui.relative-paths=no 
Feb 17
5f522c8daf8dD5979pulkit
py3: whitelist 5 new passing tests caught by buildbot 
Feb 17
c10652d1328eD5969martinvonz
uncommit: inform user if the commit is empty after uncommit 
Feb 15
d8ac04c3c74dD5966lothiraldan
test: stabilize test-run-tests.t output 
Feb 14
4cb2ac16d9afD5960lothiraldan
test: stabilize test-remotefilelog-bgprefetch.t flaky output 
Feb 14
64d519ca44dbD5792taapas1128
uncommit: added interactive mode(issue6062) 
Feb 1
949c4a3b7373D5969martinvonz
uncommit: inform user if the commit is empty after uncommit 
Feb 15
4618bdf75d8aD5966lothiraldan
test: stabilize test-run-tests.t output 
Feb 14
5b6ee1b16f9aD5960lothiraldan
test: stabilize test-remotefilelog-bgprefetch.t flaky output 
Feb 14
edd5c8dc812eD5792taapas1128
uncommit: added interactive mode(issue6062) 
Feb 1
c3c942c8ebd3JordiGH
color: change color of grep.rev label 
Feb 15
39fa2cf1837eJordiGH
crecord: remove obsolete version check 
Feb 14
da425bd21fa7JordiGH
histedit: remove "chistedit" mention from interface 
Feb 13
735da363556dD5953navaneeth.suresh
revset: improve documentation on expectsize() 
Feb 13
879495c68e31D5956martinvonz
scmutil: fix a comment that doesn't match the code 
Feb 13
4eeed5eac0f4D5958indygreg
remotefilelog: remove strkwargs() 
Feb 13
e37751bd1666gracinet
rust-cpython: binding for headrevs() 
Jan 10
a38c0662e9f4gracinet
rust-cpython: moved py_set() utility to conversion module 
Jan 16
9370f4843084D5417gracinet
rust: translated random test of missingancestors 
Dec 2 2018
b738093d4b8fD5949martinvonz
debugpathcopies: fix typo in synopsis 
Feb 12
a04e0ec65ce3D5948martinvonz
debugrename: don't require at least one path 
Feb 12
389ad992d953D5947indygreg
revlog: use iterbytestr() 
Feb 12