Fossil

Check-in [2868a0ec]
Login

Check-in [2868a0ec]

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

Overview
Comment:Update (json status) docs for [771e592b4c59].
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 2868a0ec4c6f8545d1bdfb8bee05ba0b3a2d95d99f06a10a8ec9ab28b4760974
User & Date: stephan 2023-07-01 16:51:56
Context
2023-07-04
18:00
Updates to the sync protocol documentation. (check-in: e57613dc user: drh tags: trunk)
2023-07-01
16:51
Update (json status) docs for [771e592b4c59]. (check-in: 2868a0ec user: stephan tags: trunk)
16:06
give 'json status' the same rename treatment as recent status work

As reported by larrybr on the forum: 9e9778f2e6, 'fossil json status' reports renamed _and_ edited files as only renamed. This change reports such cases as both edited and renamed, and displays the filename prior to being renamed as well as the renamed path. We now also update the vfile table before generating the status report to ensure the current checkout state is reported. (check-in: 771e592b user: mark tags: trunk)

Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to www/json-api/api-checkout.md.

︙︙
37
38
39
40
41
42
43







44
45

Notes:

-   The `checkout.tags` property follows the framework-wide convention
    that the first tag in the list is the primary branch and any others
    are secondary.
-   `errorCount` is +1 for each missing file. Conflicts are not treated as
    errors because the CLI 'status' command does not treat them as such.







-   TODO: Info for the parent version is currently missing.
-   TODO: "merged with" info for the checkout is currently missing.








>
>
>
>
>
>
>



37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52

Notes:

-   The `checkout.tags` property follows the framework-wide convention
    that the first tag in the list is the primary branch and any others
    are secondary.
-   `errorCount` is +1 for each missing file. Conflicts are not treated as
    errors because the CLI 'status' command does not treat them as such.
-   The `"status"` entry for each of the `"files"` entries will be either a
    single string containing a single description of the status change, or
    an array of strings if more than one change was made, e.g. `"edited"`
    and `"renamed"`. The status strings include:\  
    `deleted`, `new`, `notAFile`, `missing`, `updatedByMerge`,
    `updatedByIntegrate`, `addedBymerge`, `addedByIntegrate`,
    `conflict`, `edited`, `renamed`
-   TODO: Info for the parent version is currently missing.
-   TODO: "merged with" info for the checkout is currently missing.