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
17
from .branch import Branch
18
from .trace import note
19
from .errors import NoSuchRevision, BzrCommandError
22
class GhostFetcher(object):
25
def from_cmdline(klass, other):
26
this_branch = Branch.open_containing('.')[0]
28
other = this_branch.get_parent()
30
raise BzrCommandError('No branch specified and no location'
33
note("Using saved location %s.", other)
34
other_branch = Branch.open_containing(other)[0]
35
return klass(this_branch, other_branch)
37
def __init__(self, this_branch, other_branch):
38
self.this_branch = this_branch
39
self.other_branch = other_branch
42
lock_other = self.this_branch.base != self.other_branch.base
43
self.this_branch.lock_write()
46
self.other_branch.lock_read()
48
return self._run_locked()
51
self.other_branch.unlock()
53
self.this_branch.unlock()
55
def iter_ghosts(self):
56
"""Find all ancestors that aren't stored in this branch."""
58
lines = [self.this_branch.last_revision()]
68
revision = self.this_branch.repository.get_revision(line)
69
new_lines.extend(revision.parent_ids)
70
except NoSuchRevision:
74
def _run_locked(self):
77
if self.this_branch.last_revision() is None:
78
print("No revisions in branch.")
80
# Because iter_ghosts tests for existence after our last fetch
81
# is complete, it won't falsely report an ancestor as a ghost.
83
ghosts = self.iter_ghosts()
84
for revision in ghosts:
86
self.this_branch.fetch(self.other_branch, revision)
87
installed.append(revision)
88
except NoSuchRevision:
89
failed.append(revision)
90
return installed, failed
93
def fetch_ghosts(branch, do_reconcile):
94
"""Install ghosts from copies in another branch."""
95
installed, failed = GhostFetcher.from_cmdline(branch).run()
96
if len(installed) > 0:
101
print("Still missing:")
104
if do_reconcile and len(installed) > 0:
105
from .builtins import cmd_reconcile
106
cmd_reconcile().run(".")