/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to commands.py

https://launchpad.net/bugs/400598
Avoid 'No such revision' error when encountering submodules.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commands.py
28
28
    Option,
29
29
    )
30
30
 
 
31
from bzrlib.plugins.git import (
 
32
    get_rich_root_format,
 
33
    )
31
34
 
32
35
class cmd_git_import(Command):
33
36
    """Import all branches from a git repository.
54
57
            InterRepository,
55
58
            Repository,
56
59
            )
57
 
        from bzrlib.plugins.git.branch import (
58
 
            GitBranch,
59
 
            extract_tags,
60
 
            )
 
60
        from bzrlib.plugins.git.branch import GitBranch
61
61
        from bzrlib.plugins.git.repository import GitRepository
62
62
 
63
63
        if dest_location is None:
66
66
        source_repo = Repository.open(src_location)
67
67
        if not isinstance(source_repo, GitRepository):
68
68
            raise BzrCommandError("%r is not a git repository" % src_location)
 
69
        format = get_rich_root_format()
69
70
        try:
70
71
            target_bzrdir = BzrDir.open(dest_location)
71
72
        except NotBranchError:
72
 
            target_bzrdir = BzrDir.create(dest_location)
 
73
            target_bzrdir = BzrDir.create(dest_location, format=format)
73
74
        try:
74
 
            target_repo = target_bzrdir.find_repository()
 
75
            target_repo = target_bzrdir.open_repository()
75
76
        except NoRepositoryPresent:
76
77
            target_repo = target_bzrdir.create_repository(shared=True)
77
78
 
80
81
 
81
82
        interrepo = InterRepository.get(source_repo, target_repo)
82
83
        mapping = source_repo.get_mapping()
83
 
        refs = interrepo.fetch()
84
 
        tags = {}
85
 
        for k, v in extract_tags(refs).iteritems():
86
 
            tags[k] = mapping.revision_id_foreign_to_bzr(v)
 
84
        refs = interrepo.fetch_refs()
87
85
        pb = ui.ui_factory.nested_progress_bar()
88
86
        try:
89
87
            for i, (name, ref) in enumerate(refs.iteritems()):
97
95
                    parent_path = urlutils.dirname(head_loc)
98
96
                    if not os.path.isdir(parent_path):
99
97
                        os.makedirs(parent_path)
100
 
                    head_bzrdir = BzrDir.create(head_loc)
 
98
                    head_bzrdir = BzrDir.create(head_loc, format=format)
101
99
                try:
102
100
                    head_branch = head_bzrdir.open_branch()
103
101
                except NotBranchError:
104
102
                    head_branch = head_bzrdir.create_branch()
105
103
                revid = mapping.revision_id_foreign_to_bzr(ref)
106
 
                source_branch = GitBranch(source_repo.bzrdir, source_repo,
107
 
                    name, None, tags)
 
104
                source_branch = GitBranch(source_repo.bzrdir, source_repo, 
 
105
                    name, None)
108
106
                source_branch.head = ref
109
 
                if head_branch.last_revision() != revid:
110
 
                    head_branch.generate_revision_history(revid)
 
107
                head_branch.generate_revision_history(revid)
111
108
                source_branch.tags.merge_to(head_branch.tags)
112
109
        finally:
113
110
            pb.finished()
115
112
 
116
113
class cmd_git_object(Command):
117
114
    """List or display Git objects by SHA.
118
 
 
 
115
    
119
116
    Cat a particular object's Git representation if a SHA is specified.
120
117
    List all available SHAs otherwise.
121
118
    """
124
121
 
125
122
    aliases = ["git-objects", "git-cat"]
126
123
    takes_args = ["sha1?"]
127
 
    takes_options = [Option('directory',
 
124
    takes_options = [Option('directory', 
128
125
        short_name='d',
129
126
        help='Location of repository.', type=unicode),
130
127
        Option('pretty', help='Pretty-print objects.')]
161
158
                    self.outf.write("%s\n" % sha1)
162
159
        finally:
163
160
            repo.unlock()
164
 
 
165
 
 
166
 
class cmd_git_refs(Command):
167
 
    """Output all of the virtual refs for a repository.
168
 
 
169
 
    """
170
 
 
171
 
    hidden = True
172
 
 
173
 
    takes_options = [Option('directory',
174
 
        short_name='d',
175
 
        help='Location of repository.', type=unicode)]
176
 
 
177
 
    @display_command
178
 
    def run(self, directory="."):
179
 
        from bzrlib.bzrdir import (
180
 
            BzrDir,
181
 
            )
182
 
        from bzrlib.plugins.git.refs import (
183
 
            BazaarRefsContainer,
184
 
            )
185
 
        from bzrlib.plugins.git.object_store import (
186
 
            get_object_store,
187
 
            )
188
 
        bzrdir, _ = BzrDir.open_containing(directory)
189
 
        repo = bzrdir.find_repository()
190
 
        repo.lock_read()
191
 
        try:
192
 
            object_store = get_object_store(repo)
193
 
            refs = BazaarRefsContainer(bzrdir, object_store)
194
 
            for k, v in refs.as_dict().iteritems():
195
 
                self.outf.write("%s -> %s\n" % (k, v))
196
 
        finally:
197
 
            repo.unlock()
198
 
 
199
 
 
200
 
class cmd_git_apply(Command):
201
 
    """Apply a series of git-am style patches.
202
 
 
203
 
    This command will in the future probably be integrated into 
204
 
    "bzr pull".
205
 
    """
206
 
 
207
 
    takes_args = ["patches*"]
208
 
 
209
 
    def _apply_patch(self, wt, f):
210
 
        from dulwich.patch import git_am_patch_split
211
 
        (c, diff, version) = git_am_patch_split(f)
212
 
        # FIXME: Process diff
213
 
        wt.commit(committer=c.committer,
214
 
                  message=c.message)
215
 
 
216
 
    def run(self, patches_list=None):
217
 
        from bzrlib.workingtree import WorkingTree
218
 
        if patches_list is None:
219
 
            patches_list = []
220
 
        
221
 
        tree, _ = WorkingTree.open_containing(".")
222
 
        tree.lock_write()
223
 
        try:
224
 
            for patch in patches_list:
225
 
                f = open(patch, 'r')
226
 
                try:
227
 
                    self._apply_patch(tree, f)
228
 
                finally:
229
 
                    f.close()
230
 
        finally:
231
 
            tree.unlock()