comparison mercurial/repair.py @ 16623:def6a19c3b4d

repair: no need to call filterunknown() in strip() Calling strip() will eventually trigger localrepo.destroyed() which will invalidate _parseroots. It will call filterunknown() upon reload. Changes to test-keyword.t are related to commit --debug running after either qpop or rollback.
author Patrick Mezard <patrick@mezard.eu>
date Thu, 10 May 2012 18:21:15 +0200
parents 692bf06bb1af
children 3c738cb162bf
comparison
equal deleted inserted replaced
16622:e4451d7432fa 16623:def6a19c3b4d
4 # Copyright 2007 Matt Mackall 4 # Copyright 2007 Matt Mackall
5 # 5 #
6 # This software may be used and distributed according to the terms of the 6 # This software may be used and distributed according to the terms of the
7 # GNU General Public License version 2 or any later version. 7 # GNU General Public License version 2 or any later version.
8 8
9 from mercurial import changegroup, bookmarks, phases 9 from mercurial import changegroup, bookmarks
10 from mercurial.node import short 10 from mercurial.node import short
11 from mercurial.i18n import _ 11 from mercurial.i18n import _
12 import os 12 import os
13 import errno 13 import errno
14 14
168 ui.warn(_("strip failed, partial bundle stored in '%s'\n") 168 ui.warn(_("strip failed, partial bundle stored in '%s'\n")
169 % chgrpfile) 169 % chgrpfile)
170 raise 170 raise
171 171
172 repo.destroyed() 172 repo.destroyed()
173
174 # remove potential unknown phase
175 # XXX using to_strip data would be faster
176 phases.filterunknown(repo)