bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
1 |
# Copyright (C) 2007 Canonical Ltd
|
|
0.200.252
by Jelmer Vernooij
Clarify history, copyright. |
2 |
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
|
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
3 |
#
|
4 |
# This program is free software; you can redistribute it and/or modify
|
|
5 |
# it under the terms of the GNU General Public License as published by
|
|
6 |
# the Free Software Foundation; either version 2 of the License, or
|
|
7 |
# (at your option) any later version.
|
|
8 |
#
|
|
9 |
# This program is distributed in the hope that it will be useful,
|
|
10 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
11 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
12 |
# GNU General Public License for more details.
|
|
13 |
#
|
|
14 |
# You should have received a copy of the GNU General Public License
|
|
15 |
# along with this program; if not, write to the Free Software
|
|
16 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
17 |
||
18 |
"""An adapter between a Git Branch and a Bazaar Branch"""
|
|
19 |
||
|
0.200.261
by Jelmer Vernooij
More formatting fixes. |
20 |
from dulwich.objects import ( |
21 |
Commit, |
|
22 |
Tag, |
|
23 |
)
|
|
24 |
||
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
25 |
from bzrlib import ( |
26 |
branch, |
|
|
0.200.513
by Jelmer Vernooij
Fix imports. |
27 |
bzrdir, |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
28 |
config, |
|
0.200.446
by Jelmer Vernooij
Support new 'local' argument. |
29 |
errors, |
|
0.200.225
by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches. |
30 |
repository, |
|
0.200.19
by John Arbash Meinel
More refactoring. Add some direct tests for GitModel. |
31 |
revision, |
|
0.200.82
by Jelmer Vernooij
Support listing tags. |
32 |
tag, |
|
0.230.1
by Jelmer Vernooij
Support lightweight checkouts. |
33 |
transport, |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
34 |
)
|
|
0.200.261
by Jelmer Vernooij
More formatting fixes. |
35 |
from bzrlib.decorators import ( |
36 |
needs_read_lock, |
|
37 |
)
|
|
38 |
from bzrlib.trace import ( |
|
|
0.200.342
by Jelmer Vernooij
Report git sha during pull. |
39 |
is_quiet, |
|
0.200.261
by Jelmer Vernooij
More formatting fixes. |
40 |
mutter, |
41 |
)
|
|
42 |
||
|
0.200.513
by Jelmer Vernooij
Fix imports. |
43 |
from bzrlib.plugins.git import ( |
44 |
get_rich_root_format, |
|
45 |
)
|
|
|
0.200.386
by Jelmer Vernooij
Move config to a separate file, support BranchConfig.username(). |
46 |
from bzrlib.plugins.git.config import ( |
47 |
GitBranchConfig, |
|
48 |
)
|
|
|
0.200.278
by Jelmer Vernooij
Update branch head appropriately during dpull. |
49 |
from bzrlib.plugins.git.errors import ( |
|
0.200.472
by Jelmer Vernooij
Fix printing error when user attempts to push into git. |
50 |
NoPushSupport, |
|
0.200.278
by Jelmer Vernooij
Update branch head appropriately during dpull. |
51 |
NoSuchRef, |
52 |
)
|
|
|
0.200.261
by Jelmer Vernooij
More formatting fixes. |
53 |
|
|
0.238.5
by Jelmer Vernooij
Remove old backwards compatibility code. |
54 |
from bzrlib.foreign import ForeignBranch |
|
0.200.388
by Jelmer Vernooij
Support bzr 1.14 as well. |
55 |
|
|
0.200.261
by Jelmer Vernooij
More formatting fixes. |
56 |
|
|
0.200.648
by Jelmer Vernooij
Fix tag handling when encountering packed refs. |
57 |
def extract_tags(refs): |
|
0.200.462
by Jelmer Vernooij
Import tags when pulling. |
58 |
ret = {} |
59 |
for k,v in refs.iteritems(): |
|
60 |
if k.startswith("refs/tags/") and not k.endswith("^{}"): |
|
61 |
v = refs.get(k+"^{}", v) |
|
|
0.200.648
by Jelmer Vernooij
Fix tag handling when encountering packed refs. |
62 |
ret[k[len("refs/tags/"):]] = v |
|
0.200.462
by Jelmer Vernooij
Import tags when pulling. |
63 |
return ret |
64 |
||
65 |
||
|
0.200.334
by Jelmer Vernooij
Support pulling from git to git. |
66 |
class GitPullResult(branch.PullResult): |
67 |
||
68 |
def _lookup_revno(self, revid): |
|
69 |
assert isinstance(revid, str), "was %r" % revid |
|
70 |
# Try in source branch first, it'll be faster
|
|
71 |
return self.target_branch.revision_id_to_revno(revid) |
|
72 |
||
73 |
@property
|
|
74 |
def old_revno(self): |
|
75 |
return self._lookup_revno(self.old_revid) |
|
76 |
||
77 |
@property
|
|
78 |
def new_revno(self): |
|
79 |
return self._lookup_revno(self.new_revid) |
|
80 |
||
81 |
||
|
0.200.261
by Jelmer Vernooij
More formatting fixes. |
82 |
class LocalGitTagDict(tag.BasicTags): |
83 |
"""Dictionary with tags in a local repository.""" |
|
|
0.200.82
by Jelmer Vernooij
Support listing tags. |
84 |
|
|
0.200.89
by Jelmer Vernooij
Support sprouting branches. |
85 |
def __init__(self, branch): |
86 |
self.branch = branch |
|
87 |
self.repository = branch.repository |
|
|
0.200.82
by Jelmer Vernooij
Support listing tags. |
88 |
|
89 |
def get_tag_dict(self): |
|
90 |
ret = {} |
|
|
0.200.648
by Jelmer Vernooij
Fix tag handling when encountering packed refs. |
91 |
for k,v in extract_tags(self.repository._git.get_refs()).iteritems(): |
|
0.200.609
by Jelmer Vernooij
Cope with tags pointing at nonexisting objects. |
92 |
try: |
|
0.200.647
by Jelmer Vernooij
Fix use of packed refs. |
93 |
obj = self.repository._git[v] |
|
0.200.609
by Jelmer Vernooij
Cope with tags pointing at nonexisting objects. |
94 |
except KeyError: |
95 |
mutter("Tag %s points at unknown object %s, ignoring", v, obj) |
|
96 |
continue
|
|
|
0.200.194
by Jelmer Vernooij
Look for commit object in heavyweight tags. |
97 |
while isinstance(obj, Tag): |
98 |
v = obj.object[1] |
|
|
0.200.647
by Jelmer Vernooij
Fix use of packed refs. |
99 |
obj = self.repository._git[v] |
|
0.200.194
by Jelmer Vernooij
Look for commit object in heavyweight tags. |
100 |
if not isinstance(obj, Commit): |
|
0.200.261
by Jelmer Vernooij
More formatting fixes. |
101 |
mutter("Tag %s points at object %r that is not a commit, " |
102 |
"ignoring", k, obj) |
|
|
0.200.194
by Jelmer Vernooij
Look for commit object in heavyweight tags. |
103 |
continue
|
|
0.200.180
by Jelmer Vernooij
Simplify tag handling. |
104 |
ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v) |
|
0.200.82
by Jelmer Vernooij
Support listing tags. |
105 |
return ret |
106 |
||
|
0.200.711
by Jelmer Vernooij
Support merging tags to a local Git repository. |
107 |
def _set_tag_dict(self, to_dict): |
108 |
extra = set(self.repository._git.get_refs().keys()) |
|
109 |
for k, revid in to_dict.iteritems(): |
|
110 |
name = "refs/tags/%s" % k |
|
111 |
if name in extra: |
|
112 |
extra.remove(name) |
|
113 |
self.set_tag(k, revid) |
|
114 |
for name in extra: |
|
115 |
if name.startswith("refs/tags/"): |
|
116 |
del self.repository._git[name] |
|
117 |
||
|
0.200.86
by Jelmer Vernooij
Clearer error when setting tags. |
118 |
def set_tag(self, name, revid): |
|
0.200.480
by Jelmer Vernooij
Cope with API changes in Dulwich. |
119 |
self.repository._git.refs["refs/tags/%s" % name], _ = \ |
|
0.200.462
by Jelmer Vernooij
Import tags when pulling. |
120 |
self.branch.mapping.revision_id_bzr_to_foreign(revid) |
|
0.200.86
by Jelmer Vernooij
Clearer error when setting tags. |
121 |
|
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
122 |
|
|
0.239.1
by Jelmer Vernooij
Avoid re-connecting to fetch tags we already know. |
123 |
class DictTagDict(LocalGitTagDict): |
124 |
||
125 |
||
126 |
def __init__(self, branch, tags): |
|
127 |
super(DictTagDict, self).__init__(branch) |
|
128 |
self._tags = tags |
|
129 |
||
130 |
def get_tag_dict(self): |
|
131 |
return self._tags |
|
132 |
||
133 |
||
134 |
||
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
135 |
class GitBranchFormat(branch.BranchFormat): |
136 |
||
|
0.200.70
by Jelmer Vernooij
Implement GitBranchFormat.get_format_description. |
137 |
def get_format_description(self): |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
138 |
return 'Git Branch' |
139 |
||
|
0.243.1
by Jelmer Vernooij
Use foreign branch testing infrastructure. |
140 |
def network_name(self): |
141 |
return "git" |
|
142 |
||
|
0.200.82
by Jelmer Vernooij
Support listing tags. |
143 |
def supports_tags(self): |
144 |
return True |
|
145 |
||
|
0.243.1
by Jelmer Vernooij
Use foreign branch testing infrastructure. |
146 |
def get_foreign_tests_branch_factory(self): |
147 |
from bzrlib.plugins.git.tests.test_branch import ForeignTestsBranchFactory |
|
148 |
return ForeignTestsBranchFactory() |
|
149 |
||
|
0.200.246
by Jelmer Vernooij
Cope with API changes in 1.13. |
150 |
def make_tags(self, branch): |
|
0.228.3
by Jelmer Vernooij
Fix tags when fetching from remotes. |
151 |
if getattr(branch.repository, "get_refs", None) is not None: |
152 |
from bzrlib.plugins.git.remote import RemoteGitTagDict |
|
153 |
return RemoteGitTagDict(branch) |
|
|
0.200.261
by Jelmer Vernooij
More formatting fixes. |
154 |
else: |
155 |
return LocalGitTagDict(branch) |
|
|
0.200.246
by Jelmer Vernooij
Cope with API changes in 1.13. |
156 |
|
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
157 |
|
|
0.200.388
by Jelmer Vernooij
Support bzr 1.14 as well. |
158 |
class GitBranch(ForeignBranch): |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
159 |
"""An adapter to git repositories for bzr Branch objects.""" |
160 |
||
|
0.239.1
by Jelmer Vernooij
Avoid re-connecting to fetch tags we already know. |
161 |
def __init__(self, bzrdir, repository, name, lockfiles, tagsdict=None): |
|
0.200.82
by Jelmer Vernooij
Support listing tags. |
162 |
self.repository = repository |
|
0.200.246
by Jelmer Vernooij
Cope with API changes in 1.13. |
163 |
self._format = GitBranchFormat() |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
164 |
self.control_files = lockfiles |
|
0.200.59
by Jelmer Vernooij
Add more tests, fix revision history. |
165 |
self.bzrdir = bzrdir |
|
0.231.1
by Jelmer Vernooij
Check that regenerated objects have the expected sha1. |
166 |
super(GitBranch, self).__init__(repository.get_mapping()) |
|
0.239.1
by Jelmer Vernooij
Avoid re-connecting to fetch tags we already know. |
167 |
if tagsdict is not None: |
168 |
self.tags = DictTagDict(self, tagsdict) |
|
|
0.200.139
by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches. |
169 |
self.name = name |
|
0.200.461
by Jelmer Vernooij
Reduce number of round trips when fetching from Git. |
170 |
self._head = None |
|
0.200.630
by Jelmer Vernooij
Fix base url of Git branches - use the working tree path rather than the control directory path. |
171 |
self.base = bzrdir.root_transport.base |
|
0.200.722
by Jelmer Vernooij
Implement GitDir.list_branches() and support name argument to open_branch. |
172 |
if self.name != "HEAD": |
173 |
self.base += ",%s" % self.name |
|
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
174 |
|
|
0.239.8
by Jelmer Vernooij
Support checkouts. |
175 |
def _get_checkout_format(self): |
176 |
"""Return the most suitable metadir for a checkout of this branch. |
|
177 |
Weaves are used if this branch's repository uses weaves.
|
|
178 |
"""
|
|
179 |
return get_rich_root_format() |
|
180 |
||
|
0.238.3
by Jelmer Vernooij
Remove svn references, prefer git send format when submitting changes against a git branch. |
181 |
def get_child_submit_format(self): |
182 |
"""Return the preferred format of submissions to this branch.""" |
|
183 |
ret = self.get_config().get_user_option("child_submit_format") |
|
184 |
if ret is not None: |
|
185 |
return ret |
|
186 |
return "git" |
|
187 |
||
|
0.200.293
by Jelmer Vernooij
Fix branch nicks. |
188 |
def _get_nick(self, local=False, possible_master_transports=None): |
189 |
"""Find the nick name for this branch. |
|
190 |
||
191 |
:return: Branch nick
|
|
192 |
"""
|
|
193 |
return self.name |
|
194 |
||
|
0.200.331
by Jelmer Vernooij
Add stub for setting nick function. |
195 |
def _set_nick(self, nick): |
196 |
raise NotImplementedError |
|
197 |
||
198 |
nick = property(_get_nick, _set_nick) |
|
|
0.200.293
by Jelmer Vernooij
Fix branch nicks. |
199 |
|
|
0.200.412
by Jelmer Vernooij
Implement GitBranch.__repr__. |
200 |
def __repr__(self): |
201 |
return "%s(%r, %r)" % (self.__class__.__name__, self.repository.base, self.name) |
|
202 |
||
|
0.200.334
by Jelmer Vernooij
Support pulling from git to git. |
203 |
def generate_revision_history(self, revid, old_revid=None): |
204 |
# FIXME: Check that old_revid is in the ancestry of revid
|
|
205 |
newhead, self.mapping = self.mapping.revision_id_bzr_to_foreign(revid) |
|
206 |
self._set_head(newhead) |
|
207 |
||
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
208 |
def lock_write(self): |
209 |
self.control_files.lock_write() |
|
210 |
||
|
0.200.139
by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches. |
211 |
def get_stacked_on_url(self): |
212 |
# Git doesn't do stacking (yet...)
|
|
|
0.200.631
by Jelmer Vernooij
Raise proper exception in Branch.get_stacked_on_url(). |
213 |
raise errors.UnstackableBranchFormat(self._format, self.base) |
|
0.200.139
by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches. |
214 |
|
215 |
def get_parent(self): |
|
216 |
"""See Branch.get_parent().""" |
|
|
0.200.312
by Jelmer Vernooij
Add notes about parent locations. |
217 |
# FIXME: Set "origin" url from .git/config ?
|
|
0.200.139
by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches. |
218 |
return None |
219 |
||
|
0.200.175
by Jelmer Vernooij
Add optimized handling when fetching from git to git. |
220 |
def set_parent(self, url): |
|
0.200.312
by Jelmer Vernooij
Add notes about parent locations. |
221 |
# FIXME: Set "origin" url in .git/config ?
|
|
0.200.175
by Jelmer Vernooij
Add optimized handling when fetching from git to git. |
222 |
pass
|
223 |
||
|
0.200.139
by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches. |
224 |
def lock_read(self): |
225 |
self.control_files.lock_read() |
|
226 |
||
|
0.200.432
by Jelmer Vernooij
Support Branch.is_locked, required for loggerhead. |
227 |
def is_locked(self): |
228 |
return self.control_files.is_locked() |
|
229 |
||
|
0.200.139
by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches. |
230 |
def unlock(self): |
231 |
self.control_files.unlock() |
|
232 |
||
233 |
def get_physical_lock_status(self): |
|
234 |
return False |
|
235 |
||
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
236 |
@needs_read_lock
|
237 |
def last_revision(self): |
|
238 |
# perhaps should escape this ?
|
|
|
0.200.57
by Jelmer Vernooij
Fix more tests. |
239 |
if self.head is None: |
|
0.200.19
by John Arbash Meinel
More refactoring. Add some direct tests for GitModel. |
240 |
return revision.NULL_REVISION |
|
0.200.112
by Jelmer Vernooij
Fix the build. |
241 |
return self.mapping.revision_id_foreign_to_bzr(self.head) |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
242 |
|
|
0.200.501
by Jelmer Vernooij
Support push from git into bzr. |
243 |
def _basic_push(self, target, overwrite=False, stop_revision=None): |
244 |
return branch.InterBranch.get(self, target)._basic_push( |
|
245 |
overwrite, stop_revision) |
|
246 |
||
|
0.200.692
by Jelmer Vernooij
Refuse pulling into non-rich-root branches rather than erroring out with an AttributeError. |
247 |
|
|
0.200.465
by Jelmer Vernooij
Use dulwich standard functionality for finding missing revisions. |
248 |
class LocalGitBranch(GitBranch): |
249 |
"""A local Git branch.""" |
|
250 |
||
|
0.200.261
by Jelmer Vernooij
More formatting fixes. |
251 |
def create_checkout(self, to_location, revision_id=None, lightweight=False, |
252 |
accelerator_tree=None, hardlink=False): |
|
|
0.200.210
by Jelmer Vernooij
properly error out about not support lightweight checkouts. |
253 |
if lightweight: |
|
0.230.1
by Jelmer Vernooij
Support lightweight checkouts. |
254 |
t = transport.get_transport(to_location) |
255 |
t.ensure_base() |
|
256 |
format = self._get_checkout_format() |
|
257 |
checkout = format.initialize_on_transport(t) |
|
|
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
258 |
from_branch = branch.BranchReferenceFormat().initialize(checkout, |
|
0.230.1
by Jelmer Vernooij
Support lightweight checkouts. |
259 |
self) |
260 |
tree = checkout.create_workingtree(revision_id, |
|
261 |
from_branch=from_branch, hardlink=hardlink) |
|
262 |
return tree |
|
263 |
else: |
|
264 |
return self._create_heavyweight_checkout(to_location, revision_id, |
|
|
0.200.261
by Jelmer Vernooij
More formatting fixes. |
265 |
hardlink) |
|
0.200.210
by Jelmer Vernooij
properly error out about not support lightweight checkouts. |
266 |
|
|
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
267 |
def _create_heavyweight_checkout(self, to_location, revision_id=None, |
|
0.200.210
by Jelmer Vernooij
properly error out about not support lightweight checkouts. |
268 |
hardlink=False): |
269 |
"""Create a new heavyweight checkout of this branch. |
|
270 |
||
271 |
:param to_location: URL of location to create the new checkout in.
|
|
272 |
:param revision_id: Revision that should be the tip of the checkout.
|
|
273 |
:param hardlink: Whether to hardlink
|
|
274 |
:return: WorkingTree object of checkout.
|
|
275 |
"""
|
|
|
0.200.513
by Jelmer Vernooij
Fix imports. |
276 |
checkout_branch = bzrdir.BzrDir.create_branch_convenience( |
|
0.200.210
by Jelmer Vernooij
properly error out about not support lightweight checkouts. |
277 |
to_location, force_new_tree=False, format=get_rich_root_format()) |
278 |
checkout = checkout_branch.bzrdir |
|
279 |
checkout_branch.bind(self) |
|
|
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
280 |
# pull up to the specified revision_id to set the initial
|
|
0.200.210
by Jelmer Vernooij
properly error out about not support lightweight checkouts. |
281 |
# branch tip correctly, and seed it with history.
|
282 |
checkout_branch.pull(self, stop_revision=revision_id) |
|
283 |
return checkout.create_workingtree(revision_id, hardlink=hardlink) |
|
284 |
||
|
0.200.57
by Jelmer Vernooij
Fix more tests. |
285 |
def _gen_revision_history(self): |
|
0.200.58
by Jelmer Vernooij
Fix remaining tests. |
286 |
if self.head is None: |
287 |
return [] |
|
|
0.200.261
by Jelmer Vernooij
More formatting fixes. |
288 |
ret = list(self.repository.iter_reverse_revision_history( |
289 |
self.last_revision())) |
|
|
0.200.59
by Jelmer Vernooij
Add more tests, fix revision history. |
290 |
ret.reverse() |
|
0.200.57
by Jelmer Vernooij
Fix more tests. |
291 |
return ret |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
292 |
|
|
0.200.461
by Jelmer Vernooij
Reduce number of round trips when fetching from Git. |
293 |
def _get_head(self): |
|
0.200.480
by Jelmer Vernooij
Cope with API changes in Dulwich. |
294 |
try: |
295 |
return self.repository._git.ref(self.name) |
|
296 |
except KeyError: |
|
297 |
return None |
|
|
0.200.461
by Jelmer Vernooij
Reduce number of round trips when fetching from Git. |
298 |
|
|
0.200.507
by Jelmer Vernooij
Implement set_last_revision{_info,}. |
299 |
def set_last_revision_info(self, revno, revid): |
300 |
self.set_last_revision(revid) |
|
301 |
||
302 |
def set_last_revision(self, revid): |
|
|
0.200.523
by Jelmer Vernooij
Fix undefined error. |
303 |
(newhead, self.mapping) = self.mapping.revision_id_bzr_to_foreign( |
|
0.200.507
by Jelmer Vernooij
Implement set_last_revision{_info,}. |
304 |
revid) |
|
0.200.523
by Jelmer Vernooij
Fix undefined error. |
305 |
self.head = newhead |
|
0.200.507
by Jelmer Vernooij
Implement set_last_revision{_info,}. |
306 |
|
|
0.200.461
by Jelmer Vernooij
Reduce number of round trips when fetching from Git. |
307 |
def _set_head(self, value): |
308 |
self._head = value |
|
|
0.200.480
by Jelmer Vernooij
Cope with API changes in Dulwich. |
309 |
self.repository._git.refs[self.name] = self._head |
|
0.200.461
by Jelmer Vernooij
Reduce number of round trips when fetching from Git. |
310 |
self._clear_cached_state() |
311 |
||
312 |
head = property(_get_head, _set_head) |
|
313 |
||
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
314 |
def get_config(self): |
315 |
return GitBranchConfig(self) |
|
316 |
||
317 |
def get_push_location(self): |
|
318 |
"""See Branch.get_push_location.""" |
|
319 |
push_loc = self.get_config().get_user_option('push_location') |
|
320 |
return push_loc |
|
321 |
||
322 |
def set_push_location(self, location): |
|
323 |
"""See Branch.set_push_location.""" |
|
|
0.200.19
by John Arbash Meinel
More refactoring. Add some direct tests for GitModel. |
324 |
self.get_config().set_user_option('push_location', location, |
|
0.217.54
by John Carr
set_user_option breaks - doesnt have a local option in BranchConfig. Follow the bzr.dev syntax instead. |
325 |
store=config.STORE_LOCATION) |
|
0.200.43
by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity. |
326 |
|
327 |
def supports_tags(self): |
|
|
0.200.82
by Jelmer Vernooij
Support listing tags. |
328 |
return True |
|
0.200.96
by Jelmer Vernooij
Fix branch. |
329 |
|
|
0.200.225
by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches. |
330 |
|
|
0.200.342
by Jelmer Vernooij
Report git sha during pull. |
331 |
class GitBranchPullResult(branch.PullResult): |
332 |
||
333 |
def report(self, to_file): |
|
334 |
if not is_quiet(): |
|
335 |
if self.old_revid == self.new_revid: |
|
336 |
to_file.write('No revisions to pull.\n') |
|
337 |
else: |
|
|
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
338 |
to_file.write('Now on revision %d (git sha: %s).\n' % |
|
0.200.342
by Jelmer Vernooij
Report git sha during pull. |
339 |
(self.new_revno, self.new_git_head)) |
340 |
self._show_tag_conficts(to_file) |
|
341 |
||
342 |
||
|
0.200.504
by Jelmer Vernooij
Lazily find revno's for git branches. |
343 |
class GitBranchPushResult(branch.BranchPushResult): |
344 |
||
345 |
def _lookup_revno(self, revid): |
|
346 |
assert isinstance(revid, str), "was %r" % revid |
|
347 |
# Try in source branch first, it'll be faster
|
|
348 |
try: |
|
349 |
return self.source_branch.revision_id_to_revno(revid) |
|
|
0.200.523
by Jelmer Vernooij
Fix undefined error. |
350 |
except errors.NoSuchRevision: |
|
0.200.504
by Jelmer Vernooij
Lazily find revno's for git branches. |
351 |
# FIXME: Check using graph.find_distance_to_null() ?
|
352 |
return self.target_branch.revision_id_to_revno(revid) |
|
353 |
||
354 |
@property
|
|
355 |
def old_revno(self): |
|
356 |
return self._lookup_revno(self.old_revid) |
|
357 |
||
358 |
@property
|
|
359 |
def new_revno(self): |
|
360 |
return self._lookup_revno(self.new_revid) |
|
361 |
||
362 |
||
|
0.200.501
by Jelmer Vernooij
Support push from git into bzr. |
363 |
class InterFromGitBranch(branch.GenericInterBranch): |
|
0.200.261
by Jelmer Vernooij
More formatting fixes. |
364 |
"""InterBranch implementation that pulls from Git into bzr.""" |
|
0.200.225
by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches. |
365 |
|
366 |
@classmethod
|
|
|
0.200.692
by Jelmer Vernooij
Refuse pulling into non-rich-root branches rather than erroring out with an AttributeError. |
367 |
def _get_interrepo(self, source, target): |
368 |
return repository.InterRepository.get(source.repository, |
|
369 |
target.repository) |
|
370 |
||
371 |
@classmethod
|
|
372 |
def is_compatible(cls, source, target): |
|
373 |
return (isinstance(source, GitBranch) and |
|
374 |
not isinstance(target, GitBranch) and |
|
375 |
(getattr(cls._get_interrepo(source, target), "fetch_objects", None) is not None)) |
|
|
0.200.225
by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches. |
376 |
|
|
0.247.7
by Michael Hudson
preserve the interface of update_revisions() |
377 |
def _update_revisions(self, stop_revision=None, overwrite=False, |
|
0.247.2
by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general |
378 |
graph=None, limit=None): |
|
0.247.7
by Michael Hudson
preserve the interface of update_revisions() |
379 |
"""Like InterBranch.update_revisions(), but with additions. |
380 |
||
381 |
Compared to the `update_revisions()` below, this function takes a
|
|
382 |
`limit` argument that limits how many git commits will be converted
|
|
383 |
and returns the new git head.
|
|
384 |
"""
|
|
|
0.200.692
by Jelmer Vernooij
Refuse pulling into non-rich-root branches rather than erroring out with an AttributeError. |
385 |
interrepo = self._get_interrepo(self.source, self.target) |
|
0.200.225
by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches. |
386 |
def determine_wants(heads): |
387 |
if not self.source.name in heads: |
|
|
0.200.278
by Jelmer Vernooij
Update branch head appropriately during dpull. |
388 |
raise NoSuchRef(self.source.name, heads.keys()) |
|
0.200.314
by Jelmer Vernooij
Support stop_revision. |
389 |
if stop_revision is not None: |
|
0.247.6
by Michael Hudson
away with underscore prefixed local variables |
390 |
last_revid = stop_revision |
391 |
head, mapping = self.source.repository.lookup_bzr_revision_id( |
|
|
0.200.316
by Jelmer Vernooij
Fix formatting. |
392 |
stop_revision) |
|
0.200.314
by Jelmer Vernooij
Support stop_revision. |
393 |
else: |
|
0.247.6
by Michael Hudson
away with underscore prefixed local variables |
394 |
head = heads[self.source.name] |
395 |
last_revid = self.source.mapping.revision_id_foreign_to_bzr( |
|
396 |
head) |
|
397 |
if self.target.repository.has_revision(last_revid): |
|
|
0.200.225
by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches. |
398 |
return [] |
|
0.247.6
by Michael Hudson
away with underscore prefixed local variables |
399 |
return [head] |
400 |
_, head = interrepo.fetch_objects( |
|
|
0.247.2
by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general |
401 |
determine_wants, self.source.mapping, limit=limit) |
|
0.247.6
by Michael Hudson
away with underscore prefixed local variables |
402 |
if head is None: |
403 |
last_revid = self.target.last_revision() |
|
|
0.247.5
by Michael Hudson
test and fix for noop pull case |
404 |
else: |
|
0.247.6
by Michael Hudson
away with underscore prefixed local variables |
405 |
last_revid = self.source.mapping.revision_id_foreign_to_bzr(head) |
|
0.200.313
by Jelmer Vernooij
Support overwrite parameter. |
406 |
if overwrite: |
|
0.200.314
by Jelmer Vernooij
Support stop_revision. |
407 |
prev_last_revid = None |
|
0.200.313
by Jelmer Vernooij
Support overwrite parameter. |
408 |
else: |
|
0.200.314
by Jelmer Vernooij
Support stop_revision. |
409 |
prev_last_revid = self.target.last_revision() |
|
0.247.6
by Michael Hudson
away with underscore prefixed local variables |
410 |
self.target.generate_revision_history(last_revid, prev_last_revid) |
411 |
return head |
|
|
0.200.225
by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches. |
412 |
|
|
0.247.7
by Michael Hudson
preserve the interface of update_revisions() |
413 |
def update_revisions(self, stop_revision=None, overwrite=False, graph=None): |
414 |
"""See InterBranch.update_revisions().""" |
|
415 |
self._update_revisions(stop_revision, overwrite, graph) |
|
416 |
||
|
0.200.338
by Jelmer Vernooij
Fix dpushing without changes necessary. |
417 |
def pull(self, overwrite=False, stop_revision=None, |
418 |
possible_transports=None, _hook_master=None, run_hooks=True, |
|
|
0.247.2
by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general |
419 |
_override_hook_target=None, local=False, limit=None): |
|
0.200.338
by Jelmer Vernooij
Fix dpushing without changes necessary. |
420 |
"""See Branch.pull. |
421 |
||
422 |
:param _hook_master: Private parameter - set the branch to
|
|
423 |
be supplied as the master to pull hooks.
|
|
424 |
:param run_hooks: Private parameter - if false, this branch
|
|
425 |
is being called because it's the master of the primary branch,
|
|
426 |
so it should not run its hooks.
|
|
427 |
:param _override_hook_target: Private parameter - set the branch to be
|
|
428 |
supplied as the target_branch to pull hooks.
|
|
|
0.247.2
by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general |
429 |
:param limit: Only import this many revisons. `None`, the default,
|
430 |
means import all revisions.
|
|
|
0.200.338
by Jelmer Vernooij
Fix dpushing without changes necessary. |
431 |
"""
|
|
0.200.446
by Jelmer Vernooij
Support new 'local' argument. |
432 |
# This type of branch can't be bound.
|
433 |
if local: |
|
434 |
raise errors.LocalRequiresBoundBranch() |
|
|
0.200.342
by Jelmer Vernooij
Report git sha during pull. |
435 |
result = GitBranchPullResult() |
|
0.200.338
by Jelmer Vernooij
Fix dpushing without changes necessary. |
436 |
result.source_branch = self.source |
437 |
if _override_hook_target is None: |
|
438 |
result.target_branch = self.target |
|
439 |
else: |
|
440 |
result.target_branch = _override_hook_target |
|
441 |
self.source.lock_read() |
|
442 |
try: |
|
443 |
# We assume that during 'pull' the target repository is closer than
|
|
444 |
# the source one.
|
|
445 |
graph = self.target.repository.get_graph(self.source.repository) |
|
|
0.247.6
by Michael Hudson
away with underscore prefixed local variables |
446 |
result.old_revno, result.old_revid = self.target.last_revision_info() |
|
0.247.7
by Michael Hudson
preserve the interface of update_revisions() |
447 |
result.new_git_head = self._update_revisions( |
|
0.247.6
by Michael Hudson
away with underscore prefixed local variables |
448 |
stop_revision, overwrite=overwrite, graph=graph, limit=limit) |
|
0.200.338
by Jelmer Vernooij
Fix dpushing without changes necessary. |
449 |
result.tag_conflicts = self.source.tags.merge_to(self.target.tags, |
450 |
overwrite) |
|
451 |
result.new_revno, result.new_revid = self.target.last_revision_info() |
|
452 |
if _hook_master: |
|
453 |
result.master_branch = _hook_master |
|
454 |
result.local_branch = result.target_branch |
|
455 |
else: |
|
456 |
result.master_branch = result.target_branch |
|
457 |
result.local_branch = None |
|
458 |
if run_hooks: |
|
459 |
for hook in branch.Branch.hooks['post_pull']: |
|
460 |
hook(result) |
|
461 |
finally: |
|
462 |
self.source.unlock() |
|
463 |
return result |
|
464 |
||
|
0.200.501
by Jelmer Vernooij
Support push from git into bzr. |
465 |
def _basic_push(self, overwrite=False, stop_revision=None): |
466 |
result = branch.BranchPushResult() |
|
467 |
result.source_branch = self.source |
|
468 |
result.target_branch = self.target |
|
|
0.200.505
by Jelmer Vernooij
Remove duplicate code. |
469 |
graph = self.target.repository.get_graph(self.source.repository) |
|
0.200.501
by Jelmer Vernooij
Support push from git into bzr. |
470 |
result.old_revno, result.old_revid = self.target.last_revision_info() |
|
0.247.8
by Michael Hudson
incredibly minor tweak |
471 |
result.new_git_head = self._update_revisions( |
|
0.247.3
by Michael Hudson
oh, so it wasn't (particularly) wrong, but it was a bit obscure |
472 |
stop_revision, overwrite=overwrite, graph=graph) |
|
0.200.501
by Jelmer Vernooij
Support push from git into bzr. |
473 |
result.tag_conflicts = self.source.tags.merge_to(self.target.tags, |
474 |
overwrite) |
|
475 |
result.new_revno, result.new_revid = self.target.last_revision_info() |
|
476 |
return result |
|
477 |
||
|
0.200.338
by Jelmer Vernooij
Fix dpushing without changes necessary. |
478 |
|
|
0.200.512
by Jelmer Vernooij
Support pushing git->git. |
479 |
class InterGitBranch(branch.GenericInterBranch): |
|
0.200.334
by Jelmer Vernooij
Support pulling from git to git. |
480 |
"""InterBranch implementation that pulls between Git branches.""" |
481 |
||
|
0.200.512
by Jelmer Vernooij
Support pushing git->git. |
482 |
|
483 |
class InterGitLocalRemoteBranch(InterGitBranch): |
|
484 |
"""InterBranch that copies from a local to a remote git branch.""" |
|
485 |
||
486 |
@classmethod
|
|
487 |
def is_compatible(self, source, target): |
|
488 |
from bzrlib.plugins.git.remote import RemoteGitBranch |
|
|
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
489 |
return (isinstance(source, LocalGitBranch) and |
|
0.200.512
by Jelmer Vernooij
Support pushing git->git. |
490 |
isinstance(target, RemoteGitBranch)) |
491 |
||
492 |
def _basic_push(self, overwrite=False, stop_revision=None): |
|
493 |
result = GitBranchPushResult() |
|
494 |
result.source_branch = self.source |
|
495 |
result.target_branch = self.target |
|
496 |
if stop_revision is None: |
|
497 |
stop_revision = self.source.last_revision() |
|
498 |
# FIXME: Check for diverged branches
|
|
499 |
def get_changed_refs(old_refs): |
|
|
0.200.544
by Jelmer Vernooij
Support pushing from git -> empty git repo. |
500 |
result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(old_refs.get("refs/heads/master", "0" * 40)) |
|
0.200.650
by Jelmer Vernooij
Use standard names for lookup functions. |
501 |
refs = { "refs/heads/master": self.source.repository.lookup_bzr_revision_id(stop_revision)[0] } |
|
0.200.512
by Jelmer Vernooij
Support pushing git->git. |
502 |
result.new_revid = stop_revision |
503 |
for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems(): |
|
504 |
refs["refs/tags/%s" % name] = sha |
|
505 |
return refs |
|
|
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
506 |
self.target.repository.send_pack(get_changed_refs, |
|
0.200.512
by Jelmer Vernooij
Support pushing git->git. |
507 |
self.source.repository._git.object_store.generate_pack_contents) |
508 |
return result |
|
509 |
||
510 |
||
511 |
class InterGitRemoteLocalBranch(InterGitBranch): |
|
512 |
"""InterBranch that copies from a remote to a local git branch.""" |
|
513 |
||
|
0.200.334
by Jelmer Vernooij
Support pulling from git to git. |
514 |
@classmethod
|
515 |
def is_compatible(self, source, target): |
|
516 |
from bzrlib.plugins.git.remote import RemoteGitBranch |
|
|
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
517 |
return (isinstance(source, RemoteGitBranch) and |
|
0.200.334
by Jelmer Vernooij
Support pulling from git to git. |
518 |
isinstance(target, LocalGitBranch)) |
519 |
||
|
0.200.501
by Jelmer Vernooij
Support push from git into bzr. |
520 |
def _basic_push(self, overwrite=False, stop_revision=None): |
521 |
result = branch.BranchPushResult() |
|
522 |
result.source_branch = self.source |
|
523 |
result.target_branch = self.target |
|
524 |
result.old_revid = self.target.last_revision() |
|
525 |
refs, stop_revision = self.update_refs(stop_revision) |
|
526 |
self.target.generate_revision_history(stop_revision, result.old_revid) |
|
527 |
self.update_tags(refs) |
|
|
0.200.505
by Jelmer Vernooij
Remove duplicate code. |
528 |
result.new_revid = self.target.last_revision() |
|
0.200.501
by Jelmer Vernooij
Support push from git into bzr. |
529 |
return result |
530 |
||
531 |
def update_tags(self, refs): |
|
|
0.200.648
by Jelmer Vernooij
Fix tag handling when encountering packed refs. |
532 |
for name, v in extract_tags(refs).iteritems(): |
533 |
revid = self.target.mapping.revision_id_foreign_to_bzr(v) |
|
|
0.200.501
by Jelmer Vernooij
Support push from git into bzr. |
534 |
self.target.tags.set_tag(name, revid) |
535 |
||
536 |
def update_refs(self, stop_revision=None): |
|
|
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
537 |
interrepo = repository.InterRepository.get(self.source.repository, |
|
0.200.501
by Jelmer Vernooij
Support push from git into bzr. |
538 |
self.target.repository) |
539 |
if stop_revision is None: |
|
540 |
refs = interrepo.fetch_refs(branches=["HEAD"]) |
|
541 |
stop_revision = self.target.mapping.revision_id_foreign_to_bzr(refs["HEAD"]) |
|
542 |
else: |
|
543 |
refs = interrepo.fetch_refs(revision_id=stop_revision) |
|
544 |
return refs, stop_revision |
|
545 |
||
|
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
546 |
def pull(self, stop_revision=None, overwrite=False, |
|
0.200.446
by Jelmer Vernooij
Support new 'local' argument. |
547 |
possible_transports=None, local=False): |
548 |
# This type of branch can't be bound.
|
|
549 |
if local: |
|
550 |
raise errors.LocalRequiresBoundBranch() |
|
|
0.200.334
by Jelmer Vernooij
Support pulling from git to git. |
551 |
result = GitPullResult() |
552 |
result.source_branch = self.source |
|
553 |
result.target_branch = self.target |
|
554 |
result.old_revid = self.target.last_revision() |
|
|
0.200.501
by Jelmer Vernooij
Support push from git into bzr. |
555 |
refs, stop_revision = self.update_refs(stop_revision) |
|
0.200.334
by Jelmer Vernooij
Support pulling from git to git. |
556 |
self.target.generate_revision_history(stop_revision, result.old_revid) |
|
0.200.501
by Jelmer Vernooij
Support push from git into bzr. |
557 |
self.update_tags(refs) |
|
0.200.334
by Jelmer Vernooij
Support pulling from git to git. |
558 |
result.new_revid = self.target.last_revision() |
559 |
return result |
|
560 |
||
|
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
561 |
|
|
0.200.468
by Jelmer Vernooij
Move dpush logic onto InterBranch. |
562 |
class InterToGitBranch(branch.InterBranch): |
563 |
"""InterBranch implementation that pulls from Git into bzr.""" |
|
564 |
||
|
0.200.631
by Jelmer Vernooij
Raise proper exception in Branch.get_stacked_on_url(). |
565 |
@staticmethod
|
566 |
def _get_branch_formats_to_test(): |
|
567 |
return None, None |
|
568 |
||
|
0.200.468
by Jelmer Vernooij
Move dpush logic onto InterBranch. |
569 |
@classmethod
|
570 |
def is_compatible(self, source, target): |
|
|
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
571 |
return (not isinstance(source, GitBranch) and |
|
0.200.468
by Jelmer Vernooij
Move dpush logic onto InterBranch. |
572 |
isinstance(target, GitBranch)) |
573 |
||
|
0.200.542
by Jelmer Vernooij
Proper error for push in 1.14. |
574 |
def update_revisions(self, *args, **kwargs): |
575 |
raise NoPushSupport() |
|
576 |
||
|
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
577 |
def push(self, overwrite=True, stop_revision=None, |
|
0.200.472
by Jelmer Vernooij
Fix printing error when user attempts to push into git. |
578 |
_override_hook_source_branch=None): |
579 |
raise NoPushSupport() |
|
580 |
||
|
0.200.468
by Jelmer Vernooij
Move dpush logic onto InterBranch. |
581 |
def lossy_push(self, stop_revision=None): |
|
0.200.504
by Jelmer Vernooij
Lazily find revno's for git branches. |
582 |
result = GitBranchPushResult() |
|
0.200.503
by Jelmer Vernooij
Remove dpull, return BranchPushResult in lossy_push. |
583 |
result.source_branch = self.source |
584 |
result.target_branch = self.target |
|
|
0.239.14
by Jelmer Vernooij
Cope with pushing to (not yet) existing branches. |
585 |
try: |
586 |
result.old_revid = self.target.last_revision() |
|
587 |
except NoSuchRef: |
|
588 |
result.old_revid = revision.NULL_REVISION |
|
|
0.200.468
by Jelmer Vernooij
Move dpush logic onto InterBranch. |
589 |
if stop_revision is None: |
590 |
stop_revision = self.source.last_revision() |
|
591 |
# FIXME: Check for diverged branches
|
|
592 |
refs = { "refs/heads/master": stop_revision } |
|
593 |
for name, revid in self.source.tags.get_tag_dict().iteritems(): |
|
594 |
if self.source.repository.has_revision(revid): |
|
595 |
refs["refs/tags/%s" % name] = revid |
|
596 |
revidmap, new_refs = self.target.repository.dfetch_refs( |
|
597 |
self.source.repository, refs) |
|
598 |
if revidmap != {}: |
|
599 |
self.target.generate_revision_history(revidmap[stop_revision]) |
|
|
0.200.520
by Jelmer Vernooij
Proper output from dpush. |
600 |
result.new_revid = revidmap[stop_revision] |
601 |
else: |
|
602 |
result.new_revid = result.old_revid |
|
|
0.200.503
by Jelmer Vernooij
Remove dpull, return BranchPushResult in lossy_push. |
603 |
result.revidmap = revidmap |
604 |
return result |
|
|
0.200.468
by Jelmer Vernooij
Move dpush logic onto InterBranch. |
605 |
|
|
0.200.334
by Jelmer Vernooij
Support pulling from git to git. |
606 |
|
607 |
branch.InterBranch.register_optimiser(InterGitRemoteLocalBranch) |
|
|
0.200.468
by Jelmer Vernooij
Move dpush logic onto InterBranch. |
608 |
branch.InterBranch.register_optimiser(InterFromGitBranch) |
609 |
branch.InterBranch.register_optimiser(InterToGitBranch) |
|
|
0.200.512
by Jelmer Vernooij
Support pushing git->git. |
610 |
branch.InterBranch.register_optimiser(InterGitLocalRemoteBranch) |