diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-05-13 15:52:21 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-05-28 09:43:41 -0400 |
| commit | aa3af01db0ab89d6ae56e9656dc28590142fbcc3 (patch) | |
| tree | 5ca0937ce51a6cde742de3db35f4f42c6a75400f | |
| parent | c7f94123569e8fe00ffb3a35e6a12b6ebe9320ec (diff) | |
| download | libgit2-aa3af01db0ab89d6ae56e9656dc28590142fbcc3.tar.gz | |
index iterator: optionally include conflicts
| -rw-r--r-- | src/iterator.c | 18 | ||||
| -rw-r--r-- | src/iterator.h | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/iterator.c b/src/iterator.c index c5c5fd7ce..1e946fadc 100644 --- a/src/iterator.c +++ b/src/iterator.c @@ -46,6 +46,7 @@ #define iterator__include_trees(I) iterator__flag(I,INCLUDE_TREES) #define iterator__dont_autoexpand(I) iterator__flag(I,DONT_AUTOEXPAND) #define iterator__do_autoexpand(I) !iterator__flag(I,DONT_AUTOEXPAND) +#define iterator__include_conflicts(I) iterator__flag(I, INCLUDE_CONFLICTS) #define GIT_ITERATOR_FIRST_ACCESS (1 << 15) #define iterator__has_been_accessed(I) iterator__flag(I,FIRST_ACCESS) @@ -668,13 +669,16 @@ static const git_index_entry *index_iterator__index_entry(index_iterator *ii) return ie; } -static const git_index_entry *index_iterator__skip_conflicts(index_iterator *ii) +static const git_index_entry *index_iterator__advance_over_conflicts(index_iterator *ii) { - const git_index_entry *ie; + const git_index_entry *ie = index_iterator__index_entry(ii); - while ((ie = index_iterator__index_entry(ii)) != NULL && - git_index_entry_stage(ie) != 0) - ii->current++; + if (!iterator__include_conflicts(ii)) { + while (ie && git_index_entry_stage(ie) != 0) { + ii->current++; + ie = index_iterator__index_entry(ii); + } + } return ie; } @@ -702,7 +706,7 @@ static void index_iterator__next_prefix_tree(index_iterator *ii) static int index_iterator__first_prefix_tree(index_iterator *ii) { - const git_index_entry *ie = index_iterator__skip_conflicts(ii); + const git_index_entry *ie = index_iterator__advance_over_conflicts(ii); const char *scan, *prior, *slash; if (!ie || !iterator__include_trees(ii)) @@ -825,7 +829,7 @@ static int index_iterator__reset( git_index_snapshot_find( &ii->current, &ii->entries, ii->entry_srch, ii->base.start, 0, 0); - if ((ie = index_iterator__skip_conflicts(ii)) == NULL) + if ((ie = index_iterator__advance_over_conflicts(ii)) == NULL) return 0; if (git_buf_sets(&ii->partial, ie->path) < 0) diff --git a/src/iterator.h b/src/iterator.h index 1520bffc2..db1f325a7 100644 --- a/src/iterator.h +++ b/src/iterator.h @@ -33,6 +33,8 @@ typedef enum { GIT_ITERATOR_DONT_AUTOEXPAND = (1u << 3), /** convert precomposed unicode to decomposed unicode */ GIT_ITERATOR_PRECOMPOSE_UNICODE = (1u << 4), + /** include conflicts */ + GIT_ITERATOR_INCLUDE_CONFLICTS = (1u << 5), } git_iterator_flag_t; typedef struct { |