Mercurial > public > mercurial-scm > hg

comparison mercurial/cmdutil.py @ 30848:7080652af6e6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui: rename tmpdir parameter to more specific repopath This was requested by Augie and I agree that repopath is more descriptive.
author Sean Farley <sean@farley.io>
date Wed, 18 Jan 2017 18:25:51 -0800
parents 565c07036066
children 8d7e40524ae4
comparison
equal deleted inserted replaced
30847:e12553cfd0a4 30848:7080652af6e6
230 patchtext = (crecordmod.diffhelptext 230 patchtext = (crecordmod.diffhelptext
231 + crecordmod.patchhelptext 231 + crecordmod.patchhelptext
232 + fp.read()) 232 + fp.read())
233 reviewedpatch = ui.edit(patchtext, "", 233 reviewedpatch = ui.edit(patchtext, "",
234 extra={"suffix": ".diff"}, 234 extra={"suffix": ".diff"},
235 tmpdir=repo.path) 235 repopath=repo.path)
236 fp.truncate(0) 236 fp.truncate(0)
237 fp.write(reviewedpatch) 237 fp.write(reviewedpatch)
238 fp.seek(0) 238 fp.seek(0)
239 239
240 [os.unlink(repo.wjoin(c)) for c in newlyaddedandmodifiedfiles] 240 [os.unlink(repo.wjoin(c)) for c in newlyaddedandmodifiedfiles]
2780 repo.dirstate.write(tr) 2780 repo.dirstate.write(tr)
2781 pending = tr and tr.writepending() and repo.root 2781 pending = tr and tr.writepending() and repo.root
2782 2782
2783 editortext = repo.ui.edit(committext, ctx.user(), ctx.extra(), 2783 editortext = repo.ui.edit(committext, ctx.user(), ctx.extra(),
2784 editform=editform, pending=pending, 2784 editform=editform, pending=pending,
2785 tmpdir=repo.path) 2785 repopath=repo.path)
2786 text = editortext 2786 text = editortext
2787 2787
2788 # strip away anything below this special string (used for editors that want 2788 # strip away anything below this special string (used for editors that want
2789 # to display the diff) 2789 # to display the diff)
2790 stripbelow = re.search(_linebelow, text, flags=re.MULTILINE) 2790 stripbelow = re.search(_linebelow, text, flags=re.MULTILINE)