Skip to content

examples: ls-files: add ls-files to list paths in the index #4380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pks-t merged 13 commits into from
May 4, 2018
Merged

examples: ls-files: add ls-files to list paths in the index #4380

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
30e919c
examples: ls-files: list files
Oct 16, 2017
991fc08
examples: ls-files: show current files in index
Oct 17, 2017
52d83dd
examples: ls-files: handle --error-unmatch
Oct 18, 2017
cd39273
examples: ls-files: fix style and refactor
cjhoward92 Oct 23, 2017
d2f99e0
examples: ls-files: fix compile error
cjhoward92 Oct 23, 2017
37cbc3e
examples: ls-files: build file list with array
Oct 23, 2017
3f64a9d
examples: ls-files: use git_array_t to handle files
Oct 26, 2017
e866116
examples: ls-files: address PR and style
Nov 14, 2017
ee14465
examples: ls-files: fix build error
Nov 14, 2017
7d07941
test: ls-files: remove dependency on git_array
Dec 19, 2017
29ca3f3
examples: ls-files: update print_paths to print all cases
Jan 6, 2018
d7394c3
examples: ls-files: print entry path only when entry is found
Mar 27, 2018
8aa437e
tests: ls-files: use puts instead of printf and fix typos
May 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test: ls-files: remove dependency on git_array
  • Loading branch information
Carson Howard authored and Carson Howard committed Mar 27, 2018
commit 7d079413ed6462f03aeac93aec967b1a706ba4ee
23 changes: 12 additions & 11 deletions examples/ls-files.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@

typedef struct {
int error_unmatch;
git_array_t(char *) files;
char * files[1024];
Copy link
Copy Markdown
Member

@pks-t pks-t Apr 30, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

* goes with the variable name, so this should rather be char *files[1024];.

int file_count;
} ls_options;

/* Print a usage message for the program. */
Copy link
Copy Markdown
Member

@pks-t pks-t Jan 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment does not provide any useful information

Expand All @@ -46,10 +47,8 @@ static int parse_options(ls_options *opts, int argc, char *argv[])
{
int parsing_files = 0;
int i;
char **file;

memset(opts, 0, sizeof(ls_options));
git_array_init(opts->files);

if (argc < 2)
return 0;
Expand All @@ -61,9 +60,12 @@ static int parse_options(ls_options *opts, int argc, char *argv[])
if (a[0] != '-' || parsing_files) {
parsing_files = 1;
Copy link
Copy Markdown
Member

@pks-t pks-t Nov 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You set this, but you don't use that value to distinguish files/non-files. It should probably be

if (a[0] != '-' || parsing_files) {
    ...
}

So as soon as we find the first non-argument, we treat all remaining arguments as files.


file = git_array_alloc(opts->files);
GITERR_CHECK_ALLOC(file);
*file = a;
// watch for overflows (just in case)
Copy link
Copy Markdown
Member

@pks-t pks-t Jan 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

C++-style comments are not allowed

if (opts->file_count == 1024) {
break;
Copy link
Copy Markdown
Member

@pks-t pks-t Jan 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You probably shouldn't break here but print an error and return an error code.

}
Copy link
Copy Markdown
Member

@pks-t pks-t Oct 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for braces here.


opts->files[opts->file_count++] = a;
} else if (!strcmp(a, "--")) {
parsing_files = 1;
} else if (!strcmp(a, "--error-unmatch")) {
Expand All @@ -79,12 +81,12 @@ static int parse_options(ls_options *opts, int argc, char *argv[])

static int print_paths(ls_options *opts, git_index *index)
{
size_t i;
int i;
const git_index_entry *entry;
Copy link
Copy Markdown
Member

@pks-t pks-t Jan 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could also be scoped to the loop


/* loop through the files found in the args and print them if they exist */
for (i = 0; i < git_array_size(opts->files); ++i) {
const char *path = *(char **)git_array_get(opts->files, i);
for (i = 0; i < opts->file_count; ++i) {
const char *path = opts->files[i];

entry = git_index_get_bypath(index, path, GIT_INDEX_STAGE_NORMAL);
if (!entry && opts->error_unmatch) {
Expand Down Expand Up @@ -121,7 +123,7 @@ int main(int argc, char *argv[])
goto cleanup;

/* if there are files explicitly listed by the user, we need to treat this command differently */
if (git_array_size(opts.files) > 0) {
if (opts.file_count > 0) {
error = print_paths(&opts, index);
} else {
entry_count = git_index_entrycount(index);
Expand All @@ -133,7 +135,6 @@ int main(int argc, char *argv[])
}
Copy link
Copy Markdown
Member

@pks-t pks-t Jan 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small style issue: I do find it a bit funny that some printing logic is in print_paths and some is not. Maybe put the complete priting logic into print_paths and destinguish cases by opts.file_count inside of that function, then? That would make the main function a bit nicer to read.


cleanup:
git_array_clear(opts.files);
git_index_free(index);
git_repository_free(repo);
git_libgit2_shutdown();
Expand Down