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
b8d54f4625cbD6607taapas1128
merge: disallow merge abort in case of an unfinished operation (issue6160) 
Jul 9 2019
9f73620a65feD6622spectral
relnotes: document new range-select mechanism in crecord 
Jul 8 2019
ceb31d96d3aeD6606taapas1128
statecheck: updated docstrings related to afterresolvedstates 
Jul 4 2019
ea6558db1011D6616durin42
extdata: avoid crashing inside subprocess when we get a revset parse error 
Jul 8 2019
eec65b706cafD6615durin42
extdata: demonstrate bad behavior when a subprocess emits garbage 
Jul 8 2019
d28d91f9f35aD6614martinvonz
py3: don't run source transformer on hgext3rd (extensions) 
Jul 8 2019
9ac1a5a4a64fD6621spectral
crecord: provide 'X' as a range-select mechanism 
Jul 8 2019
cd4f1b7c3192D6620spectral
crecord: make KEY_ENTER usable in tests (by not updating UI) 
Jul 8 2019
3be6ff55095bD6619spectral
crecord: fix if -> elif when handling key presses 
Jul 8 2019
75fd9421440bD6618spectral
crecord: add "x" alias for space, remove test-only "TOGGLE" alias 
Jul 8 2019
756326d54761D6617spectral
crecord: stop using test-only "X" as alternative for "c" 
Jul 8 2019
f9da9d5f3f5aD6608taapas1128
graft: moved abortgraft and readgraft to cmdutil 
Jul 6 2019
4eaf7197a740D6556durin42
cleanup: use named constants for second arg to .seek() 
Jun 20 2019
f802a75da585D6563spectral
patch: use a short, fixed-size message for last line of prompt (issue6158) 
Jun 20 2019
4764e8436b2aD6562spectral
filemerge: make last line of prompts <40 english chars (issue6158) 
Jun 20 2019
44e99811bea7D6610valentin.gatienbaron
tweakdefaults: make hg resolve require --re-merge flag to re-merge 
Jul 6 2019
70f1a84d0794D6605navaneeth.suresh
unshelve: rename _dounshelve() to dounshelve() 
Jul 4 2019
a80464e85dddD6593Alphare
rust: remove Deref in favor of explicit methods 
Jul 1 2019
11c025c83393D6592Alphare
rust: simplify overly complicated expression 
Jul 1 2019
d26e4a434fe5D6591Alphare
rust: run rfmt on all hg-core/hg-cpython code 
Jul 1 2019
e3df1e15bee9D6595martinvonz
changelog: fix handling of empty copy entries in changeset 
Jul 1 2019
4cafbd3b50c6D6590khanchi97
relnotes: document the new --force-close-branch flag 
Jun 30 2019
8306b6c29addD6511pulkit
py3: hack around inconsistency of type of name passed to DNSQuestion 
Jun 11 2019
683aeef12830D6510pulkit
py3: add r'' prefixes and do ('%d' % int) instead of str(int) 
Jun 11 2019
fa2071753dc2D5805indygreg
zeroconf: port to Python 3 
Feb 2 2019
4ebbd7c4a3c5D6587martinvonz
copies: return only path from _tracefile() since that's all caller needs 
Jun 28 2019
6a3872e34503D6589navaneeth.suresh
extensions: add shelve to _builtin 
Jun 30 2019
904e0da2e195yuja
merge with stable 
Jun 30 2019
2702dfc7e029D6586martinvonz
automv: access status fields by name, not index 
Jun 28 2019
abd902a85040D6585martinvonz
automv: use public API for getting copies 
Jun 28 2019
2e1d9414ff71D6490khanchi97
commit: add --force-close-branch flag to close a non-head changeset 
May 18 2019
3de4f17f4824D6553navaneeth.suresh
shelve: move shelve extension to core 
Jun 28 2019
80e0ea08b55cD6584navaneeth.suresh
shelve: remove rebase.clearstatus() 
Jun 28 2019
5c64d0b4c037D6547taapas1128
shelve: removed redundant merge detection method 
Jun 19 2019
2db96bf84a8fD6395Alphare
rust-dirstate: call new "dirs" rust implementation from Python 
Jun 5 2019
ff89280c626dD6586martinvonz
automv: access status fields by name, not index 
Jun 28 2019
1caadb8e3d2cD6585martinvonz
automv: use public API for getting copies 
Jun 28 2019
171a367b7cf1D6490khanchi97
commit: add --force-close-branch flag to close a non-head changeset 
May 18 2019
46087aeb8ae2D6553navaneeth.suresh
shelve: move shelve extension to core 
Jun 28 2019
ead3a723bcefD6584navaneeth.suresh
shelve: remove rebase.clearstatus() 
Jun 28 2019
e9f2252e218eD6547taapas1128
shelve: removed redundant merge detection method 
Jun 19 2019
f5ef8c85477dD6395Alphare
rust-dirstate: call new "dirs" rust implementation from Python 
Jun 5 2019
ce94f9622acdD6394Alphare
rust-dirstate: add "dirs" rust-cpython binding 
May 16 2019
2dcee6497b0bD6393Alphare
rust-dirstate: add "dirs" Rust implementation 
May 16 2019
df5f674050b7D6557taapas1128
relnotes: added description about statemod._statecheck 
Jun 20 2019
faec09d89435D6583taapas1128
statecheck: shifted defaults to addunfinished() 
Jun 27 2019
0231032729c4D6551taapas1128
statecheck: added support for cmdutil.afterresolvedstates 
Jun 20 2019
12243f15d53eD6503taapas1128
statecheck: added support for STATES 
Jun 8 2019
5bddd2244814D6502taapas1128
state: moved cmdutil.STATES and utilities to state.py 
Jun 8 2019
dc3fdd1b5af4D6501taapas1128
state: created new class statecheck to handle unfinishedstates 
Jun 8 2019