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
a39a9df7eccaD1862joerg.sonnenberger
wireproto: split streamres into legacy and modern case 
Jan 12 2018
3a3b59bbe7ceD1918martinvonz
localrepo: run cache-warming transaction callback before report callback 
Jan 19 2018
963a611b2f39D1917martinvonz
scmutil: 0-pad transaction report callback category 
Jan 19 2018
de32acb24949lothiraldan
stream: add a test showing we also clone bookmarks 
Jan 17 2018
e5b6ba786d83D1913pulkit
branch: allow changing branch name to existing name if possible 
Jan 19 2018
3bd8ab4c80a5D1074pulkit
branch: add a --rev flag to change branch name of given revisions 
Oct 15 2017
8685192a8733yuja
templater: fix crash by empty group expression 
Jan 16 2018
3c2a6246fd63yuja
log: fix typo in comment about _matchfiles() 
Jan 16 2018
7a1806e0daeahollisb
sparse: --include 'dir1/dir2' should not include 'dir1/*' 
Jan 18 2018
73432eee0ac4yuja
fileset: add kind:pat operator 
Jan 13 2018
06a757b9e334yuja
minifileset: unify handling of symbol and string patterns 
Jan 13 2018
9eb5c400f488yuja
fileset: move import of match module to top 
Jan 13 2018
f90f6fd130c1Paul Morelle
revlog: group delta computation methods under _deltacomputer object 
Jan 14 2018
d99b07bc69fbPaul Morelle
revlog: refactor out _finddeltainfo from _addrevision 
Jan 14 2018
29f57ce416edyuja
localrepo: micro-optimize __len__() to bypass repoview 
Jan 19 2018
693e3bcae19emharbison72
lfs: defer registering the pre-push hook until blobs are committed 
Jan 18 2018
b4e1d0654736mharbison72
lfs: dump the full response on httperror in debug mode 
Jan 18 2018
3d48ae1aaa5emharbison72
lfs: default the User-Agent header for blob transfers to 'git-lfs' 
Jan 18 2018
10e62d5efa73mharbison72
lfs: default to not using workers for upload/download 
Jan 18 2018
f58245b9e3eamharbison72
lfs: add the '{lfsattrs}' template keyword to '{lfs_files}' 
Jan 14 2018
05d415790761lothiraldan
debugdownload: read repository hgrc if there is one 
Jan 18 2018
7415cc923613mharbison72
test-blackbox: stabilize for Windows 
Jan 19 2018
22a877215ea1Paul Morelle
debugdeltachain: cleanup the double call to _slicechunk 
Jan 19 2018
05c70675e5b9pulkit
blackbox: don't unpack the list while passing into str.join() 
Jan 19 2018
45b678bf3a78D1882lothiraldan
atomicupdate: add an experimental option to use atomictemp when updating 
Jan 17 2018
2a7e777c9eedD1881lothiraldan
write: add the possibility to pass keyword argument from batchget to vfs 
Jan 17 2018
853bf7d90804D1880joerg.sonnenberger
blackbox: if --debug is used, also trace ui.debug() calls 
Jan 18 2018
50868145a8deD1904alex_gaynor
bdiff: handle the possibility of overflow when computing allocation size 
Jan 18 2018
ee3cadb495e6D1904alex_gaynor
bdiff: Handle the possibility of integer overflow when computing allocation size 
Jan 18 2018
f18ba40d792fD1802tom.prince
phabricator: add a template item for linking to a differential review 
Jan 2 2018
f50067fbeeadD1729indygreg
githelp: don't reference 3rd party commands for `git show` 
Jan 14 2018
b3cf58487731D1728indygreg
githelp: improve help for "reset" 
Dec 19 2017
a4cd8f527a7fD1727indygreg
githelp: clean up reflog help 
Dec 19 2017
a10a0d5561a9D1726indygreg
githelp: replace suggestion of `hg record` 
Dec 18 2017
5edfead8cc95D1725indygreg
githelp: remove reference to tweakdefaults 
Dec 18 2017
05b8adf38c55D1724indygreg
githelp: recommend `hg import` for `git am` 
Dec 22 2017
8dbd000f7de9D1723indygreg
githelp: improve help for `git add` 
Dec 18 2017
113281667205D1722indygreg
githelp: vendor Facebook authored extension 
Dec 18 2017
7ffbd911dbc9pulkit
merge: use public interface ms.localctx instead of ms._local 
Jan 18 2018
a1a5c3842b6fD1870lothiraldan
bookmarks: display the obsfate of hidden revision we create a bookmark on 
Jan 16 2018
35a0f6f31eefD1869lothiraldan
update: display the obsfate of hidden revision we update to 
Jan 16 2018
5cd60b0587a8D1868martinvonz
evolution: make reporting of new unstable changesets optional 
Jan 14 2018
1a09dad8b85aD1867martinvonz
evolution: report new unstable changesets 
Jan 15 2018
03e921942163D1866martinvonz
transaction: register summary callbacks only at start of transaction (BC) 
Jan 10 2018
54074a82e050D1865martinvonz
repair: filter out unknown revisions from phasecache within transaction 
Jan 14 2018
5748f404dad3D1864martinvonz
repair: drop unnecessary phase cache invalidation 
Jan 15 2018
8cdb671dbd0bD1861indygreg
wireproto: drop support for reader interface from streamres (API) 
Jan 15 2018
41ef02ba329bD1829pulkit
merge: add `--abort` flag which can abort the merge 
Jan 8 2018
9a50ffd15b25D1807phillco
filemerge: only write in-memory backup during premerge 
Jan 5 2018
c0439e11af16D1806phillco
filemerge: fix backing up an in-memory file to a custom location 
Jan 5 2018