equal
deleted
inserted
replaced
1230 |
1230 |
1231 rdir = None |
1231 rdir = None |
1232 if self.configbool('experimental', 'editortmpinhg'): |
1232 if self.configbool('experimental', 'editortmpinhg'): |
1233 rdir = repopath |
1233 rdir = repopath |
1234 (fd, name) = tempfile.mkstemp(prefix='hg-' + extra['prefix'] + '-', |
1234 (fd, name) = tempfile.mkstemp(prefix='hg-' + extra['prefix'] + '-', |
1235 suffix=extra['suffix'], text=True, |
1235 suffix=extra['suffix'], |
1236 dir=rdir) |
1236 dir=rdir) |
1237 try: |
1237 try: |
1238 f = os.fdopen(fd, pycompat.sysstr("w")) |
1238 f = os.fdopen(fd, r'wb') |
1239 f.write(encoding.strfromlocal(text)) |
1239 f.write(util.tonativeeol(text)) |
1240 f.close() |
1240 f.close() |
1241 |
1241 |
1242 environ = {'HGUSER': user} |
1242 environ = {'HGUSER': user} |
1243 if 'transplant_source' in extra: |
1243 if 'transplant_source' in extra: |
1244 environ.update({'HGREVISION': hex(extra['transplant_source'])}) |
1244 environ.update({'HGREVISION': hex(extra['transplant_source'])}) |
1256 self.system("%s \"%s\"" % (editor, name), |
1256 self.system("%s \"%s\"" % (editor, name), |
1257 environ=environ, |
1257 environ=environ, |
1258 onerr=error.Abort, errprefix=_("edit failed"), |
1258 onerr=error.Abort, errprefix=_("edit failed"), |
1259 blockedtag='editor') |
1259 blockedtag='editor') |
1260 |
1260 |
1261 f = open(name) |
1261 f = open(name, r'rb') |
1262 t = encoding.strtolocal(f.read()) |
1262 t = util.fromnativeeol(f.read()) |
1263 f.close() |
1263 f.close() |
1264 finally: |
1264 finally: |
1265 os.unlink(name) |
1265 os.unlink(name) |
1266 |
1266 |
1267 return t |
1267 return t |