comparison mercurial/repair.py @ 15456:abcaaf51d568

phases: handle unknown nodes in boundary

We filter unknown node out of the boundary. No data is lost. A
filtering is explicitly done after strip too

15455:c6f87bdab2a1

# Copyright 2007 Matt Mackall
#
# 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
from mercurial.node import short
from mercurial.i18n import _
import os

def _bundle(repo, bases, heads, node, suffix, compress=True):

                os.unlink(chgrpfile)

        for m in updatebm:
            bm[m] = repo['.'].node()
        bookmarks.write(repo)

    except:
        if backupfile:
            ui.warn(_("strip failed, full bundle stored in '%s'\n")
                    % backupfile)
        elif saveheads:

15456:abcaaf51d568

# Copyright 2007 Matt Mackall
#
# 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.node import short
from mercurial.i18n import _
import os

def _bundle(repo, bases, heads, node, suffix, compress=True):

                os.unlink(chgrpfile)

        for m in updatebm:
            bm[m] = repo['.'].node()
        bookmarks.write(repo)
        # remove potential unknown phase
        # XXX using to_strip data would be faster
        phases.filterunknown(repo)
    except:
        if backupfile:
            ui.warn(_("strip failed, full bundle stored in '%s'\n")
                    % backupfile)
        elif saveheads: