Merge pull request #5125 from albfan/wip/albfan/diff_buffers Compare buffers in diff example
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367
diff --git a/examples/common.c b/examples/common.c
index 4cd9f2b..22807e1 100644
--- a/examples/common.c
+++ b/examples/common.c
@@ -14,6 +14,14 @@
#include <assert.h>
#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#ifdef _WIN32
+# include <io.h>
+#else
+# include <fcntl.h>
+# include <unistd.h>
+#endif
#include <string.h>
#include <errno.h>
@@ -391,3 +399,37 @@ out:
free(pubkey);
return error;
}
+
+char *read_file(const char *path)
+{
+ ssize_t total = 0;
+ char *buf = NULL;
+ struct stat st;
+ int fd = -1;
+
+ if ((fd = open(path, O_RDONLY)) < 0 || fstat(fd, &st) < 0)
+ goto out;
+
+ if ((buf = malloc(st.st_size + 1)) == NULL)
+ goto out;
+
+ while (total < st.st_size) {
+ ssize_t bytes = read(fd, buf + total, st.st_size - total);
+ if (bytes <= 0) {
+ if (errno == EAGAIN || errno == EINTR)
+ continue;
+ free(buf);
+ buf = NULL;
+ goto out;
+ }
+ total += bytes;
+ }
+
+ buf[total] = '\0';
+
+out:
+ if (fd >= 0)
+ close(fd);
+ return buf;
+}
+
diff --git a/examples/common.h b/examples/common.h
index 724a5c0..bba8321 100644
--- a/examples/common.h
+++ b/examples/common.h
@@ -12,10 +12,25 @@
* <http://creativecommons.org/publicdomain/zero/1.0/>.
*/
+#include <sys/types.h>
+#include <sys/stat.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <git2.h>
+#include <fcntl.h>
+
+#ifdef _WIN32
+# include <io.h>
+# include <Windows.h>
+# define open _open
+# define read _read
+# define close _close
+# define ssize_t int
+# define sleep(a) Sleep(a * 1000)
+#else
+# include <unistd.h>
+#endif
#ifndef PRIuZ
/* Define the printf format specifer to use for size_t output */
@@ -65,6 +80,14 @@ extern int lg2_tag(git_repository *repo, int argc, char **argv);
extern void check_lg2(int error, const char *message, const char *extra);
/**
+ * Read a file into a buffer
+ *
+ * @param path The path to the file that shall be read
+ * @return NUL-terminated buffer if the file was successfully read, NULL-pointer otherwise
+ */
+extern char *read_file(const char *path);
+
+/**
* Exit the program, printing error to stderr
*/
extern void fatal(const char *message, const char *extra);
@@ -90,7 +113,7 @@ struct args_info {
/**
* Check current `args` entry against `opt` string. If it matches
* exactly, take the next arg as a string; if it matches as a prefix with
- * an equal sign, take the remainder as a string; if value not supplied,
+ * an equal sign, take the remainder as a string; if value not supplied,
* default value `def` will be given. otherwise return 0.
*/
extern int optional_str_arg(
diff --git a/examples/diff.c b/examples/diff.c
index e8ba918..9e2aa9c 100644
--- a/examples/diff.c
+++ b/examples/diff.c
@@ -52,6 +52,7 @@ struct opts {
git_diff_options diffopts;
git_diff_find_options findopts;
int color;
+ int no_index;
int cache;
int output;
git_diff_format_t format;
@@ -66,14 +67,16 @@ static void parse_opts(struct opts *o, int argc, char *argv[]);
static int color_printer(
const git_diff_delta*, const git_diff_hunk*, const git_diff_line*, void*);
static void diff_print_stats(git_diff *diff, struct opts *o);
+static void compute_diff_no_index(git_diff **diff, struct opts *o);
int lg2_diff(git_repository *repo, int argc, char *argv[])
{
git_tree *t1 = NULL, *t2 = NULL;
git_diff *diff;
+
struct opts o = {
GIT_DIFF_OPTIONS_INIT, GIT_DIFF_FIND_OPTIONS_INIT,
- -1, 0, 0, GIT_DIFF_FORMAT_PATCH, NULL, NULL, "."
+ -1, -1, 0, 0, GIT_DIFF_FORMAT_PATCH, NULL, NULL, "."
};
parse_opts(&o, argc, argv);
@@ -86,49 +89,54 @@ int lg2_diff(git_repository *repo, int argc, char *argv[])
* * <sha1>
* * --cached
* * --nocache (don't use index data in diff at all)
+ * * --no-index <file1> <file2>
* * nothing
*
* Currently ranged arguments like <sha1>..<sha2> and <sha1>...<sha2>
* are not supported in this example
*/
- if (o.treeish1)
- treeish_to_tree(&t1, repo, o.treeish1);
- if (o.treeish2)
- treeish_to_tree(&t2, repo, o.treeish2);
-
- if (t1 && t2)
- check_lg2(
- git_diff_tree_to_tree(&diff, repo, t1, t2, &o.diffopts),
- "diff trees", NULL);
- else if (o.cache != CACHE_NORMAL) {
- if (!t1)
- treeish_to_tree(&t1, repo, "HEAD");
+ if (o.no_index >= 0) {
+ compute_diff_no_index(&diff, &o);
+ } else {
+ if (o.treeish1)
+ treeish_to_tree(&t1, repo, o.treeish1);
+ if (o.treeish2)
+ treeish_to_tree(&t2, repo, o.treeish2);
- if (o.cache == CACHE_NONE)
+ if (t1 && t2)
+ check_lg2(
+ git_diff_tree_to_tree(&diff, repo, t1, t2, &o.diffopts),
+ "diff trees", NULL);
+ else if (o.cache != CACHE_NORMAL) {
+ if (!t1)
+ treeish_to_tree(&t1, repo, "HEAD");
+
+ if (o.cache == CACHE_NONE)
+ check_lg2(
+ git_diff_tree_to_workdir(&diff, repo, t1, &o.diffopts),
+ "diff tree to working directory", NULL);
+ else
+ check_lg2(
+ git_diff_tree_to_index(&diff, repo, t1, NULL, &o.diffopts),
+ "diff tree to index", NULL);
+ }
+ else if (t1)
check_lg2(
- git_diff_tree_to_workdir(&diff, repo, t1, &o.diffopts),
+ git_diff_tree_to_workdir_with_index(&diff, repo, t1, &o.diffopts),
"diff tree to working directory", NULL);
else
check_lg2(
- git_diff_tree_to_index(&diff, repo, t1, NULL, &o.diffopts),
- "diff tree to index", NULL);
- }
- else if (t1)
- check_lg2(
- git_diff_tree_to_workdir_with_index(&diff, repo, t1, &o.diffopts),
- "diff tree to working directory", NULL);
- else
- check_lg2(
- git_diff_index_to_workdir(&diff, repo, NULL, &o.diffopts),
- "diff index to working directory", NULL);
+ git_diff_index_to_workdir(&diff, repo, NULL, &o.diffopts),
+ "diff index to working directory", NULL);
- /** Apply rename and copy detection if requested. */
+ /** Apply rename and copy detection if requested. */
- if ((o.findopts.flags & GIT_DIFF_FIND_ALL) != 0)
- check_lg2(
- git_diff_find_similar(diff, &o.findopts),
- "finding renames and copies", NULL);
+ if ((o.findopts.flags & GIT_DIFF_FIND_ALL) != 0)
+ check_lg2(
+ git_diff_find_similar(diff, &o.findopts),
+ "finding renames and copies", NULL);
+ }
/** Generate simple output using libgit2 display helper. */
@@ -158,6 +166,38 @@ int lg2_diff(git_repository *repo, int argc, char *argv[])
return 0;
}
+static void compute_diff_no_index(git_diff **diff, struct opts *o) {
+ git_patch *patch = NULL;
+ char *file1_str = NULL;
+ char *file2_str = NULL;
+ git_buf buf = {0};
+
+ if (!o->treeish1 || !o->treeish2) {
+ usage("two files should be provided as arguments", NULL);
+ }
+ file1_str = read_file(o->treeish1);
+ if (file1_str == NULL) {
+ usage("file cannot be read", o->treeish1);
+ }
+ file2_str = read_file(o->treeish2);
+ if (file2_str == NULL) {
+ usage("file cannot be read", o->treeish2);
+ }
+ check_lg2(
+ git_patch_from_buffers(&patch, file1_str, strlen(file1_str), o->treeish1, file2_str, strlen(file2_str), o->treeish2, &o->diffopts),
+ "patch buffers", NULL);
+ check_lg2(
+ git_patch_to_buf(&buf, patch),
+ "patch to buf", NULL);
+ check_lg2(
+ git_diff_from_buffer(diff, buf.ptr, buf.size),
+ "diff from patch", NULL);
+ git_patch_free(patch);
+ git_buf_dispose(&buf);
+ free(file1_str);
+ free(file2_str);
+}
+
static void usage(const char *message, const char *arg)
{
if (message && arg)
@@ -223,9 +263,10 @@ static void parse_opts(struct opts *o, int argc, char *argv[])
o->output |= OUTPUT_DIFF;
o->format = GIT_DIFF_FORMAT_PATCH;
}
- else if (!strcmp(a, "--cached"))
+ else if (!strcmp(a, "--cached")) {
o->cache = CACHE_ONLY;
- else if (!strcmp(a, "--nocache"))
+ if (o->no_index >= 0) usage("--cached and --no-index are incompatible", NULL);
+ } else if (!strcmp(a, "--nocache"))
o->cache = CACHE_NONE;
else if (!strcmp(a, "--name-only") || !strcmp(a, "--format=name"))
o->format = GIT_DIFF_FORMAT_NAME_ONLY;
@@ -238,7 +279,10 @@ static void parse_opts(struct opts *o, int argc, char *argv[])
o->format = GIT_DIFF_FORMAT_RAW;
o->diffopts.id_abbrev = 40;
}
- else if (!strcmp(a, "--color"))
+ else if (!strcmp(a, "--no-index")) {
+ o->no_index = 0;
+ if (o->cache == CACHE_ONLY) usage("--cached and --no-index are incompatible", NULL);
+ } else if (!strcmp(a, "--color"))
o->color = 0;
else if (!strcmp(a, "--no-color"))
o->color = -1;
diff --git a/examples/for-each-ref.c b/examples/for-each-ref.c
index eea73d2..900792c 100644
--- a/examples/for-each-ref.c
+++ b/examples/for-each-ref.c
@@ -1,5 +1,4 @@
#include <git2.h>
-#include <stdio.h>
#include "common.h"
static int show_ref(git_reference *ref, void *data)
diff --git a/examples/general.c b/examples/general.c
index 4bd1dac..ddc53c3 100644
--- a/examples/general.c
+++ b/examples/general.c
@@ -36,6 +36,8 @@
* [pg]: https://git-scm.com/book/en/v2/Git-Internals-Plumbing-and-Porcelain
*/
+#include "common.h"
+
/**
* ### Includes
*
@@ -43,9 +45,7 @@
* that you need. It should be the only thing you need to include in order
* to compile properly and get all the libgit2 API.
*/
-#include <git2.h>
-#include <stdio.h>
-#include <string.h>
+#include "git2.h"
static void oid_parsing(git_oid *out);
static void object_database(git_repository *repo, git_oid *oid);
diff --git a/examples/index-pack.c b/examples/index-pack.c
index 0941e09..2181f43 100644
--- a/examples/index-pack.c
+++ b/examples/index-pack.c
@@ -1,21 +1,5 @@
#include "common.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#ifdef _WIN32
-# include <io.h>
-# include <Windows.h>
-
-# define open _open
-# define read _read
-# define close _close
-
-#define ssize_t int
-#else
-# include <unistd.h>
-#endif
-
/*
* This could be run in the main loop whilst the application waits for
* the indexing to finish in a worker thread
diff --git a/examples/status.c b/examples/status.c
index 38e5120..979ab7c 100644
--- a/examples/status.c
+++ b/examples/status.c
@@ -13,12 +13,6 @@
*/
#include "common.h"
-#ifdef _WIN32
-# include <Windows.h>
-# define sleep(a) Sleep(a * 1000)
-#else
-# include <unistd.h>
-#endif
/**
* This example demonstrates the use of the libgit2 status APIs,