##// END OF EJS Templates
repair: use ProgrammingError
Jun Wu -
r31645:7095e783 default
parent child Browse files
Show More
@@ -163,8 +163,7 b' def strip(ui, repo, nodelist, backup=Tru'
163 curtr = repo.currenttransaction()
163 curtr = repo.currenttransaction()
164 if curtr is not None:
164 if curtr is not None:
165 del curtr # avoid carrying reference to transaction for nothing
165 del curtr # avoid carrying reference to transaction for nothing
166 msg = _('programming error: cannot strip from inside a transaction')
166 raise error.ProgrammingError('cannot strip from inside a transaction')
167 raise error.Abort(msg, hint=_('contact your extension maintainer'))
168
167
169 try:
168 try:
170 with repo.transaction("strip") as tr:
169 with repo.transaction("strip") as tr:
@@ -106,11 +106,10 b''
106 $ echo a > a
106 $ echo a > a
107 $ hg add a
107 $ hg add a
108 $ hg commit -m a
108 $ hg commit -m a
109 $ hg stripintr
109 $ hg stripintr 2>&1 | egrep -v '^(\*\*| )'
110 saved backup bundle to $TESTTMP/lock-checker/.hg/strip-backup/*-backup.hg (glob)
110 saved backup bundle to $TESTTMP/lock-checker/.hg/strip-backup/*-backup.hg (glob)
111 abort: programming error: cannot strip from inside a transaction
111 Traceback (most recent call last):
112 (contact your extension maintainer)
112 mercurial.error.ProgrammingError: cannot strip from inside a transaction
113 [255]
114
113
115 $ hg log -r "oldstyle()" -T '{rev}\n'
114 $ hg log -r "oldstyle()" -T '{rev}\n'
116 devel-warn: revset "oldstyle" uses list instead of smartset
115 devel-warn: revset "oldstyle" uses list instead of smartset
General Comments 0
You need to be logged in to leave comments. Login now