Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Show the correct hash algorithm name in the Overview section of the /info webpage. (Originally committed to the wrong branch.) |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
26dac28eec3dddb11833daf202715c95 |
| User & Date: | drh 2017-03-01 17:14:48.657 |
Context
|
2017-03-01
| ||
| 17:48 | The server issues an error asking the client to upgrade if the client is less than Fossil 2.0 and SHA3 content is encountered. ... (check-in: a13738764b user: drh tags: trunk) | |
| 17:15 | Merge updates from trunk. ... (check-in: c3fbab2edb user: drh tags: fossil-2.1) | |
| 17:14 | Show the correct hash algorithm name in the Overview section of the /info webpage. (Originally committed to the wrong branch.) ... (check-in: 26dac28eec user: drh tags: trunk) | |
| 17:11 | Show on the the first 40 characters of SHA3 hashes in the "fossil status" command, and similar, to avoid overflowing the 80-character width of a standard TTY window. ... (check-in: 5c87495e42 user: drh tags: trunk) | |
| 16:44 | Show the correct hash algorithm name in the Overview section of the /info webpage. ... (check-in: 92fb97609a user: drh tags: fossil-2.1) | |
Changes
Changes to src/hname.c.
| ︙ | ︙ | |||
46 47 48 49 50 51 52 53 54 55 56 57 58 59 |
/*
** The number of distinct hash algorithms:
*/
#define HNAME_COUNT 2 /* Just SHA1 and SHA3-256. Let's keep it that way! */
#endif /* INTERFACE */
/*
** Return the integer hash algorithm code number (ex: HNAME_K224) for
** the hash string provided. Or return HNAME_ERROR (0) if the input string
** is not a valid artifact hash string.
*/
int hname_validate(const char *zHash, int nHash){
| > > > > > > > > > > | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 |
/*
** The number of distinct hash algorithms:
*/
#define HNAME_COUNT 2 /* Just SHA1 and SHA3-256. Let's keep it that way! */
#endif /* INTERFACE */
/*
** Return a human-readable name for the hash algorithm given a hash with
** a length of nHash hexadecimal digits.
*/
const char *hname_alg(int nHash){
if( nHash==HNAME_LEN_SHA1 ) return "SHA1";
if( nHash==HNAME_LEN_K256 ) return "SHA3-256";
return "?";
}
/*
** Return the integer hash algorithm code number (ex: HNAME_K224) for
** the hash string provided. Or return HNAME_ERROR (0) if the input string
** is not a valid artifact hash string.
*/
int hname_validate(const char *zHash, int nHash){
|
| ︙ | ︙ |
Changes to src/info.c.
| ︙ | ︙ | |||
570 571 572 573 574 575 576 577 578 579 580 581 582 583 |
" WHERE blob.rid=%d"
" AND event.objid=%d",
rid, rid
);
sideBySide = !is_false(PD("sbs","1"));
if( db_step(&q1)==SQLITE_ROW ){
const char *zUuid = db_column_text(&q1, 0);
char *zEUser, *zEComment;
const char *zUser;
const char *zComment;
const char *zDate;
const char *zOrigDate;
style_header("Check-in [%S]", zUuid);
| > | 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 |
" WHERE blob.rid=%d"
" AND event.objid=%d",
rid, rid
);
sideBySide = !is_false(PD("sbs","1"));
if( db_step(&q1)==SQLITE_ROW ){
const char *zUuid = db_column_text(&q1, 0);
int nUuid = db_column_bytes(&q1, 0);
char *zEUser, *zEComment;
const char *zUser;
const char *zComment;
const char *zDate;
const char *zOrigDate;
style_header("Check-in [%S]", zUuid);
|
| ︙ | ︙ | |||
591 592 593 594 595 596 597 |
TAG_COMMENT, rid);
zUser = db_column_text(&q1, 2);
zComment = db_column_text(&q1, 3);
zDate = db_column_text(&q1,1);
zOrigDate = db_column_text(&q1, 4);
@ <div class="section">Overview</div>
@ <table class="label-value">
| | | 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 |
TAG_COMMENT, rid);
zUser = db_column_text(&q1, 2);
zComment = db_column_text(&q1, 3);
zDate = db_column_text(&q1,1);
zOrigDate = db_column_text(&q1, 4);
@ <div class="section">Overview</div>
@ <table class="label-value">
@ <tr><th>%s(hname_alg(nUuid)):</th><td>%s(zUuid)
if( g.perm.Setup ){
@ (Record ID: %d(rid))
}
@ </td></tr>
@ <tr><th>Date:</th><td>
hyperlink_to_date(zDate, "</td></tr>");
if( zOrigDate && fossil_strcmp(zDate, zOrigDate)!=0 ){
|
| ︙ | ︙ |