14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
23
25
from subprocess import Popen, PIPE
28
from bzrlib.errors import BzrCommandError
29
from bzrlib.bzrdir import BzrDir
32
29
dirname = tempfile.mkdtemp("temp-branch")
33
return BzrDir.create_standalone_workingtree(dirname)
36
shutil.rmtree(tree.basedir)
38
def is_clean(cur_tree):
30
return bzrlib.branch.Branch.initialize(dirname)
33
shutil.rmtree(br.base)
35
def is_clean(cur_branch):
40
37
Return true if no files are modifed or unknown
41
38
>>> import bzrlib.add
42
>>> tree = temp_tree()
39
>>> br = temp_branch()
45
>>> fooname = os.path.join(tree.basedir, "foo")
42
>>> fooname = os.path.join(br.base, "foo")
46
43
>>> file(fooname, "wb").write("bar")
49
>>> bzrlib.add.smart_add_tree(tree, [tree.basedir])
46
>>> bzrlib.add.smart_add_branch(br, [br.base])
53
>>> tree.commit("added file")
50
>>> br.commit("added file")
58
55
from bzrlib.diff import compare_trees
59
old_tree = cur_tree.basis_tree()
56
old_tree = cur_branch.basis_tree()
57
new_tree = cur_branch.working_tree()
62
59
for path, file_class, kind, file_id, entry in new_tree.list_files():
63
60
if file_class in ('?', 'I'):
64
61
non_source.append(path)
65
62
delta = compare_trees(old_tree, new_tree, want_unchanged=False)
66
return not delta.has_changed(), non_source
68
def set_push_data(tree, location):
69
push_file = file (tree.branch.control_files.controlfilename("x-push-data"), "wb")
63
if len(delta.added) > 0 or len(delta.removed) > 0 or \
64
len(delta.modified) > 0:
65
return False, non_source
66
return True, non_source
68
def set_pull_data(br, location, rev_id):
69
pull_file = file (br.controlfilename("x-pull-data"), "wb")
70
pull_file.write("%s\n%s\n" % (location, rev_id))
72
def get_pull_data(br):
74
>>> br = temp_branch()
77
>>> set_pull_data(br, 'http://somewhere', '888-777')
79
('http://somewhere', '888-777')
82
filename = br.controlfilename("x-pull-data")
83
if not os.path.exists(filename):
85
pull_file = file (filename, "rb")
86
location, rev_id = [f.rstrip('\n') for f in pull_file]
87
return location, rev_id
89
def set_push_data(br, location):
90
push_file = file (br.controlfilename("x-push-data"), "wb")
70
91
push_file.write("%s\n" % location)
72
def get_push_data(tree):
93
def get_push_data(br):
74
>>> tree = temp_tree()
75
>>> get_push_data(tree) is None
95
>>> br = temp_branch()
96
>>> get_push_data(br) is None
77
>>> set_push_data(tree, 'http://somewhere')
78
>>> get_push_data(tree)
98
>>> set_push_data(br, 'http://somewhere')
79
100
'http://somewhere'
82
filename = tree.branch.control_files.controlfilename("x-push-data")
103
filename = br.controlfilename("x-push-data")
83
104
if not os.path.exists(filename):
85
106
push_file = file (filename, "rb")
115
136
def rsync(source, target, ssh=False, excludes=(), silent=False,
116
137
rsync_name="rsync"):
118
>>> new_dir = tempfile.mkdtemp()
119
>>> old_dir = os.getcwd()
120
>>> os.chdir(new_dir)
121
139
>>> rsync("a", "b", silent=True)
122
140
Traceback (most recent call last):
123
RsyncNoFile: No such file...
124
>>> rsync(new_dir + "/a", new_dir + "/b", excludes=("*.py",), silent=True)
141
RsyncNoFile: No such file a
142
>>> rsync("a", "b", excludes=("*.py",), silent=True)
125
143
Traceback (most recent call last):
126
RsyncNoFile: No such file...
127
>>> rsync(new_dir + "/a", new_dir + "/b", excludes=("*.py",), silent=True, rsync_name="rsyncc")
144
RsyncNoFile: No such file a
145
>>> rsync("a", "b", excludes=("*.py",), silent=True, rsync_name="rsyncc")
128
146
Traceback (most recent call last):
129
147
NoRsync: rsyncc not found.
130
>>> os.chdir(old_dir)
131
>>> os.rmdir(new_dir)
133
149
cmd = [rsync_name, "-av", "--delete"]
189
205
raise RsyncUnknownStatus(proc.returncode)
190
206
return [l.split(' ')[-1].rstrip('\n') for l in result.splitlines(True)]
192
exclusions = ('.bzr/x-push-data', '.bzr/branch/x-push/data', '.bzr/parent',
193
'.bzr/branch/parent', '.bzr/x-pull-data', '.bzr/x-pull',
194
'.bzr/pull', '.bzr/stat-cache', '.bzr/x-rsync-data',
195
'.bzr/basis-inventory', '.bzr/inventory.backup.weave')
208
exclusions = ('.bzr/x-push-data', '.bzr/parent', '.bzr/x-pull-data',
209
'.bzr/x-pull', '.bzr/pull', '.bzr/stat-cache',
198
213
def read_revision_history(fname):
239
250
except RsyncNoFile:
242
def push(tree, location=None, overwrite=False, working_tree=True):
243
push_location = get_push_data(tree)
253
def push(cur_branch, location=None, overwrite=False):
254
push_location = get_push_data(cur_branch)
244
255
if location is not None:
245
256
if not location.endswith('/'):
247
258
push_location = location
249
260
if push_location is None:
250
if tree.branch.get_push_location() is None:
251
raise BzrCommandError("No push location known or specified.")
253
raise bzrlib.errors.MustUseDecorated
255
if push_location.find('://') != -1:
256
raise bzrlib.errors.MustUseDecorated
258
if push_location.find(':') == -1:
259
raise bzrlib.errors.MustUseDecorated
262
clean, non_source = is_clean(tree)
264
print """Error: This tree has uncommitted changes or unknown (?) files.
265
Use "bzr status" to list them."""
267
final_exclusions = non_source[:]
270
final_exclusions = []
271
for path, status, kind, file_id, entry in wt.list_files():
272
final_exclusions.append(path)
274
final_exclusions.extend(exclusions)
261
print "No push location saved. Please specify one on the command line."
264
clean, non_source = is_clean(cur_branch)
266
print """Error: This tree has uncommitted changes or unknown (?) files.
267
Use "bzr status" to list them."""
269
non_source.extend(exclusions)
275
270
if not overwrite:
277
if not history_subset(push_location, tree.branch):
272
if not history_subset(push_location, cur_branch):
278
273
raise bzrlib.errors.BzrCommandError("Local branch is not a"
279
274
" newer version of remote"
288
283
" specified location. Please ensure that"
289
284
' "%s" is of the form "machine:/path".' % push_location)
290
285
print "Pushing to %s" % push_location
291
rsync(tree.basedir+'/', push_location, ssh=True,
292
excludes=final_exclusions)
294
set_push_data(tree, push_location)
297
def short_committer(committer):
298
new_committer = re.sub('<.*>', '', committer).strip(' ')
299
if len(new_committer) < 2:
286
rsync(cur_branch.base+'/', push_location, ssh=True, excludes=non_source)
288
set_push_data(cur_branch, push_location)
added
removed
bzrtools.py
