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
f3b69aecfdc3D8551durin42
context: implement mergestate() method 
May 18
2870f5d5c977D8550durin42
mergestate: split out merge state handling code from main merge module 
May 18
bdb95edb2ac6D8549durin42
relnotes: add API change note per request in D8502 
May 18
0a76833c0cfcD8548durin42
tests: add coverage for repo.changelog.children() in the git extension 
May 18
fb91393818e5D8547durin42
tests: add coverage for repo.changelog.findmissing() in test-git-interop.t 
May 18
708ad5cf5e5aD8545valentin.gatienbaron
grep: grep the working copy faster 
May 17
8d552701806dD8544valentin.gatienbaron
grep: stop computing information for --diff when unnecessary 
May 17
f90957c947f4D8543valentin.gatienbaron
grep: don't go in an infinite loop when given empty regex 
May 17
7e7080ab8ba8D8542valentin.gatienbaron
grep: improve test coverage 
May 17
11592ce6a711D8525sfink
phabricator: avoid passing None to pycompat.fsdecode 
Feb 27
47787a48f469D8537valentin.gatienbaron
setup: stop asking cargo to spam 
May 17
3e09d22a0bf5D8540rom1dep
git: implement some changelog methods 
May 11
8bfc6cc8e480D8541rom1dep
git: avoid looking-up parents for the null commit 
May 11
288328c6711bD8539rom1dep
git: fix probable missing return 
May 11
73d6ce2746d2D8538valentin.gatienbaron
rust: fix warning about unnecessary mut 
May 17
526d69eeea31D8431marmoute
upgrade: support upgrade and downgrade from persistent nodemap 
Apr 14
4ba2a6ffcf24D8520Alphare
status: also support for `traversedir` callback in the Rust fast-path 
May 12
01afda7e7d6cD8519Alphare
rust-hg-cpython: update status bridge with the new `traversedir` support 
May 12
c802ec4f7196D8518Alphare
rust-status: collect traversed directories if required 
May 12
dc60ba32d43bD8517Alphare
rust-status: don't dispatch unknown file when traversing if not listing unknowns 
May 12
63edfea7dfdeD8516Alphare
status: update comment to reflect the more recent situation 
May 12
09da5cf44772D8490joerg.sonnenberger
hooks: provide access to transaction changes for internal hooks 
Apr 30
be6401a25726D8508Alphare
rust-regex: add test for verbatim regex syntax 
May 7
1e9bfeaec9baD8507Alphare
rust-regex: prevent nonsensical `.*.*` pattern from happening 
May 7
ad1ec40975aaD8506Alphare
rust-regex: fix issues with regex anchoring and performance 
May 7
6d3768b11241D8503durin42
diff: avoid going from contexts to nodes and back 
May 7
2dd60a9fac48D8508Alphare
rust-regex: add test for verbatim regex syntax 
May 7
dbc2dcbdd177D8507Alphare
rust-regex: prevent nonsensical `.*.*` pattern from happening 
May 7
eb301282baccD8506Alphare
rust-regex: fix issues with regex anchoring and performance 
May 7
8c0c1161614eD8503durin42
diff: avoid going from contexts to nodes and back 
May 7
3b7aabd02e11D8502durin42
cleanup: avoid extra node/ctx conversions in logcmdutil.diffordiffstat 
May 7
118f067f6bd1D8521rdamazio
pyoxidizer: formatting bazel definitions 
May 12
5835018ceefePeter Arrenbrecht
bash_completion: do not use aliased hg if it sources a script (issue6308) 
May 11
dbf9f358a3f9mjacob
demandimport: fix compatibility with meta path finders w/o find_spec() method 
May 11
ef65676bf2d4D8505joerg.sonnenberger
tests: fix timer scaling in wait-on-file 
May 7
92054972f035D8512marmoute
manifest-cache: ignore IOError while writing 
May 9
62435a5b46feD8514martinvonz
revisions: parse "x123" as "nodeid starting with 123" without prefixhexnode 
May 11
07a6a29d25eaD8511martinvonz
status: use cmdutil.check_at_most_one_arg() for checking --rev/--change 
May 8
aac816f584adD8510martinvonz
diff: use cmdutil.check_at_most_one_arg() for checking --rev/--change 
May 8
0505766084d2D8496martinvonz
copy: give better error message when no source paths found with --at-rev 
May 6
9255d14adae9D8495martinvonz
tests: show poor error message for `hg cp -A --at-rev . non-existent dst` 
May 6
81c6d1b7ceeeD8494martinvonz
copy: to find copy source, walk parent of revision we're marking copies in 
May 6
3a101007b86eD8493martinvonz
tests: show that `hg cp -A --at-rev .` doesn't work for renames 
May 6
4be0cc3458e1D8509Alphare
formatting: add missing newline 
May 7
16596f5e1afaD8496martinvonz
copy: give better error message when no source paths found with --at-rev 
May 6
8e47b43d665fD8495martinvonz
tests: show poor error message for `hg cp -A --at-rev . non-existent dst` 
May 6
02bf61bb4a70D8494martinvonz
copy: to find copy source, walk parent of revision we're marking copies in 
May 6
5c49a4fdb238D8493martinvonz
tests: show that `hg cp -A --at-rev .` doesn't work for renames 
May 6
de0fb4463a3dD8492Alphare
rust-matchers: add TODO about incomplete `Display` for `IncludeMatcher` 
May 6
e0414fcd35e0D8491Alphare
rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex 
May 6