Fossil SCM

Add '--no-prompt' option to the 'commit' command.

mistachkin 2016-09-13 22:14 trunk merge
Commit 29ef4f5d06f9a73f7423c5705718073f03061042
Parent 9595cfcd456c953…
1 file changed +55 -16
~ src/checkin.c
M src/checkin.c
+55 -16
--- src/checkin.c
+++ src/checkin.c
@@ -1470,10 +1470,11 @@
14701470
 static int commit_warning(
14711471
 Blob *p, /* The content of the file being committed. */
14721472
 int crnlOk, /* Non-zero if CR/NL warnings should be disabled. */
14731473
 int binOk, /* Non-zero if binary warnings should be disabled. */
14741474
 int encodingOk, /* Non-zero if encoding warnings should be disabled. */
1475
+ int noPrompt, /* Non-zero to disable prompts and assume 'No'. */
14751476
 const char *zFilename /* The full name of the file being committed. */
14761477
 ){
14771478
 int bReverse; /* UTF-16 byte order is reversed? */
14781479
 int fUnicode; /* return value of could_be_utf16() */
14791480
 int fBinary; /* does the blob content appear to be binary? */
@@ -1562,13 +1563,18 @@
15621563
 zMsg = mprintf(
15631564
 "%s contains %s. Use --no-warnings or the %s to"
15641565
 " disable this warning.\n"
15651566
 "Commit anyhow (a=all/%sy/N)? ",
15661567
 blob_str(&fname), zWarning, zDisable, zConvert);
1567
- prompt_user(zMsg, &ans);
1568
+ if( !noPrompt ){
1569
+ prompt_user(zMsg, &ans);
1570
+ cReply = blob_str(&ans)[0];
1571
+ blob_reset(&ans);
1572
+ }else{
1573
+ cReply = 'N';
1574
+ }
15681575
 fossil_free(zMsg);
1569
- cReply = blob_str(&ans)[0];
15701576
 if( cReply=='a' || cReply=='A' ){
15711577
 allOk = 1;
15721578
 }else if( *zConvert && (cReply=='c' || cReply=='C') ){
15731579
 char *zOrig = file_newname(zFilename, "original", 1);
15741580
 FILE *f;
@@ -1595,11 +1601,10 @@
15951601
 return 1;
15961602
 }else if( cReply!='y' && cReply!='Y' ){
15971603
 fossil_fatal("Abandoning commit due to %s in %s",
15981604
 zWarning, blob_str(&fname));
15991605
 }
1600
- blob_reset(&ans);
16011606
 blob_reset(&fname);
16021607
 }
16031608
 return 0;
16041609
 }
16051610
@@ -1683,10 +1688,13 @@
16831688
 ** --integrate close all merged-in branches
16841689
 ** -m|--comment COMMENT-TEXT use COMMENT-TEXT as commit comment
16851690
 ** -M|--message-file FILE read the commit comment from given file
16861691
 ** --mimetype MIMETYPE mimetype of check-in comment
16871692
 ** -n|--dry-run If given, display instead of run actions
1693
+** --no-prompt This option disables prompting the user for
1694
+** input and assumes an answer of 'No' for every
1695
+** question.
16881696
 ** --no-warnings omit all warnings about file contents
16891697
 ** --nosign do not attempt to sign this commit with gpg
16901698
 ** --private do not sync changes and their descendants
16911699
 ** --sha1sum verify file status using SHA1 hashing rather
16921700
 ** than relying on file mtimes
@@ -1713,10 +1721,11 @@
17131721
 char *zUuid; /* UUID of the new check-in */
17141722
 int useSha1sum = 0; /* True to verify file status using SHA1 hashing */
17151723
 int noSign = 0; /* True to omit signing the manifest using GPG */
17161724
 int isAMerge = 0; /* True if checking in a merge */
17171725
 int noWarningFlag = 0; /* True if skipping all warnings */
