~abentley/bzrtools/bzrtools.dev

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
216 by Aaron Bentley
Show branch location when using saved.
18
from bzrlib.errors import NoSuchRevision, InstallFailed, BzrCommandError
275.1.3 by Daniel Silverstone
Fix up fetch_ghosts to lock the branches, and to invoke bzr fix if it fetches any ghosts into the tree
19
def fetch_ghosts(branch, no_fix):
215 by Aaron Bentley
Renamed fetch-missing to fetch-ghosts.
20
    """Install ghosts from copies in another branch."""
234 by Aaron Bentley
Adopted Branch.open_containing's new format
21
    this_branch = Branch.open_containing('.')[0]
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()
216 by Aaron Bentley
Show branch location when using saved.
24
        if branch is None:
25
            raise BzrCommandError('No branch specified and no location saved.')
26
        else:
27
            print "Using saved location %s" % branch
150 by abentley
Made fetch_missing use the x-pull file
28
234 by Aaron Bentley
Adopted Branch.open_containing's new format
29
    other_branch = Branch.open_containing(branch)[0]
144 by aaron.bentley at utoronto
Added fetch-missing command
30
    installed = []
31
    failed = []
275.1.3 by Daniel Silverstone
Fix up fetch_ghosts to lock the branches, and to invoke bzr fix if it fetches any ghosts into the tree
32
    lock_other = this_branch.base != other_branch.base
33
    
34
    this_branch.lock_write()
35
    try:
36
        if lock_other:
37
            other_branch.lock_read()
144 by aaron.bentley at utoronto
Added fetch-missing command
38
        try:
275.1.3 by Daniel Silverstone
Fix up fetch_ghosts to lock the branches, and to invoke bzr fix if it fetches any ghosts into the tree
39
            # Because iter_ghosts tests for existence after our last fetch
40
            # is complete, it won't falsely report an ancestor as a ghost.
41
            # Yay iterators!
42
            ghosts = iter_ghosts(this_branch)
43
            for revision in ghosts:
44
                try:
45
                    greedy_fetch(this_branch, other_branch, revision)
46
                    installed.append(revision)
47
                except InstallFailed:
48
                    failed.append(revision)
49
            if len(installed) > 0:
50
                print "Installed:"
51
                for rev in installed:
52
                    print rev
53
            if len(failed) > 0:
54
                print "Still missing:"
55
                for rev in failed:
56
                    print rev
57
        finally:
58
            if lock_other:
59
                other_branch.unlock()
60
    finally:
61
        this_branch.unlock()
144 by aaron.bentley at utoronto
Added fetch-missing command
62
275.1.3 by Daniel Silverstone
Fix up fetch_ghosts to lock the branches, and to invoke bzr fix if it fetches any ghosts into the tree
63
    if not no_fix and len(installed) > 0:
64
        from reweave_inventory import cmd_fix
65
        cmd_fix().run(".")
66
        
215 by Aaron Bentley
Renamed fetch-missing to fetch-ghosts.
67
def iter_ghosts(branch):
144 by aaron.bentley at utoronto
Added fetch-missing command
68
    """Find all ancestors that aren't stored in this branch."""
69
    seen = set()
208 by Aaron Bentley
Fixed last_revision calls
70
    lines = [branch.last_revision()]
144 by aaron.bentley at utoronto
Added fetch-missing command
71
    while len(lines) > 0:
72
        new_lines = []
73
        for line in lines:
74
            if line in seen:
75
                continue
76
            seen.add(line)
77
            try:
78
                revision = branch.get_revision(line)
214 by Aaron Bentley
Got fetch_missing iterating properly. Can't actually fetch missing right now.
79
                new_lines.extend(revision.parent_ids)
144 by aaron.bentley at utoronto
Added fetch-missing command
80
            except NoSuchRevision:
81
                yield line
82
        lines = new_lines