1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
2
# Some parts of the code are:
3
# Copyright (C) 2005, 2006 by Canonical Ltd
5
# This program is free software; you can redistribute it and/or modify
6
# it under the terms of the GNU General Public License as published by
7
# the Free Software Foundation; either version 2 of the License, or
8
# (at your option) any later version.
10
# This program is distributed in the hope that it will be useful,
11
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13
# GNU General Public License for more details.
15
# You should have received a copy of the GNU General Public License
16
# along with this program; if not, write to the Free Software
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
import bzrlib.errors as errors
21
from bzrlib.workingtree import WorkingTree
23
from errors import ConnectionError, NoLocationKnown, NotBranchError
25
def missing(branch, other_branch=None, reverse=False):
26
""" Get the number of missing or extra revisions of local branch.
28
:param branch: path to local branch
30
:param other_branch: location of the other branch
32
:param reverse: reverse the order of revisions
34
:return: number of missing revisions (if < 0, then extra revisions * -1)
37
from bzrlib.missing import find_unmerged
40
local_branch = bzrlib.branch.Branch.open_containing(branch)[0]
41
except errors.NotBranchError:
42
raise NotBranchError(branch)
46
parent = local_branch.get_parent()
47
if other_branch is None:
49
if other_branch is None:
53
remote_branch = bzrlib.branch.Branch.open(other_branch)
54
except errors.NotBranchError:
55
raise NotBranchError(other_branch)
56
except errors.ConnectionError:
57
raise ConnectionError(other_branch)
61
if remote_branch.base == local_branch.base:
62
remote_branch = local_branch
63
local_branch.lock_read()
68
remote_branch.lock_read()
70
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
74
remote_extra.reverse()
77
ret = len(local_extra) * -1
80
ret = len(remote_extra)
82
if not remote_extra and not local_extra:
86
remote_branch.unlock()
90
if not ret and parent is None and other_branch is not None:
91
local_branch.lock_write()
93
# handle race conditions - a parent might be set while we run.
94
if local_branch.get_parent() is None:
95
local_branch.set_parent(remote_branch.base)
102
def pull(branch, location=None, remember=False, overwrite=False, revision=None):
103
""" Pull revisions from another branch.
105
:param branch: the local branch where you want to pull
107
:param location: location of branch you'd like to pull from (can be a bundle, too)
109
:param remeber: if True, the location will be stored
111
:param overwrite: if True, forget local changes, and update the branch to match the remote one
113
:param revision: if specified, only the given revision will be pulled (revno)
115
:return: number of revisions pulled
119
from bzrlib.branch import Branch
121
from bzrlib.bundle import read_bundle_from_url
122
from bzrlib.bundle.apply_bundle import install_bundle
128
tree_to = WorkingTree.open_containing(branch)[0]
129
branch_to = tree_to.branch
130
except errors.NoWorkingTree:
133
branch_to = Branch.open_containing(branch)[0]
134
except errors.NotBranchError:
135
raise NotBranchError(location)
136
except errors.NotBranchError:
137
raise NotBranchError(location)
140
if location is not None and not nobundle:
142
reader = read_bundle_from_url(location)
143
except errors.NotABundle:
144
pass # Continue on considering this url a Branch
146
stored_loc = branch_to.get_parent()
148
if stored_loc is None:
149
raise NoLocationKnown
151
location = stored_loc
153
if reader is not None and not nobundle:
154
install_bundle(branch_to.repository, reader)
155
branch_from = branch_to
157
branch_from = Branch.open(location)
159
if branch_to.get_parent() is None or remember:
160
branch_to.set_parent(branch_from.base)
164
if revision is not None:
165
rev_id = branch_from.get_rev_id(revision)
167
if reader is not None:
168
rev_id = reader.info.target
170
old_rh = branch_to.revision_history()
171
if tree_to is not None:
172
count = tree_to.pull(branch_from, overwrite, rev_id)
174
count = branch_to.pull(branch_from, overwrite, rev_id)
178
def update(location):
179
""" Update a tree to have the latest code committed to its branch.
181
:param location: the path to the branch/working tree
183
:return: None if tree is up to date, 1 if there are conflicts, 0 if updated without having conflicts
185
tree = WorkingTree.open_containing(location)[0]
188
if tree.last_revision() == tree.branch.last_revision():
189
# may be up to date, check master too.
190
master = tree.branch.get_master_branch()
191
if master is None or master.last_revision == tree.last_revision():
192
# tree is up to date.
194
conflicts = tree.update()
added
removed
olive/backend/update.py
