Fossil SCM
Export the committer of the tag rather than just <tagger>.
Commit
4a51461e96e0a4bb054e5a1d47844d833fffd412
Parent
27de3fc8beb0947…
1 file changed
+6
-2
+6
-2
| --- src/export.c | ||
| +++ src/export.c | ||
| @@ -630,20 +630,22 @@ | ||
| 630 | 630 | manifest_cache_clear(); |
| 631 | 631 | |
| 632 | 632 | |
| 633 | 633 | /* Output tags */ |
| 634 | 634 | db_prepare(&q, |
| 635 | - "SELECT tagname, rid, strftime('%%s',mtime)" | |
| 635 | + "SELECT tagname, rid, strftime('%%s',mtime)," | |
| 636 | + " (SELECT coalesce(euser, user) FROM event WHERE objid=rid)" | |
| 636 | 637 | " FROM tagxref JOIN tag USING(tagid)" |
| 637 | 638 | " WHERE tagtype=1 AND tagname GLOB 'sym-*'" |
| 638 | 639 | ); |
| 639 | 640 | while( db_step(&q)==SQLITE_ROW ){ |
| 640 | 641 | const char *zTagname = db_column_text(&q, 0); |
| 641 | 642 | char *zEncoded = 0; |
| 642 | 643 | int rid = db_column_int(&q, 1); |
| 643 | 644 | char *zMark = mark_name_from_rid(rid, &unused_mark); |
| 644 | 645 | const char *zSecSince1970 = db_column_text(&q, 2); |
| 646 | + const char *zUser = db_column_text(&q, 3); | |
| 645 | 647 | int i; |
| 646 | 648 | if( rid==0 || !bag_find(&vers, rid) ) continue; |
| 647 | 649 | zTagname += 4; |
| 648 | 650 | zEncoded = mprintf("%s", zTagname); |
| 649 | 651 | for(i=0; zEncoded[i]; i++){ |
| @@ -650,11 +652,13 @@ | ||
| 650 | 652 | if( !fossil_isalnum(zEncoded[i]) ) zEncoded[i] = '_'; |
| 651 | 653 | } |
| 652 | 654 | printf("tag %s\n", zEncoded); |
| 653 | 655 | printf("from %s\n", zMark); |
| 654 | 656 | free(zMark); |
| 655 | - printf("tagger <tagger> %s +0000\n", zSecSince1970); | |
| 657 | + printf("tagger"); | |
| 658 | + print_person(zUser); | |
| 659 | + printf(" %s +0000\n", zSecSince1970); | |
| 656 | 660 | printf("data 0\n"); |
| 657 | 661 | fossil_free(zEncoded); |
| 658 | 662 | } |
| 659 | 663 | db_finalize(&q); |
| 660 | 664 | |
| 661 | 665 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -630,20 +630,22 @@ | |
| 630 | manifest_cache_clear(); |
| 631 | |
| 632 | |
| 633 | /* Output tags */ |
| 634 | db_prepare(&q, |
| 635 | "SELECT tagname, rid, strftime('%%s',mtime)" |
| 636 | " FROM tagxref JOIN tag USING(tagid)" |
| 637 | " WHERE tagtype=1 AND tagname GLOB 'sym-*'" |
| 638 | ); |
| 639 | while( db_step(&q)==SQLITE_ROW ){ |
| 640 | const char *zTagname = db_column_text(&q, 0); |
| 641 | char *zEncoded = 0; |
| 642 | int rid = db_column_int(&q, 1); |
| 643 | char *zMark = mark_name_from_rid(rid, &unused_mark); |
| 644 | const char *zSecSince1970 = db_column_text(&q, 2); |
| 645 | int i; |
| 646 | if( rid==0 || !bag_find(&vers, rid) ) continue; |
| 647 | zTagname += 4; |
| 648 | zEncoded = mprintf("%s", zTagname); |
| 649 | for(i=0; zEncoded[i]; i++){ |
| @@ -650,11 +652,13 @@ | |
| 650 | if( !fossil_isalnum(zEncoded[i]) ) zEncoded[i] = '_'; |
| 651 | } |
| 652 | printf("tag %s\n", zEncoded); |
| 653 | printf("from %s\n", zMark); |
| 654 | free(zMark); |
| 655 | printf("tagger <tagger> %s +0000\n", zSecSince1970); |
| 656 | printf("data 0\n"); |
| 657 | fossil_free(zEncoded); |
| 658 | } |
| 659 | db_finalize(&q); |
| 660 | |
| 661 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -630,20 +630,22 @@ | |
| 630 | manifest_cache_clear(); |
| 631 | |
| 632 | |
| 633 | /* Output tags */ |
| 634 | db_prepare(&q, |
| 635 | "SELECT tagname, rid, strftime('%%s',mtime)," |
| 636 | " (SELECT coalesce(euser, user) FROM event WHERE objid=rid)" |
| 637 | " FROM tagxref JOIN tag USING(tagid)" |
| 638 | " WHERE tagtype=1 AND tagname GLOB 'sym-*'" |
| 639 | ); |
| 640 | while( db_step(&q)==SQLITE_ROW ){ |
| 641 | const char *zTagname = db_column_text(&q, 0); |
| 642 | char *zEncoded = 0; |
| 643 | int rid = db_column_int(&q, 1); |
| 644 | char *zMark = mark_name_from_rid(rid, &unused_mark); |
| 645 | const char *zSecSince1970 = db_column_text(&q, 2); |
| 646 | const char *zUser = db_column_text(&q, 3); |
| 647 | int i; |
| 648 | if( rid==0 || !bag_find(&vers, rid) ) continue; |
| 649 | zTagname += 4; |
| 650 | zEncoded = mprintf("%s", zTagname); |
| 651 | for(i=0; zEncoded[i]; i++){ |
| @@ -650,11 +652,13 @@ | |
| 652 | if( !fossil_isalnum(zEncoded[i]) ) zEncoded[i] = '_'; |
| 653 | } |
| 654 | printf("tag %s\n", zEncoded); |
| 655 | printf("from %s\n", zMark); |
| 656 | free(zMark); |
| 657 | printf("tagger"); |
| 658 | print_person(zUser); |
| 659 | printf(" %s +0000\n", zSecSince1970); |
| 660 | printf("data 0\n"); |
| 661 | fossil_free(zEncoded); |
| 662 | } |
| 663 | db_finalize(&q); |
| 664 | |
| 665 |