bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
0.200.206
by Jelmer Vernooij
 Move commands to a separate python module and register them lazily.  | 
1  | 
# Copyright (C) 2006-2009 Canonical Ltd
 | 
2  | 
||
3  | 
# Authors: Robert Collins <robert.collins@canonical.com>
 | 
|
4  | 
#          Jelmer Vernooij <jelmer@samba.org>
 | 
|
5  | 
#          John Carr <john.carr@unrouted.co.uk>
 | 
|
6  | 
#
 | 
|
7  | 
# This program is free software; you can redistribute it and/or modify
 | 
|
8  | 
# it under the terms of the GNU General Public License as published by
 | 
|
9  | 
# the Free Software Foundation; either version 2 of the License, or
 | 
|
10  | 
# (at your option) any later version.
 | 
|
11  | 
#
 | 
|
12  | 
# This program is distributed in the hope that it will be useful,
 | 
|
13  | 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
|
14  | 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
|
15  | 
# GNU General Public License for more details.
 | 
|
16  | 
#
 | 
|
17  | 
# You should have received a copy of the GNU General Public License
 | 
|
18  | 
# along with this program; if not, write to the Free Software
 | 
|
19  | 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | 
|
20  | 
||
21  | 
"""Git-specific subcommands for Bazaar."""
 | 
|
22  | 
||
| 
0.200.292
by Jelmer Vernooij
 Fix formatting.  | 
23  | 
from bzrlib.commands import (  | 
24  | 
Command,  | 
|
| 
0.200.423
by Jelmer Vernooij
 Support pretty-printing git objects.  | 
25  | 
display_command,  | 
| 
0.200.292
by Jelmer Vernooij
 Fix formatting.  | 
26  | 
    )
 | 
27  | 
from bzrlib.option import (  | 
|
28  | 
Option,  | 
|
29  | 
    )
 | 
|
| 
0.200.206
by Jelmer Vernooij
 Move commands to a separate python module and register them lazily.  | 
30  | 
|
| 
0.200.292
by Jelmer Vernooij
 Fix formatting.  | 
31  | 
from bzrlib.plugins.git import (  | 
32  | 
get_rich_root_format,  | 
|
33  | 
    )
 | 
|
| 
0.228.1
by Jelmer Vernooij
 Add basic tests for local fetch.  | 
34  | 
|
| 
0.200.206
by Jelmer Vernooij
 Move commands to a separate python module and register them lazily.  | 
35  | 
class cmd_git_import(Command):  | 
36  | 
"""Import all branches from a git repository.  | 
|
37  | 
||
38  | 
    """
 | 
|
39  | 
||
| 
0.200.234
by Jelmer Vernooij
 Derive to_location from from_location, simialr to bzr branch.  | 
40  | 
takes_args = ["src_location", "dest_location?"]  | 
| 
0.200.206
by Jelmer Vernooij
 Move commands to a separate python module and register them lazily.  | 
41  | 
|
| 
0.200.234
by Jelmer Vernooij
 Derive to_location from from_location, simialr to bzr branch.  | 
42  | 
def run(self, src_location, dest_location=None):  | 
| 
0.200.247
by Jelmer Vernooij
 Fix git-import.  | 
43  | 
import os  | 
44  | 
from bzrlib import (  | 
|
45  | 
ui,  | 
|
46  | 
urlutils,  | 
|
47  | 
            )
 | 
|
48  | 
from bzrlib.bzrdir import (  | 
|
49  | 
BzrDir,  | 
|
50  | 
            )
 | 
|
| 
0.200.243
by Jelmer Vernooij
 Error out on non-git repositories.  | 
51  | 
from bzrlib.errors import (  | 
52  | 
BzrCommandError,  | 
|
53  | 
NoRepositoryPresent,  | 
|
54  | 
NotBranchError,  | 
|
55  | 
            )
 | 
|
| 
0.200.306
by Jelmer Vernooij
 Fix tests, split up InterGitNonGitRepository.  | 
56  | 
from bzrlib.repository import (  | 
57  | 
InterRepository,  | 
|
58  | 
Repository,  | 
|
59  | 
            )
 | 
|
| 
0.239.1
by Jelmer Vernooij
 Avoid re-connecting to fetch tags we already know.  | 
60  | 
from bzrlib.plugins.git.branch import (  | 
61  | 
GitBranch,  | 
|
62  | 
extract_tags,  | 
|
63  | 
            )
 | 
|
| 
0.200.243
by Jelmer Vernooij
 Error out on non-git repositories.  | 
64  | 
from bzrlib.plugins.git.repository import GitRepository  | 
| 
0.200.234
by Jelmer Vernooij
 Derive to_location from from_location, simialr to bzr branch.  | 
65  | 
|
66  | 
if dest_location is None:  | 
|
67  | 
dest_location = os.path.basename(src_location.rstrip("/\\"))  | 
|
68  | 
||
| 
0.200.206
by Jelmer Vernooij
 Move commands to a separate python module and register them lazily.  | 
