HomePhabricator

merge with stable

Authored by martinvonz.

Description

merge with stable

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
df162fca07e4D8224Alphare
rust-format: cleanup ancestors.rs to make rustfmt happy 
Mar 5 2020
622646ac733bmartinvonz
merge with stable 
Mar 5 2020
e64c0067fa8dD8234marmoute
heptapod-ci: use strict module policy 
Mar 5 2020
a02418dfe7f2D8230martinvonz
histedit: fix formatting after D8150 
Mar 5 2020
3145f9bccea3D8229marmoute
heptapod-ci: use strict module policy 
Mar 5 2020
d543ef183eb8durin42
merge with stable 
Mar 5 2020
5a5aee8ba980D8222durin42
commands: switch one call of check_at_most_one_arg to strings 
Mar 4 2020
f0021fbedea9D8197martinvonz
cleanup: remove redundant clearing of mergestate in rebase and shelve 
Feb 28 2020
6a34e438461bD8196martinvonz
commit: clear resolved mergestate even if working copy is clean 
Feb 28 2020
09f3e003fc2aD8209mharbison72
phabricator: avoid a stacktrace when command arguments are missing 
Mar 4 2020
4152183aceddD8000martinvonz
mq: don't tell user to commit merge that we already committed 
Jan 24 2020
2f290136b7d6D7999martinvonz
merge: make hg.merge() take a context instead of a node 
Jan 24 2020
f82d2d4e71dbD7932pulkit
debugbackupbundle: introduce command to interact with strip backups 
Jan 17 2020
4ce2330f2d0bD8221mharbison72
phabricator: also check parent fctx for binary where it is checked for UTF-8 
Feb 20 2020
66a05dbb8b4cD8220mharbison72
phabricator: don't infer the old `fctx` in `notutf8()` 
Feb 20 2020
aa9979bb6853D8219mharbison72
phabricator: rename a variable to clarify that it is the parent filecontext 
Feb 20 2020
98f7b9cf7bfcD8218mharbison72
phabricator: pass old `fctx` to `addoldbinary()` instead of inferring it 
Feb 19 2020
5e2d74e5f450D8214mharbison72
phabricator: make `hg phabread` work outside of a repository 
Mar 4 2020
d5d262c7e7a2D8135mharbison72
phabricator: refactor `phabread` to write all patches at once 
Feb 16 2020
b715432fabbaD8208mharbison72
phabricator: make `hg phabupdate` work outside of a repository 
Feb 17 2020
ddcb51390891D8207mharbison72
phabricator: pass ui instead of repo to `userphids()` 
Feb 17 2020
df8053082364D8206mharbison72
phabricator: pass ui instead of repo to `querydrev()` 
Feb 17 2020
41217dfa7a6dD8205mharbison72
phabricator: pass ui instead of repo to `readpatch()` 
Feb 17 2020
7c0b8652fd8cD8203valentin.gatienbaron
logtoprocess: avoid traceback when running long commands 
Mar 2 2020
8ac5726d695dD8143Alphare
rust-cpython: make `NonNormalEntires` iterable to fix `fsmonitor` (issue6276) 
Feb 24 2020
a161a993f253D8214mharbison72
phabricator: make `hg phabread` work outside of a repository 
Mar 4 2020
ee5ea026ba8fD8135mharbison72
phabricator: refactor `phabread` to write all patches at once 
Feb 16 2020
2513f0f70a26D8208mharbison72
phabricator: make `hg phabupdate` work outside of a repository 
Feb 17 2020
a271ef1de086D8207mharbison72
phabricator: pass ui instead of repo to `userphids()` 
Feb 17 2020
9b4627091734D8206mharbison72
phabricator: pass ui instead of repo to `querydrev()` 
Feb 17 2020
72c6190de577D8205mharbison72
phabricator: pass ui instead of repo to `readpatch()` 
Feb 17 2020
69392460f7b1D8203valentin.gatienbaron
logtoprocess: avoid traceback when running long commands 
Mar 2 2020
5f9de600973aD8143Alphare
rust-cpython: make `NonNormalEntires` iterable to fix `fsmonitor` (issue6276) 
Feb 24 2020
89323f85176eD7932pulkit
debugbackupbundle: introduce command to interact with strip backups 
Jan 17 2020
4cabeea6d214D6825joerg.sonnenberger
hgext: start building a library for simple hooks 
Sep 7 2019
edc8504bc26bD8202valentin.gatienbaron
exchange: turn on option that makes concurrent pushes work better 
Feb 25 2020
1e508097f570D8204valentin.gatienbaron
update: simplify slightly 
Mar 2 2020
c85d5fd1a5d9D8201valentin.gatienbaron
help: clarify behavior of server.concurrent-push-mode 
Mar 1 2020
f935b680860dD8195martinvonz
commit: error out on unresolved files even if commit would be empty 
Feb 28 2020
6cf92d6c0ad5D8194martinvonz
tests: add test of committing with conflicts but no changes in wdir 
Feb 28 2020
f6798c1a80faD8176marmoute
transaction: clarify the logic around pre-finalize/post-finalize 
Feb 27 2020
baf8c3f944ebD8175marmoute
transaction: move constant to upper case 
Feb 27 2020
a1908951ca42D8171joerg.sonnenberger
tests: handle In-Reply-To headers for line wrapping 
Feb 26 2020
0e5e192adb6fD8169martinvonz
tests: use new, use-case-specific methods from merge module 
Feb 26 2020
a45ffad9ae98D8168martinvonz
merge: introduce a merge() for that use-case 
Feb 26 2020
ddbc296a1f48D8167martinvonz
merge: drop redundant mergeforce argument from hg.merge() 
Feb 26 2020
0f60687b2324D8166martinvonz
merge: change default of hg.merge()'s "force" argument from None to False 
Feb 26 2020
acbfa31cfaf2D8120martinvonz
debugmergestate: make templated 
Feb 14 2020
382f4f09f0bdD8119martinvonz
tests: add tests of debugmergestate with unresolved/resolved path conflicts 
Feb 14 2020
5e3402a0b868D8118martinvonz
mergestate: determine if active without looking for state files on disk 
Feb 13 2020