summaryrefslogtreecommitdiff
path: root/src/revwalk.h
diff options
context:
space:
mode:
authorVicent Marti <tanoku@gmail.com>2010-08-08 14:12:17 +0200
committerVicent Marti <tanoku@gmail.com>2010-08-12 18:48:55 +0200
commit3315782cb4f2b683c66a53c93aa81de501c5a4ab (patch)
treee3fa8b56dc17b749cc53520eb350cbcc46101007 /src/revwalk.h
parentf8758044876b30b0f6482d1fe8c3b1de743f4186 (diff)
downloadlibgit2-3315782cb4f2b683c66a53c93aa81de501c5a4ab.tar.gz
Redesigned the walking/object lookup interface
The old 'git_revpool' object has been removed and split into two distinct objects with separate functionality, in order to have separate methods for object management and object walking. * A new object 'git_repository' does the high-level management of a repository's objects (commits, trees, tags, etc) on top of a 'git_odb'. Eventually, it will also manage other repository attributes (e.g. tag resolution, references, etc). See: src/git/repository.h * A new external method 'git_repository_lookup(repo, oid, type)' has been added to the 'git_repository' API. All object lookups (git_XXX_lookup()) are now wrappers to this method, and duplicated code has been removed. The method does automatic type checking and returns a generic 'git_revpool_object' that can be cast to any specific object. See: src/git/repository.h * The external methods for object parsing of repository objects (git_XXX_parse()) have been removed. Loading objects from the repository is now managed through the 'lookup' functions. These objects are loaded with minimal information, and the relevant parsing is done automatically when the user requests any of the parsed attributes through accessor methods. An attribute has been added to 'git_repository' in order to force the parsing of all the repository objects immediately after lookup. See: src/git/commit.h See: src/git/tag.h See: src/git/tree.h * The previous walking functionality of the revpool is now found in 'git_revwalk', which does the actual revision walking on a repository; the attributes when walking through commits in a database have been decoupled from the actual commit objects. This increases performance when accessing commits during the walk and allows to have several 'git_revwalk' instances working at the same time on top of the same repository, without having to load commits in memory several times. See: src/git/revwalk.h * The old 'git_revpool_table' has been renamed to 'git_hashtable' and now works as a generic hashtable with support for any kind of object and custom hash functions. See: src/hashtable.h * All the relevant unit tests have been updated, renamed and grouped accordingly. Signed-off-by: Vicent Marti <tanoku@gmail.com>
Diffstat (limited to 'src/revwalk.h')
-rw-r--r--src/revwalk.h58
1 files changed, 50 insertions, 8 deletions
diff --git a/src/revwalk.h b/src/revwalk.h
index 270eb8c6b..d97e5ce8c 100644
--- a/src/revwalk.h
+++ b/src/revwalk.h
@@ -5,21 +5,63 @@
#include "git/revwalk.h"
#include "commit.h"
+#include "repository.h"
+#include "hashtable.h"
-struct git_revpool {
- git_odb *db;
+struct git_revwalk_commit;
- git_commit_list iterator;
- git_commit *(*next_commit)(git_commit_list *);
+typedef struct git_revwalk_listnode {
+ struct git_revwalk_commit *walk_commit;
+ struct git_revwalk_listnode *next;
+ struct git_revwalk_listnode *prev;
+} git_revwalk_listnode;
- git_commit_list roots;
- git_revpool_table *objects;
+typedef struct git_revwalk_list {
+ struct git_revwalk_listnode *head;
+ struct git_revwalk_listnode *tail;
+ size_t size;
+} git_revwalk_list;
+
+
+struct git_revwalk_commit {
+
+ git_commit *commit_object;
+ git_revwalk_list parents;
+
+ unsigned short in_degree;
+ unsigned seen:1,
+ uninteresting:1,
+ topo_delay:1,
+ flags:25;
+};
+
+typedef struct git_revwalk_commit git_revwalk_commit;
+
+struct git_revwalk {
+ git_repository *repo;
+
+ git_hashtable *commits;
+ git_revwalk_list iterator;
+
+ git_revwalk_commit *(*next)(git_revwalk_list *);
unsigned walking:1;
unsigned int sorting;
};
-void gitrp__prepare_walk(git_revpool *pool);
-int gitrp__enroot(git_revpool *pool, git_commit *commit);
+
+void git_revwalk__prepare_walk(git_revwalk *walk);
+int git_revwalk__enroot(git_revwalk *walk, git_commit *commit);
+
+int git_revwalk_list_push_back(git_revwalk_list *list, git_revwalk_commit *commit);
+int git_revwalk_list_push_front(git_revwalk_list *list, git_revwalk_commit *obj);
+
+git_revwalk_commit *git_revwalk_list_pop_back(git_revwalk_list *list);
+git_revwalk_commit *git_revwalk_list_pop_front(git_revwalk_list *list);
+
+void git_revwalk_list_clear(git_revwalk_list *list);
+
+void git_revwalk_list_timesort(git_revwalk_list *list);
+void git_revwalk_list_toposort(git_revwalk_list *list);
#endif /* INCLUDE_revwalk_h__ */