1726
+ int noPrompt = 0; /* True if skipping all prompts */
17181727
 int forceFlag = 0; /* Undocumented: Disables all checks */
17191728
 int forceDelta = 0; /* Force a delta-manifest */
17201729
 int forceBaseline = 0; /* Force a baseline-manifest */
17211730
 int allowConflict = 0; /* Allow unresolve merge conflicts */
17221731
 int allowEmpty = 0; /* Allow a commit with no changes */
@@ -1760,10 +1769,11 @@
17601769
 forceFlag = find_option("force", "f", 0)!=0;
17611770
 allowConflict = find_option("allow-conflict",0,0)!=0;
17621771
 allowEmpty = find_option("allow-empty",0,0)!=0;
17631772
 allowFork = find_option("allow-fork",0,0)!=0;
17641773
 allowOlder = find_option("allow-older",0,0)!=0;
1774
+ noPrompt = find_option("no-prompt", 0, 0)!=0;
17651775
 noWarningFlag = find_option("no-warnings", 0, 0)!=0;
17661776
 sCiInfo.zBranch = find_option("branch","b",1);
17671777
 sCiInfo.zColor = find_option("bgcolor",0,1);
17681778
 sCiInfo.zBrClr = find_option("branchcolor",0,1);
17691779
 sCiInfo.closeFlag = find_option("close",0,0)!=0;
@@ -1829,12 +1839,18 @@
18291839
18301840
 /* Require confirmation to continue with the check-in if there is
18311841
 ** clock skew
18321842
 */
18331843
 if( g.clockSkewSeen ){
1834
- prompt_user("continue in spite of time skew (y/N)? ", &ans);
1835
- cReply = blob_str(&ans)[0];
1844
+ if( !noPrompt ){
1845
+ prompt_user("continue in spite of time skew (y/N)? ", &ans);
1846
+ cReply = blob_str(&ans)[0];
1847
+ blob_reset(&ans);
1848
+ }else{
1849
+ fossil_print("Abandoning commit due to time skew\n");
1850
+ cReply = 'N';
1851
+ }
18361852
 if( cReply!='y' && cReply!='Y' ){
18371853
 fossil_exit(1);
18381854
 }
18391855
 }
18401856
@@ -1847,13 +1863,20 @@
18471863
 ** array is allocated to contain the "id" field from the vfile table
18481864
 ** for each file to be committed. Or, if aCommitFile is NULL, all files
18491865
 ** should be committed.
18501866
 */
18511867
 if( select_commit_files() ){
1852
- prompt_user("continue (y/N)? ", &ans);
1853
- cReply = blob_str(&ans)[0];
1854
- if( cReply!='y' && cReply!='Y' ) fossil_exit(1);
1868
+ if( !noPrompt ){
1869
+ prompt_user("continue (y/N)? ", &ans);
1870
+ cReply = blob_str(&ans)[0];
1871
+ blob_reset(&ans);
1872
+ }else{
1873
+ cReply = 'N';
1874
+ }
1875
+ if( cReply!='y' && cReply!='Y' ){
1876
+ fossil_exit(1);
1877
+ }
18551878
 }
18561879
 isAMerge = db_exists("SELECT 1 FROM vmerge WHERE id=0 OR id<-2");
18571880
 if( g.aCommitFile && isAMerge ){
18581881
 fossil_fatal("cannot do a partial commit of a merge");
18591882
 }
@@ -1954,26 +1977,35 @@
19541977
 blob_append(&comment, zComment, -1);
