merge with stable

Authored by smf.

Description

merge with stable

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
70354bd4f19bD346quark
rebase: only change self.state when collapsing in _finishrebase 
Aug 11 2017
3160876c6e4eD340quark
rebase: choose merge base without unwanted revisions 
Aug 11 2017
3cfc9070245fD351quark
demandimport: disable if chg is being used 
Aug 16 2017
8fb5212652ecD445quark
demandimport: move HGDEMANDIMPORT test to __init__.py 
Aug 18 2017
6f6c87888b22D360hooper
log: add a "graphwidth" template variable 
Aug 15 2017
833f70277f0eD413lothiraldan
obsmarker: fix precnode deprecation 
Aug 16 2017
eae63a9e59daD414lothiraldan
obsmarker: precnode was renamed into prednode 
Aug 16 2017
457d1ebf151bD416lothiraldan
revset: mark evolution-related revsets as experimental 
Aug 16 2017
f6dc30b83432D411quark
push: fix docsstring 
Aug 15 2017
cfcfbe6c96f8yuja
py3: select input or raw_input by pycompat 
Aug 16 2017
f18b11534274yuja
py3: make encoding.strio() an identity function on Python 2 
Aug 16 2017
7827fbbd0b06yuja
templatekw: specify plural form of instability 
Aug 13 2017
84a3e04e35b5yuja
templatekw: rename termwidth() per convention 
Aug 16 2017
3ae2eaecb49eD345quark
rebase: optimize "source" calculation in adjustdest 
Aug 11 2017
bc9e075133c9D344quark
rebase: remove "state >= revtodo" condition 
Aug 11 2017
ddf77c0cc169D343quark
rebase: remove self.destancestors 
Aug 11 2017
3b04a6ff625cD85quark
rebase: remove rebaseset from _checkobsrebase 
Jul 14 2017
3ddbab49efcfD26quark
rebase: remove revignored and nullmerge states 
Jul 10 2017
437e317d7913D25quark
rebase: remove messages for nullmerge and revignored (BC) 
Jul 8 2017
d8d0ef5f5975D24quark
rebase: remove revprecursor and revpruned states (BC) 
Jul 8 2017
30573b3d2ebcD23quark
rebase: move obsoleted not rebased messages earlier (BC) 
Jul 8 2017
35fc5e919675D22quark
rebase: extract ctx description logic to a function 
Jul 8 2017
627cb36b537fD302durin42
python3: whitelist another *13* tests that now pass 
Jul 27 2017
7d5bc0e5b88fD299durin42
py3: introduce a wrapper for __builtins__.{raw_,}input() 
Jul 24 2017
470e2c7ee34fD302durin42
python3: whitelist another *13* tests that now pass 
Jul 27 2017
d390726b575dD299durin42
py3: introduce a wrapper for __builtins__.{raw_,}input() 
Jul 24 2017
48f3e87ce650D298durin42
python3: whitelist four more passing tests 
Jul 26 2017
0646608368a9D353durin42
extensions: don't give AttributeError bytes message on Python 3 
Aug 11 2017
38a3767975a7D296durin42
extensions: if on py3 and propname is a bytestr, convert to sysstr 
Jul 25 2017
057d31ceace3D359pulkit
pushvars: add a coreconfigitem for push.pushvars.server 
Aug 11 2017
6e666cd59879D127quark
phabricator: add phabupdate command to update status in batch 
Jul 18 2017
fb59192b4981D126quark
phabricator: add status to revision query language 
Jul 18 2017
539541779010D125quark
phabricator: add a small language to query Differential Revisions 
Jul 18 2017
75fdaf851e83D124quark
phabricator: change "readpatch" to be more flexible 
Jul 18 2017
aa6c290a77faD376phillco
filemerge: extract `_picklabels` as a helper function 
Aug 14 2017
b86fc43e4b73D375phillco
simplemerge: write merge result to the localctx, if passed 
Aug 14 2017
8b91a4ff23adD374phillco
simplemerge: use contexts to read file data from, if passed 
Aug 13 2017
db3e9f7c91aaD373phillco
filemerge: pass contexts to simplemerge 
Aug 13 2017
b3571dc0e6b8D372phillco
simplemerge: add optional context parameters to simplemerge 
Aug 13 2017
de573184686eD371phillco
simplemerge: extract verifytext as a helper function 
Aug 13 2017
158dddc635ffD406martinvonz
commit: use context manager with dirstateguard 
Aug 15 2017
5d286eb7009fD405martinvonz
commit: move dirstateguard creation out of try-block 
Aug 15 2017
42ad7cc645a4D409pulkit
copies: add more details to the documentation of mergecopies() 
Aug 15 2017
3c91cc0c5fdeD231durin42
httppeer: add support for httppostargs when we're sending a file 
Jul 26 2017
fa7e30efe05aFUJIWARA Katsunori
i18n: get translation entries for description of each compression engines 
Aug 15 2017
d5ef17608159FUJIWARA Katsunori
i18n: ignore docstring for modules under mercurial 
Aug 15 2017
ed04d7254a91FUJIWARA Katsunori
i18n: use saved object to get actual function information if available 
Aug 15 2017
726dd73df3b9FUJIWARA Katsunori
i18n: ignore doctest part to avoid warning at "make update-pot" 
Aug 13 2017
1775f93da25cFUJIWARA Katsunori
largefiles: fix help text to avoid warning at "make update-pot" 
Aug 1 2017
97ee669f1f6dFUJIWARA Katsunori
i18n: make hggettext use original docstring to compute offset 
Aug 1 2017