Patchwork D607: editor: file created for diff action should have .diff suffix

login
register
mail settings
Submitter phabricator
Date Sept. 2, 2017, 12:51 p.m.
Message ID <30dc92af4dd2d111fe5d0afecce850f0@localhost.localdomain>
Download mbox | patch
Permalink /patch/23624/
State Not Applicable
Headers show

Comments

phabricator - Sept. 2, 2017, 12:51 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG3c82b14d2838: editor: file created for diff action should have .diff suffix (authored by mbolin).

CHANGED PRIOR TO COMMIT
  https://phab.mercurial-scm.org/D607?vs=1556&id=1577#toc

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D607?vs=1556&id=1577

REVISION DETAIL
  https://phab.mercurial-scm.org/D607

AFFECTED FILES
  mercurial/ui.py
  tests/test-editor-filename.t

CHANGE DETAILS




To: mbolin, durin42, ryanmce, quark, #hg-reviewers, yuja
Cc: mercurial-devel

Patch

diff --git a/tests/test-editor-filename.t b/tests/test-editor-filename.t
--- a/tests/test-editor-filename.t
+++ b/tests/test-editor-filename.t
@@ -33,3 +33,31 @@ 
   *.histedit.hg.txt (glob)
   abort: edit failed: editor.sh exited with status 1
   [255]
+
+Verify that when performing an action that has the side-effect of creating an
+editor for a diff, the file ends in .diff.
+
+  $ echo 1 > one
+  $ echo 2 > two
+  $ hg add
+  adding one
+  adding two
+  $ hg commit --interactive --config ui.interactive=true --config ui.interface=text << EOF
+  > y
+  > e
+  > q
+  > EOF
+  diff --git a/one b/one
+  new file mode 100644
+  examine changes to 'one'? [Ynesfdaq?] y
+  
+  @@ -0,0 +1,1 @@
+  +1
+  record change 1/2 to 'one'? [Ynesfdaq?] e
+  
+  *.diff (glob)
+  editor exited with exit code 1
+  record change 1/2 to 'one'? [Ynesfdaq?] q
+  
+  abort: user quit
+  [255]
diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -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']