Steve Borho avatar Steve Borho committed 12c8032

patchctx: catch AttributeError from record.parsepatch() (fixes #710)

The problem patch is still not usable, but at least the shelve tool is otherwise
functional

Comments (0)

Files changed (1)

tortoisehg/util/patchctx.py

                         files[path] = [chunk]
                         self._fileorder.append(path)
                     files[path].extend(chunk.hunks)
-            except patch.PatchError, e:
+            except (patch.PatchError, AttributeError), e:
                 self._status[2].append(self._parseErrorFileName)
                 files[self._parseErrorFileName] = []
                 self._parseerror = e
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.