Fossil SCM
Made a cryptic 'not found' error message when failing to resolve a symbolic name slightly less cryptic in response to confusion reported in [forum:1eaa68bb75 | forum post 1eaa68bb75].
Commit
30f669b004de35c6ed24e919325ab4de5ba1915cadc617fe6523c0ad30ab3d21
Parent
b0f84d8d1742a22…
1 file changed
+2
-2
+2
-2
| --- src/name.c | ||
| +++ src/name.c | ||
| @@ -566,11 +566,11 @@ | ||
| 566 | 566 | int rid = symbolic_name_to_rid(zName, zType); |
| 567 | 567 | if( rid<0 ){ |
| 568 | 568 | fossil_error(iErrPriority, "ambiguous name: %s", zName); |
| 569 | 569 | return 2; |
| 570 | 570 | }else if( rid==0 ){ |
| 571 | - fossil_error(iErrPriority, "not found: %s", zName); | |
| 571 | + fossil_error(iErrPriority, "cannot resolve name: %s", zName); | |
| 572 | 572 | return 1; |
| 573 | 573 | }else{ |
| 574 | 574 | blob_reset(pName); |
| 575 | 575 | db_blob(pName, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 576 | 576 | return 0; |
| @@ -676,11 +676,11 @@ | ||
| 676 | 676 | if( zName==0 || zName[0]==0 ) return 0; |
| 677 | 677 | rid = symbolic_name_to_rid(zName, zType); |
| 678 | 678 | if( rid<0 ){ |
| 679 | 679 | fossil_fatal("ambiguous name: %s", zName); |
| 680 | 680 | }else if( rid==0 ){ |
| 681 | - fossil_fatal("not found: %s", zName); | |
| 681 | + fossil_fatal("cannot resolve name: %s", zName); | |
| 682 | 682 | } |
| 683 | 683 | return rid; |
| 684 | 684 | } |
| 685 | 685 | int name_to_rid(const char *zName){ |
| 686 | 686 | return name_to_typed_rid(zName, "*"); |
| 687 | 687 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -566,11 +566,11 @@ | |
| 566 | int rid = symbolic_name_to_rid(zName, zType); |
| 567 | if( rid<0 ){ |
| 568 | fossil_error(iErrPriority, "ambiguous name: %s", zName); |
| 569 | return 2; |
| 570 | }else if( rid==0 ){ |
| 571 | fossil_error(iErrPriority, "not found: %s", zName); |
| 572 | return 1; |
| 573 | }else{ |
| 574 | blob_reset(pName); |
| 575 | db_blob(pName, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 576 | return 0; |
| @@ -676,11 +676,11 @@ | |
| 676 | if( zName==0 || zName[0]==0 ) return 0; |
| 677 | rid = symbolic_name_to_rid(zName, zType); |
| 678 | if( rid<0 ){ |
| 679 | fossil_fatal("ambiguous name: %s", zName); |
| 680 | }else if( rid==0 ){ |
| 681 | fossil_fatal("not found: %s", zName); |
| 682 | } |
| 683 | return rid; |
| 684 | } |
| 685 | int name_to_rid(const char *zName){ |
| 686 | return name_to_typed_rid(zName, "*"); |
| 687 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -566,11 +566,11 @@ | |
| 566 | int rid = symbolic_name_to_rid(zName, zType); |
| 567 | if( rid<0 ){ |
| 568 | fossil_error(iErrPriority, "ambiguous name: %s", zName); |
| 569 | return 2; |
| 570 | }else if( rid==0 ){ |
| 571 | fossil_error(iErrPriority, "cannot resolve name: %s", zName); |
| 572 | return 1; |
| 573 | }else{ |
| 574 | blob_reset(pName); |
| 575 | db_blob(pName, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 576 | return 0; |
| @@ -676,11 +676,11 @@ | |
| 676 | if( zName==0 || zName[0]==0 ) return 0; |
| 677 | rid = symbolic_name_to_rid(zName, zType); |
| 678 | if( rid<0 ){ |
| 679 | fossil_fatal("ambiguous name: %s", zName); |
| 680 | }else if( rid==0 ){ |
| 681 | fossil_fatal("cannot resolve name: %s", zName); |
| 682 | } |
| 683 | return rid; |
| 684 | } |
| 685 | int name_to_rid(const char *zName){ |
| 686 | return name_to_typed_rid(zName, "*"); |
| 687 |