##// END OF EJS Templates
bundle2: add an error message to push race error...
Pierre-Yves David -
r21185:5b3717e1 stable
parent child Browse files
Show More
@@ -730,7 +730,8 b' def handlechangegroup(op, inpart):'
730 h = inpart.read(20)
730 h = inpart.read(20)
731 assert not h
731 assert not h
732 if heads != op.repo.heads():
732 if heads != op.repo.heads():
733 raise error.PushRaced()
733 raise error.PushRaced('repository changed while pushing - '
734 'please try again')
734
735
735 @parthandler('b2x:output')
736 @parthandler('b2x:output')
736 def handleoutput(op, inpart):
737 def handleoutput(op, inpart):
@@ -139,7 +139,7 b' Create an extension to test bundle2 API'
139 > except KeyError, exc:
139 > except KeyError, exc:
140 > raise util.Abort('missing support for %s' % exc)
140 > raise util.Abort('missing support for %s' % exc)
141 > except error.PushRaced, exc:
141 > except error.PushRaced, exc:
142 > raise util.Abort('push race')
142 > raise util.Abort('push race: %s' % exc)
143 > finally:
143 > finally:
144 > if tr is not None:
144 > if tr is not None:
145 > tr.release()
145 > tr.release()
@@ -615,7 +615,7 b' Test push race detection'
615
615
616 $ hg unbundle2 < ../part-race.hg2
616 $ hg unbundle2 < ../part-race.hg2
617 0 unread bytes
617 0 unread bytes
618 abort: push race
618 abort: push race: repository changed while pushing - please try again
619 [255]
619 [255]
620
620
621 Support for changegroup
621 Support for changegroup
General Comments 0
You need to be logged in to leave comments. Login now