mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
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.
This commit is contained in:
parent
df9b03eafa
commit
2940b01bad
@ -6,7 +6,7 @@
|
||||
# This software may be used and distributed according to the terms of the
|
||||
# GNU General Public License version 2 or any later version.
|
||||
|
||||
from mercurial import changegroup, bookmarks, phases
|
||||
from mercurial import changegroup, bookmarks
|
||||
from mercurial.node import short
|
||||
from mercurial.i18n import _
|
||||
import os
|
||||
@ -170,7 +170,3 @@ def strip(ui, repo, nodelist, backup="all", topic='backup'):
|
||||
raise
|
||||
|
||||
repo.destroyed()
|
||||
|
||||
# remove potential unknown phase
|
||||
# XXX using to_strip data would be faster
|
||||
phases.filterunknown(repo)
|
||||
|
@ -558,6 +558,7 @@ Commit and show expansion in original and copy
|
||||
$ hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>'
|
||||
c
|
||||
c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
|
||||
removing unknown node 40a904bbbe4c from 1-phase boundary
|
||||
overwriting c expanding keywords
|
||||
committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d
|
||||
$ cat a c
|
||||
@ -722,6 +723,7 @@ Commit with multiline message and custom expansion
|
||||
|
||||
$ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>'
|
||||
a
|
||||
removing unknown node 40a904bbbe4c from 1-phase boundary
|
||||
overwriting a expanding keywords
|
||||
committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83
|
||||
$ rm log
|
||||
|
Loading…
Reference in New Issue
Block a user