##// END OF EJS Templates
Prompt for a commit message in editor, improve error message
Patrick Mezard -
r5754:75c20713 default
parent child Browse files
Show More
@@ -803,6 +803,8 b' class localrepository(repo.repository):'
803 if text:
803 if text:
804 edittext.append(text)
804 edittext.append(text)
805 edittext.append("")
805 edittext.append("")
806 edittext.append(_("HG: Please write and save a commit message"))
807 edittext.append("HG: --")
806 edittext.append("HG: user: %s" % user)
808 edittext.append("HG: user: %s" % user)
807 if p2 != nullid:
809 if p2 != nullid:
808 edittext.append("HG: branch merge")
810 edittext.append("HG: branch merge")
@@ -827,7 +829,7 b' class localrepository(repo.repository):'
827 while lines and not lines[0]:
829 while lines and not lines[0]:
828 del lines[0]
830 del lines[0]
829 if not lines:
831 if not lines:
830 return None
832 raise util.Abort(_("commit message cannot be left blank"))
831 text = '\n'.join(lines)
833 text = '\n'.join(lines)
832
834
833 n = self.changelog.add(mn, changed + removed, text, trp, p1, p2,
835 n = self.changelog.add(mn, changed + removed, text, trp, p1, p2,
@@ -10,6 +10,7 b' hg init test'
10 cd test
10 cd test
11 echo foo > foo
11 echo foo > foo
12 hg add foo
12 hg add foo
13 HGEDITOR=true hg commit -m ""
13 hg commit -d '0 0' -m commit-1
14 hg commit -d '0 0' -m commit-1
14 echo foo >> foo
15 echo foo >> foo
15 hg commit -d '1 4444444' -m commit-3
16 hg commit -d '1 4444444' -m commit-3
@@ -1,6 +1,9 b''
1 % commit date test
1 % commit date test
2 transaction abort!
2 transaction abort!
3 rollback completed
3 rollback completed
4 abort: commit message cannot be left blank
5 transaction abort!
6 rollback completed
4 abort: impossible time zone offset: 4444444
7 abort: impossible time zone offset: 4444444
5 transaction abort!
8 transaction abort!
6 rollback completed
9 rollback completed
@@ -22,6 +22,7 b' 2 files updated, 0 files merged, 0 files'
22 applying ../tip.patch
22 applying ../tip.patch
23 transaction abort!
23 transaction abort!
24 rollback completed
24 rollback completed
25 abort: commit message cannot be left blank
25 % import of plain diff should be ok with message
26 % import of plain diff should be ok with message
26 requesting all changes
27 requesting all changes
27 adding changesets
28 adding changesets
@@ -91,6 +92,7 b' 2 files updated, 0 files merged, 0 files'
91 applying patch from stdin
92 applying patch from stdin
92 transaction abort!
93 transaction abort!
93 rollback completed
94 rollback completed
95 abort: commit message cannot be left blank
94 % hg export in email, should use patch header
96 % hg export in email, should use patch header
95 requesting all changes
97 requesting all changes
96 adding changesets
98 adding changesets
@@ -50,6 +50,7 b' diff --git a/empty-rw b/empty-rw'
50 new file mode 100644
50 new file mode 100644
51 examine changes to 'empty-rw'? [Ynsfdaq?] transaction abort!
51 examine changes to 'empty-rw'? [Ynsfdaq?] transaction abort!
52 rollback completed
52 rollback completed
53 abort: commit message cannot be left blank
53
54
54 changeset: -1:000000000000
55 changeset: -1:000000000000
55 tag: tip
56 tag: tip
General Comments 0
You need to be logged in to leave comments. Login now