144
by aaron.bentley at utoronto
Added fetch-missing command |
1 |
# Copyright (C) 2005 by Aaron Bentley
|
2 |
||
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.
|
|
7 |
||
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.
|
|
12 |
||
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
|
|
158
by Aaron Bentley
Updated to match API changes |
16 |
from bzrlib.branch import Branch |
144
by aaron.bentley at utoronto
Added fetch-missing command |
17 |
from bzrlib.fetch import greedy_fetch |
18 |
from bzrlib.errors import NoSuchRevision, InstallFailed |
|
19 |
def fetch_missing(branch): |
|
20 |
"""Install the revisions of missing ancestors from another branch."""
|
|
158
by Aaron Bentley
Updated to match API changes |
21 |
this_branch = Branch.open_containing('.') |
150
by abentley
Made fetch_missing use the x-pull file |
22 |
if branch is None: |
163
by Aaron Bentley
switched fetch_missing to use 'parent', not 'x-pull' |
23 |
branch = this_branch.get_parent() |
150
by abentley
Made fetch_missing use the x-pull file |
24 |
|
158
by Aaron Bentley
Updated to match API changes |
25 |
other_branch = Branch.open_containing(branch) |
144
by aaron.bentley at utoronto
Added fetch-missing command |
26 |
installed = [] |
27 |
failed = [] |
|
28 |
||
29 |
# Because iter_missing_ancestors tests for existence after our last fetch
|
|
30 |
# is complete, it won't falsely report an ancestor as missing.
|
|
31 |
# Yay iterators!
|
|
32 |
missing = iter_missing_ancestors(this_branch) |
|
33 |
for revision in missing: |
|
34 |
try: |
|
35 |
greedy_fetch(this_branch, other_branch, revision) |
|
36 |
installed.append(revision) |
|
37 |
except InstallFailed: |
|
38 |
failed.append(revision) |
|
39 |
if len(installed) > 0: |
|
40 |
print "Installed:" |
|
41 |
for rev in installed: |
|
42 |
print rev |
|
43 |
if len(failed) > 0: |
|
44 |
print "Still missing:" |
|
45 |
for rev in failed: |
|
46 |
print rev |
|
47 |
||
48 |
def iter_missing_ancestors(branch): |
|
49 |
"""Find all ancestors that aren't stored in this branch."""
|
|
50 |
seen = set() |
|
51 |
lines = [branch.last_patch()] |
|
52 |
while len(lines) > 0: |
|
53 |
new_lines = [] |
|
54 |
for line in lines: |
|
55 |
if line in seen: |
|
56 |
continue
|
|
57 |
seen.add(line) |
|
58 |
try: |
|
59 |
revision = branch.get_revision(line) |
|
60 |
new_lines.extend([r.revision_id for r in revision.parents]) |
|
61 |
except NoSuchRevision: |
|
62 |
yield line |
|
63 |
lines = new_lines |