Fossil

Check-in [0c496d8ad3]
Login

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

Overview
Comment:json API: removed reference to recently-removed DIFF_CONTEXT_MASK.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 0c496d8ad35a8a87f6b707dcea19fe5f781d223139972601c07159a7a4585c0f
User & Date: stephan 2021-09-07 21:12:48.183
Context
2021-09-07
21:32
Re-added the file-toggle checkboxes to the diff views which were disabled via recent refactoring. ... (check-in: cf4b9fbd9c user: stephan tags: trunk)
21:12
json API: removed reference to recently-removed DIFF_CONTEXT_MASK. ... (check-in: 0c496d8ad3 user: stephan tags: trunk)
19:15
On the /jtext page, terminate the JSON array early if there are insufficient lines of text in the file to complete the request. ... (check-in: 6f5dfd9d80 user: drh tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/json_diff.c.
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
                                char fHtml){
  int fromid;
  int toid;
  int outLen;
  DiffConfig DCfg;
  Blob from = empty_blob, to = empty_blob, out = empty_blob;
  cson_value * rc = NULL;
  int flags = (DIFF_CONTEXT_MASK & nContext)
    | (fSbs ? DIFF_SIDEBYSIDE : 0)
    | (fHtml ? DIFF_HTML : 0);
  fromid = name_to_typed_rid(zFrom, "*");
  if(fromid<=0){
      json_set_err(FSL_JSON_E_UNRESOLVED_UUID,
                   "Could not resolve 'from' ID.");
      return NULL;
  }







<
|







39
40
41
42
43
44
45

46
47
48
49
50
51
52
53
                                char fHtml){
  int fromid;
  int toid;
  int outLen;
  DiffConfig DCfg;
  Blob from = empty_blob, to = empty_blob, out = empty_blob;
  cson_value * rc = NULL;

  int flags = (fSbs ? DIFF_SIDEBYSIDE : 0)
    | (fHtml ? DIFF_HTML : 0);
  fromid = name_to_typed_rid(zFrom, "*");
  if(fromid<=0){
      json_set_err(FSL_JSON_E_UNRESOLVED_UUID,
                   "Could not resolve 'from' ID.");
      return NULL;
  }