summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* This is 2.0.22.0.2Vincent Driessen2016-04-282-1/+7
|
* Include doc sources in sdistVincent Driessen2016-04-281-0/+2
|
* Exclude *.pyc files from source tarballsVincent Driessen2016-04-251-0/+2
|
* Add contributorsVincent Driessen2016-04-241-0/+2
|
* Remove check that didn't work as expected2.0.1Vincent Driessen2016-04-241-1/+0
|
* This is 2.0.1Vincent Driessen2016-04-241-1/+1
|
* Automate steps to upload to PyPIVincent Driessen2016-04-242-24/+27
|
* Update changelogVincent Driessen2016-04-241-0/+5
|
* Allow "@" sign in fetch output linesVincent Driessen2016-04-241-2/+1
|
* Information on how to make a release on pypiSebastian Thiel2016-04-241-0/+27
|
* set upcoming versionSebastian Thiel2016-04-241-1/+1
|
* Travis should now be able to test tagsSebastian Thiel2016-04-241-1/+1
| | | | | | | | | | It's just a guess, maybe we are lucky. The original problem is that travis checks out tags without branches, and thus checking out master does only work if travis runs on master. With tags, it will only heckout and locally know the tag in question. The changes should allow it to retry and create the master branch instead.
* Fix assertion2.0.0Sebastian Thiel2016-04-221-1/+1
| | | | Who would have thought we ever go 2.0 ;).
* version 2.0.0Sebastian Thiel2016-04-222-10/+11
|
* Declare support for py3.5Sebastian Thiel2016-04-222-0/+2
|
* Add change log entryVincent Driessen2016-04-201-0/+2
|
* Bump minor insteadVincent Driessen2016-04-202-3/+3
|
* Add change log entryVincent Driessen2016-04-201-0/+3
|
* Merge pull request #414 from nvie/support-full-datetimes-on-commitsSebastian Thiel2016-04-203-2/+50
|\ | | | | Add support for getting "aware" datetime info
| * Fix accidentally added importVincent Driessen2016-04-191-1/+0
| |
| * Add support for getting "aware" datetime infoVincent Driessen2016-04-194-2/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds 2 properties to commits. Their values are derived from the existing data stored on them, but this makes them more conveniently queryable: - authored_datetime - committed_datetime These return "aware" datetimes, so they are effectively companions to their raw timestamp equivalents, respectively `authored_date` and `committed_date`. These datetime instances are convenient structures since they show the author-local commit date and their UTC offset.
* | Merge pull request #415 from nvie/fix-for-unicode-pathsSebastian Thiel2016-04-203-15/+139
|\ \ | | | | | | Fix diff patch parser for paths with unsafe chars
| * | Python 3 compat fixesVincent Driessen2016-04-202-2/+5
| | | | | | | | | | | | Specifically "string_escape" does not exist as an encoding anymore.
| * | Fix diff patch parser for paths with unsafe charsVincent Driessen2016-04-193-15/+136
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This specifically covers the cases where unsafe chars occur in path names, and git-diff -p will escape those. From the git-diff-tree manpage: > 3. TAB, LF, double quote and backslash characters in pathnames are > represented as \t, \n, \" and \\, respectively. If there is need > for such substitution then the whole pathname is put in double > quotes. This patch checks whether or not this has happened and will unescape those paths accordingly. One thing to note here is that, depending on the position in the patch format, those paths may be prefixed with an a/ or b/. I've specifically made sure to never interpret a path that actually starts with a/ or b/ incorrectly. Example of that subtlety below. Here, the actual file path is "b/normal". On the diff file that gets encoded as "b/b/normal". diff --git a/b/normal b/b/normal new file mode 100644 index 0000000000000000000000000000000000000000..eaf5f7510320b6a327fb308379de2f94d8859a54 --- /dev/null +++ b/b/normal @@ -0,0 +1 @@ +dummy content Here, we prefer the "---" and "+++" lines' values. Note that these paths start with a/ or b/. The only exception is the value "/dev/null", which is handled as a special case. Suppose now the file gets moved "b/moved", the output of that diff would then be this: diff --git a/b/normal b/b/moved similarity index 100% rename from b/normal rename to b/moved We prefer the "rename" lines' values in this case (the "diff" line is always a last resort). Take note that those lines are not prefixed with a/ or b/, but the ones in the "diff" line are (just like the ones in "---" or "+++" lines).
* | Allow "$" sign in fetch output linesVincent Driessen2016-04-201-1/+1
|/
* Merge pull request #413 from nvie/support-repeated-cmd-kwargsVincent Driessen2016-04-192-12/+24
|\ | | | | Support repeated kwargs
| * Support repeated kwargsVincent Driessen2016-04-192-12/+24
|/ | | | | | | | | | | | | Some Git command line options are allowed to be repeated multiple times. Examples of this are the -C flag which may occur more than once to "strengthen" its effect, or the -L flag on Git blames, to select multiple blocks of lines to blame. $ git diff -C -C HEAD~1 HEAD $ git blame -L 1-3 -L 12-18 HEAD -- somefile.py This patch supports passing a list/tuple as the value part for kwargs, so that the generated Git command contain the repeated options.
* Merge pull request #412 from nvie/fix-diff-patch-parsingVincent Driessen2016-04-195-19/+58
|\ | | | | Fix diff patch parsing
| * Fix order of regex partsVincent Driessen2016-04-191-3/+4
| | | | | | | | | | When both old/new mode and rename from/to lines are found, they will appear in different order.
| * Make test stricterVincent Driessen2016-04-191-1/+1
| |
| * Fix regexVincent Driessen2016-04-191-2/+2
| | | | | | | | | | | | This makes sure we're not matching a \n here by accident. It's now almost the same as the original that used \S+, except that spaces are not eaten at the end of the string (for files that end in a space).
| * Update changelogVincent Driessen2016-04-191-3/+17
| |
| * Make diff patch parsing more reliableVincent Driessen2016-04-194-14/+38
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | The a_path and b_path cannot reliably be read from the first diff line as it's ambiguous. From the git-diff manpage: > The a/ and b/ filenames are the same unless rename/copy is involved. > Especially, **even for a creation or a deletion**, /dev/null is not > used in place of the a/ or b/ filenames. This patch changes the a_path and b_path detection to read it from the more reliable locations further down the diff headers. Two use cases are fixed by this: - As the man page snippet above states, for new/deleted files the a or b path will now be properly None. - File names with spaces in it are now properly parsed. Working on this patch, I realized the --- and +++ lines really belong to the diff header, not the diff contents. This means that when parsing the patch format, the --- and +++ will now be swallowed, and not end up anymore as part of the diff contents. The diff contents now always start with an @@ line. This may be a breaking change for some users that rely on this behaviour. However, those users could now access that information more reliably via the normal Diff properties a_path and b_path now.
* Merge pull request #411 from nvie/enrich-incremental-blame-outputVincent Driessen2016-04-192-8/+25
|\ | | | | Enrich incremental blame output
| * Merge remote-tracking branch 'upstream/master' into ↵Vincent Driessen2016-04-198-16/+54
| |\ | |/ |/| | | enrich-incremental-blame-output
* | Merge pull request #408 from nvie/masterVincent Driessen2016-04-197-18/+55
|\ \ | | | | | | Add support for diffing against root commit
| * \ Merge remote-tracking branch 'upstream/master'Vincent Driessen2016-04-193-3/+1
| |\ \ | |/ / |/| |
* | | feat(py-support): drop py2.6 supportSebastian Thiel2016-04-193-2/+4
| | | | | | | | | | | | | | | In response to https://github.com/gitpython-developers/GitPython/pull/408/files/5de21c7fa2bdd5cd50c4f62ba848af54589167d0..aae2a7328a4d28077a4b4182b4f36f19c953765b#r59722704
| * | Remove Python 2.6 hackVincent Driessen2016-04-191-8/+1
| | | | | | | | | | | | Since support was dropped.
| * | Perform diff-tree recursively to have the same output as diffVincent Driessen2016-04-141-0/+2
| | |
| * | Drop dependency on sixVincent Driessen2016-04-142-4/+5
| | |
| * | Fix test casesVincent Driessen2016-04-141-4/+5
| | |
| * | Export NULL_TREEVincent Driessen2016-04-141-1/+1
| | |
| * | Update changelog for next releaseVincent Driessen2016-04-141-0/+7
| | |
| * | Use a special object rather than a stringVincent Driessen2016-04-141-2/+5
| | | | | | | | | | | | | | | This alternative API does not prevent users from using the valid treeish "root".
| * | Fix commentVincent Driessen2016-04-141-1/+3
| | |
| * | Support "root" as a special value in .diff() callsVincent Driessen2016-04-143-5/+36
| | | | | | | | | | | | This enabled getting diff patches for root commits.
| * | Add Python 3.5 envVincent Driessen2016-04-141-1/+1
| | |
| * | Pass through the $HOME env var to the tox envVincent Driessen2016-04-141-0/+1
|/ /
| * Return all available data from git-blameVincent Driessen2016-04-142-8/+25
| | | | | | | | | | Returning this now to avoid having to change the function's return value structure later on if we want to emit more information.