Mercurial > hg
comparison mercurial/dirstatemap.py @ 47903:6816ae362ddd
dirstatemap: use the default code to handle "added" case
This one is very easy too.
Differential Revision: https://phab.mercurial-scm.org/D11328
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 16 Jul 2021 17:29:16 +0200 |
| parents | 4cade5e944c2 |
| children | 822c67420c77 |
comparison
equal
deleted
inserted
replaced
| 47902:4cade5e944c2 | 47903:6816ae362ddd |
|---|---|
| 269 return | 269 return |
| 270 else: | 270 else: |
| 271 self.addfile(filename, from_p2=True) | 271 self.addfile(filename, from_p2=True) |
| 272 return | 272 return |
| 273 elif not (p1_tracked or p2_tracked) and wc_tracked: | 273 elif not (p1_tracked or p2_tracked) and wc_tracked: |
| 274 self.addfile(filename, added=True, possibly_dirty=possibly_dirty) | 274 pass # file is added, nothing special to adjust |
| 275 return | |
| 276 elif (p1_tracked or p2_tracked) and not wc_tracked: | 275 elif (p1_tracked or p2_tracked) and not wc_tracked: |
| 277 pass | 276 pass |
| 278 elif clean_p2 and wc_tracked: | 277 elif clean_p2 and wc_tracked: |
| 279 if p1_tracked or self.get(filename) is not None: | 278 if p1_tracked or self.get(filename) is not None: |
| 280 # XXX the `self.get` call is catching some case in | 279 # XXX the `self.get` call is catching some case in |