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
from bzrlib.workingtree import WorkingTree
21
from bzrlib.errors import NoLocationKnown
23
def missing(branch, other_branch=None, reverse=False):
24
""" Get the number of missing or extra revisions of local branch.
26
:param branch: path to local branch
28
:param other_branch: location of the other branch
30
:param reverse: reverse the order of revisions
32
:return: number of missing revisions (if < 0, then extra revisions * -1)
35
from bzrlib.missing import find_unmerged
37
local_branch = bzrlib.branch.Branch.open_containing(branch)[0]
39
parent = local_branch.get_parent()
40
if other_branch is None:
42
if other_branch is None:
45
remote_branch = bzrlib.branch.Branch.open(other_branch)
47
if remote_branch.base == local_branch.base:
48
remote_branch = local_branch
49
local_branch.lock_read()
54
remote_branch.lock_read()
56
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
60
remote_extra.reverse()
63
ret = len(local_extra) * -1
66
ret = len(remote_extra)
68
if not remote_extra and not local_extra:
72
remote_branch.unlock()
76
if not ret and parent is None and other_branch is not None:
77
local_branch.lock_write()
79
# handle race conditions - a parent might be set while we run.
80
if local_branch.get_parent() is None:
81
local_branch.set_parent(remote_branch.base)
88
def pull(branch, location=None, remember=False, overwrite=False, revision=None):
89
""" Pull revisions from another branch.
91
:param branch: the local branch where you want to pull
93
:param location: location of branch you'd like to pull from (can be a bundle, too)
95
:param remeber: if True, the location will be stored
97
:param overwrite: if True, forget local changes, and update the branch to match the remote one
99
:param revision: if specified, only the given revision will be pulled (revno)
101
:return: number of revisions pulled
105
from bzrlib.branch import Branch
107
from bzrlib.bundle import read_bundle_from_url
108
from bzrlib.bundle.apply_bundle import install_bundle
114
tree_to = WorkingTree.open_containing(branch)[0]
115
branch_to = tree_to.branch
116
except NoWorkingTree:
118
branch_to = Branch.open_containing(branch)[0]
121
if location is not None and not nobundle:
123
reader = read_bundle_from_url(location)
125
pass # Continue on considering this url a Branch
127
stored_loc = branch_to.get_parent()
129
if stored_loc is None:
130
raise NoLocationKnown
132
location = stored_loc
134
if reader is not None and not nobundle:
135
install_bundle(branch_to.repository, reader)
136
branch_from = branch_to
138
branch_from = Branch.open(location)
140
if branch_to.get_parent() is None or remember:
141
branch_to.set_parent(branch_from.base)
145
if revision is not None:
146
rev_id = branch_from.get_rev_id(revision)
148
if reader is not None:
149
rev_id = reader.info.target
151
old_rh = branch_to.revision_history()
152
if tree_to is not None:
153
count = tree_to.pull(branch_from, overwrite, rev_id)
155
count = branch_to.pull(branch_from, overwrite, rev_id)
159
def update(location):
160
""" Update a tree to have the latest code committed to its branch.
162
:param location: the path to the branch/working tree
164
:return: None if tree is up to date, 1 if there are conflicts, 0 if updated without having conflicts
166
tree = WorkingTree.open_containing(location)[0]
169
if tree.last_revision() == tree.branch.last_revision():
170
# may be up to date, check master too.
171
master = tree.branch.get_master_branch()
172
if master is None or master.last_revision == tree.last_revision():
173
# tree is up to date.
175
conflicts = tree.update()
added
removed
olive/backend/update.py
