Fossil

Check-in [a7343c6a0c]
Login

Check-in [a7343c6a0c]

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

Overview
Comment:Set an appropriate base URL for the /file page when it is using name= and ci= query parameters.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: a7343c6a0cb227fac1af669642e722a4ba6dd6213d6874f045896f0dd9e476ce
User & Date: drh 2020-11-27 13:08:40.284
Context
2020-11-28
13:36
Fix how Fossil handles 'import --git' into a repository that already exists when neither the '--increment' nor '--force' options are passed, as reported by Warren in [forum:/forumpost/29e358909c|forum post 29e358909c]. The proposed fix required duplicating a file descriptor for stdin to accept keyboard input from the user and piped input from git fast-import, which necessitated machine-dependent ifdefs that have not yet been tested on Windows platforms. The fix revealed another bug that this commit also solves by avoiding duplicate artifacts being inserted into the blob table during fast_insert_content(), which can arise when importing into a repository that has used the recently implemented '--attribute' feature if manifests are generated from the same content but with different U cards. Due to a bug in Git's output, this required an additional temp table for tracking tag artifacts (see comments). Due to the complexity of this commit, and having not been tested yet on Windows platforms, further testing is needed. ... (Closed-Leaf check-in: a69f71a275 user: jamsek tags: import-git-dev)
12:51
Fix typo in the sync.wiki document. ... (check-in: 3cb82905e1 user: drh tags: trunk)
2020-11-27
13:08
Set an appropriate base URL for the /file page when it is using name= and ci= query parameters. ... (check-in: a7343c6a0c user: drh tags: trunk)
2020-11-25
21:51
Improve the "--help" option on commands so that it avoids ambiguity by only looking at commands in the help dictionary. ... (check-in: 3091605fdf user: drh tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/info.c.
2396
2397
2398
2399
2400
2401
2402

2403
2404

2405
2406

2407
2408
2409
2410
2411
2412
2413
      style_submenu_element("Shun", "%R/shun?shun=%s#addshun",zUuid);
    }
  }

  if( isFile ){
    if( isSymbolicCI ){
      zHeader = mprintf("%s at %s", file_tail(zName), zCI);

    }else if( zCIUuid && zCIUuid[0] ){
      zHeader = mprintf("%s at [%S]", file_tail(zName), zCIUuid);

    }else{
      zHeader = mprintf("%s", file_tail(zName));

    }
  }else if( descOnly ){
    zHeader = mprintf("Artifact Description [%S]", zUuid);
  }else{
    zHeader = mprintf("Artifact [%S]", zUuid);
  }
  style_header("%s", zHeader);







>


>


>







2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
      style_submenu_element("Shun", "%R/shun?shun=%s#addshun",zUuid);
    }
  }

  if( isFile ){
    if( isSymbolicCI ){
      zHeader = mprintf("%s at %s", file_tail(zName), zCI);
      style_set_current_page("doc/%t/%T", zCI, zName);
    }else if( zCIUuid && zCIUuid[0] ){
      zHeader = mprintf("%s at [%S]", file_tail(zName), zCIUuid);
      style_set_current_page("doc/%S/%T", zCIUuid, zName);
    }else{
      zHeader = mprintf("%s", file_tail(zName));
      style_set_current_page("doc/tip/%T", zName);
    }
  }else if( descOnly ){
    zHeader = mprintf("Artifact Description [%S]", zUuid);
  }else{
    zHeader = mprintf("Artifact [%S]", zUuid);
  }
  style_header("%s", zHeader);