summaryrefslogtreecommitdiff
path: root/git
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge remote-tracking branch 'upstream/master' into ↵Vincent Driessen2016-04-194-13/+45
|\ | | | | | | enrich-incremental-blame-output
| * 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
| |
| * 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.
* | 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.
* | Drop dependency on sixVincent Driessen2016-04-142-4/+5
|/
* Merge pull request #402 from rrei/masterSebastian Thiel2016-04-141-2/+6
|\ | | | | | | | | Remove assertion over fetch refspec when explicitly specified Fixes #396
| * Remove assertion over fetch refspec when explicitly specifiedrrei2016-03-291-2/+6
| |
* | Merge pull request #409 from nvie/add-incremental-blame-supportSebastian Thiel2016-04-144-3/+134
|\ \ | | | | | | Add incremental blame support
| * | Allow passing args to git-blameVincent Driessen2016-04-131-3/+3
| | | | | | | | | | | | This can be used to pass options like -C or -M.
| * | Add incremental blame supportVincent Driessen2016-04-134-2/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a sibling method to Repo's blame method: Repo.blame_incremental(rev, path, **kwargs) This can alternatively be called using: Repo.blame(rev, path, incremental=True) The main difference is that blame incremental is a bit more efficient and does not return the full file's contents, just the commits and the line number ranges. The parser is a bit more straight-forward and faster since the incremental output format is defined a little stricter.
* | | fixed unittest of issue #407 for Python3Piotr Pietraszkiewicz2016-04-131-1/+1
| | |
* | | fix(index): avoid recursing endlessly in add()Piotr Pietraszkiewicz2016-04-132-3/+22
|/ / | | | | | | Issue #407
* | Fix testsVincent Driessen2016-04-071-3/+3
| |
* | Make sure .read() and friends always return bytesVincent Driessen2016-04-061-2/+2
|/
* fix(remote): asssertion message formattingSebastian Thiel2016-03-281-2/+3
| | | | Related to #396
* fix(refs): don't raise StopIterationSebastian Thiel2016-03-281-1/+1
| | | | Fixes #394
* Add test and fixture for diff index from raw formatJonathan Chu2016-03-162-0/+7
| | | | | | This tests the edge case of doing a diff against a single whitespace filename and returns the proper change type. All other normal usage of this diff classmethod should remain unchanged.
* Split diff line by '\t' for metadata and pathJonathan Chu2016-03-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | This protects against `.split(None)` which uses consecutive whitespace as a separator to overlook paths where a single space is the filename. For example, in this diff line: line = ':100644 000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 D ' The deleted file is a file named ' ' (just one space). It's entirely possible to commit this, remove, and to produce the following output from `git diff`: git diff --name-status <SHA1> <SHA2> D M path/to/another/file.py ... This would cause the initial `.split(None, 5)` to fail as it will count all consecutive whitespace as a separator, disregarding the ' ' (single space) filename.
* config parsers as context mangers can now be reentered for locksRaphael Boidol2016-03-062-15/+38
|
* Merge pull request #389 from csnover/csnover-buffer-readsSebastian Thiel2016-02-251-0/+1
|\ | | | | fix(cmd): Use buffered reads
| * fix(cmd): Use buffered readsColin Snover2016-02-241-0/+1
| | | | | | Popen defaults to using unbuffered reads, which are extremely slow.
* | Merge pull request #385 from yarikoptic/skip-testSebastian Thiel2016-02-251-0/+4
|\ \ | |/ |/| ENH: skip test_is_ancestor on git versions < 1.8.0 not supporting git merge-base --is-ancestor
| * ENH: skip test_is_ancestor on git versions < 1.8.0 not supporting git ↵Yaroslav Halchenko2016-02-141-0/+4
| | | | | | | | merge-base --is-ancestor
* | enable config parsers to be used as context managersRaphael Boidol2016-02-203-42/+51
| | | | | | | | if used as context managers, the parsers will automatically release their file locks.
* | fix(cmd): allow improved errors during clone operationSebastian Thiel2016-02-143-6/+7
| | | | | | | | Related to #383
* | fix(cmd): focus !Sebastian Thiel2016-02-131-1/+1
| | | | | | | | Thanks travis, once again !
* | fix(cmd): safely read from stderrSebastian Thiel2016-02-131-1/+9
|/ | | | Fixes #383
* fix(refs): set fixture different versionSebastian Thiel2016-02-111-1/+1
|
* chore(version): set to next patch releaseSebastian Thiel2016-02-111-1/+1
|
* fix(cmd): prevent deadlock on clone/fetch/pullSebastian Thiel2016-02-073-12/+7
| | | | | | | | | | | | | | | We keep stdout closed, which seems to have the side-effect of stdout being connected to your TTY, in case you run a terminal. However, this shold also prevent deadlocks, as only stderr is used. The alternative would have been to try to fetch lines concurrently, and we have been there. For clone(), `communicate()` is used, and with some luck this will just do the right thing. Even though last time I checked, it didn't ... ? Lets see. Stab at #72
* chore(flake8): unnused importSebastian Thiel2016-02-072-2/+1
|
* fix(clone): call communicate if there is no progress handlerSebastian Thiel2016-02-072-1/+2
| | | | | | Previously, it could have happened that pipes ran full, deadlocking the operation Related to #72
* DOC: minor typosYaroslav Halchenko2016-01-082-2/+2
|
* Fixed a non-Windows importAshley Whetter2015-12-211-3/+5
| | | | | signal.SIGKILL is not available on Windows so use signal.SIGTERM as a backup when SIGKILL is not available.
* fix(tree): remove Tree.cache - use IndexFile.write_tree() insteadSebastian Thiel2015-12-141-85/+0
| | | | | | For more information, see CHANGES.rst Fixes #369
* fix(tree): show that fixing Tree.cache is not possibleSebastian Thiel2015-12-142-43/+64
| | | | | | | | | | The problem is that a per-tree modification API cannot work properly, as the sorting is based on full paths of all entries within the repository. This feat can only be achieved by the index, which to my knowledge already does it correctly. The only fix is to remove the misleading API entirely, which will happen in the next commit. Related to #369
* chore(tree): remove dead codeSebastian Thiel2015-12-131-1/+0
| | | | [skip ci]
* fix(tree): tree item sort now uses git-styleSebastian Thiel2015-12-132-1/+69
| | | | | | | | | Previously it was possible to generate trees which didn't appear legit to git as gitpython's sorting was a simple alpha-numeric sort. Git uses one that minimizes literal string comparisons though, and thus behaves slightly differently sometimes. Fixes #369
* Forgot to update _num_op_codesThibault Clerice2015-12-021-1/+1
|
* Added CHECKING_OUT as a logged operationThibault Clerice2015-12-021-1/+3
| | | | Closes #330
* fix(commit): respect daylight saving when computing utc-offsetSebastian Thiel2015-11-082-2/+6
| | | | Related to #362
* Merge pull request #354 from dpursehouse/execute-timeoutSebastian Thiel2015-10-161-1/+50
|\ | | | | Include 'timeout' parameter in Git execute
| * Run os.kill for all child pids even after some of them are downOswin Nathanial2015-10-131-1/+4
| | | | | | | | | | | | | | | | Right now, we come out of the iteration in case of failure while trying to kill a child pid. This may result in some of the child pids staying alive. Change-Id: I18d58fcefec2bbdae4ae9bf73594939ade241b52
| * Update docstring for 'kill_after_timeout' parameterOswin Nathanial2015-10-131-1/+5
| | | | | | | | | | | | | | | | Specify that this feature is not supported on Windows and mention about the negative side-effects of SIGKILL on a repository. Change-Id: Ibba2c3f51f84084b4637ae9aaafa87dd84000ef4
View Lorry Controller Status