Mercurial > hg
comparison mercurial/sparse.py @ 45525:590a840fa367
mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult
This makes sure it isn't intended to be overridden by subclasses.
Thanks to Yuya for the nice suggestion.
Differential Revision: https://phab.mercurial-scm.org/D9025
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Wed, 16 Sep 2020 18:09:32 +0530 |
| parents | 14b3dbfa4eeb |
| children | d55b71393907 |
comparison
equal
deleted
inserted
replaced
| 45524:6877b0ee5f9d | 45525:590a840fa367 |
|---|---|
| 397 prunedactions[file] = action | 397 prunedactions[file] = action |
| 398 elif type == mergestatemod.ACTION_MERGE: | 398 elif type == mergestatemod.ACTION_MERGE: |
| 399 temporaryfiles.append(file) | 399 temporaryfiles.append(file) |
| 400 prunedactions[file] = action | 400 prunedactions[file] = action |
| 401 elif branchmerge: | 401 elif branchmerge: |
| 402 if type not in mergemod.mergeresult.NO_OP_ACTIONS: | 402 if type not in mergestatemod.NO_OP_ACTIONS: |
| 403 temporaryfiles.append(file) | 403 temporaryfiles.append(file) |
| 404 prunedactions[file] = action | 404 prunedactions[file] = action |
| 405 elif type == mergestatemod.ACTION_FORGET: | 405 elif type == mergestatemod.ACTION_FORGET: |
| 406 prunedactions[file] = action | 406 prunedactions[file] = action |
| 407 elif file in wctx: | 407 elif file in wctx: |