19551978
 }else if( zComFile ){
19561979
 blob_zero(&comment);
19571980
 blob_read_from_file(&comment, zComFile);
19581981
 blob_to_utf8_no_bom(&comment, 1);
1959
- }else if(dryRunFlag){
1982
+ }else if( dryRunFlag ){
19601983
 blob_zero(&comment);
1961
- }else{
1984
+ }else if( !noPrompt ){
19621985
 char *zInit = db_text(0, "SELECT value FROM vvar WHERE name='ci-comment'");
19631986
 prepare_commit_comment(&comment, zInit, &sCiInfo, vid);
19641987
 if( zInit && zInit[0] && fossil_strcmp(zInit, blob_str(&comment))==0 ){
19651988
 prompt_user("unchanged check-in comment. continue (y/N)? ", &ans);
19661989
 cReply = blob_str(&ans)[0];
1967
- if( cReply!='y' && cReply!='Y' ) fossil_exit(1);
1990
+ blob_reset(&ans);
1991
+ if( cReply!='y' && cReply!='Y' ){
1992
+ fossil_exit(1);
1993
+ }
19681994
 }
19691995
 free(zInit);
19701996
 }
19711997
 if( blob_size(&comment)==0 ){
19721998
 if( !dryRunFlag ){
1973
- prompt_user("empty check-in comment. continue (y/N)? ", &ans);
1974
- cReply = blob_str(&ans)[0];
1999
+ if( !noPrompt ){
2000
+ prompt_user("empty check-in comment. continue (y/N)? ", &ans);
2001
+ cReply = blob_str(&ans)[0];
2002
+ blob_reset(&ans);
2003
+ }else{
2004
+ fossil_print("Abandoning commit due to empty check-in comment\n");
2005
+ cReply = 'N';
2006
+ }
19752007
 if( cReply!='y' && cReply!='Y' ){
19762008
 fossil_exit(1);
19772009
 }
19782010
 }
19792011
 }else{
@@ -2023,11 +2055,12 @@
20232055
 blob_read_from_file(&content, zFullname);
20242056
 }
20252057
 /* Do not emit any warnings when they are disabled. */
20262058
 if( !noWarningFlag ){
20272059
 abortCommit |= commit_warning(&content, crnlOk, binOk,
2028
- encodingOk, zFullname);
2060
+ encodingOk, noPrompt,
2061
+ zFullname);
20292062
 }
20302063
 if( contains_merge_marker(&content) ){
20312064
 Blob fname; /* Relative pathname of the file */
20322065
20332066
 nConflict++;
@@ -2107,12 +2140,18 @@
21072140
 }else if( forceDelta ){
21082141
 fossil_fatal("unable to find a baseline-manifest for the delta");
21092142
 }
21102143
 }
21112144
 if( !noSign && !g.markPrivate && clearsign(&manifest, &manifest) ){
2112
- prompt_user("unable to sign manifest. continue (y/N)? ", &ans);
2113
- cReply = blob_str(&ans)[0];
2145
+ if( !noPrompt ){
2146
+ prompt_user("unable to sign manifest. continue (y/N)? ", &ans);
2147
+ cReply = blob_str(&ans)[0];
2148
+ blob_reset(&ans);
2149
+ }else{
2150
+ fossil_print("Abandoning commit due to manifest signing failure\n");
2151
+ cReply = 'N';
2152
+ }
21142153
 if( cReply!='y' && cReply!='Y' ){
21152154
 fossil_exit(1);
21162155
 }
21172156
 }
