Mercurial > hg-stable

diff mercurial/ui.py @ 34071:3c82b14d2838

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
editor: file created for diff action should have .diff suffix This is a follow-up to https://phab.mercurial-scm.org/D464 (6e6452bc441d) that introduced the new file extension behavior. It erroneously changed `.diff` to `.diff.hg.txt`. Test Plan: Verified `make tests` passes, particularly `test-editor-filename.t`. Differential Revision: https://phab.mercurial-scm.org/D607
author Michael Bolin <mbolin@fb.com>
date Fri, 01 Sep 2017 20:28:26 +0000
parents 6e6452bc441d
children 0fa781320203
line wrap: on
line diff
--- a/mercurial/ui.py	Fri Sep 01 11:13:55 2017 -0700
+++ b/mercurial/ui.py	Fri Sep 01 20:28:26 2017 +0000
@@ -1361,7 +1361,9 @@
             extra_defaults.update(extra)
         extra = extra_defaults
 
-        if action:
+        if action == 'diff':
+            suffix = '.diff'
+        elif action:
             suffix = '.%s.hg.txt' % action
         else:
             suffix = extra['suffix']