Mercurial > public > mercurial-scm > hg

comparison mercurial/sparse.py @ 48713:5dfaca4464d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge-actions: add an explicite "no_op" attribute This make the MergeAction smarter and able to describe themself. This is useful to help introducing more MergeAction object that better the complexity of the situation. Differential Revision: https://phab.mercurial-scm.org/D12116
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 28 Jan 2022 15:19:58 +0100
parents a62ba3345534
children a6efb9180764
comparison
equal deleted inserted replaced
48712:773ad0f5152d 48713:5dfaca4464d1
394 prunedactions[file] = action 394 prunedactions[file] = action
395 elif type == mergestatemod.ACTION_MERGE: 395 elif type == mergestatemod.ACTION_MERGE:
396 temporaryfiles.append(file) 396 temporaryfiles.append(file)
397 prunedactions[file] = action 397 prunedactions[file] = action
398 elif branchmerge: 398 elif branchmerge:
399 if type not in mergestatemod.NO_OP_ACTIONS: 399 if not type.no_op:
400 temporaryfiles.append(file) 400 temporaryfiles.append(file)
401 prunedactions[file] = action 401 prunedactions[file] = action
402 elif type == mergestatemod.ACTION_FORGET: 402 elif type == mergestatemod.ACTION_FORGET:
403 prunedactions[file] = action 403 prunedactions[file] = action
404 elif file in wctx: 404 elif file in wctx: