HomePhabricator

branching: merge with stable

Authored by martinvonz.

Description

branching: merge with stable

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
9e24b3d8e896D9566marmoute
debugdiscovery: fix swapped heads and roots 
Dec 11 2020
d90f439ff19fD9565marmoute
debugdiscovery: display the number of roundtrip used 
Dec 11 2020
2f357d053df2D9567spectral
copies: make calculating lazy for dir move detection's "addedfiles" 
Dec 11 2020
bdc2bf68f19eD9551martinvonz
mergetools: add new conflict marker format with diffs in 
Dec 8 2020
aa4dbc14f735D9564martinvonz
diff: deprecate -r option 
Dec 10 2020
4a0730b7127eD9563martinvonz
diff: update synopsis to use --from/--to instead of -r 
Dec 10 2020
ed5a0b5d21a6D9562martinvonz
diff: describe behavior by using --from/--to instead of varying revision count 
Dec 10 2020
6f8a94bbfba1D9561durin42
histedit: adjust comment describing `edit` action for clarity 
Dec 10 2020
3f82a915ab2aD9560durin42
histedit: tweak `edit` message to try and guide users to our workflow 
Dec 10 2020
7ce24d3761e8pulkit
procutil: don't assign stdin to None, use os.devnull instead 
Dec 10 2020
49b6910217f9pulkit
dispatch: move IOError handling and flushing of streams to `dispatch()` 
Dec 10 2020
a771ffc378a8D9550martinvonz
simplemerge: write output only once it's complete 
Dec 9 2020
fd75e5c53ec3D9549martinvonz
simplemerge: avoid quadratic concatenation when building output text 
Dec 9 2020
5510e2ac213fD9548martinvonz
simplemerge: work with opts as native strings instead of bytes 
Dec 9 2020
1b5e0d0bdb05D9547mharbison72
hghave: update the check for virtualenv 
Dec 8 2020
4d5e2fd53707D9525joerg.sonnenberger
singlehead: introduce option to restrict to public changes 
Dec 5 2020
93e09d370003D9553spectral
treemanifest: stop storing full path for each item in manifest._lazydirs 
Dec 3 2020
1ced08423d59D9544mharbison72
extensions: avoid including `__index__` in the disabled extension list 
Dec 8 2020
224af78021deD9559mharbison72
windows: continue looking at `%HOME%` for user config files with py3.8+ 
Dec 9 2020
08fd76a553c9D9558mharbison72
run-tests: configure the environment to expand `~` properly with Windows py38+ 
Dec 9 2020
af3a6900f893D9557mharbison72
run-tests: fix `HGTESTEXTRAEXTENSIONS` with py3 
Dec 9 2020
9eb07ab3f2d4D9520Simon Sapin
rhg: use persistent nodemap when available 
Dec 4 2020
8ff2d8359d0fD9533Simon Sapin
persistent-nodemap: properly ignore non-existent `.nd` data file 
Dec 7 2020
8837498ae6e0D9555martinvonz
docs: prefer `hg diff --from/--to` over `-r` 
Dec 9 2020
64292addbe67martinvonz
diff: add --from and --to flags as clearer alternative to -r -r 
Dec 9 2020
ac9de799d390D9517pulkit
commandserver: handle IOError related to flushing of streams 
Dec 3 2020
e0866c047e64D9502pulkit
tests: conditionalize output in test-ssh.t with chg+py3 
Dec 2 2020
7e1b4154cdcaD9501pulkit
dispatch: disable line ending normalization on sys.stdin if its None 
Dec 2 2020
81c1f5d1801fD9500pulkit
procutils: don't try to get `.buffer` if sys.stdin is None 
Dec 2 2020
c80f9e3daec3D9552martinvonz
share: remove unexpected heading from "verbose" container in help test 
Dec 9 2020
c581b9ee22b1D9546joerg.sonnenberger
cext: match format string for 32bit long platforms 
Dec 8 2020
7a2b67e6b680D9545martinvonz
status: disable morestatus when using -0 
Dec 8 2020
0e5065b6baa0D9530marmoute
debugdiscovery: display some information about the initial "undecided" set 
Dec 6 2020
3ca9d26c5984D9529marmoute
debugdiscovery: add some data about the shapes of the sets 
Dec 6 2020
31ecf715efe2D9541mharbison72
tests: conditionalize the progress timestamp for Windows 
Dec 7 2020
b2a743c3abbbD9540mharbison72
tests: conditionalize a few Windows specific error messages 
Dec 7 2020
69429972ff1fD9539mharbison72
tests: correct the output order about starting a background thread for Windows 
Dec 7 2020
f4f07cc92a47D9538mharbison72
tests: update the exit status codes for Windows specific tests 
Dec 7 2020
8dfcebd084b6D9537mharbison72
tests: drop the trailing exclamation point from some Windows abort messages 
Dec 7 2020
c7899dd29800D9536mharbison72
tests: update output for test-check-pylint.t 
Dec 7 2020
9e785d940525D9535mharbison72
run-tests: extend PATH on Windows to include user installed scripts 
Dec 7 2020
cc0b332ab9fcD9543mharbison72
run-tests: stuff a `python3.exe` into the test bin directory on Windows 
Dec 7 2020
e4137c313e7fD9542mharbison72
run-tests: fix a typo in an attribute name 
Dec 7 2020
56a5ea353182yuja
test-extension: flush diagnostic message to stabilize chg output 
Dec 7 2020
1f0ed7e63c2aD9512mharbison72
formatting: re-blacken match.py 
Dec 3 2020
88de2639901bD9532joerg.sonnenberger
transaction: windows workaround for missing line iteration support 
Dec 7 2020
14ff4929ca8cD9445joerg.sonnenberger
sidedata: send the correct revision data for wireproto v2 
Nov 28 2020
44a52048c6d6D9524marmoute
debugdiscovery: move various computation earlier 
Dec 6 2020
24751551fe64D9528marmoute
debugdiscovery: clarify internal key name in debugobsolete 
Dec 6 2020
dacb771f6dd2D9421marmoute
copies-rust: extract the processing of a ChangedFiles in its own function 
Nov 20 2020