Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/sparse.py @ 45477:14b3dbfa4eeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergeresult: introduce dedicated tuple for no-op actions This will help us in adding more no-op actions in next patch while keeping the code cleaner.
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 14 Sep 2020 13:51:39 +0530
parents 77b8588dd84e
children 590a840fa367
comparison
equal deleted inserted replaced
45476:9bd60ec60601 45477:14b3dbfa4eeb
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 != mergestatemod.ACTION_KEEP: 402 if type not in mergemod.mergeresult.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: