From 9989f8965f34af5009361ec58f80bbf3ca75b465 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 26 May 2016 08:52:30 +0200 Subject: import OrderedDict from git.odict rather than directly from collections, to pix Py2.6 compatibility --- git/cmd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git/cmd.py') diff --git a/git/cmd.py b/git/cmd.py index eef52534..bbbed62f 100644 --- a/git/cmd.py +++ b/git/cmd.py @@ -13,7 +13,7 @@ import threading import errno import mmap -from collections import OrderedDict +from git.odict import OrderedDict from contextlib import contextmanager import signal -- cgit v1.2.1 From 515a6b9ccf87bd1d3f5f2edd229d442706705df5 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Thu, 26 May 2016 19:41:00 +0200 Subject: fix(remote): use universal_newlines for fetch/push That way, real-time parsing of output should finally be possible. Related to #444 --- git/cmd.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'git/cmd.py') diff --git a/git/cmd.py b/git/cmd.py index bbbed62f..0c3cc8ca 100644 --- a/git/cmd.py +++ b/git/cmd.py @@ -44,7 +44,8 @@ from git.compat import ( execute_kwargs = ('istream', 'with_keep_cwd', 'with_extended_output', 'with_exceptions', 'as_process', 'stdout_as_string', - 'output_stream', 'with_stdout', 'kill_after_timeout') + 'output_stream', 'with_stdout', 'kill_after_timeout', + 'universal_newlines') log = logging.getLogger('git.cmd') log.addHandler(logging.NullHandler()) @@ -487,6 +488,7 @@ class Git(LazyMixin): stdout_as_string=True, kill_after_timeout=None, with_stdout=True, + universal_newlines=False, **subprocess_kwargs ): """Handles executing the command on the shell and consumes and returns @@ -541,7 +543,9 @@ class Git(LazyMixin): specify may not be the same ones. :param with_stdout: If True, default True, we open stdout on the created process - + :param universal_newlines: + if True, pipes will be opened as text, and lines are split at + all known line endings. :param kill_after_timeout: To specify a timeout in seconds for the git command, after which the process should be killed. This will have no effect if as_process is set to True. It is @@ -608,6 +612,7 @@ class Git(LazyMixin): stdout=with_stdout and PIPE or open(os.devnull, 'wb'), shell=self.USE_SHELL, close_fds=(os.name == 'posix'), # unsupported on windows + universal_newlines=universal_newlines, **subprocess_kwargs ) except cmd_not_found_exception as err: -- cgit v1.2.1 From 39164b038409cb66960524e19f60e83d68790325 Mon Sep 17 00:00:00 2001 From: Aleksander Nitecki Date: Thu, 26 May 2016 23:51:19 +0200 Subject: Use proper syntax for conditional expression (instead of abusing the "short-circuit" property of logical operations) --- git/cmd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git/cmd.py') diff --git a/git/cmd.py b/git/cmd.py index 0c3cc8ca..c29e3485 100644 --- a/git/cmd.py +++ b/git/cmd.py @@ -609,7 +609,7 @@ class Git(LazyMixin): bufsize=-1, stdin=istream, stderr=PIPE, - stdout=with_stdout and PIPE or open(os.devnull, 'wb'), + stdout=PIPE if with_stdout else open(os.devnull, 'wb'), shell=self.USE_SHELL, close_fds=(os.name == 'posix'), # unsupported on windows universal_newlines=universal_newlines, -- cgit v1.2.1