1
# Copyright (C) 2005 by Aaron Bentley
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
from bzrlib.branch import Branch
17
from bzrlib.errors import NoSuchRevision, InstallFailed, BzrCommandError
18
def fetch_ghosts(branch, no_fix):
19
"""Install ghosts from copies in another branch."""
20
this_branch = Branch.open_containing('.')[0]
22
branch = this_branch.get_parent()
24
raise BzrCommandError('No branch specified and no location saved.')
26
print "Using saved location %s" % branch
28
other_branch = Branch.open_containing(branch)[0]
31
lock_other = this_branch.base != other_branch.base
33
this_branch.lock_write()
36
other_branch.lock_read()
38
# Because iter_ghosts tests for existence after our last fetch
39
# is complete, it won't falsely report an ancestor as a ghost.
41
ghosts = iter_ghosts(this_branch)
42
for revision in ghosts:
44
this_branch.fetch(other_branch, revision)
45
installed.append(revision)
47
failed.append(revision)
49
if this_branch.last_revision() is None:
50
print "No revisions in branch."
51
if len(installed) > 0:
56
print "Still missing:"
65
if not no_fix and len(installed) > 0:
66
from bzrlib.builtins import cmd_reconcile
67
cmd_reconcile().run(".")
69
def iter_ghosts(branch):
70
"""Find all ancestors that aren't stored in this branch."""
72
lines = [branch.last_revision()]
82
revision = branch.repository.get_revision(line)
83
new_lines.extend(revision.parent_ids)
84
except NoSuchRevision: