1344 if self.debugflag: |
1344 if self.debugflag: |
1345 opts[r'label'] = opts.get(r'label', '') + ' ui.debug' |
1345 opts[r'label'] = opts.get(r'label', '') + ' ui.debug' |
1346 self.write(*msg, **opts) |
1346 self.write(*msg, **opts) |
1347 |
1347 |
1348 def edit(self, text, user, extra=None, editform=None, pending=None, |
1348 def edit(self, text, user, extra=None, editform=None, pending=None, |
1349 repopath=None): |
1349 repopath=None, action=None): |
|
1350 if action is None: |
|
1351 self.develwarn('action is None but will soon be a required ' |
|
1352 'parameter to ui.edit()') |
1350 extra_defaults = { |
1353 extra_defaults = { |
1351 'prefix': 'editor', |
1354 'prefix': 'editor', |
1352 'suffix': '.txt', |
1355 'suffix': '.txt', |
1353 } |
1356 } |
1354 if extra is not None: |
1357 if extra is not None: |
|
1358 if extra.get('suffix') is not None: |
|
1359 self.develwarn('extra.suffix is not None but will soon be ' |
|
1360 'ignored by ui.edit()') |
1355 extra_defaults.update(extra) |
1361 extra_defaults.update(extra) |
1356 extra = extra_defaults |
1362 extra = extra_defaults |
|
1363 |
|
1364 if action: |
|
1365 suffix = '.%s.hg.txt' % action |
|
1366 else: |
|
1367 suffix = extra['suffix'] |
1357 |
1368 |
1358 rdir = None |
1369 rdir = None |
1359 if self.configbool('experimental', 'editortmpinhg'): |
1370 if self.configbool('experimental', 'editortmpinhg'): |
1360 rdir = repopath |
1371 rdir = repopath |
1361 (fd, name) = tempfile.mkstemp(prefix='hg-' + extra['prefix'] + '-', |
1372 (fd, name) = tempfile.mkstemp(prefix='hg-' + extra['prefix'] + '-', |
1362 suffix=extra['suffix'], |
1373 suffix=suffix, |
1363 dir=rdir) |
1374 dir=rdir) |
1364 try: |
1375 try: |
1365 f = os.fdopen(fd, r'wb') |
1376 f = os.fdopen(fd, r'wb') |
1366 f.write(util.tonativeeol(text)) |
1377 f.write(util.tonativeeol(text)) |
1367 f.close() |
1378 f.close() |