Mercurial > hg > mercurial-crew
comparison tests/test-bundle2.t @ 21185:5b3717e1a3ea stable
bundle2: add an error message to push race error
Errors with no explanations makes my uncle Bob sad.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Mon, 21 Apr 2014 20:04:54 -0700 |
parents | 28d76afa1568 |
children | 9f3652e851f8 |
comparison
equal
deleted
inserted
replaced
21184:28d76afa1568 | 21185:5b3717e1a3ea |
---|---|
137 > op = bundle2.processbundle(repo, unbundler, lambda: tr) | 137 > op = bundle2.processbundle(repo, unbundler, lambda: tr) |
138 > tr.close() | 138 > tr.close() |
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() |
146 > lock.release() | 146 > lock.release() |
147 > remains = sys.stdin.read() | 147 > remains = sys.stdin.read() |
613 | 613 |
614 $ hg bundle2 --pushrace ../part-race.hg2 | 614 $ hg bundle2 --pushrace ../part-race.hg2 |
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 |
622 =================================== | 622 =================================== |
623 | 623 |