equal
deleted
inserted
replaced
1194 (fd, name) = tempfile.mkstemp(prefix='hg-' + extra['prefix'] + '-', |
1194 (fd, name) = tempfile.mkstemp(prefix='hg-' + extra['prefix'] + '-', |
1195 suffix=extra['suffix'], text=True, |
1195 suffix=extra['suffix'], text=True, |
1196 dir=rdir) |
1196 dir=rdir) |
1197 try: |
1197 try: |
1198 f = os.fdopen(fd, pycompat.sysstr("w")) |
1198 f = os.fdopen(fd, pycompat.sysstr("w")) |
1199 f.write(text) |
1199 f.write(encoding.strfromlocal(text)) |
1200 f.close() |
1200 f.close() |
1201 |
1201 |
1202 environ = {'HGUSER': user} |
1202 environ = {'HGUSER': user} |
1203 if 'transplant_source' in extra: |
1203 if 'transplant_source' in extra: |
1204 environ.update({'HGREVISION': hex(extra['transplant_source'])}) |
1204 environ.update({'HGREVISION': hex(extra['transplant_source'])}) |
1217 environ=environ, |
1217 environ=environ, |
1218 onerr=error.Abort, errprefix=_("edit failed"), |
1218 onerr=error.Abort, errprefix=_("edit failed"), |
1219 blockedtag='editor') |
1219 blockedtag='editor') |
1220 |
1220 |
1221 f = open(name) |
1221 f = open(name) |
1222 t = f.read() |
1222 t = encoding.strtolocal(f.read()) |
1223 f.close() |
1223 f.close() |
1224 finally: |
1224 finally: |
1225 os.unlink(name) |
1225 os.unlink(name) |
1226 |
1226 |
1227 return t |
1227 return t |