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.trace import note
18
from bzrlib.errors import NoSuchRevision, BzrCommandError
20
class GhostFetcher(object):
23
def from_cmdline(klass, other):
24
this_branch = Branch.open_containing('.')[0]
26
other = this_branch.get_parent()
28
raise BzrCommandError('No branch specified and no location'
31
note("Using saved location %s.", other)
32
other_branch = Branch.open_containing(other)[0]
33
return klass(this_branch, other_branch)
35
def __init__(self, this_branch, other_branch):
36
self.this_branch = this_branch
37
self.other_branch = other_branch
40
lock_other = self.this_branch.base != self.other_branch.base
41
self.this_branch.lock_write()
44
self.other_branch.lock_read()
46
return self._run_locked()
49
self.other_branch.unlock()
51
self.this_branch.unlock()
53
def iter_ghosts(self):
54
"""Find all ancestors that aren't stored in this branch."""
56
lines = [self.this_branch.last_revision()]
66
revision = self.this_branch.repository.get_revision(line)
67
new_lines.extend(revision.parent_ids)
68
except NoSuchRevision:
72
def _run_locked(self):
75
if self.this_branch.last_revision() is None:
76
print "No revisions in branch."
78
# Because iter_ghosts tests for existence after our last fetch
79
# is complete, it won't falsely report an ancestor as a ghost.
81
ghosts = self.iter_ghosts()
82
for revision in ghosts:
84
self.this_branch.fetch(self.other_branch, revision)
85
installed.append(revision)
86
except NoSuchRevision:
87
failed.append(revision)
88
return installed, failed
90
def fetch_ghosts(branch, do_reconcile):
91
"""Install ghosts from copies in another branch."""
92
installed, failed = GhostFetcher.from_cmdline(branch).run()
93
if len(installed) > 0:
98
print "Still missing:"
101
if do_reconcile and len(installed) > 0:
102
from bzrlib.builtins import cmd_reconcile
103
cmd_reconcile().run(".")