##// END OF EJS Templates
ui: rename tmpdir parameter to more specific repopath...
Sean Farley -
r30848:7080652a stable
parent child Browse files
Show More
@@ -1335,7 +1335,7 b' def ruleeditor(repo, ui, actions, editco'
1335 rules += '\n\n'
1335 rules += '\n\n'
1336 rules += editcomment
1336 rules += editcomment
1337 rules = ui.edit(rules, ui.username(), {'prefix': 'histedit'},
1337 rules = ui.edit(rules, ui.username(), {'prefix': 'histedit'},
1338 tmpdir=repo.path)
1338 repopath=repo.path)
1339
1339
1340 # Save edit rules in .hg/histedit-last-edit.txt in case
1340 # Save edit rules in .hg/histedit-last-edit.txt in case
1341 # the user needs to ask for help after something
1341 # the user needs to ask for help after something
@@ -271,7 +271,7 b' def _getdescription(repo, defaultbody, s'
271 else:
271 else:
272 ui.write(_('\nWrite the introductory message for the '
272 ui.write(_('\nWrite the introductory message for the '
273 'patch series.\n\n'))
273 'patch series.\n\n'))
274 body = ui.edit(defaultbody, sender, tmpdir=repo.path)
274 body = ui.edit(defaultbody, sender, repopath=repo.path)
275 # Save series description in case sendmail fails
275 # Save series description in case sendmail fails
276 msgfile = repo.vfs('last-email.txt', 'wb')
276 msgfile = repo.vfs('last-email.txt', 'wb')
277 msgfile.write(body)
277 msgfile.write(body)
@@ -232,7 +232,7 b' def dorecord(ui, repo, commitfunc, cmdsu'
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)
@@ -2782,7 +2782,7 b' def commitforceeditor(repo, ctx, subs, f'
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
@@ -1022,7 +1022,7 b' class ui(object):'
1022 self.write(*msg, **opts)
1022 self.write(*msg, **opts)
1023
1023
1024 def edit(self, text, user, extra=None, editform=None, pending=None,
1024 def edit(self, text, user, extra=None, editform=None, pending=None,
1025 tmpdir=None):
1025 repopath=None):
1026 extra_defaults = {
1026 extra_defaults = {
1027 'prefix': 'editor',
1027 'prefix': 'editor',
1028 'suffix': '.txt',
1028 'suffix': '.txt',
@@ -1031,12 +1031,12 b' class ui(object):'
1031 extra_defaults.update(extra)
1031 extra_defaults.update(extra)
1032 extra = extra_defaults
1032 extra = extra_defaults
1033
1033
1034 tdir = None
1034 rdir = None
1035 if self.configbool('experimental', 'editortmpinhg'):
1035 if self.configbool('experimental', 'editortmpinhg'):
1036 tdir = tmpdir
1036 rdir = repopath
1037 (fd, name) = tempfile.mkstemp(prefix='hg-' + extra['prefix'] + '-',
1037 (fd, name) = tempfile.mkstemp(prefix='hg-' + extra['prefix'] + '-',
1038 suffix=extra['suffix'], text=True,
1038 suffix=extra['suffix'], text=True,
1039 dir=tdir)
1039 dir=rdir)
1040 try:
1040 try:
1041 f = os.fdopen(fd, "w")
1041 f = os.fdopen(fd, "w")
1042 f.write(text)
1042 f.write(text)
General Comments 0
You need to be logged in to leave comments. Login now