Commit 2594589
committed
Merge branch 'index' into improvements
* index:
Removed index test marker for custom commits as this boils down to a good way to add files to the index/remove them and make commits which are possibly customized with custom parents
index writing now creates a sha on the content making it possible to write valid indices after manually removing or altering entriesgst
Implemented merge/resolve handling , but realized that index writing is not yet working properly as it is sha1 checked as well. This explains what my 20 byte 'extension_data' actually is ;)
index: Added write_tree method including test
index.iter_blobs method added including tests ( which have been improved generally for more coverage )
tree.traverse: Added prune functionality - previously the predciate did both, pruning and preventing to return items
Improved testing of index against trees, tests succeed with next commit
Initial version of merge including tests for one-way, two-way and tree-way merge
index writing added including simple test, improved docs of IndexEntry
improved IndexEntry type and added test for parsing of the stage
Improved tuple access of EntryIndex class including test, stage and type access still needs to be decoded though
Added initial version of the index reading from file - IndexEntry interface is to be improved though, writing needs to be implemented as well
Added frame for index implementation and testing10 files changed
Lines changed: 703 additions & 22 deletions
File tree
- lib/git
- objects
- test
- fixtures
- git
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -26,7 +26,10 @@ Object | |||
| 26 | 26 | It would be good to improve things there as cat-file keeps all the data in a buffer | |
| 27 | 27 | before it writes it. Hence it does not write to a stream directly, which can be | |
| 28 | 28 | bad if files are large, say 1GB :). | |
| 29 | - | ||
| 29 | + * Effectively Objects only store hexsha's in their id attributes, so in fact | ||
| 30 | + it should be renamed to 'sha'. There was a time when references where allowed as | ||
| 31 | + well, but now objects will be 'baked' to the actual sha to assure comparisons work. | ||
| 32 | + | ||
| 30 | 33 | Config | |
| 31 | 34 | ------ | |
| 32 | 35 | * Expand .get* methods of GitConfigParser to support default value. If it is not None, | |
@@ -46,12 +49,13 @@ Overhaul docs - check examples, check looks, improve existing docs | |||
| 46 | 49 | ||
| 47 | 50 | Index | |
| 48 | 51 | ----- | |
| 49 | - * Index class required for special handling ? Probably considering what I want | ||
| 50 | - to do ! Dulwich can already write the index, and read trees, although it | ||
| 51 | - could be improved as well and could possibly be made faster unless we want | ||
| 52 | - to use the c modules ( not for now ) | ||
| 53 | - * Index Merge ( merge two trees into the index to quickly see conflicts ). | ||
| 54 | - Its possible to write it into a separate index file that can be read separately. | ||
| 52 | + * write_tree should write a tree directly, which would require ability to create | ||
| 53 | + objects in the first place. Should be rather simple as it is | ||
| 54 | + "tree" bytes datablock | sha1sum and zipped. | ||
| 55 | + Currently we use some file swapping and the git command to do it which probably | ||
| 56 | + is much slower. The thing is that properly writing a tree from an index involves | ||
| 57 | + creating several tree objects, so in the end it might be slower. | ||
| 58 | + Hmm, probably its okay to use the command unless we go c(++) | ||
| 55 | 59 | ||
| 56 | 60 | Remote | |
| 57 | 61 | ------ | |
@@ -74,8 +78,6 @@ Tree | |||
| 74 | 78 | * Should return submodules during iteration ( identifies as commit ) | |
| 75 | 79 | * Work through test and check for test-case cleanup and completeness ( what about | |
| 76 | 80 | testing whether it raises on invalid input ? ). See 6dc7799d44e1e5b9b77fd19b47309df69ec01a99 | |
| 77 | - * Derive from Iterable, simple pipe it through to Commit objects and iterate using | ||
| 78 | - commit.tree. | ||
| 79 | 81 | ||
| 80 | 82 | Testing | |
| 81 | 83 | ------- | |
@@ -84,5 +86,5 @@ Testing | |||
| 84 | 86 | as forking a shared repo in a tmp directory. In that moment, we probably want to | |
| 85 | 87 | facility committing and checkouts as well. | |
| 86 | 88 | - Use these tests for git-remote as we need to test push | |
| 87 | - | ||
| 88 | - | ||
| 89 | + - Also assure that the test-case setup is a bit more consistent ( Derive from TestCase, possibly | ||
| 90 | + make repo a class member instead of an instance member | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -19,7 +19,7 @@ | |||
| 19 | 19 | from git.repo import Repo | |
| 20 | 20 | from git.stats import Stats | |
| 21 | 21 | from git.remote import Remote | |
| 22 | - | ||
| 22 | + from git.index import * | ||
| 23 | 23 | ||
| 24 | 24 | __all__ = [ name for name, obj in locals().items() | |
| 25 | 25 | if not (name.startswith('_') or inspect.ismodule(obj)) ] | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -27,6 +27,6 @@ def __init__(self, command, status, stderr=None): | |||
| 27 | 27 | self.command = command | |
| 28 | 28 | ||
| 29 | 29 | def __str__(self): | |
| 30 | - return repr("%s returned exit status %d" % | ||
| 31 | - (str(self.command), self.status)) | ||
| 30 | + return repr("'%s' returned exit status %d: %r" % | ||
| 31 | + (' '.join(self.command), self.status, str(self.stderr))) | ||
| 32 | 32 | ||
0 commit comments