Fossil SCM
Fix a regression introduced in [69668f8c57] that broke export of tags.
Commit
b2e0fda9e1fd7776495deb615c1965e32af51fff
Parent
880e3fb51f29909…
1 file changed
+3
-1
+3
-1
| --- src/export.c | ||
| +++ src/export.c | ||
| @@ -588,20 +588,22 @@ | ||
| 588 | 588 | ); |
| 589 | 589 | while( db_step(&q)==SQLITE_ROW ){ |
| 590 | 590 | const char *zTagname = db_column_text(&q, 0); |
| 591 | 591 | char *zEncoded = 0; |
| 592 | 592 | int rid = db_column_int(&q, 1); |
| 593 | + char *zMark = mark_name_from_rid(rid, &unused_mark); | |
| 593 | 594 | const char *zSecSince1970 = db_column_text(&q, 2); |
| 594 | 595 | int i; |
| 595 | 596 | if( rid==0 || !bag_find(&vers, rid) ) continue; |
| 596 | 597 | zTagname += 4; |
| 597 | 598 | zEncoded = mprintf("%s", zTagname); |
| 598 | 599 | for(i=0; zEncoded[i]; i++){ |
| 599 | 600 | if( !fossil_isalnum(zEncoded[i]) ) zEncoded[i] = '_'; |
| 600 | 601 | } |
| 601 | 602 | printf("tag %s\n", zEncoded); |
| 602 | - printf("from :%d\n", COMMITMARK(rid)); | |
| 603 | + printf("from %s\n", zMark); | |
| 604 | + free(zMark); | |
| 603 | 605 | printf("tagger <tagger> %s +0000\n", zSecSince1970); |
| 604 | 606 | printf("data 0\n"); |
| 605 | 607 | fossil_free(zEncoded); |
| 606 | 608 | } |
| 607 | 609 | db_finalize(&q); |
| 608 | 610 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -588,20 +588,22 @@ | |
| 588 | ); |
| 589 | while( db_step(&q)==SQLITE_ROW ){ |
| 590 | const char *zTagname = db_column_text(&q, 0); |
| 591 | char *zEncoded = 0; |
| 592 | int rid = db_column_int(&q, 1); |
| 593 | const char *zSecSince1970 = db_column_text(&q, 2); |
| 594 | int i; |
| 595 | if( rid==0 || !bag_find(&vers, rid) ) continue; |
| 596 | zTagname += 4; |
| 597 | zEncoded = mprintf("%s", zTagname); |
| 598 | for(i=0; zEncoded[i]; i++){ |
| 599 | if( !fossil_isalnum(zEncoded[i]) ) zEncoded[i] = '_'; |
| 600 | } |
| 601 | printf("tag %s\n", zEncoded); |
| 602 | printf("from :%d\n", COMMITMARK(rid)); |
| 603 | printf("tagger <tagger> %s +0000\n", zSecSince1970); |
| 604 | printf("data 0\n"); |
| 605 | fossil_free(zEncoded); |
| 606 | } |
| 607 | db_finalize(&q); |
| 608 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -588,20 +588,22 @@ | |
| 588 | ); |
| 589 | while( db_step(&q)==SQLITE_ROW ){ |
| 590 | const char *zTagname = db_column_text(&q, 0); |
| 591 | char *zEncoded = 0; |
| 592 | int rid = db_column_int(&q, 1); |
| 593 | char *zMark = mark_name_from_rid(rid, &unused_mark); |
| 594 | const char *zSecSince1970 = db_column_text(&q, 2); |
| 595 | int i; |
| 596 | if( rid==0 || !bag_find(&vers, rid) ) continue; |
| 597 | zTagname += 4; |
| 598 | zEncoded = mprintf("%s", zTagname); |
| 599 | for(i=0; zEncoded[i]; i++){ |
| 600 | if( !fossil_isalnum(zEncoded[i]) ) zEncoded[i] = '_'; |
| 601 | } |
| 602 | printf("tag %s\n", zEncoded); |
| 603 | printf("from %s\n", zMark); |
| 604 | free(zMark); |
| 605 | printf("tagger <tagger> %s +0000\n", zSecSince1970); |
| 606 | printf("data 0\n"); |
| 607 | fossil_free(zEncoded); |
| 608 | } |
| 609 | db_finalize(&q); |
| 610 |