##// END OF EJS Templates
editor: file created for diff action should have .diff suffix...
Michael Bolin -
r34056:3c82b14d default
parent child Browse files
Show More
@@ -1361,7 +1361,9 b' class ui(object):'
1361 1361 extra_defaults.update(extra)
1362 1362 extra = extra_defaults
1363 1363
1364 if action:
1364 if action == 'diff':
1365 suffix = '.diff'
1366 elif action:
1365 1367 suffix = '.%s.hg.txt' % action
1366 1368 else:
1367 1369 suffix = extra['suffix']
@@ -33,3 +33,31 b' Verify that the path for a histedit edit'
33 33 *.histedit.hg.txt (glob)
34 34 abort: edit failed: editor.sh exited with status 1
35 35 [255]
36
37 Verify that when performing an action that has the side-effect of creating an
38 editor for a diff, the file ends in .diff.
39
40 $ echo 1 > one
41 $ echo 2 > two
42 $ hg add
43 adding one
44 adding two
45 $ hg commit --interactive --config ui.interactive=true --config ui.interface=text << EOF
46 > y
47 > e
48 > q
49 > EOF
50 diff --git a/one b/one
51 new file mode 100644
52 examine changes to 'one'? [Ynesfdaq?] y
53
54 @@ -0,0 +1,1 @@
55 +1
56 record change 1/2 to 'one'? [Ynesfdaq?] e
57
58 *.diff (glob)
59 editor exited with exit code 1
60 record change 1/2 to 'one'? [Ynesfdaq?] q
61
62 abort: user quit
63 [255]
General Comments 0
You need to be logged in to leave comments. Login now