Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 29889:6f447b9ec263

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util: rename checkcase() to fscasesensitive() (API) I always read the name "checkcase(path)" as "do we need to check for case folding at this path", but it's actually (I think) meant to be read "check if the file system cares about case at this path". I'm clearly not the only one confused by this as the dirstate has this property: def _checkcase(self): return not util.checkcase(self._join('.hg')) Maybe we should even inverse the function and call it fscasefolding() since that's what all callers care about?
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 30 Aug 2016 09:22:53 -0700
parents 1316c7cccc76
children a145161debed
comparison
equal deleted inserted replaced
29888:8a84347b9907 29889:6f447b9ec263
1584 for f, (m, args, msg) in actionbyfile.iteritems(): 1584 for f, (m, args, msg) in actionbyfile.iteritems():
1585 if m not in actions: 1585 if m not in actions:
1586 actions[m] = [] 1586 actions[m] = []
1587 actions[m].append((f, args, msg)) 1587 actions[m].append((f, args, msg))
1588 1588
1589 if not util.checkcase(repo.path): 1589 if not util.fscasesensitive(repo.path):
1590 # check collision between files only in p2 for clean update 1590 # check collision between files only in p2 for clean update
1591 if (not branchmerge and 1591 if (not branchmerge and
1592 (force or not wc.dirty(missing=True, branch=False))): 1592 (force or not wc.dirty(missing=True, branch=False))):
1593 _checkcollision(repo, p2.manifest(), None) 1593 _checkcollision(repo, p2.manifest(), None)
1594 else: 1594 else: