Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fixed a couple C99-isms reported at /forumpost/487f05e382. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
a7af387dd8aa7f5bfea84a15fa33487c |
| User & Date: | stephan 2021-01-14 11:15:13 |
Context
|
2021-01-14
| ||
| 14:00 | Clarified the intro to the gitusers doc. ... (check-in: 99117745 user: wyoung tags: trunk) | |
| 11:15 | Fixed a couple C99-isms reported at /forumpost/487f05e382. ... (check-in: a7af387d user: stephan tags: trunk) | |
|
2021-01-13
| ||
| 13:34 | Fix unintentional fork. ... (check-in: c21f7397 user: danield tags: trunk) | |
Changes
Changes to src/import.c.
| ︙ | ︙ | |||
1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 |
flatFlag = find_option("flat", 0, 0)!=0;
gsvn.zTrunk = find_option("trunk", 0, 1);
gsvn.zBranches = find_option("branches", 0, 1);
gsvn.zTags = find_option("tags", 0, 1);
gsvn.revFlag = find_option("rev-tags", 0, 0)
|| (incrFlag && !find_option("no-rev-tags", 0, 0));
}else if( gitFlag ){
markfile_in = find_option("import-marks", 0, 1);
markfile_out = find_option("export-marks", 0, 1);
if( !(ggit.zMasterName = find_option("rename-master", 0, 1)) ){
ggit.zMasterName = "master";
}
ggit.authorFlag = find_option("use-author", 0, 0)!=0;
/*
** Extract --attribute 'emailaddr username' args that will populate
** new 'fx_' table to later match username for check-in attribution.
*/
| > | > | | 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 |
flatFlag = find_option("flat", 0, 0)!=0;
gsvn.zTrunk = find_option("trunk", 0, 1);
gsvn.zBranches = find_option("branches", 0, 1);
gsvn.zTags = find_option("tags", 0, 1);
gsvn.revFlag = find_option("rev-tags", 0, 0)
|| (incrFlag && !find_option("no-rev-tags", 0, 0));
}else if( gitFlag ){
const char *zGitUser;
markfile_in = find_option("import-marks", 0, 1);
markfile_out = find_option("export-marks", 0, 1);
if( !(ggit.zMasterName = find_option("rename-master", 0, 1)) ){
ggit.zMasterName = "master";
}
ggit.authorFlag = find_option("use-author", 0, 0)!=0;
/*
** Extract --attribute 'emailaddr username' args that will populate
** new 'fx_' table to later match username for check-in attribution.
*/
zGitUser = find_option("attribute", 0, 1);
while( zGitUser != 0 ){
char *currGitUser;
ggit.gitUserInfo = fossil_realloc(ggit.gitUserInfo, ++ggit.nGitAttr
* sizeof(ggit.gitUserInfo[0]));
currGitUser = fossil_strdup(zGitUser);
ggit.gitUserInfo[ggit.nGitAttr-1].zEmail = next_token(&currGitUser);
ggit.gitUserInfo[ggit.nGitAttr-1].zUser = rest_of_line(&currGitUser);
zGitUser = find_option("attribute", 0, 1);
}
}
verify_all_options();
|
| ︙ | ︙ |
Changes to src/timeline.c.
| ︙ | ︙ | |||
2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 |
zFree = mprintf("[%S] Edit to wiki page \"%s\"", zId, zCom+1);
}
}else{
zFree = mprintf("[%S] %s%s", zId, zPrefix, zCom);
}
if( zFormat ){
if( nChild==0 ){
sqlite3_snprintf(sizeof(zPrefix)-n, &zPrefix[n], "*LEAF* ");
}
| > > < < | 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 |
zFree = mprintf("[%S] Edit to wiki page \"%s\"", zId, zCom+1);
}
}else{
zFree = mprintf("[%S] %s%s", zId, zPrefix, zCom);
}
if( zFormat ){
char *zEntry;
int nEntryLine = 0;
if( nChild==0 ){
sqlite3_snprintf(sizeof(zPrefix)-n, &zPrefix[n], "*LEAF* ");
}
zEntry = timeline_entry_subst(zFormat, &nEntryLine, zId, zDate, zUserShort,
zComShort, zBranch, zTags, zPrefix);
nLine += nEntryLine;
fossil_print("%s\n", zEntry);
fossil_free(zEntry);
}
else{
|
| ︙ | ︙ |