69  | 
source_repo = Repository.open(src_location)  | 
| 
0.200.243
by Jelmer Vernooij
 Error out on non-git repositories.  | 
70  | 
if not isinstance(source_repo, GitRepository):  | 
71  | 
raise BzrCommandError("%r is not a git repository" % src_location)  | 
|
| 
0.228.1
by Jelmer Vernooij
 Add basic tests for local fetch.  | 
72  | 
format = get_rich_root_format()  | 
| 
0.200.206
by Jelmer Vernooij
 Move commands to a separate python module and register them lazily.  | 
73  | 
try:  | 
74  | 
target_bzrdir = BzrDir.open(dest_location)  | 
|
75  | 
except NotBranchError:  | 
|
76  | 
target_bzrdir = BzrDir.create(dest_location, format=format)  | 
|
77  | 
try:  | 
|
| 
0.200.612
by Jelmer Vernooij
 Cope with Dulwich returning KeyError when a commit is not found.  | 
78  | 
target_repo = target_bzrdir.find_repository()  | 
| 
0.200.206
by Jelmer Vernooij
 Move commands to a separate python module and register them lazily.  | 
79  | 
except NoRepositoryPresent:  | 
80  | 
target_repo = target_bzrdir.create_repository(shared=True)  | 
|
81  | 
||
| 
0.200.569
by Jelmer Vernooij
 Check for rich root target repository.  | 
82  | 
if not target_repo.supports_rich_root():  | 
83  | 
raise BzrCommandError("Target repository doesn't support rich roots")  | 
|
84  | 
||
| 
0.200.306
by Jelmer Vernooij
 Fix tests, split up InterGitNonGitRepository.  | 
85  | 
interrepo = InterRepository.get(source_repo, target_repo)  | 
| 
0.200.247
by Jelmer Vernooij
 Fix git-import.  | 
86  | 
mapping = source_repo.get_mapping()  | 
87  | 
refs = interrepo.fetch_refs()  | 
|
| 
0.200.648
by Jelmer Vernooij
 Fix tag handling when encountering packed refs.  | 
88  | 
tags = {}  | 
89  | 
for k, v in extract_tags(refs).iteritems():  | 
|
90  | 
tags[k] = mapping.revision_id_foreign_to_bzr(v)  | 
|
| 
0.200.247
by Jelmer Vernooij
 Fix git-import.  | 
91  | 
pb = ui.ui_factory.nested_progress_bar()  | 
92  | 
try:  | 
|
93  | 
for i, (name, ref) in enumerate(refs.iteritems()):  | 
|
| 
0.200.271
by Jelmer Vernooij
 Stop importing tags as branches as part of git-import.  | 
94  | 
if name.startswith("refs/tags/"):  | 
95  | 
                    continue
 | 
|
| 
0.200.247
by Jelmer Vernooij
 Fix git-import.  | 
96  | 
pb.update("creating branches", i, len(refs))  | 
97  | 
head_loc = os.path.join(dest_location, name)  | 
|
98  | 
try:  | 
|
99  | 
head_bzrdir = BzrDir.open(head_loc)  | 
|
100  | 
except NotBranchError:  | 
|
101  | 
parent_path = urlutils.dirname(head_loc)  | 
|
102  | 
if not os.path.isdir(parent_path):  | 
|
103  | 
os.makedirs(parent_path)  | 
|
104  | 
head_bzrdir = BzrDir.create(head_loc, format=format)  | 
|
105  | 
try:  | 
|
106  | 
head_branch = head_bzrdir.open_branch()  | 
|
107  | 
except NotBranchError:  | 
|
108  | 
head_branch = head_bzrdir.create_branch()  | 
|
| 
0.200.271
by Jelmer Vernooij
 Stop importing tags as branches as part of git-import.  | 
109  | 
revid = mapping.revision_id_foreign_to_bzr(ref)  | 
| 
0.200.695
by Jelmer Vernooij
 Clean up trailing whitespace.  | 
110  | 
source_branch = GitBranch(source_repo.bzrdir, source_repo,  | 
| 
0.239.1
by Jelmer Vernooij
 Avoid re-connecting to fetch tags we already know.  | 
111  | 
name, None, tags)  | 
| 
0.200.488
by Jelmer Vernooij
 Fix git-import.  | 
112  | 
source_branch.head = ref  | 
| 
0.239.1
by Jelmer Vernooij
 Avoid re-connecting to fetch tags we already know.  | 
113  | 
if head_branch.last_revision() != revid:  | 
114  | 
head_branch.generate_revision_history(revid)  | 
|
| 
0.200.273
by Jelmer Vernooij
 Fix import of tags in git-import.  | 
115  | 
source_branch.tags.merge_to(head_branch.tags)  | 
| 
0.200.247
by Jelmer Vernooij
 Fix git-import.  | 
116  | 
finally:  | 
117  | 
pb.finished()  | 
|
| 
0.200.206
by Jelmer Vernooij
 Move commands to a separate python module and register them lazily.  | 