21182157
21192158
--- src/checkin.c
+++ src/checkin.c
@@ -1470,10 +1470,11 @@
1470 static int commit_warning(
1471 Blob *p, /* The content of the file being committed. */
1472 int crnlOk, /* Non-zero if CR/NL warnings should be disabled. */
1473 int binOk, /* Non-zero if binary warnings should be disabled. */
1474 int encodingOk, /* Non-zero if encoding warnings should be disabled. */
 
1475 const char *zFilename /* The full name of the file being committed. */
1476 ){
1477 int bReverse; /* UTF-16 byte order is reversed? */
1478 int fUnicode; /* return value of could_be_utf16() */
1479 int fBinary; /* does the blob content appear to be binary? */
@@ -1562,13 +1563,18 @@
1562 zMsg = mprintf(
1563 "%s contains %s. Use --no-warnings or the %s to"
1564 " disable this warning.\n"
1565 "Commit anyhow (a=all/%sy/N)? ",
1566 blob_str(&fname), zWarning, zDisable, zConvert);
1567 prompt_user(zMsg, &ans);
 
 
 
 
 
 
1568 fossil_free(zMsg);
1569 cReply = blob_str(&ans)[0];
1570 if( cReply=='a' || cReply=='A' ){
1571 allOk = 1;
1572 }else if( *zConvert && (cReply=='c' || cReply=='C') ){
1573 char *zOrig = file_newname(zFilename, "original", 1);
1574 FILE *f;
@@ -1595,11 +1601,10 @@
1595 return 1;
1596 }else if( cReply!='y' && cReply!='Y' ){
1597 fossil_fatal("Abandoning commit due to %s in %s",
1598 zWarning, blob_str(&fname));
1599 }
1600 blob_reset(&ans);
1601 blob_reset(&fname);
1602 }
1603 return 0;
1604 }
1605
@@ -1683,10 +1688,13 @@
1683 ** --integrate close all merged-in branches
1684 ** -m|--comment COMMENT-TEXT use COMMENT-TEXT as commit comment
1685 ** -M|--message-file FILE read the commit comment from given file
1686 ** --mimetype MIMETYPE mimetype of check-in comment
1687 ** -n|--dry-run If given, display instead of run actions
 
 
 
1688 ** --no-warnings omit all warnings about file contents
1689 ** --nosign do not attempt to sign this commit with gpg
1690 ** --private do not sync changes and their descendants
1691 ** --sha1sum verify file status using SHA1 hashing rather
1692 ** than relying on file mtimes
@@ -1713,10 +1721,11 @@
1713 char *zUuid; /* UUID of the new check-in */
1714 int useSha1sum = 0; /* True to verify file status using SHA1 hashing */
1715 int noSign = 0; /* True to omit signing the manifest using GPG */
1716 int isAMerge = 0; /* True if checking in a merge */
1717 int noWarningFlag = 0; /* True if skipping all warnings */
 
1718 int forceFlag = 0; /* Undocumented: Disables all checks */
1719 int forceDelta = 0; /* Force a delta-manifest */
1720 int forceBaseline = 0; /* Force a baseline-manifest */
1721 int allowConflict = 0; /* Allow unresolve merge conflicts */
1722 int allowEmpty = 0; /* Allow a commit with no changes */
@@ -1760,10 +1769,11 @@
1760 forceFlag = find_option("force", "f", 0)!=0;
1761 allowConflict = find_option("allow-conflict",0,0)!=0;
1762 allowEmpty = find_option("allow-empty",0,0)!=0;
1763 allowFork = find_option("allow-fork",0,0)!=0;
1764 allowOlder = find_option("allow-older",0,0)!=0;
 
