summaryrefslogtreecommitdiff
path: root/lib/git/diff.py
Commit message (Collapse)AuthorAgeFilesLines
* Diff: fixed bug that caused a string to end up as a blob modeSebastian Thiel2010-06-291-10/+11
|
* All tests adjusted to work with the changed internal sha representationSebastian Thiel2010-06-281-2/+4
|
* Adjusted all files to (hopefully) deal with the fact that all objects now ↵Sebastian Thiel2010-06-251-337/+311
| | | | | | | use 20 byte sha's internally as it is closer to the GitDB implementation Switched all remaining files back to tabs Adjusted all remaining docstrings to suit the sphinx doc convention - its likely that there are many of docstring syntax errors though
* aggressive_tree_merge: fixed incorrect handling of one branch, it was just ↵Sebastian Thiel2010-06-241-0/+1
| | | | | | not implemented causing incorrect merge results. Added test to cover this issue Diff: added NULL_BIN_SHA constant for completeness
* index.write_tree: initial version implemented, although its not yet working ↵Sebastian Thiel2010-06-221-1/+1
| | | | | | | correctly, a test to explicitly compare the git version with the python implementation is still missing Tree and Index internally use 20 byte shas, converting them only as needed to reduce memory footprint and processing time objects: started own 'fun' module containing the most important tree functions, more are likely to be added soon
* diff: by limiting the splitcount to 5, a subtle bug was introduced as the ↵0.2.0-beta1Sebastian Thiel2010-05-251-0/+1
| | | | | | newline at the end of the split line was not split away automatically. Added test for this, and the trivial fix Wow, at least two people reviewd the code, but it slipped through anyway :)
* Handle filenames with embedded spaces when generating diffsRick Copeland2010-05-101-1/+1
|
* Converted all tabs to 4 space characters each to comply with pep8Sebastian Thiel2010-03-041-334/+334
|
* SymbolicReference.delete: Now takes SymbolicReference instances as well, not ↵Sebastian Thiel2009-11-301-1/+1
| | | | | | only paths diff.__str__: fixed incorrect message generation error
* diff: added __str__ method to diff classSebastian Thiel2009-11-251-1/+40
| | | | IndexObject._mode_str_to_int: Now uses the 6 relevant bytes of the passed in octal string
* index.write_tree: fixed bug that would cause the written tree not to contain ↵Sebastian Thiel2009-11-251-0/+1
| | | | any of our changes entries as it would in fact write a possibly cached tree stored in our extension data.It was solved by simply ignoring that extension data when writing the index for tree creation. A test was added for this as well
* diff: fixed issue in diff implementation which would just drop null-shas ↵Sebastian Thiel2009-11-231-5/+15
| | | | that always occour when dealing with working tree diffs ( for ovious reasons ). Also the implementation would previously leave empty blobs where no file actually existed
* added query for 'M' modified diffs to DiffIndex including test. The latter ↵Sebastian Thiel2009-11-041-3/+13
| | | | one was made faster by reducing the amount of permutations to the minimal value
* object: renamed id attribute to sha as it in fact is always being rewritten ↵Sebastian Thiel2009-11-031-2/+2
| | | | as sha, even if the passed in id was a ref. This is done to assure objects are uniquely identified and will compare correctly
* cmd.wait: AutoKill wrapped process will automatically raise on errors to ↵Sebastian Thiel2009-10-261-3/+0
| | | | unify error handling amongst clients using the process directly. It might be needed to add a flag allowing to easily override that
* Index: Is now diffable and appears to properly implement diffing against ↵Sebastian Thiel2009-10-221-9/+28
| | | | | | | other items as well as the working tree Diff.Diffable: added callback allowing superclasses to preprocess diff arguments Diff.Diff: added eq, ne and hash methods, string methods would be nice
* diff method now checks for git-diff errrs that can easily occour if the ↵Sebastian Thiel2009-10-181-5/+16
| | | | repository is bare and if there is no index or second tree specified
* DiffIndex implemented including testSebastian Thiel2009-10-181-9/+56
|
* diff: implemented raw diff parsing which appears to be able to handle ↵Sebastian Thiel2009-10-181-9/+53
| | | | possible input types, DiffIndex still requires implementation though
* resolved cyclic inclusion issue by moving the Diffable interface into the ↵Sebastian Thiel2009-10-181-0/+72
| | | | diff module, which probably is the right thing to do anyway
* added Diffable interface to objects.base, its used by Commit and Tree objects.Sebastian Thiel2009-10-161-6/+18
| | | | Diff class has been prepared to process raw input, but its not yet more than a frame
* renamed from_string and list_from_string to _from_string and ↵Sebastian Thiel2009-10-121-1/+1
| | | | _list_from_string to indicate their new status as private method, adjusted all callers respectively
* Reorganized package structure and cleaned up importsSebastian Thiel2009-10-121-1/+1
|
* Fixed remaining tests to deal with the changesSebastian Thiel2009-10-111-0/+4
| | | | mode is now generally an int compatible to the stat module
* commit: fixed failing commit tests as the mocked git command would always ↵Sebastian Thiel2009-10-111-2/+2
| | | | | | return the same thing which does not work anymore - re-implemented it in a more dynamic manner, but in the end tests will have to be revised anyway Added slots to Diff and Stats type respectively
* converted all spaces to tabs ( 4 spaces = 1 tab ) just to allow me and my ↵Sebastian Thiel2009-10-111-70/+70
| | | | editor to work with the files properly. Can convert it back for releaes
* diff regex are now precompiled on class level, renamed a|b_blob to ↵Sebastian Thiel2009-10-091-21/+24
| | | | | | | a|b_blob_id as it better reflects the actual value actor regex now precompiled on class level blob regex now precompiled on class level; made blame method more readable and faster although it can still be improved by making assumptions about the blame format and by reading the git command stream directly ( which is a general issue right now )
* Blob|Tree: renamed 'name' member to 'path', updated tests and changelog as ↵Sebastian Thiel2009-10-091-2/+2
| | | | it would make existing code incompatible in some places
* Fixed Diff class which used Commits instead of Blobs - as Blobs contain the ↵Sebastian Thiel2009-10-081-14/+41
| | | | | | path ( in the 'name' member variable ), the a|b_path members of Diff have been removed. Tests were adjusted and run Diff docs have been updated to provide a little more information on specifics cases
* Lots of spring cleaning and added in Sphinx documentation.Michael Trier2009-01-241-1/+1
|
* Added in new properties Diff.renamed, Diff.rename_from, and Diff.rename_toMichael Trier2008-12-151-3/+8
|
* add support for parsing rename info to the diff parserPaul Sowden2008-12-151-3/+7
| | | | | Currently the parsed headers are just ignored but I'll add them to the Diff object in a future commit (cherry picked from commit 711b655f29b42821c51be8e592143c7db31ed140)
* implement a far far faster diff parserPaul Sowden2008-12-151-42/+19
| | | | | The old diff parser in list_from_string took a large amount of time to parse long diffs, on one of my repositories it took over 3 minutes to parse the initial commit. The new parser uses a single regexp to match the header of a diff, and iterates over the each individual diff by splitting the entire string by the diff seperator, attempting to match the header for each individual diff. With the new parser parsing the same repository is almost instant, woohoo! (cherry picked from commit 5b6b27f153bdc30380bea12a528ef483571dd57a)
* Fix unneeded dict unpacking.Steve Frécinaux2008-09-051-2/+2
|
* Added license information to all files.Michael Trier2008-07-161-0/+6
|
* renamed git_python to git. Removed pop_key and replaced with dict.pop. Fixed ↵Michael Trier2008-05-301-0/+79
up tests so they pass except for stderr test. Modified version information retrieval.
View Lorry Controller Status