Fossil SCM
Try to provide better information on manifest errors.
Commit
5ff4e336174bbecd43952f01875d9684de141314
Parent
f60f9cddbab15b0…
1 file changed
+4
-2
+4
-2
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -1733,11 +1733,12 @@ | ||
| 1733 | 1733 | |
| 1734 | 1734 | if( (p = manifest_cache_find(rid))!=0 ){ |
| 1735 | 1735 | blob_reset(pContent); |
| 1736 | 1736 | }else if( (p = manifest_parse(pContent, rid, 0))==0 ){ |
| 1737 | 1737 | assert( blob_is_reset(pContent) || pContent==0 ); |
| 1738 | - fossil_error(1, "syntax error in manifest"); | |
| 1738 | + fossil_error(1, "syntax error in manifest [%s]", | |
| 1739 | + db_text(0,"SELECT uuid FROM blob WHERE rid=%d",rid)); | |
| 1739 | 1740 | return 0; |
| 1740 | 1741 | } |
| 1741 | 1742 | if( g.xlinkClusterOnly && p->type!=CFTYPE_CLUSTER ){ |
| 1742 | 1743 | manifest_destroy(p); |
| 1743 | 1744 | assert( blob_is_reset(pContent) ); |
| @@ -1745,11 +1746,12 @@ | ||
| 1745 | 1746 | return 0; |
| 1746 | 1747 | } |
| 1747 | 1748 | if( p->type==CFTYPE_MANIFEST && fetch_baseline(p, 0) ){ |
| 1748 | 1749 | manifest_destroy(p); |
| 1749 | 1750 | assert( blob_is_reset(pContent) ); |
| 1750 | - fossil_error(1, "cannot fetch baseline manifest"); | |
| 1751 | + fossil_error(1, "cannot fetch baseline for manifest [%s]", | |
| 1752 | + db_text(0, "SELECT uuid FROM blob WHERE rid=%d",rid)); | |
| 1751 | 1753 | return 0; |
| 1752 | 1754 | } |
| 1753 | 1755 | db_begin_transaction(); |
| 1754 | 1756 | if( p->type==CFTYPE_MANIFEST ){ |
| 1755 | 1757 | if( permitHooks ){ |
| 1756 | 1758 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1733,11 +1733,12 @@ | |
| 1733 | |
| 1734 | if( (p = manifest_cache_find(rid))!=0 ){ |
| 1735 | blob_reset(pContent); |
| 1736 | }else if( (p = manifest_parse(pContent, rid, 0))==0 ){ |
| 1737 | assert( blob_is_reset(pContent) || pContent==0 ); |
| 1738 | fossil_error(1, "syntax error in manifest"); |
| 1739 | return 0; |
| 1740 | } |
| 1741 | if( g.xlinkClusterOnly && p->type!=CFTYPE_CLUSTER ){ |
| 1742 | manifest_destroy(p); |
| 1743 | assert( blob_is_reset(pContent) ); |
| @@ -1745,11 +1746,12 @@ | |
| 1745 | return 0; |
| 1746 | } |
| 1747 | if( p->type==CFTYPE_MANIFEST && fetch_baseline(p, 0) ){ |
| 1748 | manifest_destroy(p); |
| 1749 | assert( blob_is_reset(pContent) ); |
| 1750 | fossil_error(1, "cannot fetch baseline manifest"); |
| 1751 | return 0; |
| 1752 | } |
| 1753 | db_begin_transaction(); |
| 1754 | if( p->type==CFTYPE_MANIFEST ){ |
| 1755 | if( permitHooks ){ |
| 1756 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1733,11 +1733,12 @@ | |
| 1733 | |
| 1734 | if( (p = manifest_cache_find(rid))!=0 ){ |
| 1735 | blob_reset(pContent); |
| 1736 | }else if( (p = manifest_parse(pContent, rid, 0))==0 ){ |
| 1737 | assert( blob_is_reset(pContent) || pContent==0 ); |
| 1738 | fossil_error(1, "syntax error in manifest [%s]", |
| 1739 | db_text(0,"SELECT uuid FROM blob WHERE rid=%d",rid)); |
| 1740 | return 0; |
| 1741 | } |
| 1742 | if( g.xlinkClusterOnly && p->type!=CFTYPE_CLUSTER ){ |
| 1743 | manifest_destroy(p); |
| 1744 | assert( blob_is_reset(pContent) ); |
| @@ -1745,11 +1746,12 @@ | |
| 1746 | return 0; |
| 1747 | } |
| 1748 | if( p->type==CFTYPE_MANIFEST && fetch_baseline(p, 0) ){ |
| 1749 | manifest_destroy(p); |
| 1750 | assert( blob_is_reset(pContent) ); |
| 1751 | fossil_error(1, "cannot fetch baseline for manifest [%s]", |
| 1752 | db_text(0, "SELECT uuid FROM blob WHERE rid=%d",rid)); |
| 1753 | return 0; |
| 1754 | } |
| 1755 | db_begin_transaction(); |
| 1756 | if( p->type==CFTYPE_MANIFEST ){ |
| 1757 | if( permitHooks ){ |
| 1758 |