Merge remote-tracking branch 'upstream/master'

Author: barry-scott

.travis.yml

@@ -1,10 +1,14 @@
 language: python
 python:
+ - "2.6"
  - "2.7"
  - "3.3"
  - "3.4"
  - "3.5"
 # - "pypy" - won't work as smmap doesn't work (see gitdb/.travis.yml for details)
+matrix:
+allow_failures:
+ - python: "2.6"
 git:
 # a higher depth is needed for most of the tests - must be high enough to not actually be shallow
 # as we clone our own repository in the process

doc/source/intro.rst

@@ -14,7 +14,8 @@ Requirements
 ============
 
 * `Python`_ 2.7 or newer
- Since GitPython 2.0.0
+ Since GitPython 2.0.0. Please note that python 2.6 is still reasonably well supported, but might
+ deteriorate over time.
 * `Git`_ 1.7.0 or newer
  It should also work with older versions, but it may be that some operations
  involving remotes will not work as expected.

git/cmd.py

@@ -13,7 +13,7 @@
 importerrno
 importmmap
 
-fromcollectionsimportOrderedDict
+fromgit.odictimportOrderedDict
 
 fromcontextlibimportcontextmanager
 importsignal
@@ -44,7 +44,8 @@
 
 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 @@ def execute(self, command,
 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 @@ def execute(self, command,
  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
@@ -605,9 +609,10 @@ def execute(self, command,
 bufsize=-1,
 stdin=istream,
 stderr=PIPE,
-stdout=with_stdoutandPIPEoropen(os.devnull, 'wb'),
+stdout=PIPEifwith_stdoutelseopen(os.devnull, 'wb'),
 shell=self.USE_SHELL,
 close_fds=(os.name=='posix'), # unsupported on windows
+universal_newlines=universal_newlines,
 **subprocess_kwargs
  )
 exceptcmd_not_found_exceptionaserr:

git/remote.py

@@ -20,8 +20,6 @@
 SymbolicReference,
 TagReference
 )
-
-
 fromgit.utilimport (
 LazyMixin,
 Iterable,
@@ -34,7 +32,10 @@
 )
 fromgit.cmdimporthandle_process_output
 fromgitdb.utilimportjoin
-fromgit.compatimportdefenc
+fromgit.compatimport (defenc, force_text)
+importlogging
+
+log=logging.getLogger('git.remote')
 
 
 __all__= ('RemoteProgress', 'PushInfo', 'FetchInfo', 'Remote')
@@ -568,8 +569,8 @@ def _get_fetch_info_from_stderr(self, proc, progress):
 
 progress_handler=progress.new_message_handler()
 
-forlineinproc.stderr.readlines():
-line=line.decode(defenc)
+forlineinproc.stderr:
+line=force_text(line)
 forplineinprogress_handler(line):
 ifline.startswith('fatal:') orline.startswith('error:'):
 raiseGitCommandError(("Error when fetching: %s"%line,), 2)
@@ -589,11 +590,21 @@ def _get_fetch_info_from_stderr(self, proc, progress):
 fetch_head_info= [l.decode(defenc) forlinfp.readlines()]
 fp.close()
 
-# NOTE: We assume to fetch at least enough progress lines to allow matching each fetch head line with it.
 l_fil=len(fetch_info_lines)
 l_fhi=len(fetch_head_info)
-assertl_fil>=l_fhi, "len(%s) <= len(%s)"% (l_fil, l_fhi)
-
+ifl_fil!=l_fhi:
+msg="Fetch head lines do not match lines provided via progress information\n"
+msg+="length of progress lines %i should be equal to lines in FETCH_HEAD file %i\n"
+msg+="Will ignore extra progress lines or fetch head lines."
+msg%= (l_fil, l_fhi)
+log.debug(msg)
+ifl_fil<l_fhi:
+fetch_head_info=fetch_head_info[:l_fil]
+else:
+fetch_info_lines=fetch_info_lines[:l_fhi]
+# end truncate correct list
+# end sanity check + sanitization
+
 output.extend(FetchInfo._from_line(self.repo, err_line, fetch_line)
 forerr_line, fetch_lineinzip(fetch_info_lines, fetch_head_info))
 returnoutput
@@ -673,8 +684,8 @@ def fetch(self, refspec=None, progress=None, **kwargs):
 else:
 args= [refspec]
 
-proc=self.repo.git.fetch(self, *args, as_process=True, with_stdout=False,v=True,
-**kwargs)
+proc=self.repo.git.fetch(self, *args, as_process=True, with_stdout=False,
+universal_newlines=True, v=True, **kwargs)
 res=self._get_fetch_info_from_stderr(proc, progress)
 ifhasattr(self.repo.odb, 'update_cache'):
 self.repo.odb.update_cache()
@@ -692,7 +703,8 @@ def pull(self, refspec=None, progress=None, **kwargs):
 # No argument refspec, then ensure the repo's config has a fetch refspec.
 self._assert_refspec()
 kwargs=add_progress(kwargs, self.repo.git, progress)
-proc=self.repo.git.pull(self, refspec, with_stdout=False, as_process=True, v=True, **kwargs)
+proc=self.repo.git.pull(self, refspec, with_stdout=False, as_process=True,
+universal_newlines=True, v=True, **kwargs)
 res=self._get_fetch_info_from_stderr(proc, progress)
 ifhasattr(self.repo.odb, 'update_cache'):
 self.repo.odb.update_cache()
@@ -733,7 +745,8 @@ def push(self, refspec=None, progress=None, **kwargs):
  If the operation fails completely, the length of the returned IterableList will
  be null."""
 kwargs=add_progress(kwargs, self.repo.git, progress)
-proc=self.repo.git.push(self, refspec, porcelain=True, as_process=True, **kwargs)
+proc=self.repo.git.push(self, refspec, porcelain=True, as_process=True,
+universal_newlines=True, **kwargs)
 returnself._get_push_info(proc, progress)
 
 @property