Mercurial > public > mercurial-scm > hg

comparison mercurial/cmdutil.py @ 23139:e53f6b72a0e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
spelling: fixes from proofreading of spell checker issues
author Mads Kiilerich <madski@unity3d.com>
date Thu, 17 Apr 2014 22:47:38 +0200
parents b564330d4b1f
children 10697f29af2b
comparison
equal deleted inserted replaced
23136:6eab50a34fed 23139:e53f6b72a0e4
111 return message 111 return message
112 112
113 def mergeeditform(ctxorbool, baseform): 113 def mergeeditform(ctxorbool, baseform):
114 """build appropriate editform from ctxorbool and baseform 114 """build appropriate editform from ctxorbool and baseform
115 115
116 'cxtorbool' is one of a ctx to be committed, or a bool whether 116 'ctxorbool' is one of a ctx to be committed, or a bool whether
117 merging is committed. 117 merging is committed.
118 118
119 This returns editform 'baseform' with '.merge' if merging is 119 This returns editform 'baseform' with '.merge' if merging is
120 committed, or one with '.normal' suffix otherwise. 120 committed, or one with '.normal' suffix otherwise.
121 """ 121 """
1781 if opts.get('patch') or opts.get('stat'): 1781 if opts.get('patch') or opts.get('stat'):
1782 # When following files, track renames via a special matcher. 1782 # When following files, track renames via a special matcher.
1783 # If we're forced to take the slowpath it means we're following 1783 # If we're forced to take the slowpath it means we're following
1784 # at least one pattern/directory, so don't bother with rename tracking. 1784 # at least one pattern/directory, so don't bother with rename tracking.
1785 if follow and not match.always() and not slowpath: 1785 if follow and not match.always() and not slowpath:
1786 # _makelogfilematcher expects its files argument to be relative to 1786 # _makefollowlogfilematcher expects its files argument to be
1787 # the repo root, so use match.files(), not pats. 1787 # relative to the repo root, so use match.files(), not pats.
1788 filematcher = _makefollowlogfilematcher(repo, match.files(), 1788 filematcher = _makefollowlogfilematcher(repo, match.files(),
1789 followfirst) 1789 followfirst)
1790 else: 1790 else:
1791 filematcher = _makenofollowlogfilematcher(repo, pats, opts) 1791 filematcher = _makenofollowlogfilematcher(repo, pats, opts)
1792 if filematcher is None: 1792 if filematcher is None:
2520 2520
2521 # determine the exact nature of the deleted changesets 2521 # determine the exact nature of the deleted changesets
2522 deladded = _deleted - smf 2522 deladded = _deleted - smf
2523 deleted = _deleted - deladded 2523 deleted = _deleted - deladded
2524 2524
2525 # We need to account for the state of file in the dirstate 2525 # We need to account for the state of file in the dirstate.
2526 # 2526 #
2527 # Even, when we revert agains something else than parent. this will 2527 # Even, when we revert against something else than parent. This will
2528 # slightly alter the behavior of revert (doing back up or not, delete 2528 # slightly alter the behavior of revert (doing back up or not, delete
2529 # or just forget etc) 2529 # or just forget etc).
2530 if parent == node: 2530 if parent == node:
2531 dsmodified = modified 2531 dsmodified = modified
2532 dsadded = added 2532 dsadded = added
2533 dsremoved = removed 2533 dsremoved = removed
2534 modified, added, removed = set(), set(), set() 2534 modified, added, removed = set(), set(), set()