Mercurial > hg
comparison mercurial/dirstatemap.py @ 47530:a1745a292885
dirstate: drop `state` to `_addpath`
All its value are inferred within the dirstatemap now.
Differential Revision: https://phab.mercurial-scm.org/D10972
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sun, 04 Jul 2021 01:59:41 +0200 |
| parents | d3cf20328abd |
| children | 6025353c9c55 |
comparison
equal
deleted
inserted
replaced
| 47529:d3cf20328abd | 47530:a1745a292885 |
|---|---|
| 145 self._map | 145 self._map |
| 146 | 146 |
| 147 def addfile( | 147 def addfile( |
| 148 self, | 148 self, |
| 149 f, | 149 f, |
| 150 state=None, | |
| 151 mode=0, | 150 mode=0, |
| 152 size=None, | 151 size=None, |
| 153 mtime=None, | 152 mtime=None, |
| 154 added=False, | 153 added=False, |
| 155 merged=False, | 154 merged=False, |
| 178 elif possibly_dirty: | 177 elif possibly_dirty: |
| 179 state = b'n' | 178 state = b'n' |
| 180 size = NONNORMAL | 179 size = NONNORMAL |
| 181 mtime = AMBIGUOUS_TIME | 180 mtime = AMBIGUOUS_TIME |
| 182 else: | 181 else: |
| 183 assert state != b'a' | |
| 184 assert size != FROM_P2 | 182 assert size != FROM_P2 |
| 185 assert size != NONNORMAL | 183 assert size != NONNORMAL |
| 184 state = b'n' | |
| 186 size = size & rangemask | 185 size = size & rangemask |
| 187 mtime = mtime & rangemask | 186 mtime = mtime & rangemask |
| 188 assert state is not None | 187 assert state is not None |
| 189 assert size is not None | 188 assert size is not None |
| 190 assert mtime is not None | 189 assert mtime is not None |
| 473 ) | 472 ) |
| 474 | 473 |
| 475 def addfile( | 474 def addfile( |
| 476 self, | 475 self, |
| 477 f, | 476 f, |
| 478 state=None, | |
| 479 mode=0, | 477 mode=0, |
| 480 size=None, | 478 size=None, |
| 481 mtime=None, | 479 mtime=None, |
| 482 added=False, | 480 added=False, |
| 483 merged=False, | 481 merged=False, |
| 484 from_p2=False, | 482 from_p2=False, |
| 485 possibly_dirty=False, | 483 possibly_dirty=False, |
| 486 ): | 484 ): |
| 487 return self._rustmap.addfile( | 485 return self._rustmap.addfile( |
| 488 f, | 486 f, |
| 489 state, | |
| 490 mode, | 487 mode, |
| 491 size, | 488 size, |
| 492 mtime, | 489 mtime, |
| 493 added, | 490 added, |
| 494 merged, | 491 merged, |