Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/cmdutil.py @ 28570:5508cf9a52fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
crecord: rewrite a comment about filtering patches I couldn't parse the previous version. I think the rewrite better expresses the intent of that comment.
author Jordi Guti?rrez Hermoso <jordigh@octave.org>
date Fri, 18 Mar 2016 16:14:57 -0400
parents 0bb01c8754bf
children 0d6137891114
comparison
equal deleted inserted replaced
28569:1ad0ddf8cccc 28570:5508cf9a52fe
146 diffopts.git = True 146 diffopts.git = True
147 diffopts.showfunc = True 147 diffopts.showfunc = True
148 originaldiff = patch.diff(repo, changes=status, opts=diffopts) 148 originaldiff = patch.diff(repo, changes=status, opts=diffopts)
149 originalchunks = patch.parsepatch(originaldiff) 149 originalchunks = patch.parsepatch(originaldiff)
150 150
151 # 1. filter patch, so we have intending-to apply subset of it 151 # 1. filter patch, since we are intending to apply subset of it
152 try: 152 try:
153 chunks, newopts = filterfn(ui, originalchunks) 153 chunks, newopts = filterfn(ui, originalchunks)
154 except patch.PatchError as err: 154 except patch.PatchError as err:
155 raise error.Abort(_('error parsing patch: %s') % err) 155 raise error.Abort(_('error parsing patch: %s') % err)
156 opts.update(newopts) 156 opts.update(newopts)