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
fec944719324D4824martinvonz
narrow: move support for `hg verify` into core 
Sep 28 2018
a81cb91b15f0D4824martinvonz
narrow: move support for `hg verify` into core 
Sep 28 2018
84092edd5c88D4823martinvonz
narrow: drop unnecessary overrides of patch 
Sep 28 2018
277a6fb460a6D4822martinvonz
tests: add test showing that paths outside narrowspec are not added 
Sep 28 2018
cb9b23ec093cD4818durin42
catapipe: fix bug introduced when switching to the timer api 
Oct 1 2018
a24f4638d6c1D4809pulkit
narrow: move the ellipses server capability to core 
Sep 29 2018
d5498db5f86aD4808pulkit
narrow: move the wireprotocol narrow capability name to core 
Sep 29 2018
e743907d0932yuja
help: document about "files" template keywords 
Sep 30 2018
0d703063d0c8yuja
formatter: remove experimental marker from -T option 
Sep 30 2018
66df1059b7c0yuja
grep: rename {line_number} to {lineno} as well (BC) 
Sep 30 2018
47cb6750dea3yuja
annotate: rename {line_number} to {lineno} (BC) 
Sep 30 2018
f07ab9ddc0c0yuja
resolve: rename {status} to {mergestatus} to not shadow change status (BC) 
Sep 30 2018
59592ac26f85D4817durin42
py3: whitelist one additional test 
Oct 1 2018
c4a3d3c67c4fD4816lothiraldan
logtoprocess: connect all fds to /dev/null to avoid bad interaction with pager 
Nov 3 2017
dfca83594145D4815lothiraldan
logtoprocess: add a test to show pager and ltp bad interaction 
Nov 3 2017
7ea24d05d702D4814pulkit
py3: add one more passing test to whitelist caught by buildbot 
Sep 30 2018
61f39a892168lothiraldan
cleanupnodes: pass multiple predecessors to `createmarkers` directly 
Sep 27 2018
6335c0de80falothiraldan
obsolete: allow multiple predecessors in createmarkers 
Sep 22 2018
99f0f052b6bflothiraldan
obsolete: preindent code in createmarkers 
Sep 26 2018
bae6f1418a95lothiraldan
obsolete: explicitly pass relation items to effectflag computation 
Sep 26 2018
0428feb1f0d7lothiraldan
rebase: explicitly track collapses as fold 
Sep 26 2018
a8318c9cb2adlothiraldan
rebase: use tuple as `replacement` keys 
Sep 26 2018
a8ccd9523d40lothiraldan
rebase: expand a long "one-liner" 
Sep 26 2018
1857f50a9643lothiraldan
cleanupnodes: drop special casing around prune markers (API) 
Sep 26 2018
7198cdbbbde1lothiraldan
rebase: don't try to prune obsolete changeset already in the destination 
Sep 26 2018
b153ca77a52blothiraldan
histedit: don't cleanup nodes already disposed of 
Sep 26 2018
8bd589aecf65mharbison72
py3: avoid b'' output in test-hgweb-non-interactive.t 
Sep 30 2018
7b35209ba1a7mharbison72
py3: convert print to a function call in a few tests 
Sep 30 2018
d1bc6cf2be69mharbison72
py3: use util.forcebytestr() to convert push lock error to bytes 
Sep 29 2018
6e2c8f7f894emharbison72
py3: byteify windows.shelltocmdexe() 
Sep 29 2018
0f8ff3ff5d5cmharbison72
run-tests: flush output stream before prompting to accept changes 
Sep 29 2018
d70e620ee8c9D4811pulkit
py3: use util.forcebytestr() to convert error messages to bytes 
Sep 29 2018
8cef57031bbeD4807martinvonz
context: stop catching TypeError when converting hex nodeid to binary 
Sep 27 2018
2327abace563D4806martinvonz
context: stop catching and re-raising FilteredRepoLookupError 
Sep 27 2018
4017968f0a1dmharbison72
util: use a context manager in readlock() 
Sep 28 2018
5fe0b880200emharbison72
py3: convert os.readlink() path to native strings on Windows 
Sep 25 2018
803b7569c9eamharbison72
py3: suppress the output from .write() calls in the remaining tests 
Sep 29 2018
8d6ab33a61b2mharbison72
py3: conditionalize json float precision difference in test-debugcommands.t 
Sep 28 2018
8a42aa04ef36mharbison72
py3: byteify extension in test-debugcommands.t 
Sep 28 2018
a89dd6d01df0lothiraldan
pullreport: rev duplicated and extinct into account 
Sep 27 2018
f9232b0310eflothiraldan
pullreport: issue a message about "extinct" pulled changesets 
Sep 27 2018
b5e12039e6e0lothiraldan
pullreport: skip or rework some early return 
Sep 27 2018
a477679f6323lothiraldan
pullreport: skip filtered revs instead of obsolete ones 
Sep 27 2018
642cbc228badlothiraldan
pullreport: add a test to show misreporting of visible changeset 
Sep 27 2018
1a184b727affD4781martinvonz
repo: don't look up context for tip node if it's not needed 
Sep 26 2018
d739f423bf06D4780martinvonz
repo: look up nullrev context by revnum, not symbolic name 
Sep 27 2018
f6874567a93bD4779martinvonz
bundle: consistently put revnums in "base" collection 
Sep 27 2018
b55747ca518fmharbison72
py3: ensure printing to stdout uses str in test-hgweb-no-request-uri.t 
Sep 27 2018
b99903534e06lothiraldan
scmutil: accept multiple predecessors in 'replacements' (API) 
Sep 27 2018
1c3f1491965flothiraldan
scmutil: expand long "one-liner" 
Sep 27 2018