summaryrefslogtreecommitdiff
path: root/git
Commit message (Collapse)AuthorAgeFilesLines
* use $GIT_DIR when setPiotr Gaczkowski2016-08-171-1/+1
|
* Merge pull request #496 from haizaar/masterSebastian Thiel2016-08-022-4/+25
|\ | | | | is_dirty supports path. Fixes #482.
| * is_dirty supports path. Fixes #482.Zaar Hai2016-08-012-4/+25
| |
* | refactor(cmd): streamline usage of creationflagsSebastian Thiel2016-08-021-13/+4
| |
* | fix flake8 problemsBarry Scott2016-08-011-3/+3
| |
* | add test to detect the corrupt logBarry Scott2016-08-011-1/+12
| | | | | | | | - add a second line to commit messages with the "BAD MESSAGE" text - read in the log and confirm that the seond line is not in the log file
* | creationflags must be set to 0 on non-windows platformsBarry Scott2016-08-011-4/+5
| |
* | Must pass creationflags as a keyworkBarry Scott2016-08-011-1/+1
| |
* | Prevent CMD windows being shown when starting git in a subprocess.Barry Scott2016-07-291-1/+14
| | | | | | | | | | This fixes a UI problem with using GitPython from a GUI python probgram. Each repo that is opened creates a git cat-file processs and that provess will create a console window with out this change.
* | Merge remote-tracking branch 'upstream/master'Barry Scott2016-07-297-11/+23
|\ \
| * \ Merge pull request #490 from bertwesarg/patch-1Sebastian Thiel2016-07-231-1/+1
| |\ \ | | | | | | | | Add missing newline when writing a symbolic ref.
| | * | Use binary string constant for concatenation.Bert Wesarg2016-07-191-1/+1
| | | |
| | * | Add missing newline when writing a symbolic ref.Bert Wesarg2016-07-191-1/+1
| | | |
| * | | fix(diff): use explicit change-type if possibleSebastian Thiel2016-07-233-5/+19
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | That way, we do not have to figure the change type out by examining the diff object. It's implemented in a way that should yield more desireable results as we keep the change-type that git is providing us with. Fixes #493
| * | fix(blame): lazily fetch full commit messageSebastian Thiel2016-07-172-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That way, we will not only get the summary line contained in the blame, but fetch the full message. This is more costly than the previous implementation allowed it to be, but being less surprising/correct certainly is the preferred behaviour here. Fixes #485
| * | chore(version-up): v2.0.72.0.7Sebastian Thiel2016-07-171-0/+0
| |/
* | Merge branch 'master' of https://github.com/gitpython-developers/GitPythonBarry Scott2016-07-1210-42/+183
|\ \ | |/
| * Commit without executing hooks, fixes #468Peter Bengtsson2016-06-201-3/+8
| |
| * fix(remote): lazy PushInfo.old_commit initializationSebastian Thiel2016-06-201-4/+7
| | | | | | | | | | | | | | | | We will now populate the old_commit on demand, which will allow us to keep going even if the given commit does not exist locally. Fixes #461
| * Merge branch 'master' into fix-non-ascii-chars-in-status-linesfix-non-ascii-chars-in-status-linesSebastian Thiel2016-06-203-18/+48
| |\
| | * Merge pull request #474 from gitpython-developers/keep-raw-bytes-on-diffsSebastian Thiel2016-06-203-18/+48
| | |\ | | | | | | | | Store raw path bytes in Diff instances
| | | * Store raw path bytes in Diff instanceskeep-raw-bytes-on-diffsVincent Driessen2016-06-143-18/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the following fields on Diff instances were assumed to be passed in as unicode strings: - `a_path` - `b_path` - `rename_from` - `rename_to` However, since Git natively records paths as bytes, these may potentially not have a valid unicode representation. This patch changes the Diff instance to instead take the following equivalent fields that should be raw bytes instead: - `a_rawpath` - `b_rawpath` - `raw_rename_from` - `raw_rename_to` NOTE ON BACKWARD COMPATIBILITY: The original `a_path`, `b_path`, etc. fields are still available as properties (rather than slots). These properties now dynamically decode the raw bytes into a unicode string (performing the potentially destructive operation of replacing invalid unicode chars by "�"'s). This means that all code using Diffs should remain backward compatible. The only exception is when people would manually construct Diff instances by calling the constructor directly, in which case they should now pass in bytes rather than unicode strings. See also the discussion on https://github.com/gitpython-developers/GitPython/pull/467
| * | | Merge branch 'master' into fix-non-ascii-chars-in-status-linesSebastian Thiel2016-06-201-5/+6
| |\ \ \ | | |/ /
| | * | Fix issue #470Barry Warsaw2016-06-151-5/+6
| | |/
| * | Fix for parsing non-ASCII chars in status linesVincent Driessen2016-06-141-1/+1
| |/
| * Python 2.6 compatVincent Driessen2016-06-141-1/+1
| |
| * fix(test_docs): skip master-dependent assertionSebastian Thiel2016-06-141-1/+3
| | | | | | | | | | It usually fails on branches, which doesn't help assessing PRs.
| * Merge pull request #446 from guyzmo/updating_remote_url_handlingSebastian Thiel2016-06-142-2/+95
| |\ | | | | | | Adding support for git remote set-url/get-url API to Remote
| | * Switching the `urls` property to use `git remote show` instead of `git ↵Guyzmo2016-06-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | remote get-url` `get-url` is a new API that is not widely available yet (introduced in git 2.7.0), and provokes failure on travis. Signed-off-by: Guyzmo <guyzmo+github@m0g.net>
| | * Adding support for git remote set-url/get-url API to RemoteGuyzmo2016-06-082-2/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both commands enable handling of a little known feature of git, which is to support multiple URL for one remote. You can add multiple url using the `set_url` subcommand of `git remote`. As listing them is also handy, there's a nice method to do it, using `get_url`. * adding set_url method that maps to the git remote set-url command¶ * can be used to set an URL, or replace an URL with optional positional arg¶ * can be used to add, delete URL with kwargs (matching set-url options)¶ * adding add_url, delete_url methods that wraps around set_url for conveniency¶ * adding urls property that yields an iterator over the setup urls for a remote¶ * adding a test suite that checks all use case scenarii of this added API.¶ Signed-off-by: Guyzmo <guyzmo+github@m0g.net>
| * | Merge pull request #467 from ↵Sebastian Thiel2016-06-143-10/+18
| |\ \ | | | | | | | | | | | | | | | | gitpython-developers/fix-dont-choke-on-invalid-unicode-paths Don't choke on (legitimately) invalidly encoded Unicode paths
| | * | Don't choke on (legitimately) invalidly encoded Unicode pathsfix-dont-choke-on-invalid-unicode-pathsVincent Driessen2016-06-063-10/+18
| | | |
| * | | fix(flake): misc whitespace fixesSebastian Thiel2016-06-143-3/+1
| | | |
* | | | fix flake8 found problemsBarry Scott2016-06-132-2/+1
| | | |
* | | | Fix corruption of the ref logs fileBarry Scott2016-06-131-2/+3
|/ / / | | | | | | | | | | | | It must only have the first line of the commit messages, not the while multiple line log.
* | | fix(cmd): allow any kind of status messageSebastian Thiel2016-06-131-1/+0
| | | | | | | | | | | | | | | I see no need in verifying the status code. It's enough to just get the error.
* | | fix(misc): various cleanupSebastian Thiel2016-06-134-48/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | Just went through all changes and adjusted them to the best of my abilities. As there are no tests to claim otherwise, I believe this is correct enough. However, it becomes evident that it's no longer possible to just make changes without backing them with a respective test.
* | | Merge branch 'pr-cmd-raise-with-stderr-on-error' of ↵Sebastian Thiel2016-06-133-9/+61
|\ \ \ | | | | | | | | | | | | https://github.com/barry-scott/GitPython into barry-scott-pr-cmd-raise-with-stderr-on-error
| * | | Can get a str object from stream.read rather then bytes.Barry Scott2016-06-061-1/+4
| | | | | | | | | | | | Convert to the expected bytes.
| * | | log all the output from stdout and stderr for debugging process failuresBarry Scott2016-06-061-1/+14
| | | |
| * | | Merge remote-tracking branch 'upstream/master' into ↵Barry Scott2016-06-069-18/+51
| |\ \ \ | | |/ / | | | | | | | | pr-cmd-raise-with-stderr-on-error
| * | | Make sure that stderr is converted to bytesBarry Scott2016-05-302-5/+14
| | | | | | | | | | | | remove stderr for a wait() that is not the GitPython wrapper.
| * | | Fix flake8 complaintsBarry Scott2016-05-302-4/+4
| | | |
| * | | Return stderr lines from a pull() call that failsBarry Scott2016-05-292-1/+13
| | | |
| * | | Return all the stderr messge after an error is detected for pull()Barry Scott2016-05-292-5/+20
| | | |
* | | | fix(repo): prevent error messages from being swallowedSebastian Thiel2016-06-131-1/+2
| |/ / |/| | | | | | | | | | | | | | | | | This issue must have rosen from `to_progress_instance()` being inserted in a spot where `None` was a legit value. Fixes #462
* | | Merge pull request #460 from ddanier/autointerrupt_del_no_os_killSebastian Thiel2016-06-021-1/+1
|\ \ \ | | | | | | | | Make sure os is not even partly destroyed
| * | | Make sure os is not even partly destroyedDavid Danier2016-06-011-1/+1
| | | |
* | | | fix(test): remove unused importSebastian Thiel2016-06-022-1/+1
|/ / /
* | | Fixed 'TypeError: decode() takes no keyword arguments' on Python 2.6Andreas Maier2016-06-011-3/+3
| | |
View Lorry Controller Status