Fossil SCM
Further improvements to the "fossil git status" command.
Commit
8b18d011a4a99f8bf41b475df8140c33c39c7dbc82af40eadb70d99ed596bc3c
Parent
ab68afe984d7e43…
1 file changed
+9
-2
+9
-2
| --- src/export.c | ||
| +++ src/export.c | ||
| @@ -1575,11 +1575,17 @@ | ||
| 1575 | 1575 | } |
| 1576 | 1576 | fossil_print("Git mirror: %s\n", zMirror); |
| 1577 | 1577 | db_multi_exec("ATTACH '%q/.mirror_state/db' AS mirror;", zMirror); |
| 1578 | 1578 | z = db_text(0, "SELECT datetime(value) FROM mconfig WHERE key='start'"); |
| 1579 | 1579 | if( z ){ |
| 1580 | - fossil_print("Last export: %s\n", z); | |
| 1580 | + double rAge = db_double(0.0, "SELECT julianday('now') - value" | |
| 1581 | + " FROM mconfig WHERE key='start'"); | |
| 1582 | + if( rAge>1.0/86400.0 ){ | |
| 1583 | + fossil_print("Last export: %s (%z ago)\n", z, human_readable_age(rAge)); | |
| 1584 | + }else{ | |
| 1585 | + fossil_print("Last export: %s (moments ago)\n", z); | |
| 1586 | + } | |
| 1581 | 1587 | } |
| 1582 | 1588 | z = db_text(0, "SELECT value FROM mconfig WHERE key='autopush'"); |
| 1583 | 1589 | if( z==0 ){ |
| 1584 | 1590 | fossil_print("Autopush: off\n"); |
| 1585 | 1591 | }else{ |
| @@ -1594,11 +1600,12 @@ | ||
| 1594 | 1600 | " WHERE key='start'),0.0)" |
| 1595 | 1601 | ); |
| 1596 | 1602 | if( n==0 ){ |
| 1597 | 1603 | fossil_print("Status: up-to-date\n"); |
| 1598 | 1604 | }else{ |
| 1599 | - fossil_print("Status: %d check-ins awaiting export\n", n); | |
| 1605 | + fossil_print("Status: %d check-in%s awaiting export\n", | |
| 1606 | + n, n==1 ? "" : "s"); | |
| 1600 | 1607 | } |
| 1601 | 1608 | n = db_int(0, "SELECT count(*) FROM mmark WHERE isfile"); |
| 1602 | 1609 | k = db_int(0, "SELECT count(*) FROm mmark WHERE NOT isfile"); |
| 1603 | 1610 | fossil_print("Exported: %d check-ins and %d file blobs\n", k, n); |
| 1604 | 1611 | } |
| 1605 | 1612 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -1575,11 +1575,17 @@ | |
| 1575 | } |
| 1576 | fossil_print("Git mirror: %s\n", zMirror); |
| 1577 | db_multi_exec("ATTACH '%q/.mirror_state/db' AS mirror;", zMirror); |
| 1578 | z = db_text(0, "SELECT datetime(value) FROM mconfig WHERE key='start'"); |
| 1579 | if( z ){ |
| 1580 | fossil_print("Last export: %s\n", z); |
| 1581 | } |
| 1582 | z = db_text(0, "SELECT value FROM mconfig WHERE key='autopush'"); |
| 1583 | if( z==0 ){ |
| 1584 | fossil_print("Autopush: off\n"); |
| 1585 | }else{ |
| @@ -1594,11 +1600,12 @@ | |
| 1594 | " WHERE key='start'),0.0)" |
| 1595 | ); |
| 1596 | if( n==0 ){ |
| 1597 | fossil_print("Status: up-to-date\n"); |
| 1598 | }else{ |
| 1599 | fossil_print("Status: %d check-ins awaiting export\n", n); |
| 1600 | } |
| 1601 | n = db_int(0, "SELECT count(*) FROM mmark WHERE isfile"); |
| 1602 | k = db_int(0, "SELECT count(*) FROm mmark WHERE NOT isfile"); |
| 1603 | fossil_print("Exported: %d check-ins and %d file blobs\n", k, n); |
| 1604 | } |
| 1605 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -1575,11 +1575,17 @@ | |
| 1575 | } |
| 1576 | fossil_print("Git mirror: %s\n", zMirror); |
| 1577 | db_multi_exec("ATTACH '%q/.mirror_state/db' AS mirror;", zMirror); |
| 1578 | z = db_text(0, "SELECT datetime(value) FROM mconfig WHERE key='start'"); |
| 1579 | if( z ){ |
| 1580 | double rAge = db_double(0.0, "SELECT julianday('now') - value" |
| 1581 | " FROM mconfig WHERE key='start'"); |
| 1582 | if( rAge>1.0/86400.0 ){ |
| 1583 | fossil_print("Last export: %s (%z ago)\n", z, human_readable_age(rAge)); |
| 1584 | }else{ |
| 1585 | fossil_print("Last export: %s (moments ago)\n", z); |
| 1586 | } |
| 1587 | } |
| 1588 | z = db_text(0, "SELECT value FROM mconfig WHERE key='autopush'"); |
| 1589 | if( z==0 ){ |
| 1590 | fossil_print("Autopush: off\n"); |
| 1591 | }else{ |
| @@ -1594,11 +1600,12 @@ | |
| 1600 | " WHERE key='start'),0.0)" |
| 1601 | ); |
| 1602 | if( n==0 ){ |
| 1603 | fossil_print("Status: up-to-date\n"); |
| 1604 | }else{ |
| 1605 | fossil_print("Status: %d check-in%s awaiting export\n", |
| 1606 | n, n==1 ? "" : "s"); |
| 1607 | } |
| 1608 | n = db_int(0, "SELECT count(*) FROM mmark WHERE isfile"); |
| 1609 | k = db_int(0, "SELECT count(*) FROm mmark WHERE NOT isfile"); |
| 1610 | fossil_print("Exported: %d check-ins and %d file blobs\n", k, n); |
| 1611 | } |
| 1612 |