1765 noWarningFlag = find_option("no-warnings", 0, 0)!=0;
1766 sCiInfo.zBranch = find_option("branch","b",1);
1767 sCiInfo.zColor = find_option("bgcolor",0,1);
1768 sCiInfo.zBrClr = find_option("branchcolor",0,1);
1769 sCiInfo.closeFlag = find_option("close",0,0)!=0;
@@ -1829,12 +1839,18 @@
1829
1830 /* Require confirmation to continue with the check-in if there is
1831 ** clock skew
1832 */
1833 if( g.clockSkewSeen ){
1834 prompt_user("continue in spite of time skew (y/N)? ", &ans);
1835 cReply = blob_str(&ans)[0];
 
 
 
 
 
 
1836 if( cReply!='y' && cReply!='Y' ){
1837 fossil_exit(1);
1838 }
1839 }
1840
@@ -1847,13 +1863,20 @@
1847 ** array is allocated to contain the "id" field from the vfile table
1848 ** for each file to be committed. Or, if aCommitFile is NULL, all files
1849 ** should be committed.
1850 */
1851 if( select_commit_files() ){
1852 prompt_user("continue (y/N)? ", &ans);
1853 cReply = blob_str(&ans)[0];
1854 if( cReply!='y' && cReply!='Y' ) fossil_exit(1);
 
 
 
 
 
 
 
1855 }
1856 isAMerge = db_exists("SELECT 1 FROM vmerge WHERE id=0 OR id<-2");
1857 if( g.aCommitFile && isAMerge ){
1858 fossil_fatal("cannot do a partial commit of a merge");
1859 }
@@ -1954,26 +1977,35 @@
1954 blob_append(&comment, zComment, -1);
1955 }else if( zComFile ){
1956 blob_zero(&comment);
1957 blob_read_from_file(&comment, zComFile);
1958 blob_to_utf8_no_bom(&comment, 1);
1959 }else if(dryRunFlag){
1960 blob_zero(&comment);
1961 }else{
1962 char *zInit = db_text(0, "SELECT value FROM vvar WHERE name='ci-comment'");
1963 prepare_commit_comment(&comment, zInit, &sCiInfo, vid);
1964 if( zInit && zInit[0] && fossil_strcmp(zInit, blob_str(&comment))==0 ){
1965 prompt_user("unchanged check-in comment. continue (y/N)? ", &ans);
1966 cReply = blob_str(&ans)[0];
1967 if( cReply!='y' && cReply!='Y' ) fossil_exit(1);
 
 
 
1968 }
1969 free(zInit);
1970 }
1971 if( blob_size(&comment)==0 ){
1972 if( !dryRunFlag ){
1973 prompt_user("empty check-in comment. continue (y/N)? ", &ans);
1974 cReply = blob_str(&ans)[0];
 
 
 
 
 
 
1975 if( cReply!='y' && cReply!='Y' ){
1976 fossil_exit(1);
1977 }
1978 }
1979 }else{
@@ -2023,11 +2055,12 @@
2023 blob_read_from_file(&content, zFullname);
2024 }
2025 /* Do not emit any warnings when they are disabled. */
2026 if( !noWarningFlag ){
2027 abortCommit |= commit_warning(&content, crnlOk, binOk,
2028 encodingOk, zFullname);
 
2029 }
2030 if( contains_merge_marker(&content) ){
2031 Blob fname; /* Relative pathname of the file */
2032
2033 nConflict++;
@@ -2107,12 +2140,18 @@
2107 }else if( forceDelta ){
2108 fossil_fatal("unable to find a baseline-manifest for the delta");
2109 }
2110 }
2111 if( !noSign && !g.markPrivate && clearsign(&manifest, &manifest) ){
2112 prompt_user("unable to sign manifest. continue (y/N)? ", &ans);
2113 cReply = blob_str(&ans)[0];
 
 
 
 
 
 
2114 if( cReply!='y' && cReply!='Y' ){
2115 fossil_exit(1);
2116 }
2117 }
2118
2119
--- src/checkin.c
+++ src/checkin.c
@@ -1470,10 +1470,11 @@
1470 static int commit_warning(
1471 Blob *p, /* The content of the file being committed. */
1472 int crnlOk, /* Non-zero if CR/NL warnings should be disabled. */
1473 int binOk, /* Non-zero if binary warnings should be disabled. */
1474 int encodingOk, /* Non-zero if encoding warnings should be disabled. */
1475 int noPrompt, /* Non-zero to disable prompts and assume 'No'. */
1476 const char *zFilename /* The full name of the file being committed. */
1477 ){
1478 int bReverse; /* UTF-16 byte order is reversed? */
1479 int fUnicode; /* return value of could_be_utf16() */
1480 int fBinary; /* does the blob content appear to be binary? */
@@ -1562,13 +1563,18 @@
1563 zMsg = mprintf(
1564 "%s contains %s. Use --no-warnings or the %s to"
1565 " disable this warning.\n"
1566 "Commit anyhow (a=all/%sy/N)? ",
1567 blob_str(&fname), zWarning, zDisable, zConvert);
1568 if( !noPrompt ){
1569 prompt_user(zMsg, &ans);
1570 cReply = blob_str(&ans)[0];
1571 blob_reset(&ans);
1572 }else{
1573 cReply = 'N';
1574 }
1575 fossil_free(zMsg);
 
1576 if( cReply=='a' || cReply=='A' ){
1577 allOk = 1;
1578 }else if( *zConvert && (cReply=='c' || cReply=='C') ){
1579 char *zOrig = file_newname(zFilename, "original", 1);
1580 FILE *f;
@@ -1595,11 +1601,10 @@
1601 return 1;
1602 }else if( cReply!='y' && cReply!='Y' ){
1603 fossil_fatal("Abandoning commit due to %s in %s",
1604 zWarning, blob_str(&fname));
1605 }
 
1606 blob_reset(&fname);
1607 }
1608 return 0;
1609 }
1610
@@ -1683,10 +1688,13 @@
1688 ** --integrate close all merged-in branches
1689 ** -m|--comment COMMENT-TEXT use COMMENT-TEXT as commit comment
1690 ** -M|--message-file FILE read the commit comment from given file
1691 ** --mimetype MIMETYPE mimetype of check-in comment
1692 ** -n|--dry-run If given, display instead of run actions
1693 ** --no-prompt This option disables prompting the user for
1694 ** input and assumes an answer of 'No' for every
1695 ** question.
1696 ** --no-warnings omit all warnings about file contents
1697 ** --nosign do not attempt to sign this commit with gpg
1698 ** --private do not sync changes and their descendants
1699 ** --sha1sum verify file status using SHA1 hashing rather
1700 ** than relying on file mtimes
@@ -1713,10 +1721,11 @@
1721 char *zUuid; /* UUID of the new check-in */
1722 int useSha1sum = 0; /* True to verify file status using SHA1 hashing */
1723 int noSign = 0; /* True to omit signing the manifest using GPG */
1724 int isAMerge = 0; /* True if checking in a merge */
1725 int noWarningFlag = 0; /* True if skipping all warnings */
1726 int noPrompt = 0; /* True if skipping all prompts */
1727 int forceFlag = 0; /* Undocumented: Disables all checks */
1728 int forceDelta = 0; /* Force a delta-manifest */
1729 int forceBaseline = 0; /* Force a baseline-manifest */
1730 int allowConflict = 0; /* Allow unresolve merge conflicts */
1731 int allowEmpty = 0; /* Allow a commit with no changes */
@@ -1760,10 +1769,11 @@
1769 forceFlag = find_option("force", "f", 0)!=0;
1770 allowConflict = find_option("allow-conflict",0,0)!=0;
1771 allowEmpty = find_option("allow-empty",0,0)!=0;
1772 allowFork = find_option("allow-fork",0,0)!=0;
1773 allowOlder = find_option("allow-older",0,0)!=0;
1774 noPrompt = find_option("no-prompt", 0, 0)!=0;
1775 noWarningFlag = find_option("no-warnings", 0, 0)!=0;
1776 sCiInfo.zBranch = find_option("branch","b",1);
1777 sCiInfo.zColor = find_option("bgcolor",0,1);
1778 sCiInfo.zBrClr = find_option("branchcolor",0,1);
1779 sCiInfo.closeFlag = find_option("close",0,0)!=0;
@@ -1829,12 +1839,18 @@
1839
1840 /* Require confirmation to continue with the check-in if there is
1841 ** clock skew
1842 */
1843 if( g.clockSkewSeen ){
1844 if( !noPrompt ){
1845 prompt_user("continue in spite of time skew (y/N)? ", &ans);
1846 cReply = blob_str(&ans)[0];
1847 blob_reset(&ans);
1848 }else{
1849 fossil_print("Abandoning commit due to time skew\n");
1850 cReply = 'N';
1851 }
1852 if( cReply!='y' && cReply!='Y' ){
1853 fossil_exit(1);
1854 }
1855 }
1856
@@ -1847,13 +1863,20 @@
1863 ** array is allocated to contain the "id" field from the vfile table
1864 ** for each file to be committed. Or, if aCommitFile is NULL, all files
1865 ** should be committed.
1866 */
1867 if( select_commit_files() ){
1868 if( !noPrompt ){
1869 prompt_user("continue (y/N)? ", &ans);
1870 cReply = blob_str(&ans)[0];
1871 blob_reset(&ans);
1872 }else{
1873 cReply = 'N';
1874 }
1875 if( cReply!='y' && cReply!='Y' ){
1876 fossil_exit(1);
1877 }
1878 }
1879 isAMerge = db_exists("SELECT 1 FROM vmerge WHERE id=0 OR id<-2");
1880 if( g.aCommitFile && isAMerge ){
1881 fossil_fatal("cannot do a partial commit of a merge");
1882 }
@@ -1954,26 +1977,35 @@
1977 blob_append(&comment, zComment, -1);
1978 }else if( zComFile ){
1979 blob_zero(&comment);
1980 blob_read_from_file(&comment, zComFile);
1981 blob_to_utf8_no_bom(&comment, 1);
1982 }else if( dryRunFlag ){
1983 blob_zero(&comment);
1984 }else if( !noPrompt ){
1985 char *zInit = db_text(0, "SELECT value FROM vvar WHERE name='ci-comment'");
1986 prepare_commit_comment(&comment, zInit, &sCiInfo, vid);
1987 if( zInit && zInit[0] && fossil_strcmp(zInit, blob_str(&comment))==0 ){
1988 prompt_user("unchanged check-in comment. continue (y/N)? ", &ans);
1989 cReply = blob_str(&ans)[0];
1990 blob_reset(&ans);
1991 if( cReply!='y' && cReply!='Y' ){
1992 fossil_exit(1);
1993 }
1994 }
1995 free(zInit);
1996 }
1997 if( blob_size(&comment)==0 ){
1998 if( !dryRunFlag ){
1999 if( !noPrompt ){
2000 prompt_user("empty check-in comment. continue (y/N)? ", &ans);
2001 cReply = blob_str(&ans)[0];
2002 blob_reset(&ans);
2003 }else{
2004 fossil_print("Abandoning commit due to empty check-in comment\n");
2005 cReply = 'N';
2006 }
2007 if( cReply!='y' && cReply!='Y' ){
2008 fossil_exit(1);
2009 }
2010 }
2011 }else{
@@ -2023,11 +2055,12 @@
2055 blob_read_from_file(&content, zFullname);
2056 }
2057 /* Do not emit any warnings when they are disabled. */
2058 if( !noWarningFlag ){
2059 abortCommit |= commit_warning(&content, crnlOk, binOk,
2060 encodingOk, noPrompt,
2061 zFullname);
2062 }
2063 if( contains_merge_marker(&content) ){
2064 Blob fname; /* Relative pathname of the file */
2065
2066 nConflict++;
@@ -2107,12 +2140,18 @@
2140 }else if( forceDelta ){
2141 fossil_fatal("unable to find a baseline-manifest for the delta");
2142 }
2143 }
2144 if( !noSign && !g.markPrivate && clearsign(&manifest, &manifest) ){
2145 if( !noPrompt ){
2146 prompt_user("unable to sign manifest. continue (y/N)? ", &ans);
2147 cReply = blob_str(&ans)[0];
2148 blob_reset(&ans);
2149 }else{
2150 fossil_print("Abandoning commit due to manifest signing failure\n");
2151 cReply = 'N';
2152 }
2153 if( cReply!='y' && cReply!='Y' ){
2154 fossil_exit(1);
2155 }
2156 }
2157
2158

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button