equal
deleted
inserted
replaced
1359 self.develwarn('extra.suffix is not None but will soon be ' |
1359 self.develwarn('extra.suffix is not None but will soon be ' |
1360 'ignored by ui.edit()') |
1360 'ignored by ui.edit()') |
1361 extra_defaults.update(extra) |
1361 extra_defaults.update(extra) |
1362 extra = extra_defaults |
1362 extra = extra_defaults |
1363 |
1363 |
1364 if action: |
1364 if action == 'diff': |
|
1365 suffix = '.diff' |
|
1366 elif action: |
1365 suffix = '.%s.hg.txt' % action |
1367 suffix = '.%s.hg.txt' % action |
1366 else: |
1368 else: |
1367 suffix = extra['suffix'] |
1369 suffix = extra['suffix'] |
1368 |
1370 |
1369 rdir = None |
1371 rdir = None |