Fossil SCM
merge trunk
Commit
0e4dee009ed842cbfcdf349793d6930ed4c4a6f5
Parent
63bd6754a5136fd…
3 files changed
+1
-3
+1
-3
+1
-1
+1
-3
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -1592,18 +1592,16 @@ | ||
| 1592 | 1592 | const char *zFilename = db_column_text(&fchngQuery, 2); |
| 1593 | 1593 | int isNew = db_column_int(&fchngQuery, 0); |
| 1594 | 1594 | int isDel = db_column_int(&fchngQuery, 1); |
| 1595 | 1595 | if( isNew ){ |
| 1596 | 1596 | fossil_print(" ADDED %s\n",zFilename); |
| 1597 | - nLine++; /* record another line */ | |
| 1598 | 1597 | }else if( isDel ){ |
| 1599 | 1598 | fossil_print(" DELETED %s\n",zFilename); |
| 1600 | - nLine++; /* record another line */ | |
| 1601 | 1599 | }else{ |
| 1602 | 1600 | fossil_print(" EDITED %s\n", zFilename); |
| 1603 | - nLine++; /* record another line */ | |
| 1604 | 1601 | } |
| 1602 | + nLine++; /* record another line */ | |
| 1605 | 1603 | } |
| 1606 | 1604 | db_reset(&fchngQuery); |
| 1607 | 1605 | } |
| 1608 | 1606 | nEntry++; /* record another complete entry */ |
| 1609 | 1607 | if( !nAbsLimit ) continue; /* no limit, continue */ |
| 1610 | 1608 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1592,18 +1592,16 @@ | |
| 1592 | const char *zFilename = db_column_text(&fchngQuery, 2); |
| 1593 | int isNew = db_column_int(&fchngQuery, 0); |
| 1594 | int isDel = db_column_int(&fchngQuery, 1); |
| 1595 | if( isNew ){ |
| 1596 | fossil_print(" ADDED %s\n",zFilename); |
| 1597 | nLine++; /* record another line */ |
| 1598 | }else if( isDel ){ |
| 1599 | fossil_print(" DELETED %s\n",zFilename); |
| 1600 | nLine++; /* record another line */ |
| 1601 | }else{ |
| 1602 | fossil_print(" EDITED %s\n", zFilename); |
| 1603 | nLine++; /* record another line */ |
| 1604 | } |
| 1605 | } |
| 1606 | db_reset(&fchngQuery); |
| 1607 | } |
| 1608 | nEntry++; /* record another complete entry */ |
| 1609 | if( !nAbsLimit ) continue; /* no limit, continue */ |
| 1610 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1592,18 +1592,16 @@ | |
| 1592 | const char *zFilename = db_column_text(&fchngQuery, 2); |
| 1593 | int isNew = db_column_int(&fchngQuery, 0); |
| 1594 | int isDel = db_column_int(&fchngQuery, 1); |
| 1595 | if( isNew ){ |
| 1596 | fossil_print(" ADDED %s\n",zFilename); |
| 1597 | }else if( isDel ){ |
| 1598 | fossil_print(" DELETED %s\n",zFilename); |
| 1599 | }else{ |
| 1600 | fossil_print(" EDITED %s\n", zFilename); |
| 1601 | } |
| 1602 | nLine++; /* record another line */ |
| 1603 | } |
| 1604 | db_reset(&fchngQuery); |
| 1605 | } |
| 1606 | nEntry++; /* record another complete entry */ |
| 1607 | if( !nAbsLimit ) continue; /* no limit, continue */ |
| 1608 |
+1
-3
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -1592,18 +1592,16 @@ | ||
| 1592 | 1592 | const char *zFilename = db_column_text(&fchngQuery, 2); |
| 1593 | 1593 | int isNew = db_column_int(&fchngQuery, 0); |
| 1594 | 1594 | int isDel = db_column_int(&fchngQuery, 1); |
| 1595 | 1595 | if( isNew ){ |
| 1596 | 1596 | fossil_print(" ADDED %s\n",zFilename); |
| 1597 | - nLine++; /* record another line */ | |
| 1598 | 1597 | }else if( isDel ){ |
| 1599 | 1598 | fossil_print(" DELETED %s\n",zFilename); |
| 1600 | - nLine++; /* record another line */ | |
| 1601 | 1599 | }else{ |
| 1602 | 1600 | fossil_print(" EDITED %s\n", zFilename); |
| 1603 | - nLine++; /* record another line */ | |
| 1604 | 1601 | } |
| 1602 | + nLine++; /* record another line */ | |
| 1605 | 1603 | } |
| 1606 | 1604 | db_reset(&fchngQuery); |
| 1607 | 1605 | } |
| 1608 | 1606 | nEntry++; /* record another complete entry */ |
| 1609 | 1607 | if( !nAbsLimit ) continue; /* no limit, continue */ |
| 1610 | 1608 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1592,18 +1592,16 @@ | |
| 1592 | const char *zFilename = db_column_text(&fchngQuery, 2); |
| 1593 | int isNew = db_column_int(&fchngQuery, 0); |
| 1594 | int isDel = db_column_int(&fchngQuery, 1); |
| 1595 | if( isNew ){ |
| 1596 | fossil_print(" ADDED %s\n",zFilename); |
| 1597 | nLine++; /* record another line */ |
| 1598 | }else if( isDel ){ |
| 1599 | fossil_print(" DELETED %s\n",zFilename); |
| 1600 | nLine++; /* record another line */ |
| 1601 | }else{ |
| 1602 | fossil_print(" EDITED %s\n", zFilename); |
| 1603 | nLine++; /* record another line */ |
| 1604 | } |
| 1605 | } |
| 1606 | db_reset(&fchngQuery); |
| 1607 | } |
| 1608 | nEntry++; /* record another complete entry */ |
| 1609 | if( !nAbsLimit ) continue; /* no limit, continue */ |
| 1610 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1592,18 +1592,16 @@ | |
| 1592 | const char *zFilename = db_column_text(&fchngQuery, 2); |
| 1593 | int isNew = db_column_int(&fchngQuery, 0); |
| 1594 | int isDel = db_column_int(&fchngQuery, 1); |
| 1595 | if( isNew ){ |
| 1596 | fossil_print(" ADDED %s\n",zFilename); |
| 1597 | }else if( isDel ){ |
| 1598 | fossil_print(" DELETED %s\n",zFilename); |
| 1599 | }else{ |
| 1600 | fossil_print(" EDITED %s\n", zFilename); |
| 1601 | } |
| 1602 | nLine++; /* record another line */ |
| 1603 | } |
| 1604 | db_reset(&fchngQuery); |
| 1605 | } |
| 1606 | nEntry++; /* record another complete entry */ |
| 1607 | if( !nAbsLimit ) continue; /* no limit, continue */ |
| 1608 |
+1
-1
| --- www/concepts.wiki | ||
| +++ www/concepts.wiki | ||
| @@ -79,11 +79,11 @@ | ||
| 79 | 79 | |
| 80 | 80 | <h3>2.1 Identification Of Artifacts</h3> |
| 81 | 81 | |
| 82 | 82 | A particular version of a particular file is called an "artifact". |
| 83 | 83 | Each artifact has a universally unique name which is the |
| 84 | -<a href="http://en.wikipedia.org/wiki/SHA">SHA1</a> hash of the content | |
| 84 | +<a href="http://en.wikipedia.org/wiki/SHA1">SHA1</a> hash of the content | |
| 85 | 85 | of that file expressed as 40 characters of lower-case hexadecimal. Such |
| 86 | 86 | a hash is referred to as the Artifact Identifier or Artifact ID |
| 87 | 87 | for the artifact. The SHA1 algorithm is created with the purpose of |
| 88 | 88 | providing a highly forgery-resistant identifier for a file. Given any |
| 89 | 89 | file it is simple to find the artifact ID for that file. But given a |
| 90 | 90 |
| --- www/concepts.wiki | |
| +++ www/concepts.wiki | |
| @@ -79,11 +79,11 @@ | |
| 79 | |
| 80 | <h3>2.1 Identification Of Artifacts</h3> |
| 81 | |
| 82 | A particular version of a particular file is called an "artifact". |
| 83 | Each artifact has a universally unique name which is the |
| 84 | <a href="http://en.wikipedia.org/wiki/SHA">SHA1</a> hash of the content |
| 85 | of that file expressed as 40 characters of lower-case hexadecimal. Such |
| 86 | a hash is referred to as the Artifact Identifier or Artifact ID |
| 87 | for the artifact. The SHA1 algorithm is created with the purpose of |
| 88 | providing a highly forgery-resistant identifier for a file. Given any |
| 89 | file it is simple to find the artifact ID for that file. But given a |
| 90 |
| --- www/concepts.wiki | |
| +++ www/concepts.wiki | |
| @@ -79,11 +79,11 @@ | |
| 79 | |
| 80 | <h3>2.1 Identification Of Artifacts</h3> |
| 81 | |
| 82 | A particular version of a particular file is called an "artifact". |
| 83 | Each artifact has a universally unique name which is the |
| 84 | <a href="http://en.wikipedia.org/wiki/SHA1">SHA1</a> hash of the content |
| 85 | of that file expressed as 40 characters of lower-case hexadecimal. Such |
| 86 | a hash is referred to as the Artifact Identifier or Artifact ID |
| 87 | for the artifact. The SHA1 algorithm is created with the purpose of |
| 88 | providing a highly forgery-resistant identifier for a file. Given any |
| 89 | file it is simple to find the artifact ID for that file. But given a |
| 90 |