Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 43787:be8552f25cab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: fix docstring formatting This is just removing the b'' prefix (except demandimportpy2), and making sure it is triple quoted. I skipped the mapping.py module in zope because that's 3rd party code. Differential Revision: https://phab.mercurial-scm.org/D7539
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 01 Dec 2019 18:46:10 -0500
parents 95d2eab0a7b9
children ebfd349eac46
comparison
equal deleted inserted replaced
43786:421ea5772039 43787:be8552f25cab
2091 assert len(getfiledata) == (len(actions[ACTION_GET]) if wantfiledata else 0) 2091 assert len(getfiledata) == (len(actions[ACTION_GET]) if wantfiledata else 0)
2092 return updateresult(updated, merged, removed, unresolved), getfiledata 2092 return updateresult(updated, merged, removed, unresolved), getfiledata
2093 2093
2094 2094
2095 def recordupdates(repo, actions, branchmerge, getfiledata): 2095 def recordupdates(repo, actions, branchmerge, getfiledata):
2096 b"record merge actions to the dirstate" 2096 """record merge actions to the dirstate"""
2097 # remove (must come first) 2097 # remove (must come first)
2098 for f, args, msg in actions.get(ACTION_REMOVE, []): 2098 for f, args, msg in actions.get(ACTION_REMOVE, []):
2099 if branchmerge: 2099 if branchmerge:
2100 repo.dirstate.remove(f) 2100 repo.dirstate.remove(f)
2101 else: 2101 else: