thodg/got/include/got_diff.h

Branch : - branch - main - tag - 0.1 0.10 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.20 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.30 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.40 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.50 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.60 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.70 0.71 0.72 0.8 0.9

• Show log

  Commit

• Author : Stefan Sperling
  Date : 2018-12-24 10:58:32
  Hash : 54156555
  Message : undo commit timestamps next to paths in diffs; they are redundant

• include/got_diff.h

• /*
   * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
   * copyright notice and this permission notice appear in all copies.
   *
   * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
   * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
   * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
   * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
   * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
   * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
  
  /*
   * Compute the differences between two blobs and write unified diff text
   * to the provided output FILE. Two const char * diff header labels may
   * be provided which will be used to identify each blob in the diff output.
   * If a label is NULL, use the blob's SHA1 checksum instead.
   * The number of context lines to show in the diff must be specified as well.
   */
  const struct got_error *got_diff_blob(struct got_blob_object *,
      struct got_blob_object *, const char *, const char *, int, FILE *);
  
  /*
   * Compute the differences between two trees and write unified diff text
   * to the provided output FILE. Two const char * diff header labels may
   * be provided which will be used to identify each blob in the diff output.
   * If a label is NULL, use the blob's SHA1 checksum instead.
   * The number of context lines to show in the diff must be specified as well.
   */
  const struct got_error *got_diff_tree(struct got_tree_object *,
      struct got_tree_object *, const char *label1, const char *label2,
      int, struct got_repository *, FILE *);
  
  /*
   * Diff two objects, assuming both objects are blobs. Two const char * diff
   * header labels may be provided which will be used to identify each blob in
   * the diff output. If a label is NULL, use the blob's SHA1 checksum instead.
   * The number of context lines to show in the diff must be specified as well.
   * Write unified diff text to the provided output FILE.
   */
  const struct got_error *got_diff_objects_as_blobs(struct got_object_id *,
      struct got_object_id *, const char *, const char *, int,
      struct got_repository *, FILE *);
  
  /*
   * Diff two objects, assuming both objects are trees. Two const char * diff
   * header labels may be provided which will be used to identify each blob in
   * the trees. If a label is NULL, use the blob's SHA1 checksum instead.
   * The number of context lines to show in diffs must be specified.
   * Write unified diff text to the provided output FILE.
   */
  const struct got_error *got_diff_objects_as_trees(struct got_object_id *,
      struct got_object_id *, char *, char *, int, struct got_repository *, FILE *);
  
  /*
   * Diff two objects, assuming both objects are commits.
   * The number of context lines to show in diffs must be specified.
   * Write unified diff text to the provided output FILE.
   */
  const struct got_error *got_diff_objects_as_commits(struct got_object_id *,
      struct got_object_id *, int, struct got_repository *, FILE *);
  
  #define GOT_DIFF_MAX_CONTEXT	64