Artifact [46d2956c79]

Artifact 46d2956c791779c911eb2b542e9427babab3c9dc97b0e9026615ad47fdb56eed:

• File internal/fsltype/cardtime.go — part of check-in [d810a8118f] at 2026-10-18 20:01:53 on branch main — fix: handle time exactly as fossil does (#442)

  * fix(manifest): round a caller's check-in and tag time as fossil does

  Fossil reads a --date-override through SQLite's strftime, which rounds the seconds to the millisecond (holding a fraction past .999 in its second) rather than truncating them. A caller time finer than a millisecond now gets the D card fossil would write for it; the default clock time is still truncated, as fossil reads its clock.

  fsltype.CardTime and CardTimeNow are the one place both rules live, and the checkout commit path and branch creation take their default time through them.

  * fix(repo): stamp config and user rows in seconds since 1970

  Fossil writes config.mtime and user.mtime with its now() SQL function, time(0). SetConfig, SetHashPolicy and CreateUser wrote julianday('now') instead, so fossil read those rows as dating from 1970 when comparing times in a configuration merge, and SetCaps and SetPassword left the user's mtime alone where fossil's user command restamps it.

  * fix(auth): read and write user.cexpire as a Julian day

  Fossil keeps user.cexpire as a Julian day (src/login.c). A sync login parsed it as RFC 3339 or 'YYYY-MM-DD HH:MM:SS' text, so any value fossil had written failed to parse and the login was refused as expired. The expiry is now read through julianday(), which takes both forms, and repo invite --ttl writes a Julian day; its write error is now checked.

  * fix(checkout): set file times as fossil's --setmtime does

  Fossil's --setmtime gives each unedited file the time of the newest check-in, among the version and its primary ancestors, that recorded the file's content, truncated to whole seconds (mtime_of_manifest_file), and it does so for every unedited file of the version once the checkout is up to date (vfile_check_signature with CKSIG_SETMTIME). SetMTime gave every written file the target check-in's time to the millisecond, and an update left the files it did not write alone.

  * fix(stash): keep and show stash and bisect times as fossil does

  Fossil stores stash.ctime as julianday('now') and lists it with datetime(ctime); go-libfossil stored CURRENT_TIMESTAMP text, which the two drivers returned in different forms, and showed a fossil-written time as a bare number. bisect's list now shows datetime(event.mtime), as fossil's bisect ls does, instead of the Julian day.

  * test(verify): fossil rebuild keeps the times go-libfossil stores

  A repository go-libfossil wrote, with check-ins at caller and clock times, a tag and a branch, is rebuilt by the fossil binary, and every check-in event, plink and tagxref time must come back unchanged.

  * test(sync): a fossil clone and push agree on every synced time

  The fossil binary clones a go-libfossil server, unversioned files included, commits at a time finer than a millisecond and pushes back. Each side derives check-in event, plink and tagxref times from the artifacts itself, and the unversioned time travels on the wire; both repositories must then hold the same values.

  * fix(resolve): bound NAME:TIMESTAMP with julianday() as fossil does

  Fossil resolves BRANCH:TIMESTAMP with event.mtime<=julianday(BOUND). The bound was computed in the text form event rows hold, so on a millisecond where that form is larger than julianday()'s, a check-in at the bound itself resolved here and not in fossil.

  * fix(manifest): round a caller's card time with integer arithmetic

  CardTime followed SQLite's printing of the seconds as a double, which is not a well-defined rounding: at exact half-millisecond ties fossil 2.28's SQLite gives .124 for .1245 but .020 for .0195, and other SQLite versions differ again. A caller time is now rounded to the nearest millisecond on its nanoseconds, ties up, held at .999 as fossil holds it. The fossil binary test compares every non-tie value, across second, minute, day and year ends; ties are asserted on their own.

  * fix(auth): ignore user.cexpire at sync login, as fossil does

  user.cexpire is the expiry of fossil's web-login cookie: fossil sets it at web login, writes 0 at logout, and its sync login (check_login) never reads it. Refusing a sync login on it locked out anyone who had logged into or out of fossil's web UI, or whose cookie had lapsed.

  The invite TTL that relied on it now lives in a config row of its own, invite-expire:LOGIN, as a UTC instant checked at sync login; repo invite no longer writes cexpire, and the expiry is no longer written in local time and read as UTC. Deleting a user drops its invite expiry.

  Tracked in #441.

  * fix(repo): convert Julian config and user mtimes on open

  Repositories go-libfossil wrote before config and user rows were stamped in seconds since 1970 still hold Julian days there, which fossil reads as January 1970. Open converts those rows to the seconds they stand for. It checks first and writes only when a row needs it, so it converts once and takes no write lock on an up-to-date repository.

  * fix(checkout): set a file no check-in recorded to 1970, as fossil does

  With no mlink row for a file's artifact in the version's ancestry, fossil's max(event.mtime) is NULL, which mtime_of_manifest_file reads as 0, so --setmtime sets the file to 1970. SetMTime skipped the file.

  * fix(stash): list stashes by creation time, as fossil's stash ls does

  fossil stash ls orders by ctime, oldest first. List ordered by stash id, newest first; it now orders by ctime with the id breaking a tie.

  * fix(auth): clear a login's invite expiry with the user, atomically

  DeleteUser removed the user and its invite expiry in two statements; a failure between them left the user's expiry behind or the user without it. Both now go in one transaction. A user fossil deleted leaves its invite-expire row behind, so CreateUser clears it in the same transaction as the insert; repo invite sets its own expiry afterwards.

  The on-open conversion of Julian config and user mtimes is now best-effort: while another connection holds the write lock, Open skips it and a later open converts the rows, instead of failing. (user: [email protected], size: 1418) [annotate] [blame] [check-ins using] [more...]

package fsltype

import "time"

// Card times the way fossil writes them. Fossil turns a check-in or tag date
// into its D card with date_in_standard_format (src/checkin.c), which is
// SQLite's strftime('%Y-%m-%dT%H:%M:%f', DATE): the date is written in UTC
// with exactly three fractional digits.

// CardTime returns the time fossil records for t given as the date of a new
// artifact, as `fossil commit --date-override` takes one: t in UTC, rounded
// to the nearest millisecond, except that a fraction past .999 stays at .999
// rather than carrying into the next second, as SQLite holds it there.
//
// This matches fossil except at an exact half millisecond, which rounds up
// here. Fossil's result for a tie comes from how its bundled SQLite prints
// the seconds as a double, and differs between SQLite versions (fossil 2.28
// writes .124 for .1245 but .020 for .0195), so it is not followed.
func CardTime(t time.Time) time.Time {
	t = t.UTC()
	ms := (t.Nanosecond() + 500000) / 1000000
	if ms > 999 {
		ms = 999
	}
	return t.Truncate(time.Second).Add(time.Duration(ms) * time.Millisecond)
}

// CardTimeNow returns the time fossil records for "now", the default date of
// a new artifact, given the clock reading now: SQLite reads the clock in whole
// milliseconds, so the rest is dropped rather than rounded.
func CardTimeNow(now time.Time) time.Time {
	return now.UTC().Truncate(time.Millisecond)
}