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
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
06df075b8925yuja
rust-cpython: use PyList.insert() instead of .insert_item() 
Jan 30
25ed4d8e707fyuja
rust-cpython: bump cpython to 0.4 to switch to upstreamed PySharedRef 
Jan 30
3e794419d234yuja
rust: update dependencies 
Jan 30
064eb65d040fmarmoute
contrib: a small script to nudge lingering diff 
Jan 24
281b6690e646D7450indygreg
packaging: add support for PyOxidizer 
Jan 26
b1069b369d6eD8040martinvonz
mergestate: add accessors for local and other nodeid, not just contexts 
Jan 29
3d2de64c49d2D7906martinvonz
rebase: define base in only place in defineparents() 
Jan 16
5323cdb8ae33D8028martinvonz
tests: use full `uncommit` command name in tests 
Dec 20 2019
cb8b67016110D8027martinvonz
graft: default `base` argument to common case of `ctx.p1()` 
Jan 28
fc7175df6359D8026martinvonz
graft: let caller pass in overlayworkingctx to merge.graft() 
Jan 10
d0c3eead515aD8046martinvonz
copies: fix crash when copy source is not in graft base 
Jan 30
ae4d729eb3c8D8045martinvonz
tests: add test showing crash when shelving ghosted rename target 
Jan 30
e960c30d7e50yuja
rust-cpython: mark all PyLeaked methods as unsafe 
Oct 22 2019
9804badd5970yuja
rust-cpython: make PySharedRef::try_borrow_mut() return BorrowMutError 
Oct 19 2019
f015d679f08cyuja
rust-cpython: inline PySharedState::leak_immutable() and PyLeaked::new() 
Oct 19 2019
bafdaf4858d8yuja
rust-cpython: inline PySharedState::try_borrow_mut() 
Oct 19 2019
2a24ead003f0yuja
rust-cpython: add panicking version of borrow_mut() and use it 
Oct 12 2019
a7f8160cc4e4D8038mharbison72
setup: don't skip the search for global hg.exe if there is no local instance 
Jan 28
64e104ca555eD8037mharbison72
make: also delete hg.exe when cleaning 
Jan 28
fa9ad1da2e77D7990martinvonz
merge: start using the per-side copy dicts 
Jan 23
7f8bdee0034eD7989martinvonz
copies: define a type to return from mergecopies() 
Jan 22
8ad263c3a358D7988martinvonz
merge: move initialization of copy dicts to one place 
Jan 22
17e12938f8e7D7987martinvonz
copies: print debug information about copies per side/branch 
Jan 24
ccb719dd1fe3D8054mharbison72
resourceutil: correct the root path for file based lookup under py2exe 
Jan 30
0dd8b752f287D7450indygreg
packaging: add support for PyOxidizer 
Jan 26
b8b4d9ad4613D8040martinvonz
mergestate: add accessors for local and other nodeid, not just contexts 
Jan 29
0712c5e86b9cD7906martinvonz
rebase: define base in only place in defineparents() 
Jan 16
4f4382291204D8028martinvonz
tests: use full `uncommit` command name in tests 
Dec 20 2019
4b774ce8e778D8027martinvonz
graft: default `base` argument to common case of `ctx.p1()` 
Jan 28
916e3ed05195D8026martinvonz
graft: let caller pass in overlayworkingctx to merge.graft() 
Jan 10
a0f34033adf6D8046martinvonz
copies: fix crash when copy source is not in graft base 
Jan 30
b3c08e1b2cd8D8045martinvonz
tests: add test showing crash when shelving ghosted rename target 
Jan 30
71457ff69c2fyuja
rust-cpython: mark all PyLeaked methods as unsafe 
Oct 22 2019
b556400bee95yuja
rust-cpython: make PySharedRef::try_borrow_mut() return BorrowMutError 
Oct 19 2019
22d39bb6d777yuja
rust-cpython: inline PySharedState::leak_immutable() and PyLeaked::new() 
Oct 19 2019
0ca7018c6531yuja
rust-cpython: inline PySharedState::try_borrow_mut() 
Oct 19 2019
cacdc766825dyuja
rust-cpython: add panicking version of borrow_mut() and use it 
Oct 12 2019
35289b5654e0D8038mharbison72
setup: don't skip the search for global hg.exe if there is no local instance 
Jan 28
dd0226d07866D8037mharbison72
make: also delete hg.exe when cleaning 
Jan 28
45f0d1cd562aD7990martinvonz
merge: start using the per-side copy dicts 
Jan 23
ece703502f52D7989martinvonz
copies: define a type to return from mergecopies() 
Jan 22