HomePhabricator

merge with stable

Authored by pulkit.

Description

merge with stable

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
3e6ac7ce1e2cD8090durin42
archival: use walk() instead of matches() on manifest 
Feb 6
a5c7d6cdaa2eD7921Alphare
rust-dirs-multiset: improve temporary error message 
Jan 24
5fb0592f90e7D7969mharbison72
exchange: check the `ui.clonebundleprefers` form while processing (issue6257) 
Jan 22
820bcb4875f7D8078marmoute
copies: add a new test dedicated to testing chain of changeset with merge 
Dec 13 2019
9bd4be23156cD7733joerg.sonnenberger
hgext: initial version of fastexport extension 
Sep 18 2019
8607dc2aa686D8092jcristau
hghave: cache the result of gethgversion 
Feb 7
3245cdea2c63D7992martinvonz
clean: delete obsolete unlinking of .hg/graftstate 
Jan 24
30862e226339D8071martinvonz
copies: avoid filtering by short-circuit dirstate-only copies earlier 
Feb 4
66dab0d9a78eD8070martinvonz
tests: add test showing that repo filter is calculated for `hg st --copies` 
Feb 4
87167caa2989D7963mharbison72
lfs: enable workers by default 
Jan 21
43eea17ae7b3D7962mharbison72
lfs: fix the stall and corruption issue when concurrently uploading blobs 
Jan 21
06de4a673f48D7961mharbison72
lfs: add a method to the local blobstore to convert OIDs to file paths 
Jan 21
c791ed6a2154D7901martinvonz
merge: introduce a revert_to() for that use-case 
Jan 15
f546d2170b0fD7902martinvonz
merge: introduce a clean_update() for that use-case 
Jan 15
48a1a974a92cD8081durin42
manifest: fix _very_ subtle bug with exact matchers passed to walk() 
Feb 5
aa0fc32ece9eD7870Alphare
rust-utils: add `Escaped` trait 
Jan 14
0e9ac3968b56D7869Alphare
rust-dirs-multiset: add `DirsChildrenMultiset` 
Jan 14
9ab4830e9e3dD7867Alphare
rust-hg-path: add useful methods to `HgPath` 
Jan 14
c18dd48cea4aD7866Alphare
rust-pathauditor: add Rust implementation of the `pathauditor` 
Feb 5
d3f776c4760eD7965pulkit
py3: catch AttributeError too with ImportError 
Jan 21
2dca0d76358cD7869Alphare
rust-dirs-multiset: add `DirsChildrenMultiset` 
Jan 14
e1ba9c5d5e78D7867Alphare
rust-hg-path: add useful methods to `HgPath` 
Jan 14
4d6e568a1e0eD7866Alphare
rust-pathauditor: add Rust implementation of the `pathauditor` 
Feb 5
a540e96b9029D7866Alphare
rust-pathauditor: add Rust implementation of the `pathauditor` 
Feb 5
9a92b29cf930D7965pulkit
py3: catch AttributeError too with ImportError 
Jan 21
2d1b2ad3705bD8083durin42
archival: use walk() instead of matches() on manifest 
Feb 5
beea86e4d332D8080durin42
context: use manifest.walk() instead of manifest.match() to get file list 
Feb 5
c86256bd4eb8D8079durin42
manifest: remove `.new()` from the interface 
Feb 5
04a3ae7aba14D8039spectral
chg: force-set LC_CTYPE on server start to actual value from the environment 
Jan 29
216fc4633800D8067marmoute
perf: fix list formatting in perfindex documentation 
Feb 3
141ceec06b55D8065marmoute
test: simplify test-amend.t to avoid race condition 
Feb 1
cb69802f28fbD8067marmoute
perf: fix list formatting in perfindex documentation 
Feb 3
63a4d43db8d0D8065marmoute
test: simplify test-amend.t to avoid race condition 
Feb 1
1c530957a3eaD8075marmoute
config: also respect HGRCSKIPREPO in the zeroconf extension 
Feb 4
890de6f991f2D8074marmoute
config: also respect HGRCSKIPREPO in hgwebdir_mod 
Feb 4
9514f2fc64caD8073marmoute
config: also respect HGRCSKIPREPO in `dispatch._getlocal` 
Feb 3
8a4766e38f35D8072marmoute
config: add a function in `rcutil` to abstract HGRCSKIPREPO 
Feb 4
9659ec161644D8077marmoute
test: document test-copy-move-merge.t 
Dec 13 2019
dbbae122f5e4D8069durin42
manifest: remove optional default= argument on flags(path) 
Feb 3
aea79f41ee55durin42
resourceutil: blacken 
Feb 3
15eb90965a00durin42
merge with stable 
Feb 3
830eae18b2f3D8057martinvonz
rebase: abort if the user tries to rebase the working copy 
Jan 31
35d6b05fd87fD8057martinvonz
rebase: abort if the user tries to rebase the working copy 
Jan 31
130e27fcf48fD8057martinvonz
rebase: abort if the user tries to rebase the working copy 
Jan 31
6e4ff6a766c2D8056martinvonz
tests: add tests for rebasing wdir() revision 
Jan 31
b4057d001760D7974martinvonz
merge: when rename was made on both sides, use ancestor as merge base 
Jan 22
e1ecfc7c84beD8055martinvonz
absorb: graduate -i flag from experimental 
Jan 31
6b7aef44274byuja
rust-cpython: remove PySharedRefCell and its companion structs 
Jan 25
bad4e7b361d2yuja
rust-cpython: switch to upstreamed version of PySharedRefCell 
Jan 25
281642cd1d04yuja
rust-cpython: rename inner_shared() to inner() 
Jan 25