Skip to content
Snippets Groups Projects
Commit 721165a4 authored by Brendan Cully's avatar Brendan Cully
Browse files

Catch GitProtocolError wherever HangupException can occur.

With recent changes to dulwich, this exception occurs in more places.
parent 15d36267
No related branches found
No related tags found
No related merge requests found
......@@ -563,8 +563,8 @@
self.ui.status(_("creating and sending data\n"))
changed_refs = client.send_pack(path, changed, genpack)
return changed_refs
except HangupException:
raise hgutil.Abort("the remote end hung up unexpectedly")
except (HangupException, GitProtocolError), e:
raise hgutil.Abort(_("git remote error: ") + str(e))
def get_changed_refs(self, refs, revs, force):
new_refs = refs.copy()
......@@ -673,8 +673,8 @@
try:
return client.fetch_pack(path, determine_wants, graphwalker,
f.write, self.ui.status)
except HangupException:
raise hgutil.Abort("the remote end hung up unexpectedly")
except (HangupException, GitProtocolError), e:
raise hgutil.Abort(_("git remote error: ") + str(e))
finally:
commit()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment