Fossil

Check-in [52fb87ba]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Forgot to remove redundant ternary operator after testing [cd4fbdee00].
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 52fb87ba5003934a9c7bbb2d34aa6f95fa48c57c1af2a7c57b566568d6fadac3
User & Date: jamsek 2020-11-12 14:51:48
Context
2020-11-12
22:42
Nearly complete rewrite of the "Caps Affect Web Interfaces Only" section of the caps/index.md doc, disentangling the concepts for greater clarity. ... (check-in: 50eeced0 user: wyoung tags: trunk)
14:51
Forgot to remove redundant ternary operator after testing [cd4fbdee00]. ... (check-in: 52fb87ba user: jamsek tags: trunk)
14:26
Add new --attribute option to the 'fossil import --git' command that enables attributing commits to a username rather than the corresponding Git committer/author contact info of a given commit. Conversely, construct a full 'user <emailaddr>' Git committer string for commits when using 'fossil git export' by querying the new 'fx_git' table if it exists, or the 'info' column in the 'user' table. If no user specified emailaddr can be parsed, then use the generic 'user@noemail.net' string. ... (check-in: cd4fbdee user: jamsek tags: trunk)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/export.c.

1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
    /* If username is in emailaddr form, don't append '@noemail.net' */
    if (strchr(pMan->zUser, '@') == NULL) {
      zEmail = mprintf("%s@noemail.net", pMan->zUser);
    } else {
      zEmail = fossil_strdup(pMan->zUser);
    }
  }
  fprintf(xCmd, "committer %s <%s> %s +0000\n", pMan->zUser,
   strchr(pMan->zUser, '@') == NULL ? zEmail : pMan->zUser, buf);
  fossil_free(zEmail);
  blob_init(&comment, pMan->zComment, -1);
  if( blob_size(&comment)==0 ){
    blob_append(&comment, "(no comment)", -1);
  }
  blob_appendf(&comment, "\n\nFossilOrigin-Name: %s", zUuid);
  fprintf(xCmd, "data %d\n%s\n", blob_size(&comment), blob_str(&comment));







|
<







1182
1183
1184
1185
1186
1187
1188
1189

1190
1191
1192
1193
1194
1195
1196
    /* If username is in emailaddr form, don't append '@noemail.net' */
    if (strchr(pMan->zUser, '@') == NULL) {
      zEmail = mprintf("%s@noemail.net", pMan->zUser);
    } else {
      zEmail = fossil_strdup(pMan->zUser);
    }
  }
  fprintf(xCmd, "committer %s <%s> %s +0000\n", pMan->zUser, zEmail, buf);

  fossil_free(zEmail);
  blob_init(&comment, pMan->zComment, -1);
  if( blob_size(&comment)==0 ){
    blob_append(&comment, "(no comment)", -1);
  }
  blob_appendf(&comment, "\n\nFossilOrigin-Name: %s", zUuid);
  fprintf(xCmd, "data %d\n%s\n", blob_size(&comment), blob_str(&comment));