proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-03 04:01:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add the --shortstat flag to examples/diff.c

Browse Source
This commit is contained in:
Sun He 2014-03-05 20:13:34 +08:00
parent 66d9e0461c
commit 45d2e8dc46
2 changed files with 51 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PROJECTS.md
View File

@ -32,8 +32,6 @@ These are good small projects to get started with libgit2.
diff API now has a flag to support it diff API now has a flag to support it
* Add the `--patience` flag to `examples/diff.c` since it is also now * Add the `--patience` flag to `examples/diff.c` since it is also now
supported. supported.
* Add the `--shortstat` flag to `examples/diff.c` based on the work
that was done to add `--numstat` already.
* Fix the `examples/diff.c` implementation of the `-B` * Fix the `examples/diff.c` implementation of the `-B`
(a.k.a. `--break-rewrites`) command line option to actually look for (a.k.a. `--break-rewrites`) command line option to actually look for
the optional `[<n>][/<m>]` configuration values. There is an the optional `[<n>][/<m>]` configuration values. There is an

52
examples/diff.c
View File

@ -40,6 +40,7 @@ struct opts {
int color; int color;
int cached; int cached;
int numstat; int numstat;
int shortstat;
git_diff_format_t format; git_diff_format_t format;
const char *treeish1; const char *treeish1;
const char *treeish2; const char *treeish2;
@ -51,6 +52,7 @@ static void parse_opts(struct opts *o, int argc, char *argv[]);
static int color_printer( static int color_printer(
const git_diff_delta*, const git_diff_hunk*, const git_diff_line*, void*); const git_diff_delta*, const git_diff_hunk*, const git_diff_line*, void*);
static void diff_print_numstat(git_diff *diff); static void diff_print_numstat(git_diff *diff);
static void diff_print_shortstat(git_diff *diff);
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -59,7 +61,7 @@ int main(int argc, char *argv[])
git_diff *diff; git_diff *diff;
struct opts o = { struct opts o = {
GIT_DIFF_OPTIONS_INIT, GIT_DIFF_FIND_OPTIONS_INIT, GIT_DIFF_OPTIONS_INIT, GIT_DIFF_FIND_OPTIONS_INIT,
-1, 0, 0, GIT_DIFF_FORMAT_PATCH, NULL, NULL, "." -1, 0, 0, 0, GIT_DIFF_FORMAT_PATCH, NULL, NULL, "."
}; };
git_threads_init(); git_threads_init();
@ -121,6 +123,8 @@ int main(int argc, char *argv[])
if (o.numstat == 1) if (o.numstat == 1)
diff_print_numstat(diff); diff_print_numstat(diff);
else if (o.shortstat == 1)
diff_print_shortstat(diff);
else { else {
if (o.color >= 0) if (o.color >= 0)
fputs(colors[0], stdout); fputs(colors[0], stdout);
@ -236,6 +240,8 @@ static void parse_opts(struct opts *o, int argc, char *argv[])
o->diffopts.flags |= GIT_DIFF_INCLUDE_UNTRACKED; o->diffopts.flags |= GIT_DIFF_INCLUDE_UNTRACKED;
else if (!strcmp(a, "--numstat")) else if (!strcmp(a, "--numstat"))
o->numstat = 1; o->numstat = 1;
else if (!strcmp(a, "--shortstat"))
o->shortstat = 1;
else if (match_uint16_arg( else if (match_uint16_arg(
&o->findopts.rename_threshold, &args, "-M") || &o->findopts.rename_threshold, &args, "-M") ||
match_uint16_arg( match_uint16_arg(
@ -289,3 +295,47 @@ static void diff_print_numstat(git_diff *diff)
git_patch_free(patch); git_patch_free(patch);
} }
} }
/** Display diff output with "--shortstat".*/
static void diff_print_shortstat(git_diff *diff)
{
git_patch *patch;
size_t d, ndeltas = git_diff_num_deltas(diff);
size_t nadditions, ndeletions;
long nadditions_sum, ndeletions_sum;
nadditions_sum = 0;
ndeletions_sum = 0;
for (d = 0; d < ndeltas; d++){
check_lg2(
git_patch_from_diff(&patch, diff, d),
"generating patch from diff", NULL);
check_lg2(
git_patch_line_stats(NULL, &nadditions, &ndeletions, patch),
"generating the number of additions and deletions", NULL);
nadditions_sum += nadditions;
ndeletions_sum += ndeletions;
git_patch_free(patch);
}
if (ndeltas) {
printf(", %ld ", (long)ndeltas);
printf("%s", 1==ndeltas ? "file changed" : "files changed");
if(nadditions_sum) {
printf(", %ld ",nadditions_sum);
printf("%s", 1==nadditions_sum ? "insertion(+)" : "insertions(+)");
}
if(ndeletions_sum) {
printf(", %ld ",ndeletions_sum);
printf("%s", 1==ndeletions_sum ? "deletion(-)" : "deletions(-)");
}
}
printf("\n");
}