Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | When editing the properties of a check-in and comparing the old and new comment text, ignore leading and trailing whitespace and the differences between \r\n and \n. Hopefully this will reduce the number of unwanted comment edits. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
48928829e23d602162c71a469f2fef9f |
| User & Date: | drh 2011-10-18 23:37:15.810 |
Context
|
2011-10-19
| ||
| 01:44 | Increase the version number to 1.20. Improvements to style sheets. ... (check-in: 91db2ccfa2 user: drh tags: trunk) | |
| 01:29 | Merge updates from trunk. ... (check-in: 62d928cb41 user: mistachkin tags: tcl-integration) | |
|
2011-10-18
| ||
| 23:37 | When editing the properties of a check-in and comparing the old and new comment text, ignore leading and trailing whitespace and the differences between \r\n and \n. Hopefully this will reduce the number of unwanted comment edits. ... (check-in: 48928829e2 user: drh tags: trunk) | |
|
2011-10-17
| ||
| 23:12 | Fix typo in warning message. ... (check-in: c80ee413ab user: drh tags: trunk) | |
Changes
Changes to src/info.c.
| ︙ | ︙ | |||
1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 | @ <input type="text" name="%s(zIdCustom)" @ id="%s(zIdCustom)" class="checkinUserColor" @ value="%h(stdClrFound?"":zDefaultColor)" /> @ </td> @ </tr> @ </table> } /* ** WEBPAGE: ci_edit ** URL: ci_edit?r=RID&c=NEWCOMMENT&u=NEWUSER ** ** Present a dialog for updating properties of a baseline: ** | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 |
@ <input type="text" name="%s(zIdCustom)"
@ id="%s(zIdCustom)" class="checkinUserColor"
@ value="%h(stdClrFound?"":zDefaultColor)" />
@ </td>
@ </tr>
@ </table>
}
/*
** Do a comment comparison.
**
** + Leading and trailing whitespace are ignored.
** + \r\n characters compare equal to \n
**
** Return true if equal and false if not equal.
*/
static int comment_compare(const char *zA, const char *zB){
if( zA==0 ) zA = "";
if( zB==0 ) zB = "";
while( fossil_isspace(zA[0]) ) zA++;
while( fossil_isspace(zB[0]) ) zB++;
while( zA[0] && zB[0] ){
if( zA[0]==zB[0] ){ zA++; zB++; continue; }
if( zA[0]=='\r' && zA[1]=='\n' && zB[0]=='\n' ){
zA += 2;
zB++;
continue;
}
if( zB[0]=='\r' && zB[1]=='\n' && zA[0]=='\n' ){
zB += 2;
zA++;
continue;
}
return 0;
}
while( fossil_isspace(zB[0]) ) zB++;
while( fossil_isspace(zA[0]) ) zA++;
return zA[0]==0 && zB[0]==0;
}
/*
** WEBPAGE: ci_edit
** URL: ci_edit?r=RID&c=NEWCOMMENT&u=NEWUSER
**
** Present a dialog for updating properties of a baseline:
**
|
| ︙ | ︙ | |||
1750 1751 1752 1753 1754 1755 1756 |
login_verify_csrf_secret();
blob_zero(&ctrl);
zNow = date_in_standard_format("now");
blob_appendf(&ctrl, "D %s\n", zNow);
db_multi_exec("CREATE TEMP TABLE newtags(tag UNIQUE, prefix, value)");
if( zNewColor[0]
| | > | | 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 |
login_verify_csrf_secret();
blob_zero(&ctrl);
zNow = date_in_standard_format("now");
blob_appendf(&ctrl, "D %s\n", zNow);
db_multi_exec("CREATE TEMP TABLE newtags(tag UNIQUE, prefix, value)");
if( zNewColor[0]
&& (fPropagateColor!=fNewPropagateColor
|| fossil_strcmp(zColor,zNewColor)!=0)
){
char *zPrefix = "+";
if( fNewPropagateColor ){
zPrefix = "*";
}
db_multi_exec("REPLACE INTO newtags VALUES('bgcolor',%Q,%Q)",
zPrefix, zNewColor);
}
if( zNewColor[0]==0 && zColor[0]!=0 ){
db_multi_exec("REPLACE INTO newtags VALUES('bgcolor','-',NULL)");
}
if( comment_compare(zComment,zNewComment)==0 ){
db_multi_exec("REPLACE INTO newtags VALUES('comment','+',%Q)",
zNewComment);
}
if( fossil_strcmp(zDate,zNewDate)!=0 ){
db_multi_exec("REPLACE INTO newtags VALUES('date','+',%Q)",
zNewDate);
}
|
| ︙ | ︙ |