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
508394e38580D11375marmoute
dirstate-item: implement `v1_mtime` with higher level block 
Aug 27
dbf2d03850a2D11374marmoute
dirstate-item: implement `v1_size` with higher level block 
Aug 27
0d185f73c619D11373marmoute
dirstate-item: implement v1_state with higher level block 
Aug 27
97e9f3fd9324D11372marmoute
dirstate-item: add more logic to `from_p2` 
Aug 27
f94cc63df859D11371marmoute
dirstate-item: implement `merged_removed` in a simpler way 
Aug 27
774e235d13c3D11370marmoute
dirstate-item: implement `removed` in a simpler way 
Aug 27
59eddbaa5bfbD11369marmoute
dirstate-item: implement `from_p2_removed` in a simpler way 
Aug 27
7033d1d5bd18D11368marmoute
dirstate-item: implement `from_p2` in a simpler way 
Aug 27
7c37d153c22dD11367marmoute
dirstate-item: implement `merged` in a simpler way 
Aug 27
03f57915e0ceD11366marmoute
dirstate-item: implement `added` in a simpler way 
Aug 27
f1033c2d9b66D11365marmoute
dirstate-item: implement `tracked` in a simpler way 
Aug 27
b81f52ca8075D11364marmoute
dirstate-item: keep the full information in memory (for pure form) 
Aug 27
05f2be3affe3D11363marmoute
dirstate-item: have all the logic go through the v1_ accessors 
Aug 26
ba9491be5e0cD11362marmoute
dirstate-item: drop the deprecated __getitem__ variante 
Aug 26
66ff8d3865b3Alphare
branching: merge stable into default 
Aug 30
c89ddef6474dD11361valentin.gatienbaron
tests: normalize the way some debug output it matched 
Aug 27
e5efbb11e185D11247valentin.gatienbaron
tests: drop hgrc bits that have become the default 
Aug 2
0c92cd9286eeD11246valentin.gatienbaron
tests: manual cleanup now that dummyssh usage is implied 
Aug 2
9c4204b7f3e4D11245valentin.gatienbaron
tests: rely on dummyssh being the default 
Aug 2
a28a7dcb9158D11244valentin.gatienbaron
tests: setup dummyssh as the default ssh 
Aug 2
496a8e383aebD11353marmoute
dirstate: drop the `_otherparent` method 
Aug 24
1b3c753b62c6D11352marmoute
dirstate: drop the `_normal` method 
Aug 24
65e3d8028f2eD11351marmoute
dirstate: drop the `_merge` method 
Aug 24
51cd60c0a345D11350marmoute
dirstate: drop the deprecated `drop` method 
Aug 24
8e46934c58d2D11349marmoute
dirstate: drop the deprecated `merge` method 
Aug 24
3911c61f09c6D11348marmoute
dirstate: drop the deprecated `remove` method 
Aug 24
91afee6f959eD11347marmoute
dirstate: drop the deprecated `add` method 
Aug 24
3d2c17c5d7f2D11346marmoute
dirstate: drop the deprecated `otherparent` method 
Aug 24
50bed873a765D11345marmoute
dirstate: drop the deprecated `normallookup` method 
Aug 24
f89ac1ed2bc6D11344marmoute
dirstate: drop the deprecated `normal` method 
Aug 24
74a8d5c6fdc6D11343marmoute
dirstate: also wrap the new method in `dirstatenonnormalcheck` 
Aug 24
bbae583333e9D11332marmoute
dirstatemap: also discard item from sets 
Aug 20
50ded8854f8dD11331marmoute
dirstatemap: drop unused internal constant definition 
Jul 16
c0d6a59a7704D11330marmoute
dirstate-item: add dedicated "legacy" constructor for `addfile` case 
Jul 16
822c67420c77D11329marmoute
dirstatemap: use the default code to handle "merged" case 
Jul 16
6816ae362dddD11328marmoute
dirstatemap: use the default code to handle "added" case 
Jul 16
4cade5e944c2D11327marmoute
dirstatemap: use the default code to handle "removed" case 
Jul 16
3429f48d486dD11326marmoute
dirstatemap: use the default code to handle "clean-p2" case 
Jul 16
40cf4b278f8fD11325marmoute
dirstatemap: use the default code to handle "p2-tracked" case 
Jul 16
625b6ddb828cD11324marmoute
dirstatemap: use the default code to handle "possibly_dirty" case 
Jul 16
442711f2c447D11323marmoute
dirstatemap: use the default code to handle normal entry 
Jul 16
4f0ebf83e4dcD11322marmoute
dirstatemap: conclude `reset_state` with logic using the new __init__ 
Jul 16
d5b54917eb92D11321marmoute
dirstatemap: temporarily return early in `reset_state` 
Jul 16
22c39f8acf78D11320marmoute
dirstate-item: feed more information to `__init__` 
Jul 16
226c7dbeea11D11319marmoute
rust-dirstatemap: temporarily use `from_v1_data` in `addfile` 
Aug 20
0b35bc0b8636D11318marmoute
dirstatemap: temporarily use `from_v1_data` in `addfile` 
Jul 16
32aa80a8d162D11317marmoute
dirstate-item: fix the declaration of the Cext `from_v1_meth` 
Aug 20
37bffc450897D11316marmoute
dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent 
Aug 20
3853e6ee160dD11315marmoute
dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` 
Aug 20
6614ab9f061dD11314marmoute
dirstate: forward `remove` call to newer `API` 
Aug 20