| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,3 +1,3 @@ | |||
| 1 | - [submodule "gitdb"] | ||
| 2 | - path = git/ext/gitdb | ||
| 3 | - url = git://github.com/gitpython-developers/gitdb.git | ||
| 1 | + [submodule "gitdb"] | ||
| 2 | + path = git/ext/gitdb | ||
| 3 | + url = git://github.com/gitpython-developers/gitdb.git | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -49,7 +49,7 @@ def digest_process_messages(fh, progress): | |||
| 49 | 49 | if not char: | |
| 50 | 50 | break | |
| 51 | 51 | ||
| 52 | - if char in ('\r', '\n'): | ||
| 52 | + if char in ('\r', '\n') and line_so_far: | ||
| 53 | 53 | dropped_lines.extend(progress._parse_progress_line(line_so_far)) | |
| 54 | 54 | line_so_far = '' | |
| 55 | 55 | else: | |
@@ -510,7 +510,7 @@ def _get_fetch_info_from_stderr(self, proc, progress): | |||
| 510 | 510 | fetch_head_info = fp.readlines() | |
| 511 | 511 | fp.close() | |
| 512 | 512 | ||
| 513 | - assert len(fetch_info_lines) == len(fetch_head_info) | ||
| 513 | + assert len(fetch_info_lines) == len(fetch_head_info), "len(%s) != len(%s)" % (fetch_head_info, fetch_info_lines) | ||
| 514 | 514 | ||
| 515 | 515 | output.extend(FetchInfo._from_line(self.repo, err_line, fetch_line) | |
| 516 | 516 | for err_line,fetch_line in zip(fetch_info_lines, fetch_head_info)) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -176,7 +176,18 @@ def _parse_progress_line(self, line): | |||
| 176 | 176 | elif op_name == 'Resolving deltas': | |
| 177 | 177 | op_code |= self.RESOLVING | |
| 178 | 178 | else: | |
| 179 | - raise ValueError("Operation name %r unknown" % op_name) | ||
| 179 | + # Note: On windows it can happen that partial lines are sent | ||
| 180 | + # Hence we get something like "CompreReceiving objects", which is | ||
| 181 | + # a blend of "Compressing objects" and "Receiving objects". | ||
| 182 | + # This can't really be prevented, so we drop the line verbosely | ||
| 183 | + # to make sure we get informed in case the process spits out new | ||
| 184 | + # commands at some point. | ||
| 185 | + self.line_dropped(sline) | ||
| 186 | + sys.stderr.write("Operation name %r unknown - skipping line '%s'" % (op_name, sline)) | ||
| 187 | + # Note: Don't add this line to the failed lines, as we have to silently | ||
| 188 | + # drop it | ||
| 189 | + return failed_lines | ||
| 190 | + # END handle op code | ||
| 180 | 191 | ||
| 181 | 192 | # figure out stage | |
| 182 | 193 | if op_code not in self._seen_ops: | |
| Back | FazBrowse Home | New Git URL |
0 commit comments