diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2009-10-18 14:25:14 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2009-10-18 14:25:14 +0200 |
| commit | 225999e9442c746333a8baa17a6dbf7341c135ca (patch) | |
| tree | 82e4bdf8a59fae869bae41aa6b9b048fee2d3e09 /lib/git/__init__.py | |
| parent | 919164df96d9f956c8be712f33a9a037b097745b (diff) | |
| parent | 9acc7806d6bdb306a929c460437d3d03e5e48dcd (diff) | |
| download | GitPython-225999e9442c746333a8baa17a6dbf7341c135ca.tar.gz GitPython-225999e9442c746333a8baa17a6dbf7341c135ca.zip | |
Merge branch 'diffing' into improvements
* diffing:
DiffIndex implemented including test
diff: implemented raw diff parsing which appears to be able to handle possible input types, DiffIndex still requires implementation though
resolved cyclic inclusion issue by moving the Diffable interface into the diff module, which probably is the right thing to do anyway
repo: fixed untracked files function which used git-commit before, it can open vim to get a message though which makes the program appear to freeze - using git-status now
implemented diff tests, but will have to move the diff module as it needs to create objects, whose import would create a dependency cycle
Removed a few diff-related test cases that fail now as the respective method is missing - these tests have to be redone in test-diff module accordingly
added Diffable interface to objects.base, its used by Commit and Tree objects.
Fixed object bug that would cause object ids not to be resolved to sha's as this was assumed - now there is a test for it as well
Diffstat (limited to 'lib/git/__init__.py')
| -rw-r--r-- | lib/git/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/git/__init__.py b/lib/git/__init__.py index 6f482128..e2adac62 100644 --- a/lib/git/__init__.py +++ b/lib/git/__init__.py @@ -12,7 +12,7 @@ __version__ = 'git' from git.objects import * from git.refs import * from git.actor import Actor -from git.diff import Diff +from git.diff import * from git.errors import InvalidGitRepositoryError, NoSuchPathError, GitCommandError from git.cmd import Git from git.repo import Repo |