118  | 
|
| 
0.200.419
by Jelmer Vernooij
 Add hidden git-cat command that can cat git objects from Bazaar repositories.  | 
119  | 
|
| 
0.200.422
by Jelmer Vernooij
 'bzr git-object' without arguments now prints the available git objects.  | 
120  | 
class cmd_git_object(Command):  | 
121  | 
"""List or display Git objects by SHA.  | 
|
| 
0.200.695
by Jelmer Vernooij
 Clean up trailing whitespace.  | 
122  | 
|
| 
0.200.422
by Jelmer Vernooij
 'bzr git-object' without arguments now prints the available git objects.  | 
123  | 
    Cat a particular object's Git representation if a SHA is specified.
 | 
124  | 
    List all available SHAs otherwise.
 | 
|
125  | 
    """
 | 
|
| 
0.200.419
by Jelmer Vernooij
 Add hidden git-cat command that can cat git objects from Bazaar repositories.  | 
126  | 
|
127  | 
hidden = True  | 
|
128  | 
||
| 
0.200.422
by Jelmer Vernooij
 'bzr git-object' without arguments now prints the available git objects.  | 
129  | 
aliases = ["git-objects", "git-cat"]  | 
130  | 
takes_args = ["sha1?"]  | 
|
| 
0.200.695
by Jelmer Vernooij
 Clean up trailing whitespace.  | 
131  | 
takes_options = [Option('directory',  | 
| 
0.200.440
by Jelmer Vernooij
 Remove silly mapping of timezones; dulwich uses offsets now as well.  | 
132  | 
short_name='d',  | 
| 
0.200.424
by Jelmer Vernooij
 Fix formatting.  | 
133  | 
help='Location of repository.', type=unicode),  | 
134  | 
Option('pretty', help='Pretty-print objects.')]  | 
|
| 
0.200.423
by Jelmer Vernooij
 Support pretty-printing git objects.  | 
135  | 
encoding_type = 'exact'  | 
| 
0.200.419
by Jelmer Vernooij
 Add hidden git-cat command that can cat git objects from Bazaar repositories.  | 
136  | 
|
| 
0.200.423
by Jelmer Vernooij
 Support pretty-printing git objects.  | 
137  | 
    @display_command
 | 
138  | 
def run(self, sha1=None, directory=".", pretty=False):  | 
|
| 
0.200.419
by Jelmer Vernooij
 Add hidden git-cat command that can cat git objects from Bazaar repositories.  | 
139  | 
from bzrlib.errors import (  | 
140  | 
BzrCommandError,  | 
|
141  | 
            )
 | 
|
142  | 
from bzrlib.bzrdir import (  | 
|
143  | 
BzrDir,  | 
|
144  | 
            )
 | 
|
145  | 
bzrdir, _ = BzrDir.open_containing(directory)  | 
|
146  | 
repo = bzrdir.find_repository()  | 
|
| 
0.200.452
by Jelmer Vernooij
 Rename converter -> object_store, provide utility function for getting ObjectStore's.  | 
147  | 
from bzrlib.plugins.git.object_store import (  | 
148  | 
get_object_store,  | 
|
149  | 
            )
 | 
|
150  | 
object_store = get_object_store(repo)  | 
|
| 
0.200.419
by Jelmer Vernooij
 Add hidden git-cat command that can cat git objects from Bazaar repositories.  | 
151  | 
repo.lock_read()  | 
152  | 
try:  | 
|
| 
0.200.422
by Jelmer Vernooij
 'bzr git-object' without arguments now prints the available git objects.  | 
153  | 
if sha1 is not None:  | 
154  | 
try:  | 
|
| 
0.200.532
by Jelmer Vernooij
 The object store requires plain strings.  | 
155  | 
obj = object_store[str(sha1)]  | 
| 
0.200.422
by Jelmer Vernooij
 'bzr git-object' without arguments now prints the available git objects.  | 
156  | 
except KeyError:  | 
157  | 
raise BzrCommandError("Object not found: %s" % sha1)  | 
|
| 
0.200.423
by Jelmer Vernooij
 Support pretty-printing git objects.  | 
158  | 
if pretty:  | 
159  | 
text = obj.as_pretty_string()  | 
|
160  | 
else:  | 
|
161  | 
text = obj.as_raw_string()  | 
|
162  | 
self.outf.write(text)  | 
|
| 
0.200.419
by Jelmer Vernooij
 Add hidden git-cat command that can cat git objects from Bazaar repositories.  | 
163  | 
else:  | 
| 
0.200.422
by Jelmer Vernooij
 'bzr git-object' without arguments now prints the available git objects.  | 
164  | 
for sha1 in object_store:  | 
165  | 
self.outf.write("%s\n" % sha1)  | 
|
| 
0.200.419
by Jelmer Vernooij
 Add hidden git-cat command that can cat git objects from Bazaar repositories.  | 
166  | 
finally:  | 
167  | 
repo.unlock()  |