« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 1185.52.1
- compare with another revision
- download diff
- download tarball
- view history from revision 1185.52.1
- Committer: James Henstridge
- Date: 2005-12-02 03:36:43 UTC
- mto: (1185.33.82 bzr.dev (Main development branch))
- mto: This revision was merged to the branch mainline in revision 1520.
- Revision ID: james.henstridge@canonical.com-20051202033643-11c50c1f530b3e13
Don't encode unicode messages to UTF-8 in mutter() (the stream writer does it).
Use a codec wrapped log file in tests to match the real environment.
Use a codec wrapped log file in tests to match the real environment.
- files added:
- NEWS.developers
- bzrlib/util/urlgrabber
- notes
- patches
- files removed:
- BRANCH.TODO
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- bzrlib/bundle
- bzrlib/bundle/old
- bzrlib/bundle/serializer
- bzrlib/doc
- bzrlib/doc/api
- bzrlib/plugins/launchpad
- bzrlib/repofmt
- bzrlib/smart
- bzrlib/store/revision
- bzrlib/store/versioned
- bzrlib/tests/branch_implementations
- bzrlib/tests/bzrdir_implementations
- bzrlib/tests/interrepository_implementations
- bzrlib/tests/intertree_implementations
- bzrlib/tests/interversionedfile_implementations
- bzrlib/tests/per_lock
- bzrlib/tests/repository_implementations
- bzrlib/tests/revisionstore_implementations
- bzrlib/tests/test_patches_data
- bzrlib/tests/tree_implementations
- bzrlib/tests/workingtree_implementations
- bzrlib/transport/http
- bzrlib/ui
- bzrlib/version_info_formats
- doc/developers
- man1
- tools/doc_generate
- tools/win32
- files renamed:
- doc/developers/HACKING => HACKING
- tools/doc_generate/autodoc_man.py => bzr_man.py
- bzrlib/bundle/__init__.py => bzrlib/changeset.py
- bzrlib/store/versioned/__init__.py => bzrlib/store/weave.py
- bzrlib/tests/blackbox/test_annotate.py => bzrlib/tests/test_annotate.py
- bzrlib/tests/branch_implementations/test_branch.py => bzrlib/tests/test_branch.py
- bzrlib/tests/test_commands.py => bzrlib/tests/test_command.py
- bzrlib/tests/branch_implementations/test_parent.py => bzrlib/tests/test_parent.py
- bzrlib/tests/blackbox/test_revision_info.py => bzrlib/tests/test_revision_info.py
- bzrlib/tests/repository_implementations/test_revision.py => bzrlib/tests/test_revprops.py
- bzrlib/tests/test_sftp_transport.py => bzrlib/tests/test_sftp.py
- bzrlib/tests/blackbox/test_status.py => bzrlib/tests/test_status.py
- bzrlib/tests/blackbox/test_uncommit.py => bzrlib/tests/test_uncommit.py
- bzrlib/transport/http/__init__.py => bzrlib/transport/http.py
- bzrlib/ui/__init__.py => bzrlib/ui.py
- bzrlib/win32utils.py => bzrlib/win32console.py
- bzrlib/xml_serializer.py => bzrlib/xml.py
- doc/tutorial.txt => tutorial.txt
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2004, 2005, 2006, 2007 Canonical Ltd
2
#
1
# Copyright (C) 2004, 2005 by Canonical Ltd
2
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
#
7
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
12
#
12
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
16
17
"""builtin bzr commands"""
18
19
import os
17
# DO NOT change this to cStringIO - it results in control files
18
# written as UCS4
19
# FIXIT! (Only deal with byte streams OR unicode at any one layer.)
20
# RBC 20051018
20
21
from StringIO import StringIO
21
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
24
import codecs
25
import errno
26
import smtplib
27
22
import sys
28
import tempfile
29
import time
23
import os
30
24
31
25
import bzrlib
32
from bzrlib import (
33
branch,
34
bugtracker,
35
bundle,
36
bzrdir,
37
delta,
38
config,
39
errors,
40
globbing,
41
ignores,
42
log,
43
merge as _mod_merge,
44
merge_directive,
45
osutils,
46
registry,
47
repository,
48
revisionspec,
49
symbol_versioning,
50
transport,
51
tree as _mod_tree,
52
ui,
53
urlutils,
54
)
26
from bzrlib import BZRDIR
27
from bzrlib.commands import Command, display_command
55
28
from bzrlib.branch import Branch
56
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
57
from bzrlib.conflicts import ConflictList
58
29
from bzrlib.revision import common_ancestor
30
import bzrlib.errors as errors
31
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError,
32
NotBranchError, DivergedBranches, NotConflicted,
33
NoSuchFile, NoWorkingTree, FileInWrongBranch)
34
from bzrlib.option import Option
59
35
from bzrlib.revisionspec import RevisionSpec
36
import bzrlib.trace
37
from bzrlib.trace import mutter, note, log_error, warning, is_quiet
60
38
from bzrlib.workingtree import WorkingTree
61
""")
62
63
from bzrlib.commands import Command, display_command
64
from bzrlib.option import ListOption, Option, RegistryOption
65
from bzrlib.progress import DummyProgress, ProgressPhase
66
from bzrlib.trace import mutter, note, log_error, warning, is_quiet, info
67
39
68
40
69
41
def tree_files(file_list, default_branch=u'.'):
70
42
try:
71
43
return internal_tree_files(file_list, default_branch)
72
except errors.FileInWrongBranch, e:
73
raise errors.BzrCommandError("%s is not in the same branch as %s" %
74
(e.path, file_list[0]))
75
76
77
# XXX: Bad function name; should possibly also be a class method of
78
# WorkingTree rather than a function.
44
except FileInWrongBranch, e:
45
raise BzrCommandError("%s is not in the same branch as %s" %
46
(e.path, file_list[0]))
47
79
48
def internal_tree_files(file_list, default_branch=u'.'):
80
"""Convert command-line paths to a WorkingTree and relative paths.
81
82
This is typically used for command-line processors that take one or
83
more filenames, and infer the workingtree that contains them.
84
85
The filenames given are not required to exist.
86
87
:param file_list: Filenames to convert.
88
89
:param default_branch: Fallback tree path to use if file_list is empty or
90
None.
91
92
:return: workingtree, [relative_paths]
49
"""\
50
Return a branch and list of branch-relative paths.
51
If supplied file_list is empty or None, the branch default will be used,
52
and returned file_list will match the original.
93
53
"""
94
54
if file_list is None or len(file_list) == 0:
95
55
return WorkingTree.open_containing(default_branch)[0], file_list
96
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
56
tree = WorkingTree.open_containing(file_list[0])[0]
97
57
new_list = []
98
58
for filename in file_list:
99
59
try:
100
new_list.append(tree.relpath(osutils.dereference_path(filename)))
101
except errors.PathNotChild:
102
raise errors.FileInWrongBranch(tree.branch, filename)
60
new_list.append(tree.relpath(filename))
61
except NotBranchError:
62
raise FileInWrongBranch(tree.branch, filename)
103
63
return tree, new_list
104
64
105
65
106
@symbol_versioning.deprecated_function(symbol_versioning.zero_fifteen)
107
def get_format_type(typestring):
108
"""Parse and return a format specifier."""
109
# Have to use BzrDirMetaFormat1 directly, so that
110
# RepositoryFormat.set_default_format works
111
if typestring == "default":
112
return bzrdir.BzrDirMetaFormat1()
113
try:
114
return bzrdir.format_registry.make_bzrdir(typestring)
115
except KeyError:
116
msg = 'Unknown bzr format "%s". See "bzr help formats".' % typestring
117
raise errors.BzrCommandError(msg)
118
119
120
66
# TODO: Make sure no commands unconditionally use the working directory as a
121
67
# branch. If a filename argument is used, the first of them should be used to
122
68
# specify the branch. (Perhaps this can be factored out into some kind of
144
90
modified
145
91
Text has changed since the previous revision.
146
92
147
kind changed
148
File kind has been changed (e.g. from file to directory).
93
unchanged
94
Nothing about this file has changed since the previous revision.
95
Only shown with --all.
149
96
150
97
unknown
151
98
Not versioned and not matching an ignore pattern.
152
99
153
To see ignored files use 'bzr ignored'. For details on the
100
To see ignored files use 'bzr ignored'. For details in the
154
101
changes to file texts, use 'bzr diff'.
155
156
--short gives a status flags for each item, similar to the SVN's status
157
command.
158
159
Column 1: versioning / renames
160
+ File versioned
161
- File unversioned
162
R File renamed
163
? File unknown
164
C File has conflicts
165
P Entry for a pending merge (not a file)
166
167
Column 2: Contents
168
N File created
169
D File deleted
170
K File kind changed
171
M File modified
172
173
Column 3: Execute
174
* The execute bit was changed
175
102
176
103
If no arguments are specified, the status of the entire working
177
104
directory is shown. Otherwise, only the status of the specified
185
112
# TODO: --no-recurse, --recurse options
186
113
187
114
takes_args = ['file*']
188
takes_options = ['show-ids', 'revision',
189
Option('short', help='Give short SVN-style status lines'),
190
Option('versioned', help='Only show versioned files')]
115
takes_options = ['all', 'show-ids', 'revision']
191
116
aliases = ['st', 'stat']
192
193
encoding_type = 'replace'
194
_see_also = ['diff', 'revert']
195
117
196
118
@display_command
197
def run(self, show_ids=False, file_list=None, revision=None, short=False,
198
versioned=False):
199
from bzrlib.status import show_tree_status
200
119
def run(self, all=False, show_ids=False, file_list=None, revision=None):
201
120
tree, file_list = tree_files(file_list)
202
121
203
show_tree_status(tree, show_ids=show_ids,
204
specific_files=file_list, revision=revision,
205
to_file=self.outf, short=short, versioned=versioned)
122
from bzrlib.status import show_status
123
show_status(tree.branch, show_unchanged=all, show_ids=show_ids,
124
specific_files=file_list, revision=revision)
206
125
207
126
208
127
class cmd_cat_revision(Command):
215
134
hidden = True
216
135
takes_args = ['revision_id?']
217
136
takes_options = ['revision']
218
# cat-revision is more for frontends so should be exact
219
encoding = 'strict'
220
137
221
138
@display_command
222
139
def run(self, revision_id=None, revision=None):
223
140
224
revision_id = osutils.safe_revision_id(revision_id, warn=False)
225
141
if revision_id is not None and revision is not None:
226
raise errors.BzrCommandError('You can only supply one of'
227
' revision_id or --revision')
142
raise BzrCommandError('You can only supply one of revision_id or --revision')
228
143
if revision_id is None and revision is None:
229
raise errors.BzrCommandError('You must supply either'
230
' --revision or a revision_id')
144
raise BzrCommandError('You must supply either --revision or a revision_id')
231
145
b = WorkingTree.open_containing(u'.')[0].branch
232
233
# TODO: jam 20060112 should cat-revision always output utf-8?
234
146
if revision_id is not None:
235
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
147
sys.stdout.write(b.get_revision_xml(revision_id))
236
148
elif revision is not None:
237
149
for rev in revision:
238
150
if rev is None:
239
raise errors.BzrCommandError('You cannot specify a NULL'
240
' revision.')
151
raise BzrCommandError('You cannot specify a NULL revision.')
241
152
revno, rev_id = rev.in_history(b)
242
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
153
sys.stdout.write(b.get_revision_xml(rev_id))
243
154
244
155
245
class cmd_remove_tree(Command):
246
"""Remove the working tree from a given branch/checkout.
247
248
Since a lightweight checkout is little more than a working tree
249
this will refuse to run against one.
250
251
To re-create the working tree, use "bzr checkout".
252
"""
253
_see_also = ['checkout', 'working-trees']
254
255
takes_args = ['location?']
256
257
def run(self, location='.'):
258
d = bzrdir.BzrDir.open(location)
259
260
try:
261
working = d.open_workingtree()
262
except errors.NoWorkingTree:
263
raise errors.BzrCommandError("No working tree to remove")
264
except errors.NotLocalUrl:
265
raise errors.BzrCommandError("You cannot remove the working tree of a "
266
"remote path")
267
268
working_path = working.bzrdir.root_transport.base
269
branch_path = working.branch.bzrdir.root_transport.base
270
if working_path != branch_path:
271
raise errors.BzrCommandError("You cannot remove the working tree from "
272
"a lightweight checkout")
273
274
d.destroy_workingtree()
275
276
277
156
class cmd_revno(Command):
278
157
"""Show current revision number.
279
158
280
This is equal to the number of revisions on this branch.
281
"""
282
283
_see_also = ['info']
284
takes_args = ['location?']
285
159
This is equal to the number of revisions on this branch."""
286
160
@display_command
287
def run(self, location=u'.'):
288
self.outf.write(str(Branch.open_containing(location)[0].revno()))
289
self.outf.write('\n')
161
def run(self):
162
print Branch.open_containing(u'.')[0].revno()
290
163
291
164
292
165
class cmd_revision_info(Command):
295
168
hidden = True
296
169
takes_args = ['revision_info*']
297
170
takes_options = ['revision']
298
299
171
@display_command
300
172
def run(self, revision=None, revision_info_list=[]):
301
173
304
176
revs.extend(revision)
305
177
if revision_info_list is not None:
306
178
for rev in revision_info_list:
307
revs.append(RevisionSpec.from_string(rev))
308
309
b = Branch.open_containing(u'.')[0]
310
179
revs.append(RevisionSpec(rev))
311
180
if len(revs) == 0:
312
revs.append(RevisionSpec.from_string('-1'))
181
raise BzrCommandError('You must supply a revision identifier')
182
183
b = WorkingTree.open_containing(u'.')[0].branch
313
184
314
185
for rev in revs:
315
186
revinfo = rev.in_history(b)
316
187
if revinfo.revno is None:
317
dotted_map = b.get_revision_id_to_revno_map()
318
revno = '.'.join(str(i) for i in dotted_map[revinfo.rev_id])
319
print '%s %s' % (revno, revinfo.rev_id)
188
print ' %s' % revinfo.rev_id
320
189
else:
321
190
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
322
191
341
210
342
211
Adding a file whose parent directory is not versioned will
343
212
implicitly add the parent, and so on up to the root. This means
344
you should never need to explicitly add a directory, they'll just
213
you should never need to explictly add a directory, they'll just
345
214
get added when you add a file in the directory.
346
347
--dry-run will show which files would be added, but not actually
348
add them.
349
350
--file-ids-from will try to use the file ids from the supplied path.
351
It looks up ids trying to find a matching parent directory with the
352
same filename, and then by pure path. This option is rarely needed
353
but can be useful when adding the same logical file into two
354
branches that will be merged later (without showing the two different
355
adds as a conflict). It is also useful when merging another project
356
into a subdirectory of this one.
357
215
"""
358
216
takes_args = ['file*']
359
takes_options = ['no-recurse', 'dry-run', 'verbose',
360
Option('file-ids-from', type=unicode,
361
help='Lookup file ids from here')]
362
encoding_type = 'replace'
363
_see_also = ['remove']
364
365
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
366
file_ids_from=None):
367
import bzrlib.add
368
369
base_tree = None
370
if file_ids_from is not None:
371
try:
372
base_tree, base_path = WorkingTree.open_containing(
373
file_ids_from)
374
except errors.NoWorkingTree:
375
base_branch, base_path = Branch.open_containing(
376
file_ids_from)
377
base_tree = base_branch.basis_tree()
378
379
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
380
to_file=self.outf, should_print=(not is_quiet()))
217
takes_options = ['no-recurse']
218
219
def run(self, file_list, no_recurse=False):
220
from bzrlib.add import smart_add, add_reporter_print, add_reporter_null
221
if is_quiet():
222
reporter = add_reporter_null
381
223
else:
382
action = bzrlib.add.AddAction(to_file=self.outf,
383
should_print=(not is_quiet()))
384
385
if base_tree:
386
base_tree.lock_read()
387
try:
388
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
389
action=action, save=not dry_run)
390
finally:
391
if base_tree is not None:
392
base_tree.unlock()
393
if len(ignored) > 0:
394
if verbose:
395
for glob in sorted(ignored.keys()):
396
for path in ignored[glob]:
397
self.outf.write("ignored %s matching \"%s\"\n"
398
% (path, glob))
399
else:
400
match_len = 0
401
for glob, paths in ignored.items():
402
match_len += len(paths)
403
self.outf.write("ignored %d file(s).\n" % match_len)
404
self.outf.write("If you wish to add some of these files,"
405
" please add them by name.\n")
224
reporter = add_reporter_print
225
smart_add(file_list, not no_recurse, reporter)
406
226
407
227
408
228
class cmd_mkdir(Command):
410
230
411
231
This is equivalent to creating the directory and then adding it.
412
232
"""
413
414
233
takes_args = ['dir+']
415
encoding_type = 'replace'
416
234
417
235
def run(self, dir_list):
418
236
for d in dir_list:
419
237
os.mkdir(d)
420
238
wt, dd = WorkingTree.open_containing(d)
421
239
wt.add([dd])
422
self.outf.write('added %s\n' % d)
240
print 'added', d
423
241
424
242
425
243
class cmd_relpath(Command):
426
244
"""Show path of a file relative to root"""
427
428
245
takes_args = ['filename']
429
246
hidden = True
430
247
431
248
@display_command
432
249
def run(self, filename):
433
# TODO: jam 20050106 Can relpath return a munged path if
434
# sys.stdout encoding cannot represent it?
435
250
tree, relpath = WorkingTree.open_containing(filename)
436
self.outf.write(relpath)
437
self.outf.write('\n')
251
print relpath
438
252
439
253
440
254
class cmd_inventory(Command):
441
255
"""Show inventory of the current working copy or a revision.
442
256
443
257
It is possible to limit the output to a particular entry
444
type using the --kind option. For example: --kind file.
445
446
It is also possible to restrict the list of files to a specific
447
set. For example: bzr inventory --show-ids this/file
258
type using the --kind option. For example; --kind file.
448
259
"""
449
450
hidden = True
451
_see_also = ['ls']
452
260
takes_options = ['revision', 'show-ids', 'kind']
453
takes_args = ['file*']
454
261
455
262
@display_command
456
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
263
def run(self, revision=None, show_ids=False, kind=None):
457
264
if kind and kind not in ['file', 'directory', 'symlink']:
458
raise errors.BzrCommandError('invalid kind specified')
459
460
work_tree, file_list = tree_files(file_list)
461
work_tree.lock_read()
462
try:
463
if revision is not None:
464
if len(revision) > 1:
465
raise errors.BzrCommandError(
466
'bzr inventory --revision takes exactly one revision'
467
' identifier')
468
revision_id = revision[0].in_history(work_tree.branch).rev_id
469
tree = work_tree.branch.repository.revision_tree(revision_id)
470
471
extra_trees = [work_tree]
472
tree.lock_read()
473
else:
474
tree = work_tree
475
extra_trees = []
476
477
if file_list is not None:
478
file_ids = tree.paths2ids(file_list, trees=extra_trees,
479
require_versioned=True)
480
# find_ids_across_trees may include some paths that don't
481
# exist in 'tree'.
482
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
483
for file_id in file_ids if file_id in tree)
484
else:
485
entries = tree.inventory.entries()
486
finally:
487
tree.unlock()
488
if tree is not work_tree:
489
work_tree.unlock()
490
491
for path, entry in entries:
265
raise BzrCommandError('invalid kind specified')
266
tree = WorkingTree.open_containing(u'.')[0]
267
if revision is None:
268
inv = tree.read_working_inventory()
269
else:
270
if len(revision) > 1:
271
raise BzrCommandError('bzr inventory --revision takes'
272
' exactly one revision identifier')
273
inv = tree.branch.get_revision_inventory(
274
revision[0].in_history(tree.branch).rev_id)
275
276
for path, entry in inv.entries():
492
277
if kind and kind != entry.kind:
493
278
continue
494
279
if show_ids:
495
self.outf.write('%-50s %s\n' % (path, entry.file_id))
280
print '%-50s %s' % (path, entry.file_id)
496
281
else:
497
self.outf.write(path)
498
self.outf.write('\n')
282
print path
283
284
285
class cmd_move(Command):
286
"""Move files to a different directory.
287
288
examples:
289
bzr move *.txt doc
290
291
The destination must be a versioned directory in the same branch.
292
"""
293
takes_args = ['source$', 'dest']
294
def run(self, source_list, dest):
295
tree, source_list = tree_files(source_list)
296
# TODO: glob expansion on windows?
297
tree.move(source_list, tree.relpath(dest))
298
299
300
class cmd_rename(Command):
301
"""Change the name of an entry.
302
303
examples:
304
bzr rename frob.c frobber.c
305
bzr rename src/frob.c lib/frob.c
306
307
It is an error if the destination name exists.
308
309
See also the 'move' command, which moves files into a different
310
directory without changing their name.
311
"""
312
# TODO: Some way to rename multiple files without invoking
313
# bzr for each one?"""
314
takes_args = ['from_name', 'to_name']
315
316
def run(self, from_name, to_name):
317
tree, (from_name, to_name) = tree_files((from_name, to_name))
318
tree.rename_one(from_name, to_name)
499
319
500
320
501
321
class cmd_mv(Command):
507
327
508
328
If the last argument is a versioned directory, all the other names
509
329
are moved into it. Otherwise, there must be exactly two arguments
510
and the file is changed to a new name.
511
512
If OLDNAME does not exist on the filesystem but is versioned and
513
NEWNAME does exist on the filesystem but is not versioned, mv
514
assumes that the file has been manually moved and only updates
515
its internal inventory to reflect that change.
516
The same is valid when moving many SOURCE files to a DESTINATION.
330
and the file is changed to a new name, which must not already exist.
517
331
518
332
Files cannot be moved between branches.
519
333
"""
520
521
334
takes_args = ['names*']
522
takes_options = [Option("after", help="move only the bzr identifier"
523
" of the file (file has already been moved). Use this flag if"
524
" bzr is not able to detect this itself.")]
525
aliases = ['move', 'rename']
526
encoding_type = 'replace'
527
528
def run(self, names_list, after=False):
529
if names_list is None:
530
names_list = []
531
335
def run(self, names_list):
532
336
if len(names_list) < 2:
533
raise errors.BzrCommandError("missing file argument")
337
raise BzrCommandError("missing file argument")
534
338
tree, rel_names = tree_files(names_list)
535
339
536
340
if os.path.isdir(names_list[-1]):
537
341
# move into existing directory
538
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
539
self.outf.write("%s => %s\n" % pair)
342
for pair in tree.move(rel_names[:-1], rel_names[-1]):
343
print "%s => %s" % pair
540
344
else:
541
345
if len(names_list) != 2:
542
raise errors.BzrCommandError('to mv multiple files the'
543
' destination must be a versioned'
544
' directory')
545
tree.rename_one(rel_names[0], rel_names[1], after=after)
546
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
346
raise BzrCommandError('to mv multiple files the destination '
347
'must be a versioned directory')
348
tree.rename_one(rel_names[0], rel_names[1])
349
print "%s => %s" % (rel_names[0], rel_names[1])
547
350
548
351
549
352
class cmd_pull(Command):
550
"""Turn this branch into a mirror of another branch.
353
"""Pull any changes from another branch into the current one.
354
355
If there is no default location set, the first pull will set it. After
356
that, you can omit the location to use the default. To change the
357
default, use --remember.
551
358
552
359
This command only works on branches that have not diverged. Branches are
553
considered diverged if the destination branch's most recent commit is one
554
that has not been merged (directly or indirectly) into the parent.
360
considered diverged if both branches have had commits without first
361
pulling from the other.
555
362
556
If branches have diverged, you can use 'bzr merge' to integrate the changes
363
If branches have diverged, you can use 'bzr merge' to pull the text changes
557
364
from one into the other. Once one branch has merged, the other should
558
365
be able to pull it again.
559
366
560
367
If you want to forget your local changes and just update your branch to
561
match the remote one, use pull --overwrite.
562
563
If there is no default location set, the first pull will set it. After
564
that, you can omit the location to use the default. To change the
565
default, use --remember. The value will only be saved if the remote
566
location can be accessed.
368
match the remote one, use --overwrite.
567
369
"""
568
569
_see_also = ['push', 'update']
570
takes_options = ['remember', 'overwrite', 'revision', 'verbose',
571
Option('directory',
572
help='branch to pull into, '
573
'rather than the one containing the working directory',
574
short_name='d',
575
type=unicode,
576
),
577
]
370
takes_options = ['remember', 'overwrite', 'verbose']
578
371
takes_args = ['location?']
579
encoding_type = 'replace'
580
581
def run(self, location=None, remember=False, overwrite=False,
582
revision=None, verbose=False,
583
directory=None):
584
from bzrlib.tag import _merge_tags_if_possible
585
# FIXME: too much stuff is in the command class
586
revision_id = None
587
mergeable = None
588
if directory is None:
589
directory = u'.'
590
try:
591
tree_to = WorkingTree.open_containing(directory)[0]
592
branch_to = tree_to.branch
593
except errors.NoWorkingTree:
594
tree_to = None
595
branch_to = Branch.open_containing(directory)[0]
596
597
reader = None
598
if location is not None:
599
try:
600
mergeable = bundle.read_mergeable_from_url(
601
location)
602
except errors.NotABundle:
603
pass # Continue on considering this url a Branch
604
605
stored_loc = branch_to.get_parent()
372
373
def run(self, location=None, remember=False, overwrite=False, verbose=False):
374
from bzrlib.merge import merge
375
from shutil import rmtree
376
import errno
377
# FIXME: too much stuff is in the command class
378
tree_to = WorkingTree.open_containing(u'.')[0]
379
stored_loc = tree_to.branch.get_parent()
606
380
if location is None:
607
381
if stored_loc is None:
608
raise errors.BzrCommandError("No pull location known or"
609
" specified.")
382
raise BzrCommandError("No pull location known or specified.")
610
383
else:
611
display_url = urlutils.unescape_for_display(stored_loc,
612
self.outf.encoding)
613
self.outf.write("Using saved location: %s\n" % display_url)
384
print "Using saved location: %s" % stored_loc
614
385
location = stored_loc
615
616
if mergeable is not None:
617
if revision is not None:
618
raise errors.BzrCommandError(
619
'Cannot use -r with merge directives or bundles')
620
revision_id = mergeable.install_revisions(branch_to.repository)
621
branch_from = branch_to
622
else:
623
branch_from = Branch.open(location)
624
625
if branch_to.get_parent() is None or remember:
626
branch_to.set_parent(branch_from.base)
627
628
if revision is not None:
629
if len(revision) == 1:
630
revision_id = revision[0].in_history(branch_from).rev_id
631
else:
632
raise errors.BzrCommandError(
633
'bzr pull --revision takes one value.')
634
635
old_rh = branch_to.revision_history()
636
if tree_to is not None:
637
result = tree_to.pull(branch_from, overwrite, revision_id,
638
delta._ChangeReporter(unversioned_filter=tree_to.is_ignored))
639
else:
640
result = branch_to.pull(branch_from, overwrite, revision_id)
641
642
result.report(self.outf)
386
br_from = Branch.open(location)
387
br_to = tree_to.branch
388
try:
389
old_rh = br_to.revision_history()
390
count = tree_to.pull(br_from, overwrite)
391
except DivergedBranches:
392
# FIXME: Just make DivergedBranches display the right message
393
# itself.
394
raise BzrCommandError("These branches have diverged."
395
" Try merge.")
396
if br_to.get_parent() is None or remember:
397
br_to.set_parent(location)
398
note('%d revision(s) pulled.', count)
643
399
if verbose:
644
from bzrlib.log import show_changed_revisions
645
new_rh = branch_to.revision_history()
646
show_changed_revisions(branch_to, old_rh, new_rh,
647
to_file=self.outf)
400
new_rh = tree_to.branch.revision_history()
401
if old_rh != new_rh:
402
# Something changed
403
from bzrlib.log import show_changed_revisions
404
show_changed_revisions(tree_to.branch, old_rh, new_rh)
648
405
649
406
650
407
class cmd_push(Command):
651
"""Update a mirror of this branch.
652
653
The target branch will not have its working tree populated because this
654
is both expensive, and is not supported on remote file systems.
655
656
Some smart servers or protocols *may* put the working tree in place in
657
the future.
408
"""Push this branch into another branch.
409
410
The remote branch will not have its working tree populated because this
411
is both expensive, and may not be supported on the remote file system.
412
413
Some smart servers or protocols *may* put the working tree in place.
414
415
If there is no default push location set, the first push will set it.
416
After that, you can omit the location to use the default. To change the
417
default, use --remember.
658
418
659
419
This command only works on branches that have not diverged. Branches are
660
considered diverged if the destination branch's most recent commit is one
661
that has not been merged (directly or indirectly) by the source branch.
420
considered diverged if the branch being pushed to is not an older version
421
of this branch.
662
422
663
423
If branches have diverged, you can use 'bzr push --overwrite' to replace
664
the other branch completely, discarding its unmerged changes.
424
the other branch completely.
665
425
666
426
If you want to ensure you have the different changes in the other branch,
667
do a merge (see bzr help merge) from the other branch, and commit that.
668
After that you will be able to do a push without '--overwrite'.
669
670
If there is no default push location set, the first push will set it.
671
After that, you can omit the location to use the default. To change the
672
default, use --remember. The value will only be saved if the remote
673
location can be accessed.
427
do a merge (see bzr help merge) from the other branch, and commit that
428
before doing a 'push --overwrite'.
674
429
"""
675
676
_see_also = ['pull', 'update', 'working-trees']
677
takes_options = ['remember', 'overwrite', 'verbose',
678
Option('create-prefix',
679
help='Create the path leading up to the branch '
680
'if it does not already exist'),
681
Option('directory',
682
help='branch to push from, '
683
'rather than the one containing the working directory',
684
short_name='d',
685
type=unicode,
686
),
687
Option('use-existing-dir',
688
help='By default push will fail if the target'
689
' directory exists, but does not already'
690
' have a control directory. This flag will'
691
' allow push to proceed.'),
692
]
430
takes_options = ['remember', 'overwrite',
431
Option('create-prefix',
432
help='Create the path leading up to the branch '
433
'if it does not already exist')]
693
434
takes_args = ['location?']
694
encoding_type = 'replace'
695
435
696
436
def run(self, location=None, remember=False, overwrite=False,
697
create_prefix=False, verbose=False,
698
use_existing_dir=False,
699
directory=None):
437
create_prefix=False, verbose=False):
700
438
# FIXME: Way too big! Put this into a function called from the
701
439
# command.
702
if directory is None:
703
directory = '.'
704
br_from = Branch.open_containing(directory)[0]
705
stored_loc = br_from.get_push_location()
440
import errno
441
from shutil import rmtree
442
from bzrlib.transport import get_transport
443
444
tree_from = WorkingTree.open_containing(u'.')[0]
445
br_from = tree_from.branch
446
stored_loc = tree_from.branch.get_push_location()
706
447
if location is None:
707
448
if stored_loc is None:
708
raise errors.BzrCommandError("No push location known or specified.")
449
raise BzrCommandError("No push location known or specified.")
709
450
else:
710
display_url = urlutils.unescape_for_display(stored_loc,
711
self.outf.encoding)
712
self.outf.write("Using saved location: %s\n" % display_url)
451
print "Using saved location: %s" % stored_loc
713
452
location = stored_loc
714
715
to_transport = transport.get_transport(location)
716
717
br_to = repository_to = dir_to = None
718
453
try:
719
dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
720
except errors.NotBranchError:
721
pass # Didn't find anything
722
else:
723
# If we can open a branch, use its direct repository, otherwise see
724
# if there is a repository without a branch.
725
try:
726
br_to = dir_to.open_branch()
727
except errors.NotBranchError:
728
# Didn't find a branch, can we find a repository?
454
br_to = Branch.open(location)
455
except NotBranchError:
456
# create a branch.
457
transport = get_transport(location).clone('..')
458
if not create_prefix:
729
459
try:
730
repository_to = dir_to.find_repository()
731
except errors.NoRepositoryPresent:
732
pass
460
transport.mkdir(transport.relpath(location))
461
except NoSuchFile:
462
raise BzrCommandError("Parent directory of %s "
463
"does not exist." % location)
733
464
else:
734
# Found a branch, so we must have found a repository
735
repository_to = br_to.repository
736
push_result = None
737
old_rh = []
738
if dir_to is None:
739
# The destination doesn't exist; create it.
740
# XXX: Refactor the create_prefix/no_create_prefix code into a
741
# common helper function
742
try:
743
to_transport.mkdir('.')
744
except errors.FileExists:
745
if not use_existing_dir:
746
raise errors.BzrCommandError("Target directory %s"
747
" already exists, but does not have a valid .bzr"
748
" directory. Supply --use-existing-dir to push"
749
" there anyway." % location)
750
except errors.NoSuchFile:
751
if not create_prefix:
752
raise errors.BzrCommandError("Parent directory of %s"
753
" does not exist."
754
"\nYou may supply --create-prefix to create all"
755
" leading parent directories."
756
% location)
757
758
cur_transport = to_transport
759
needed = [cur_transport]
760
# Recurse upwards until we can create a directory successfully
761
while True:
762
new_transport = cur_transport.clone('..')
763
if new_transport.base == cur_transport.base:
764
raise errors.BzrCommandError("Failed to create path"
765
" prefix for %s."
766
% location)
767
try:
768
new_transport.mkdir('.')
769
except errors.NoSuchFile:
770
needed.append(new_transport)
771
cur_transport = new_transport
772
else:
773
break
774
775
# Now we only need to create child directories
465
current = transport.base
466
needed = [(transport, transport.relpath(location))]
776
467
while needed:
777
cur_transport = needed.pop()
778
cur_transport.ensure_base()
779
780
# Now the target directory exists, but doesn't have a .bzr
781
# directory. So we need to create it, along with any work to create
782
# all of the dependent branches, etc.
783
dir_to = br_from.bzrdir.clone_on_transport(to_transport,
784
revision_id=br_from.last_revision())
785
br_to = dir_to.open_branch()
786
# TODO: Some more useful message about what was copied
787
note('Created new branch.')
788
# We successfully created the target, remember it
789
if br_from.get_push_location() is None or remember:
790
br_from.set_push_location(br_to.base)
791
elif repository_to is None:
792
# we have a bzrdir but no branch or repository
793
# XXX: Figure out what to do other than complain.
794
raise errors.BzrCommandError("At %s you have a valid .bzr control"
795
" directory, but not a branch or repository. This is an"
796
" unsupported configuration. Please move the target directory"
797
" out of the way and try again."
798
% location)
799
elif br_to is None:
800
# We have a repository but no branch, copy the revisions, and then
801
# create a branch.
802
last_revision_id = br_from.last_revision()
803
repository_to.fetch(br_from.repository,
804
revision_id=last_revision_id)
805
br_to = br_from.clone(dir_to, revision_id=last_revision_id)
806
note('Created new branch.')
807
if br_from.get_push_location() is None or remember:
808
br_from.set_push_location(br_to.base)
809
else: # We have a valid to branch
810
# We were able to connect to the remote location, so remember it
811
# we don't need to successfully push because of possible divergence.
812
if br_from.get_push_location() is None or remember:
813
br_from.set_push_location(br_to.base)
468
try:
469
transport, relpath = needed[-1]
470
transport.mkdir(relpath)
471
needed.pop()
472
except NoSuchFile:
473
new_transport = transport.clone('..')
474
needed.append((new_transport,
475
new_transport.relpath(transport.base)))
476
if new_transport.base == transport.base:
477
raise BzrCommandError("Could not creeate "
478
"path prefix.")
479
br_to = Branch.initialize(location)
480
try:
814
481
old_rh = br_to.revision_history()
815
try:
816
try:
817
tree_to = dir_to.open_workingtree()
818
except errors.NotLocalUrl:
819
warning("This transport does not update the working "
820
"tree of: %s. See 'bzr help working-trees' for "
821
"more information." % br_to.base)
822
push_result = br_from.push(br_to, overwrite)
823
except errors.NoWorkingTree:
824
push_result = br_from.push(br_to, overwrite)
825
else:
826
tree_to.lock_write()
827
try:
828
push_result = br_from.push(tree_to.branch, overwrite)
829
tree_to.update()
830
finally:
831
tree_to.unlock()
832
except errors.DivergedBranches:
833
raise errors.BzrCommandError('These branches have diverged.'
834
' Try using "merge" and then "push".')
835
if push_result is not None:
836
push_result.report(self.outf)
837
elif verbose:
482
count = br_to.pull(br_from, overwrite)
483
except DivergedBranches:
484
raise BzrCommandError("These branches have diverged."
485
" Try a merge then push with overwrite.")
486
if br_from.get_push_location() is None or remember:
487
br_from.set_push_location(location)
488
note('%d revision(s) pushed.' % (count,))
489
if verbose:
838
490
new_rh = br_to.revision_history()
839
491
if old_rh != new_rh:
840
492
# Something changed
841
493
from bzrlib.log import show_changed_revisions
842
show_changed_revisions(br_to, old_rh, new_rh,
843
to_file=self.outf)
844
else:
845
# we probably did a clone rather than a push, so a message was
846
# emitted above
847
pass
494
show_changed_revisions(br_to, old_rh, new_rh)
848
495
849
496
850
497
class cmd_branch(Command):
852
499
853
500
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
854
501
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
855
If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION
856
is derived from the FROM_LOCATION by stripping a leading scheme or drive
857
identifier, if any. For example, "branch lp:foo-bar" will attempt to
858
create ./foo-bar.
859
502
860
503
To retrieve the branch as of a particular revision, supply the --revision
861
504
parameter, as in "branch foo/bar -r 5".
505
506
--basis is to speed up branching from remote branches. When specified, it
507
copies all the file-contents, inventory and revision data from the basis
508
branch before copying anything from the remote branch.
862
509
"""
863
864
_see_also = ['checkout']
865
510
takes_args = ['from_location', 'to_location?']
866
takes_options = ['revision']
511
takes_options = ['revision', 'basis']
867
512
aliases = ['get', 'clone']
868
513
869
def run(self, from_location, to_location=None, revision=None):
870
from bzrlib.tag import _merge_tags_if_possible
514
def run(self, from_location, to_location=None, revision=None, basis=None):
515
from bzrlib.clone import copy_branch
516
import errno
517
from shutil import rmtree
871
518
if revision is None:
872
519
revision = [None]
873
520
elif len(revision) > 1:
874
raise errors.BzrCommandError(
521
raise BzrCommandError(
875
522
'bzr branch --revision takes exactly 1 revision value')
876
877
br_from = Branch.open(from_location)
523
try:
524
br_from = Branch.open(from_location)
525
except OSError, e:
526
if e.errno == errno.ENOENT:
527
raise BzrCommandError('Source location "%s" does not'
528
' exist.' % to_location)
529
else:
530
raise
878
531
br_from.lock_read()
879
532
try:
533
if basis is not None:
534
basis_branch = WorkingTree.open_containing(basis)[0].branch
535
else:
536
basis_branch = None
880
537
if len(revision) == 1 and revision[0] is not None:
881
538
revision_id = revision[0].in_history(br_from)[1]
882
539
else:
883
# FIXME - wt.last_revision, fallback to branch, fall back to
884
# None or perhaps NULL_REVISION to mean copy nothing
885
# RBC 20060209
886
revision_id = br_from.last_revision()
540
revision_id = None
887
541
if to_location is None:
888
to_location = urlutils.derive_to_location(from_location)
542
to_location = os.path.basename(from_location.rstrip("/\\"))
889
543
name = None
890
544
else:
891
545
name = os.path.basename(to_location) + '\n'
892
893
to_transport = transport.get_transport(to_location)
894
try:
895
to_transport.mkdir('.')
896
except errors.FileExists:
897
raise errors.BzrCommandError('Target directory "%s" already'
898
' exists.' % to_location)
899
except errors.NoSuchFile:
900
raise errors.BzrCommandError('Parent of "%s" does not exist.'
901
% to_location)
902
try:
903
# preserve whatever source format we have.
904
dir = br_from.bzrdir.sprout(to_transport.base, revision_id)
905
branch = dir.open_branch()
906
except errors.NoSuchRevision:
907
to_transport.delete_tree('.')
546
try:
547
os.mkdir(to_location)
548
except OSError, e:
549
if e.errno == errno.EEXIST:
550
raise BzrCommandError('Target directory "%s" already'
551
' exists.' % to_location)
552
if e.errno == errno.ENOENT:
553
raise BzrCommandError('Parent of "%s" does not exist.' %
554
to_location)
555
else:
556
raise
557
try:
558
copy_branch(br_from, to_location, revision_id, basis_branch)
559
except bzrlib.errors.NoSuchRevision:
560
rmtree(to_location)
908
561
msg = "The branch %s has no revision %s." % (from_location, revision[0])
909
raise errors.BzrCommandError(msg)
562
raise BzrCommandError(msg)
563
except bzrlib.errors.UnlistableBranch:
564
rmtree(to_location)
565
msg = "The branch %s cannot be used as a --basis"
566
raise BzrCommandError(msg)
567
branch = Branch.open(to_location)
910
568
if name:
911
branch.control_files.put_utf8('branch-name', name)
912
_merge_tags_if_possible(br_from, branch)
569
name = StringIO(name)
570
branch.put_controlfile('branch-name', name)
913
571
note('Branched %d revision(s).' % branch.revno())
914
572
finally:
915
573
br_from.unlock()
916
574
917
575
918
class cmd_checkout(Command):
919
"""Create a new checkout of an existing branch.
920
921
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
922
the branch found in '.'. This is useful if you have removed the working tree
923
or if it was never created - i.e. if you pushed the branch to its current
924
location using SFTP.
925
926
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
927
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
928
If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
929
is derived from the BRANCH_LOCATION by stripping a leading scheme or drive
930
identifier, if any. For example, "checkout lp:foo-bar" will attempt to
931
create ./foo-bar.
932
933
To retrieve the branch as of a particular revision, supply the --revision
934
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
935
out of date [so you cannot commit] but it may be useful (i.e. to examine old
936
code.)
937
"""
938
939
_see_also = ['checkouts', 'branch']
940
takes_args = ['branch_location?', 'to_location?']
941
takes_options = ['revision',
942
Option('lightweight',
943
help="perform a lightweight checkout. Lightweight "
944
"checkouts depend on access to the branch for "
945
"every operation. Normal checkouts can perform "
946
"common operations like diff and status without "
947
"such access, and also support local commits."
948
),
949
]
950
aliases = ['co']
951
952
def run(self, branch_location=None, to_location=None, revision=None,
953
lightweight=False):
954
if revision is None:
955
revision = [None]
956
elif len(revision) > 1:
957
raise errors.BzrCommandError(
958
'bzr checkout --revision takes exactly 1 revision value')
959
if branch_location is None:
960
branch_location = osutils.getcwd()
961
to_location = branch_location
962
source = Branch.open(branch_location)
963
if len(revision) == 1 and revision[0] is not None:
964
revision_id = revision[0].in_history(source)[1]
965
else:
966
revision_id = None
967
if to_location is None:
968
to_location = urlutils.derive_to_location(branch_location)
969
# if the source and to_location are the same,
970
# and there is no working tree,
971
# then reconstitute a branch
972
if (osutils.abspath(to_location) ==
973
osutils.abspath(branch_location)):
974
try:
975
source.bzrdir.open_workingtree()
976
except errors.NoWorkingTree:
977
source.bzrdir.create_workingtree()
978
return
979
try:
980
os.mkdir(to_location)
981
except OSError, e:
982
if e.errno == errno.EEXIST:
983
raise errors.BzrCommandError('Target directory "%s" already'
984
' exists.' % to_location)
985
if e.errno == errno.ENOENT:
986
raise errors.BzrCommandError('Parent of "%s" does not exist.'
987
% to_location)
988
else:
989
raise
990
source.create_checkout(to_location, revision_id, lightweight)
991
992
993
576
class cmd_renames(Command):
994
577
"""Show list of renamed files.
995
578
"""
996
579
# TODO: Option to show renames between two historical versions.
997
580
998
581
# TODO: Only show renames under dir, rather than in the whole branch.
999
_see_also = ['status']
1000
582
takes_args = ['dir?']
1001
583
1002
584
@display_command
1003
585
def run(self, dir=u'.'):
1004
586
tree = WorkingTree.open_containing(dir)[0]
1005
tree.lock_read()
1006
try:
1007
new_inv = tree.inventory
1008
old_tree = tree.basis_tree()
1009
old_tree.lock_read()
1010
try:
1011
old_inv = old_tree.inventory
1012
renames = list(_mod_tree.find_renames(old_inv, new_inv))
1013
renames.sort()
1014
for old_name, new_name in renames:
1015
self.outf.write("%s => %s\n" % (old_name, new_name))
1016
finally:
1017
old_tree.unlock()
1018
finally:
1019
tree.unlock()
1020
1021
1022
class cmd_update(Command):
1023
"""Update a tree to have the latest code committed to its branch.
1024
1025
This will perform a merge into the working tree, and may generate
1026
conflicts. If you have any local changes, you will still
1027
need to commit them after the update for the update to be complete.
1028
1029
If you want to discard your local changes, you can just do a
1030
'bzr revert' instead of 'bzr commit' after the update.
1031
"""
1032
1033
_see_also = ['pull', 'working-trees']
1034
takes_args = ['dir?']
1035
aliases = ['up']
1036
1037
def run(self, dir='.'):
1038
tree = WorkingTree.open_containing(dir)[0]
1039
master = tree.branch.get_master_branch()
1040
if master is not None:
1041
tree.lock_write()
1042
else:
1043
tree.lock_tree_write()
1044
try:
1045
existing_pending_merges = tree.get_parent_ids()[1:]
1046
last_rev = tree.last_revision()
1047
if last_rev == tree.branch.last_revision():
1048
# may be up to date, check master too.
1049
master = tree.branch.get_master_branch()
1050
if master is None or last_rev == master.last_revision():
1051
revno = tree.branch.revision_id_to_revno(last_rev)
1052
note("Tree is up to date at revision %d." % (revno,))
1053
return 0
1054
conflicts = tree.update()
1055
revno = tree.branch.revision_id_to_revno(tree.last_revision())
1056
note('Updated to revision %d.' % (revno,))
1057
if tree.get_parent_ids()[1:] != existing_pending_merges:
1058
note('Your local commits will now show as pending merges with '
1059
"'bzr status', and can be committed with 'bzr commit'.")
1060
if conflicts != 0:
1061
return 1
1062
else:
1063
return 0
1064
finally:
1065
tree.unlock()
587
old_inv = tree.branch.basis_tree().inventory
588
new_inv = tree.read_working_inventory()
589
590
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
591
renames.sort()
592
for old_name, new_name in renames:
593
print "%s => %s" % (old_name, new_name)
1066
594
1067
595
1068
596
class cmd_info(Command):
1069
"""Show information about a working tree, branch or repository.
1070
1071
This command will show all known locations and formats associated to the
1072
tree, branch or repository. Statistical information is included with
1073
each report.
1074
1075
Branches and working trees will also report any missing revisions.
1076
"""
1077
_see_also = ['revno', 'working-trees', 'repositories']
1078
takes_args = ['location?']
1079
takes_options = ['verbose']
1080
597
"""Show statistical information about a branch."""
598
takes_args = ['branch?']
599
1081
600
@display_command
1082
def run(self, location=None, verbose=False):
1083
from bzrlib.info import show_bzrdir_info
1084
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1085
verbose=verbose)
601
def run(self, branch=None):
602
import info
603
b = WorkingTree.open_containing(branch)[0].branch
604
info.show_info(b)
1086
605
1087
606
1088
607
class cmd_remove(Command):
1089
"""Remove files or directories.
1090
1091
This makes bzr stop tracking changes to the specified files and
1092
delete them if they can easily be recovered using revert.
1093
1094
You can specify one or more files, and/or --new. If you specify --new,
1095
only 'added' files will be removed. If you specify both, then new files
1096
in the specified directories will be removed. If the directories are
1097
also new, they will also be removed.
608
"""Make a file unversioned.
609
610
This makes bzr stop tracking changes to a versioned file. It does
611
not delete the working copy.
1098
612
"""
1099
takes_args = ['file*']
1100
takes_options = ['verbose',
1101
Option('new', help='remove newly-added files'),
1102
RegistryOption.from_kwargs('file-deletion-strategy',
1103
'The file deletion mode to be used',
1104
title='Deletion Strategy', value_switches=True, enum_switch=False,
1105
safe='Only delete files if they can be'
1106
' safely recovered (default).',
1107
keep="Don't delete any files.",
1108
force='Delete all the specified files, even if they can not be '
1109
'recovered and even if they are non-empty directories.')]
613
takes_args = ['file+']
614
takes_options = ['verbose']
1110
615
aliases = ['rm']
1111
encoding_type = 'replace'
1112
1113
def run(self, file_list, verbose=False, new=False,
1114
file_deletion_strategy='safe'):
616
617
def run(self, file_list, verbose=False):
1115
618
tree, file_list = tree_files(file_list)
1116
1117
if file_list is not None:
1118
file_list = [f for f in file_list if f != '']
1119
elif not new:
1120
raise errors.BzrCommandError('Specify one or more files to'
1121
' remove, or use --new.')
1122
1123
if new:
1124
added = tree.changes_from(tree.basis_tree(),
1125
specific_files=file_list).added
1126
file_list = sorted([f[0] for f in added], reverse=True)
1127
if len(file_list) == 0:
1128
raise errors.BzrCommandError('No matching files.')
1129
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1130
keep_files=file_deletion_strategy=='keep',
1131
force=file_deletion_strategy=='force')
619
tree.remove(file_list, verbose=verbose)
1132
620
1133
621
1134
622
class cmd_file_id(Command):
1138
626
same through all revisions where the file exists, even when it is
1139
627
moved or renamed.
1140
628
"""
1141
1142
629
hidden = True
1143
_see_also = ['inventory', 'ls']
1144
630
takes_args = ['filename']
1145
1146
631
@display_command
1147
632
def run(self, filename):
1148
633
tree, relpath = WorkingTree.open_containing(filename)
1149
i = tree.path2id(relpath)
1150
if i is None:
1151
raise errors.NotVersionedError(filename)
634
i = tree.inventory.path2id(relpath)
635
if i == None:
636
raise BzrError("%r is not a versioned file" % filename)
1152
637
else:
1153
self.outf.write(i + '\n')
638
print i
1154
639
1155
640
1156
641
class cmd_file_path(Command):
1157
642
"""Print path of file_ids to a file or directory.
1158
643
1159
644
This prints one line for each directory down to the target,
1160
starting at the branch root.
1161
"""
1162
645
starting at the branch root."""
1163
646
hidden = True
1164
647
takes_args = ['filename']
1165
1166
648
@display_command
1167
649
def run(self, filename):
1168
650
tree, relpath = WorkingTree.open_containing(filename)
1169
fid = tree.path2id(relpath)
1170
if fid is None:
1171
raise errors.NotVersionedError(filename)
1172
segments = osutils.splitpath(relpath)
1173
for pos in range(1, len(segments) + 1):
1174
path = osutils.joinpath(segments[:pos])
1175
self.outf.write("%s\n" % tree.path2id(path))
1176
1177
1178
class cmd_reconcile(Command):
1179
"""Reconcile bzr metadata in a branch.
1180
1181
This can correct data mismatches that may have been caused by
1182
previous ghost operations or bzr upgrades. You should only
1183
need to run this command if 'bzr check' or a bzr developer
1184
advises you to run it.
1185
1186
If a second branch is provided, cross-branch reconciliation is
1187
also attempted, which will check that data like the tree root
1188
id which was not present in very early bzr versions is represented
1189
correctly in both branches.
1190
1191
At the same time it is run it may recompress data resulting in
1192
a potential saving in disk space or performance gain.
1193
1194
The branch *MUST* be on a listable system such as local disk or sftp.
1195
"""
1196
1197
_see_also = ['check']
1198
takes_args = ['branch?']
1199
1200
def run(self, branch="."):
1201
from bzrlib.reconcile import reconcile
1202
dir = bzrdir.BzrDir.open(branch)
1203
reconcile(dir)
651
inv = tree.inventory
652
fid = inv.path2id(relpath)
653
if fid == None:
654
raise BzrError("%r is not a versioned file" % filename)
655
for fip in inv.get_idpath(fid):
656
print fip
1204
657
1205
658
1206
659
class cmd_revision_history(Command):
1207
"""Display the list of revision ids on a branch."""
1208
1209
_see_also = ['log']
1210
takes_args = ['location?']
1211
660
"""Display list of revision ids on this branch."""
1212
661
hidden = True
1213
1214
662
@display_command
1215
def run(self, location="."):
1216
branch = Branch.open_containing(location)[0]
1217
for revid in branch.revision_history():
1218
self.outf.write(revid)
1219
self.outf.write('\n')
663
def run(self):
664
branch = WorkingTree.open_containing(u'.')[0].branch
665
for patchid in branch.revision_history():
666
print patchid
1220
667
1221
668
1222
669
class cmd_ancestry(Command):
1223
670
"""List all revisions merged into this branch."""
1224
1225
_see_also = ['log', 'revision-history']
1226
takes_args = ['location?']
1227
1228
671
hidden = True
1229
1230
672
@display_command
1231
def run(self, location="."):
1232
try:
1233
wt = WorkingTree.open_containing(location)[0]
1234
except errors.NoWorkingTree:
1235
b = Branch.open(location)
1236
last_revision = b.last_revision()
1237
else:
1238
b = wt.branch
1239
last_revision = wt.last_revision()
1240
1241
revision_ids = b.repository.get_ancestry(last_revision)
1242
assert revision_ids[0] is None
1243
revision_ids.pop(0)
1244
for revision_id in revision_ids:
1245
self.outf.write(revision_id + '\n')
673
def run(self):
674
tree = WorkingTree.open_containing(u'.')[0]
675
b = tree.branch
676
# FIXME. should be tree.last_revision
677
for revision_id in b.get_ancestry(b.last_revision()):
678
print revision_id
1246
679
1247
680
1248
681
class cmd_init(Command):
1251
684
Use this to create an empty branch, or before importing an
1252
685
existing project.
1253
686
1254
If there is a repository in a parent directory of the location, then
1255
the history of the branch will be stored in the repository. Otherwise
1256
init creates a standalone branch which carries its own history
1257
in the .bzr directory.
1258
1259
If there is already a branch at the location but it has no working tree,
1260
the tree can be populated with 'bzr checkout'.
1261
1262
687
Recipe for importing a tree of files:
1263
688
cd ~/project
1264
689
bzr init
1266
691
bzr status
1267
692
bzr commit -m 'imported project'
1268
693
"""
1269
1270
_see_also = ['init-repo', 'branch', 'checkout']
1271
694
takes_args = ['location?']
1272
takes_options = [
1273
RegistryOption('format',
1274
help='Specify a format for this branch. '
1275
'See "help formats".',
1276
registry=bzrdir.format_registry,
1277
converter=bzrdir.format_registry.make_bzrdir,
1278
value_switches=True,
1279
title="Branch Format",
1280
),
1281
Option('append-revisions-only',
1282
help='Never change revnos or the existing log.'
1283
' Append revisions to it only.')
1284
]
1285
def run(self, location=None, format=None, append_revisions_only=False):
1286
if format is None:
1287
format = bzrdir.format_registry.make_bzrdir('default')
695
def run(self, location=None):
696
from bzrlib.branch import Branch
1288
697
if location is None:
1289
698
location = u'.'
1290
1291
to_transport = transport.get_transport(location)
1292
1293
# The path has to exist to initialize a
1294
# branch inside of it.
1295
# Just using os.mkdir, since I don't
1296
# believe that we want to create a bunch of
1297
# locations if the user supplies an extended path
1298
# TODO: create-prefix
1299
to_transport.ensure_base()
1300
1301
try:
1302
existing_bzrdir = bzrdir.BzrDir.open(location)
1303
except errors.NotBranchError:
1304
# really a NotBzrDir error...
1305
branch = bzrdir.BzrDir.create_branch_convenience(to_transport.base,
1306
format=format)
1307
699
else:
1308
from bzrlib.transport.local import LocalTransport
1309
if existing_bzrdir.has_branch():
1310
if (isinstance(to_transport, LocalTransport)
1311
and not existing_bzrdir.has_workingtree()):
1312
raise errors.BranchExistsWithoutWorkingTree(location)
1313
raise errors.AlreadyBranchError(location)
1314
else:
1315
branch = existing_bzrdir.create_branch()
1316
existing_bzrdir.create_workingtree()
1317
if append_revisions_only:
1318
try:
1319
branch.set_append_revisions_only(True)
1320
except errors.UpgradeRequired:
1321
raise errors.BzrCommandError('This branch format cannot be set'
1322
' to append-revisions-only. Try --experimental-branch6')
1323
1324
1325
class cmd_init_repository(Command):
1326
"""Create a shared repository to hold branches.
1327
1328
New branches created under the repository directory will store their
1329
revisions in the repository, not in the branch directory.
1330
1331
If the --no-trees option is used then the branches in the repository
1332
will not have working trees by default.
1333
1334
example:
1335
bzr init-repo --no-trees repo
1336
bzr init repo/trunk
1337
bzr checkout --lightweight repo/trunk trunk-checkout
1338
cd trunk-checkout
1339
(add files here)
1340
1341
See 'bzr help repositories' for more information.
1342
"""
1343
1344
_see_also = ['init', 'branch', 'checkout']
1345
takes_args = ["location"]
1346
takes_options = [RegistryOption('format',
1347
help='Specify a format for this repository. See'
1348
' "bzr help formats" for details',
1349
registry=bzrdir.format_registry,
1350
converter=bzrdir.format_registry.make_bzrdir,
1351
value_switches=True, title='Repository format'),
1352
Option('no-trees',
1353
help='Branches in the repository will default to'
1354
' not having a working tree'),
1355
]
1356
aliases = ["init-repo"]
1357
1358
def run(self, location, format=None, no_trees=False):
1359
if format is None:
1360
format = bzrdir.format_registry.make_bzrdir('default')
1361
1362
if location is None:
1363
location = '.'
1364
1365
to_transport = transport.get_transport(location)
1366
to_transport.ensure_base()
1367
1368
newdir = format.initialize_on_transport(to_transport)
1369
repo = newdir.create_repository(shared=True)
1370
repo.set_make_working_trees(not no_trees)
700
# The path has to exist to initialize a
701
# branch inside of it.
702
# Just using os.mkdir, since I don't
703
# believe that we want to create a bunch of
704
# locations if the user supplies an extended path
705
if not os.path.exists(location):
706
os.mkdir(location)
707
Branch.initialize(location)
1371
708
1372
709
1373
710
class cmd_diff(Command):
1374
"""Show differences in the working tree or between revisions.
711
"""Show differences in working tree.
1375
712
1376
713
If files are listed, only the changes in those files are listed.
1377
714
Otherwise, all changes for the tree are listed.
1378
715
1379
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1380
produces patches suitable for "patch -p1".
1381
1382
716
examples:
1383
717
bzr diff
1384
Shows the difference in the working tree versus the last commit
1385
718
bzr diff -r1
1386
Difference between the working tree and revision 1
1387
719
bzr diff -r1..2
1388
Difference between revision 2 and revision 1
1389
bzr diff --prefix old/:new/
1390
Same as 'bzr diff' but prefix paths with old/ and new/
1391
bzr diff bzr.mine bzr.dev
1392
Show the differences between the two working trees
1393
bzr diff foo.c
1394
Show just the differences for 'foo.c'
1395
720
"""
721
# TODO: Allow diff across branches.
1396
722
# TODO: Option to use external diff command; could be GNU diff, wdiff,
1397
723
# or a graphical diff.
1398
724
1399
725
# TODO: Python difflib is not exactly the same as unidiff; should
1400
726
# either fix it up or prefer to use an external diff.
1401
727
728
# TODO: If a directory is given, diff everything under that.
729
1402
730
# TODO: Selected-file diff is inefficient and doesn't show you
1403
731
# deleted files.
1404
732
1405
733
# TODO: This probably handles non-Unix newlines poorly.
1406
1407
_see_also = ['status']
734
1408
735
takes_args = ['file*']
1409
takes_options = ['revision', 'diff-options',
1410
Option('prefix', type=str,
1411
short_name='p',
1412
help='Set prefixes to added to old and new filenames, as '
1413
'two values separated by a colon. (eg "old/:new/")'),
1414
]
736
takes_options = ['revision', 'diff-options']
1415
737
aliases = ['di', 'dif']
1416
encoding_type = 'exact'
1417
738
1418
739
@display_command
1419
def run(self, revision=None, file_list=None, diff_options=None,
1420
prefix=None):
1421
from bzrlib.diff import diff_cmd_helper, show_diff_trees
1422
1423
if (prefix is None) or (prefix == '0'):
1424
# diff -p0 format
1425
old_label = ''
1426
new_label = ''
1427
elif prefix == '1':
1428
old_label = 'old/'
1429
new_label = 'new/'
1430
elif ':' in prefix:
1431
old_label, new_label = prefix.split(":")
1432
else:
1433
raise errors.BzrCommandError(
1434
'--prefix expects two values separated by a colon'
1435
' (eg "old/:new/")')
1436
1437
if revision and len(revision) > 2:
1438
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1439
' one or two revision specifiers')
1440
740
def run(self, revision=None, file_list=None, diff_options=None):
741
from bzrlib.diff import show_diff
1441
742
try:
1442
tree1, file_list = internal_tree_files(file_list)
1443
tree2 = None
743
tree, file_list = internal_tree_files(file_list)
1444
744
b = None
1445
745
b2 = None
1446
except errors.FileInWrongBranch:
746
except FileInWrongBranch:
1447
747
if len(file_list) != 2:
1448
raise errors.BzrCommandError("Files are in different branches")
748
raise BzrCommandError("Files are in different branches")
1449
749
1450
tree1, file1 = WorkingTree.open_containing(file_list[0])
1451
tree2, file2 = WorkingTree.open_containing(file_list[1])
750
b, file1 = Branch.open_containing(file_list[0])
751
b2, file2 = Branch.open_containing(file_list[1])
1452
752
if file1 != "" or file2 != "":
1453
753
# FIXME diff those two files. rbc 20051123
1454
raise errors.BzrCommandError("Files are in different branches")
754
raise BzrCommandError("Files are in different branches")
1455
755
file_list = None
1456
except errors.NotBranchError:
1457
if (revision is not None and len(revision) == 2
1458
and not revision[0].needs_branch()
1459
and not revision[1].needs_branch()):
1460
# If both revision specs include a branch, we can
1461
# diff them without needing a local working tree
1462
tree1, tree2 = None, None
1463
else:
1464
raise
1465
1466
if tree2 is not None:
1467
if revision is not None:
1468
# FIXME: but there should be a clean way to diff between
1469
# non-default versions of two trees, it's not hard to do
1470
# internally...
1471
raise errors.BzrCommandError(
1472
"Sorry, diffing arbitrary revisions across branches "
1473
"is not implemented yet")
1474
return show_diff_trees(tree1, tree2, sys.stdout,
1475
specific_files=file_list,
1476
external_diff_options=diff_options,
1477
old_label=old_label, new_label=new_label)
1478
1479
return diff_cmd_helper(tree1, file_list, diff_options,
1480
revision_specs=revision,
1481
old_label=old_label, new_label=new_label)
756
if revision is not None:
757
if b2 is not None:
758
raise BzrCommandError("Can't specify -r with two branches")
759
if len(revision) == 1:
760
return show_diff(tree.branch, revision[0], specific_files=file_list,
761
external_diff_options=diff_options)
762
elif len(revision) == 2:
763
return show_diff(tree.branch, revision[0], specific_files=file_list,
764
external_diff_options=diff_options,
765
revision2=revision[1])
766
else:
767
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
768
else:
769
if b is not None:
770
return show_diff(b, None, specific_files=file_list,
771
external_diff_options=diff_options, b2=b2)
772
else:
773
return show_diff(tree.branch, None, specific_files=file_list,
774
external_diff_options=diff_options)
1482
775
1483
776
1484
777
class cmd_deleted(Command):
1490
783
# directories with readdir, rather than stating each one. Same
1491
784
# level of effort but possibly much less IO. (Or possibly not,
1492
785
# if the directories are very large...)
1493
_see_also = ['status', 'ls']
1494
takes_options = ['show-ids']
1495
1496
786
@display_command
1497
787
def run(self, show_ids=False):
1498
788
tree = WorkingTree.open_containing(u'.')[0]
1499
tree.lock_read()
1500
try:
1501
old = tree.basis_tree()
1502
old.lock_read()
1503
try:
1504
for path, ie in old.inventory.iter_entries():
1505
if not tree.has_id(ie.file_id):
1506
self.outf.write(path)
1507
if show_ids:
1508
self.outf.write(' ')
1509
self.outf.write(ie.file_id)
1510
self.outf.write('\n')
1511
finally:
1512
old.unlock()
1513
finally:
1514
tree.unlock()
789
old = tree.branch.basis_tree()
790
for path, ie in old.inventory.iter_entries():
791
if not tree.has_id(ie.file_id):
792
if show_ids:
793
print '%-50s %s' % (path, ie.file_id)
794
else:
795
print path
1515
796
1516
797
1517
798
class cmd_modified(Command):
1518
"""List files modified in working tree.
1519
"""
1520
799
"""List files modified in working tree."""
1521
800
hidden = True
1522
_see_also = ['status', 'ls']
1523
1524
801
@display_command
1525
802
def run(self):
803
from bzrlib.delta import compare_trees
804
1526
805
tree = WorkingTree.open_containing(u'.')[0]
1527
td = tree.changes_from(tree.basis_tree())
806
td = compare_trees(tree.branch.basis_tree(), tree)
807
1528
808
for path, id, kind, text_modified, meta_modified in td.modified:
1529
self.outf.write(path + '\n')
809
print path
810
1530
811
1531
812
1532
813
class cmd_added(Command):
1533
"""List files added in working tree.
1534
"""
1535
814
"""List files added in working tree."""
1536
815
hidden = True
1537
_see_also = ['status', 'ls']
1538
1539
816
@display_command
1540
817
def run(self):
1541
818
wt = WorkingTree.open_containing(u'.')[0]
1542
wt.lock_read()
1543
try:
1544
basis = wt.basis_tree()
1545
basis.lock_read()
1546
try:
1547
basis_inv = basis.inventory
1548
inv = wt.inventory
1549
for file_id in inv:
1550
if file_id in basis_inv:
1551
continue
1552
if inv.is_root(file_id) and len(basis_inv) == 0:
1553
continue
1554
path = inv.id2path(file_id)
1555
if not os.access(osutils.abspath(path), os.F_OK):
1556
continue
1557
self.outf.write(path + '\n')
1558
finally:
1559
basis.unlock()
1560
finally:
1561
wt.unlock()
1562
819
basis_inv = wt.branch.basis_tree().inventory
820
inv = wt.inventory
821
for file_id in inv:
822
if file_id in basis_inv:
823
continue
824
path = inv.id2path(file_id)
825
if not os.access(b.abspath(path), os.F_OK):
826
continue
827
print path
828
829
1563
830
1564
831
class cmd_root(Command):
1565
832
"""Show the tree root directory.
1566
833
1567
834
The root is the nearest enclosing directory with a .bzr control
1568
835
directory."""
1569
1570
836
takes_args = ['filename?']
1571
837
@display_command
1572
838
def run(self, filename=None):
1573
839
"""Print the branch root."""
1574
840
tree = WorkingTree.open_containing(filename)[0]
1575
self.outf.write(tree.basedir + '\n')
1576
1577
1578
def _parse_limit(limitstring):
1579
try:
1580
return int(limitstring)
1581
except ValueError:
1582
msg = "The limit argument must be an integer."
1583
raise errors.BzrCommandError(msg)
841
print tree.basedir
1584
842
1585
843
1586
844
class cmd_log(Command):
1587
"""Show log of a branch, file, or directory.
1588
1589
By default show the log of the branch containing the working directory.
845
"""Show log of this branch.
1590
846
1591
847
To request a range of logs, you can use the command -r begin..end
1592
848
-r revision requests a specific revision, -r ..end or -r begin.. are
1593
849
also valid.
1594
1595
examples:
1596
bzr log
1597
bzr log foo.c
1598
bzr log -r -10.. http://server/branch
1599
850
"""
1600
851
1601
852
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1602
853
1603
takes_args = ['location?']
854
takes_args = ['filename?']
1604
855
takes_options = [Option('forward',
1605
856
help='show from oldest to newest'),
1606
'timezone',
1607
Option('verbose',
1608
short_name='v',
1609
help='show files changed in each revision'),
857
'timezone', 'verbose',
1610
858
'show-ids', 'revision',
1611
'log-format',
859
Option('line', help='format with one line per revision'),
860
'long',
1612
861
Option('message',
1613
short_name='m',
1614
862
help='show revisions whose message matches this regexp',
1615
863
type=str),
1616
Option('limit',
1617
help='limit the output to the first N revisions',
1618
type=_parse_limit),
864
Option('short', help='use moderately short format'),
1619
865
]
1620
encoding_type = 'replace'
1621
1622
866
@display_command
1623
def run(self, location=None, timezone='original',
867
def run(self, filename=None, timezone='original',
1624
868
verbose=False,
1625
869
show_ids=False,
1626
870
forward=False,
1627
871
revision=None,
1628
log_format=None,
1629
872
message=None,
1630
limit=None):
1631
from bzrlib.log import show_log
873
long=False,
874
short=False,
875
line=False):
876
from bzrlib.log import log_formatter, show_log
877
import codecs
1632
878
assert message is None or isinstance(message, basestring), \
1633
879
"invalid message argument %r" % message
1634
880
direction = (forward and 'forward') or 'reverse'
1635
881
1636
# log everything
1637
file_id = None
1638
if location:
1639
# find the file id to log:
1640
1641
tree, b, fp = bzrdir.BzrDir.open_containing_tree_or_branch(
1642
location)
882
if filename:
883
# might be a tree:
884
tree = None
885
try:
886
tree, fp = WorkingTree.open_containing(filename)
887
b = tree.branch
888
if fp != '':
889
inv = tree.read_working_inventory()
890
except NotBranchError:
891
pass
892
if tree is None:
893
b, fp = Branch.open_containing(filename)
894
if fp != '':
895
inv = b.get_inventory(b.last_revision())
1643
896
if fp != '':
1644
if tree is None:
1645
tree = b.basis_tree()
1646
file_id = tree.path2id(fp)
1647
if file_id is None:
1648
raise errors.BzrCommandError(
1649
"Path does not have any revision history: %s" %
1650
location)
1651
else:
1652
# local dir only
1653
# FIXME ? log the current subdir only RBC 20060203
1654
if revision is not None \
1655
and len(revision) > 0 and revision[0].get_branch():
1656
location = revision[0].get_branch()
1657
else:
1658
location = '.'
1659
dir, relpath = bzrdir.BzrDir.open_containing(location)
1660
b = dir.open_branch()
1661
1662
b.lock_read()
1663
try:
1664
if revision is None:
1665
rev1 = None
1666
rev2 = None
1667
elif len(revision) == 1:
1668
rev1 = rev2 = revision[0].in_history(b).revno
1669
elif len(revision) == 2:
1670
if revision[1].get_branch() != revision[0].get_branch():
1671
# b is taken from revision[0].get_branch(), and
1672
# show_log will use its revision_history. Having
1673
# different branches will lead to weird behaviors.
1674
raise errors.BzrCommandError(
1675
"Log doesn't accept two revisions in different"
1676
" branches.")
1677
if revision[0].spec is None:
1678
# missing begin-range means first revision
1679
rev1 = 1
1680
else:
1681
rev1 = revision[0].in_history(b).revno
1682
1683
if revision[1].spec is None:
1684
# missing end-range means last known revision
1685
rev2 = b.revno()
1686
else:
1687
rev2 = revision[1].in_history(b).revno
1688
else:
1689
raise errors.BzrCommandError(
1690
'bzr log --revision takes one or two values.')
1691
1692
# By this point, the revision numbers are converted to the +ve
1693
# form if they were supplied in the -ve form, so we can do
1694
# this comparison in relative safety
1695
if rev1 > rev2:
1696
(rev2, rev1) = (rev1, rev2)
1697
1698
if log_format is None:
1699
log_format = log.log_formatter_registry.get_default(b)
1700
1701
lf = log_format(show_ids=show_ids, to_file=self.outf,
1702
show_timezone=timezone)
1703
1704
show_log(b,
1705
lf,
1706
file_id,
1707
verbose=verbose,
1708
direction=direction,
1709
start_revision=rev1,
1710
end_revision=rev2,
1711
search=message,
1712
limit=limit)
1713
finally:
1714
b.unlock()
1715
1716
1717
def get_log_format(long=False, short=False, line=False, default='long'):
1718
log_format = default
1719
if long:
897
file_id = inv.path2id(fp)
898
else:
899
file_id = None # points to branch root
900
else:
901
tree, relpath = WorkingTree.open_containing(u'.')
902
b = tree.branch
903
file_id = None
904
905
if revision is None:
906
rev1 = None
907
rev2 = None
908
elif len(revision) == 1:
909
rev1 = rev2 = revision[0].in_history(b).revno
910
elif len(revision) == 2:
911
rev1 = revision[0].in_history(b).revno
912
rev2 = revision[1].in_history(b).revno
913
else:
914
raise BzrCommandError('bzr log --revision takes one or two values.')
915
916
# By this point, the revision numbers are converted to the +ve
917
# form if they were supplied in the -ve form, so we can do
918
# this comparison in relative safety
919
if rev1 > rev2:
920
(rev2, rev1) = (rev1, rev2)
921
922
mutter('encoding log as %r', bzrlib.user_encoding)
923
924
# use 'replace' so that we don't abort if trying to write out
925
# in e.g. the default C locale.
926
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
927
1720
928
log_format = 'long'
1721
if short:
1722
log_format = 'short'
1723
if line:
1724
log_format = 'line'
1725
return log_format
929
if short:
930
log_format = 'short'
931
if line:
932
log_format = 'line'
933
lf = log_formatter(log_format,
934
show_ids=show_ids,
935
to_file=outf,
936
show_timezone=timezone)
937
938
show_log(b,
939
lf,
940
file_id,
941
verbose=verbose,
942
direction=direction,
943
start_revision=rev1,
944
end_revision=rev2,
945
search=message)
946
1726
947
1727
948
1728
949
class cmd_touching_revisions(Command):
1729
950
"""Return revision-ids which affected a particular file.
1730
951
1731
A more user-friendly interface is "bzr log FILE".
1732
"""
1733
952
A more user-friendly interface is "bzr log FILE"."""
1734
953
hidden = True
1735
954
takes_args = ["filename"]
1736
1737
955
@display_command
1738
956
def run(self, filename):
1739
957
tree, relpath = WorkingTree.open_containing(filename)
1740
958
b = tree.branch
1741
file_id = tree.path2id(relpath)
1742
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1743
self.outf.write("%6d %s\n" % (revno, what))
959
inv = tree.read_working_inventory()
960
file_id = inv.path2id(relpath)
961
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
962
print "%6d %s" % (revno, what)
1744
963
1745
964
1746
965
class cmd_ls(Command):
1747
966
"""List files in a tree.
1748
967
"""
1749
1750
_see_also = ['status', 'cat']
1751
takes_args = ['path?']
1752
968
# TODO: Take a revision or remote path and list that tree instead.
969
hidden = True
1753
970
takes_options = ['verbose', 'revision',
1754
971
Option('non-recursive',
1755
972
help='don\'t recurse into sub-directories'),
1760
977
Option('ignored', help='Print ignored files'),
1761
978
1762
979
Option('null', help='Null separate the files'),
1763
'kind', 'show-ids'
1764
980
]
1765
981
@display_command
1766
982
def run(self, revision=None, verbose=False,
1767
983
non_recursive=False, from_root=False,
1768
984
unknown=False, versioned=False, ignored=False,
1769
null=False, kind=None, show_ids=False, path=None):
1770
1771
if kind and kind not in ('file', 'directory', 'symlink'):
1772
raise errors.BzrCommandError('invalid kind specified')
985
null=False):
1773
986
1774
987
if verbose and null:
1775
raise errors.BzrCommandError('Cannot set both --verbose and --null')
988
raise BzrCommandError('Cannot set both --verbose and --null')
1776
989
all = not (unknown or versioned or ignored)
1777
990
1778
991
selection = {'I':ignored, '?':unknown, 'V':versioned}
1779
992
1780
if path is None:
1781
fs_path = '.'
1782
prefix = ''
1783
else:
1784
if from_root:
1785
raise errors.BzrCommandError('cannot specify both --from-root'
1786
' and PATH')
1787
fs_path = path
1788
prefix = path
1789
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
1790
fs_path)
993
tree, relpath = WorkingTree.open_containing(u'.')
1791
994
if from_root:
1792
995
relpath = u''
1793
996
elif relpath:
1794
997
relpath += '/'
1795
998
if revision is not None:
1796
tree = branch.repository.revision_tree(
1797
revision[0].in_history(branch).rev_id)
1798
elif tree is None:
1799
tree = branch.basis_tree()
1800
1801
tree.lock_read()
1802
try:
1803
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1804
if fp.startswith(relpath):
1805
fp = osutils.pathjoin(prefix, fp[len(relpath):])
1806
if non_recursive and '/' in fp:
1807
continue
1808
if not all and not selection[fc]:
1809
continue
1810
if kind is not None and fkind != kind:
1811
continue
1812
if verbose:
1813
kindch = entry.kind_character()
1814
outstring = '%-8s %s%s' % (fc, fp, kindch)
1815
if show_ids and fid is not None:
1816
outstring = "%-50s %s" % (outstring, fid)
1817
self.outf.write(outstring + '\n')
1818
elif null:
1819
self.outf.write(fp + '\0')
1820
if show_ids:
1821
if fid is not None:
1822
self.outf.write(fid)
1823
self.outf.write('\0')
1824
self.outf.flush()
1825
else:
1826
if fid is not None:
1827
my_id = fid
1828
else:
1829
my_id = ''
1830
if show_ids:
1831
self.outf.write('%-50s %s\n' % (fp, my_id))
1832
else:
1833
self.outf.write(fp + '\n')
1834
finally:
1835
tree.unlock()
999
tree = tree.branch.revision_tree(
1000
revision[0].in_history(tree.branch).rev_id)
1001
for fp, fc, kind, fid, entry in tree.list_files():
1002
if fp.startswith(relpath):
1003
fp = fp[len(relpath):]
1004
if non_recursive and '/' in fp:
1005
continue
1006
if not all and not selection[fc]:
1007
continue
1008
if verbose:
1009
kindch = entry.kind_character()
1010
print '%-8s %s%s' % (fc, fp, kindch)
1011
elif null:
1012
sys.stdout.write(fp)
1013
sys.stdout.write('\0')
1014
sys.stdout.flush()
1015
else:
1016
print fp
1836
1017
1837
1018
1838
1019
class cmd_unknowns(Command):
1839
"""List unknown files.
1840
"""
1841
1842
hidden = True
1843
_see_also = ['ls']
1844
1020
"""List unknown files."""
1845
1021
@display_command
1846
1022
def run(self):
1023
from bzrlib.osutils import quotefn
1847
1024
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1848
self.outf.write(osutils.quotefn(f) + '\n')
1025
print quotefn(f)
1849
1026
1850
1027
1851
1028
class cmd_ignore(Command):
1852
"""Ignore specified files or patterns.
1029
"""Ignore a command or pattern.
1853
1030
1854
1031
To remove patterns from the ignore list, edit the .bzrignore file.
1855
1032
1856
Trailing slashes on patterns are ignored.
1857
If the pattern contains a slash or is a regular expression, it is compared
1858
to the whole path from the branch root. Otherwise, it is compared to only
1859
the last component of the path. To match a file only in the root
1860
directory, prepend './'.
1861
1862
Ignore patterns specifying absolute paths are not allowed.
1863
1864
Ignore patterns may include globbing wildcards such as:
1865
? - Matches any single character except '/'
1866
* - Matches 0 or more characters except '/'
1867
/**/ - Matches 0 or more directories in a path
1868
[a-z] - Matches a single character from within a group of characters
1869
1870
Ignore patterns may also be Python regular expressions.
1871
Regular expression ignore patterns are identified by a 'RE:' prefix
1872
followed by the regular expression. Regular expression ignore patterns
1873
may not include named or numbered groups.
1874
1875
Note: ignore patterns containing shell wildcards must be quoted from
1876
the shell on Unix.
1033
If the pattern contains a slash, it is compared to the whole path
1034
from the branch root. Otherwise, it is compared to only the last
1035
component of the path. To match a file only in the root directory,
1036
prepend './'.
1037
1038
Ignore patterns are case-insensitive on case-insensitive systems.
1039
1040
Note: wildcards must be quoted from the shell on Unix.
1877
1041
1878
1042
examples:
1879
1043
bzr ignore ./Makefile
1880
1044
bzr ignore '*.class'
1881
bzr ignore 'lib/**/*.o'
1882
bzr ignore 'RE:lib/.*\.o'
1883
1045
"""
1884
1885
_see_also = ['status', 'ignored']
1886
takes_args = ['name_pattern*']
1887
takes_options = [
1888
Option('old-default-rules',
1889
help='Out the ignore rules bzr < 0.9 always used.')
1890
]
1046
# TODO: Complain if the filename is absolute
1047
takes_args = ['name_pattern']
1891
1048
1892
def run(self, name_pattern_list=None, old_default_rules=None):
1049
def run(self, name_pattern):
1893
1050
from bzrlib.atomicfile import AtomicFile
1894
if old_default_rules is not None:
1895
# dump the rules and exit
1896
for pattern in ignores.OLD_DEFAULTS:
1897
print pattern
1898
return
1899
if not name_pattern_list:
1900
raise errors.BzrCommandError("ignore requires at least one "
1901
"NAME_PATTERN or --old-default-rules")
1902
name_pattern_list = [globbing.normalize_pattern(p)
1903
for p in name_pattern_list]
1904
for name_pattern in name_pattern_list:
1905
if (name_pattern[0] == '/' or
1906
(len(name_pattern) > 1 and name_pattern[1] == ':')):
1907
raise errors.BzrCommandError(
1908
"NAME_PATTERN should not be an absolute path")
1051
import os.path
1052
1909
1053
tree, relpath = WorkingTree.open_containing(u'.')
1910
1054
ifn = tree.abspath('.bzrignore')
1055
1911
1056
if os.path.exists(ifn):
1912
1057
f = open(ifn, 'rt')
1913
1058
try:
1922
1067
1923
1068
if igns and igns[-1] != '\n':
1924
1069
igns += '\n'
1925
for name_pattern in name_pattern_list:
1926
igns += name_pattern + '\n'
1070
igns += name_pattern + '\n'
1927
1071
1928
f = AtomicFile(ifn, 'wb')
1929
1072
try:
1073
f = AtomicFile(ifn, 'wt')
1930
1074
f.write(igns.encode('utf-8'))
1931
1075
f.commit()
1932
1076
finally:
1933
1077
f.close()
1934
1078
1935
if not tree.path2id('.bzrignore'):
1079
inv = tree.inventory
1080
if inv.path2id('.bzrignore'):
1081
mutter('.bzrignore is already versioned')
1082
else:
1083
mutter('need to make new .bzrignore file versioned')
1936
1084
tree.add(['.bzrignore'])
1937
1085
1938
1086
1939
1087
class cmd_ignored(Command):
1940
1088
"""List ignored files and the patterns that matched them.
1941
"""
1942
1089
1943
_see_also = ['ignore']
1090
See also: bzr ignore"""
1944
1091
@display_command
1945
1092
def run(self):
1946
1093
tree = WorkingTree.open_containing(u'.')[0]
1947
tree.lock_read()
1948
try:
1949
for path, file_class, kind, file_id, entry in tree.list_files():
1950
if file_class != 'I':
1951
continue
1952
## XXX: Slightly inefficient since this was already calculated
1953
pat = tree.is_ignored(path)
1954
print '%-50s %s' % (path, pat)
1955
finally:
1956
tree.unlock()
1094
for path, file_class, kind, file_id, entry in tree.list_files():
1095
if file_class != 'I':
1096
continue
1097
## XXX: Slightly inefficient since this was already calculated
1098
pat = tree.is_ignored(path)
1099
print '%-50s %s' % (path, pat)
1957
1100
1958
1101
1959
1102
class cmd_lookup_revision(Command):
1970
1113
try:
1971
1114
revno = int(revno)
1972
1115
except ValueError:
1973
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
1116
raise BzrCommandError("not a valid revision-number: %r" % revno)
1974
1117
1975
1118
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1976
1119
1977
1120
1978
1121
class cmd_export(Command):
1979
"""Export current or past revision to a destination directory or archive.
1122
"""Export past revision to destination directory.
1980
1123
1981
1124
If no revision is specified this exports the last committed revision.
1982
1125
1984
1127
given, try to find the format with the extension. If no extension
1985
1128
is found exports to a directory (equivalent to --format=dir).
1986
1129
1987
If root is supplied, it will be used as the root directory inside
1988
container formats (tar, zip, etc). If it is not supplied it will default
1989
to the exported filename. The root option has no effect for 'dir' format.
1990
1991
If branch is omitted then the branch containing the current working
1992
directory will be used.
1993
1994
Note: Export of tree with non-ASCII filenames to zip is not supported.
1995
1996
Supported formats Autodetected by extension
1997
----------------- -------------------------
1130
Root may be the top directory for tar, tgz and tbz2 formats. If none
1131
is given, the top directory will be the root name of the file.
1132
1133
Note: export of tree with non-ascii filenames to zip is not supported.
1134
1135
Supported formats Autodetected by extension
1136
----------------- -------------------------
1998
1137
dir -
1999
1138
tar .tar
2000
1139
tbz2 .tar.bz2, .tbz2
2001
1140
tgz .tar.gz, .tgz
2002
1141
zip .zip
2003
1142
"""
2004
takes_args = ['dest', 'branch?']
1143
takes_args = ['dest']
2005
1144
takes_options = ['revision', 'format', 'root']
2006
def run(self, dest, branch=None, revision=None, format=None, root=None):
1145
def run(self, dest, revision=None, format=None, root=None):
1146
import os.path
2007
1147
from bzrlib.export import export
2008
2009
if branch is None:
2010
tree = WorkingTree.open_containing(u'.')[0]
2011
b = tree.branch
2012
else:
2013
b = Branch.open(branch)
2014
1148
tree = WorkingTree.open_containing(u'.')[0]
1149
b = tree.branch
2015
1150
if revision is None:
2016
1151
# should be tree.last_revision FIXME
2017
1152
rev_id = b.last_revision()
2018
1153
else:
2019
1154
if len(revision) != 1:
2020
raise errors.BzrCommandError('bzr export --revision takes exactly 1 argument')
1155
raise BzrError('bzr export --revision takes exactly 1 argument')
2021
1156
rev_id = revision[0].in_history(b).rev_id
2022
t = b.repository.revision_tree(rev_id)
1157
t = b.revision_tree(rev_id)
2023
1158
try:
2024
1159
export(t, dest, format, root)
2025
1160
except errors.NoSuchExportFormat, e:
2026
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
1161
raise BzrCommandError('Unsupported export format: %s' % e.format)
2027
1162
2028
1163
2029
1164
class cmd_cat(Command):
2030
"""Write the contents of a file as of a given revision to standard output.
2031
2032
If no revision is nominated, the last revision is used.
2033
2034
Note: Take care to redirect standard output when using this command on a
2035
binary file.
2036
"""
2037
2038
_see_also = ['ls']
2039
takes_options = ['revision', 'name-from-revision']
1165
"""Write a file's text from a previous revision."""
1166
1167
takes_options = ['revision']
2040
1168
takes_args = ['filename']
2041
encoding_type = 'exact'
2042
1169
2043
1170
@display_command
2044
def run(self, filename, revision=None, name_from_revision=False):
2045
if revision is not None and len(revision) != 1:
2046
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2047
" one number")
2048
1171
def run(self, filename, revision=None):
1172
if revision is None:
1173
raise BzrCommandError("bzr cat requires a revision number")
1174
elif len(revision) != 1:
1175
raise BzrCommandError("bzr cat --revision takes exactly one number")
2049
1176
tree = None
2050
1177
try:
2051
tree, b, relpath = \
2052
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2053
except errors.NotBranchError:
1178
tree, relpath = WorkingTree.open_containing(filename)
1179
b = tree.branch
1180
except NotBranchError:
2054
1181
pass
2055
2056
if revision is not None and revision[0].get_branch() is not None:
2057
b = Branch.open(revision[0].get_branch())
2058
1182
if tree is None:
2059
tree = b.basis_tree()
2060
if revision is None:
2061
revision_id = b.last_revision()
2062
else:
2063
revision_id = revision[0].in_history(b).rev_id
2064
2065
cur_file_id = tree.path2id(relpath)
2066
rev_tree = b.repository.revision_tree(revision_id)
2067
old_file_id = rev_tree.path2id(relpath)
2068
2069
if name_from_revision:
2070
if old_file_id is None:
2071
raise errors.BzrCommandError("%r is not present in revision %s"
2072
% (filename, revision_id))
2073
else:
2074
rev_tree.print_file(old_file_id)
2075
elif cur_file_id is not None:
2076
rev_tree.print_file(cur_file_id)
2077
elif old_file_id is not None:
2078
rev_tree.print_file(old_file_id)
2079
else:
2080
raise errors.BzrCommandError("%r is not present in revision %s" %
2081
(filename, revision_id))
1183
b, relpath = Branch.open_containing(filename)
1184
b.print_file(relpath, revision[0].in_history(b).revno)
2082
1185
2083
1186
2084
1187
class cmd_local_time_offset(Command):
2086
1189
hidden = True
2087
1190
@display_command
2088
1191
def run(self):
2089
print osutils.local_time_offset()
1192
print bzrlib.osutils.local_time_offset()
2090
1193
2091
1194
2092
1195
2100
1203
within it is committed.
2101
1204
2102
1205
A selected-file commit may fail in some cases where the committed
2103
tree would be invalid. Consider::
2104
2105
bzr init foo
2106
mkdir foo/bar
2107
bzr add foo/bar
2108
bzr commit foo -m "committing foo"
2109
bzr mv foo/bar foo/baz
2110
mkdir foo/bar
2111
bzr add foo/bar
2112
bzr commit foo/bar -m "committing bar but not baz"
2113
2114
In the example above, the last commit will fail by design. This gives
2115
the user the opportunity to decide whether they want to commit the
2116
rename at the same time, separately first, or not at all. (As a general
2117
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2118
2119
Note: A selected-file commit after a merge is not yet supported.
1206
tree would be invalid, such as trying to commit a file in a
1207
newly-added directory that is not itself committed.
2120
1208
"""
2121
1209
# TODO: Run hooks on tree to-be-committed, and after commit.
2122
1210
2127
1215
2128
1216
# XXX: verbose currently does nothing
2129
1217
2130
_see_also = ['bugs', 'uncommit']
2131
1218
takes_args = ['selected*']
2132
1219
takes_options = ['message', 'verbose',
2133
1220
Option('unchanged',
2134
1221
help='commit even if nothing has changed'),
2135
1222
Option('file', type=str,
2136
short_name='F',
2137
1223
argname='msgfile',
2138
1224
help='file containing commit message'),
2139
1225
Option('strict',
2140
1226
help="refuse to commit if there are unknown "
2141
1227
"files in the working tree."),
2142
ListOption('fixes', type=str,
2143
help="mark a bug as being fixed by this "
2144
"revision."),
2145
Option('local',
2146
help="perform a local only commit in a bound "
2147
"branch. Such commits are not pushed to "
2148
"the master branch until a normal commit "
2149
"is performed."
2150
),
2151
1228
]
2152
1229
aliases = ['ci', 'checkin']
2153
1230
2154
def _get_bug_fix_properties(self, fixes, branch):
2155
properties = []
2156
# Configure the properties for bug fixing attributes.
2157
for fixed_bug in fixes:
2158
tokens = fixed_bug.split(':')
2159
if len(tokens) != 2:
2160
raise errors.BzrCommandError(
2161
"Invalid bug %s. Must be in the form of 'tag:id'. "
2162
"Commit refused." % fixed_bug)
2163
tag, bug_id = tokens
2164
try:
2165
bug_url = bugtracker.get_bug_url(tag, branch, bug_id)
2166
except errors.UnknownBugTrackerAbbreviation:
2167
raise errors.BzrCommandError(
2168
'Unrecognized bug %s. Commit refused.' % fixed_bug)
2169
except errors.MalformedBugIdentifier:
2170
raise errors.BzrCommandError(
2171
"Invalid bug identifier for %s. Commit refused."
2172
% fixed_bug)
2173
properties.append('%s fixed' % bug_url)
2174
return '\n'.join(properties)
2175
2176
1231
def run(self, message=None, file=None, verbose=True, selected_list=None,
2177
unchanged=False, strict=False, local=False, fixes=None):
2178
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1232
unchanged=False, strict=False):
2179
1233
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
2180
1234
StrictCommitFailed)
2181
from bzrlib.msgeditor import edit_commit_message, \
2182
make_commit_message_template
2183
2184
# TODO: Need a blackbox test for invoking the external editor; may be
2185
# slightly problematic to run this cross-platform.
2186
2187
# TODO: do more checks that the commit will succeed before
2188
# spending the user's valuable time typing a commit message.
2189
2190
properties = {}
1235
from bzrlib.msgeditor import edit_commit_message
1236
from bzrlib.status import show_status
1237
from cStringIO import StringIO
2191
1238
2192
1239
tree, selected_list = tree_files(selected_list)
2193
if selected_list == ['']:
2194
# workaround - commit of root of tree should be exactly the same
2195
# as just default commit in that tree, and succeed even though
2196
# selected-file merge commit is not done yet
2197
selected_list = []
2198
2199
bug_property = self._get_bug_fix_properties(fixes, tree.branch)
2200
if bug_property:
2201
properties['bugs'] = bug_property
2202
2203
if local and not tree.branch.get_bound_location():
2204
raise errors.LocalRequiresBoundBranch()
2205
2206
def get_message(commit_obj):
2207
"""Callback to get commit message"""
2208
my_message = message
2209
if my_message is None and not file:
2210
template = make_commit_message_template(tree, selected_list)
2211
my_message = edit_commit_message(template)
2212
if my_message is None:
2213
raise errors.BzrCommandError("please specify a commit"
2214
" message with either --message or --file")
2215
elif my_message and file:
2216
raise errors.BzrCommandError(
2217
"please specify either --message or --file")
2218
if file:
2219
my_message = codecs.open(file, 'rt',
2220
bzrlib.user_encoding).read()
2221
if my_message == "":
2222
raise errors.BzrCommandError("empty commit message specified")
2223
return my_message
2224
2225
if verbose:
2226
reporter = ReportCommitToLog()
2227
else:
2228
reporter = NullCommitReporter()
2229
1240
if message is None and not file:
1241
catcher = StringIO()
1242
show_status(tree.branch, specific_files=selected_list,
1243
to_file=catcher)
1244
message = edit_commit_message(catcher.getvalue())
1245
1246
if message is None:
1247
raise BzrCommandError("please specify a commit message"
1248
" with either --message or --file")
1249
elif message and file:
1250
raise BzrCommandError("please specify either --message or --file")
1251
1252
if file:
1253
import codecs
1254
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1255
1256
if message == "":
1257
raise BzrCommandError("empty commit message specified")
1258
2230
1259
try:
2231
tree.commit(message_callback=get_message,
2232
specific_files=selected_list,
2233
allow_pointless=unchanged, strict=strict, local=local,
2234
reporter=reporter, revprops=properties)
1260
tree.commit(message, specific_files=selected_list,
1261
allow_pointless=unchanged, strict=strict)
2235
1262
except PointlessCommit:
2236
1263
# FIXME: This should really happen before the file is read in;
2237
1264
# perhaps prepare the commit; get the message; then actually commit
2238
raise errors.BzrCommandError("no changes to commit."
2239
" use --unchanged to commit anyhow")
1265
raise BzrCommandError("no changes to commit",
1266
["use --unchanged to commit anyhow"])
2240
1267
except ConflictsInTree:
2241
raise errors.BzrCommandError('Conflicts detected in working '
2242
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
2243
' resolve.')
1268
raise BzrCommandError("Conflicts detected in working tree. "
1269
'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
2244
1270
except StrictCommitFailed:
2245
raise errors.BzrCommandError("Commit refused because there are"
2246
" unknown files in the working tree.")
2247
except errors.BoundBranchOutOfDate, e:
2248
raise errors.BzrCommandError(str(e) + "\n"
2249
'To commit to master branch, run update and then commit.\n'
2250
'You can also pass --local to commit to continue working '
2251
'disconnected.')
2252
1271
raise BzrCommandError("Commit refused because there are unknown "
1272
"files in the working tree.")
1273
note('Committed revision %d.' % (tree.branch.revno(),))
1274
2253
1275
2254
1276
class cmd_check(Command):
2255
1277
"""Validate consistency of branch history.
2257
1279
This command checks various invariants about the branch storage to
2258
1280
detect data corruption or bzr bugs.
2259
1281
"""
2260
2261
_see_also = ['reconcile']
2262
1282
takes_args = ['branch?']
2263
1283
takes_options = ['verbose']
2264
1284
2272
1292
check(branch, verbose)
2273
1293
2274
1294
1295
class cmd_scan_cache(Command):
1296
hidden = True
1297
def run(self):
1298
from bzrlib.hashcache import HashCache
1299
1300
c = HashCache(u'.')
1301
c.read()
1302
c.scan()
1303
1304
print '%6d stats' % c.stat_count
1305
print '%6d in hashcache' % len(c._cache)
1306
print '%6d files removed from cache' % c.removed_count
1307
print '%6d hashes updated' % c.update_count
1308
print '%6d files changed too recently to cache' % c.danger_count
1309
1310
if c.needs_write:
1311
c.write()
1312
1313
1314
2275
1315
class cmd_upgrade(Command):
2276
1316
"""Upgrade branch storage to current format.
2277
1317
2278
1318
The check command or bzr developers may sometimes advise you to run
2279
this command. When the default format has changed you may also be warned
2280
during other operations to upgrade.
1319
this command.
1320
1321
This version of this command upgrades from the full-text storage
1322
used by bzr 0.0.8 and earlier to the weave format (v5).
2281
1323
"""
2282
2283
_see_also = ['check']
2284
takes_args = ['url?']
2285
takes_options = [
2286
RegistryOption('format',
2287
help='Upgrade to a specific format. See "bzr help'
2288
' formats" for details',
2289
registry=bzrdir.format_registry,
2290
converter=bzrdir.format_registry.make_bzrdir,
2291
value_switches=True, title='Branch format'),
2292
]
2293
2294
def run(self, url='.', format=None):
1324
takes_args = ['dir?']
1325
1326
def run(self, dir=u'.'):
2295
1327
from bzrlib.upgrade import upgrade
2296
if format is None:
2297
format = bzrdir.format_registry.make_bzrdir('default')
2298
upgrade(url, format)
1328
upgrade(dir)
2299
1329
2300
1330
2301
1331
class cmd_whoami(Command):
2302
"""Show or set bzr user id.
2303
2304
examples:
2305
bzr whoami --email
2306
bzr whoami 'Frank Chu <fchu@example.com>'
2307
"""
2308
takes_options = [ Option('email',
2309
help='display email address only'),
2310
Option('branch',
2311
help='set identity for the current branch instead of '
2312
'globally'),
2313
]
2314
takes_args = ['name?']
2315
encoding_type = 'replace'
1332
"""Show bzr user id."""
1333
takes_options = ['email']
2316
1334
2317
1335
@display_command
2318
def run(self, email=False, branch=False, name=None):
2319
if name is None:
2320
# use branch if we're inside one; otherwise global config
2321
try:
2322
c = Branch.open_containing('.')[0].get_config()
2323
except errors.NotBranchError:
2324
c = config.GlobalConfig()
2325
if email:
2326
self.outf.write(c.user_email() + '\n')
2327
else:
2328
self.outf.write(c.username() + '\n')
2329
return
2330
2331
# display a warning if an email address isn't included in the given name.
1336
def run(self, email=False):
2332
1337
try:
2333
config.extract_email_address(name)
2334
except errors.NoEmailInUsername, e:
2335
warning('"%s" does not seem to contain an email address. '
2336
'This is allowed, but not recommended.', name)
1338
b = WorkingTree.open_containing(u'.')[0].branch
1339
config = bzrlib.config.BranchConfig(b)
1340
except NotBranchError:
1341
config = bzrlib.config.GlobalConfig()
2337
1342
2338
# use global config unless --branch given
2339
if branch:
2340
c = Branch.open_containing('.')[0].get_config()
1343
if email:
1344
print config.user_email()
2341
1345
else:
2342
c = config.GlobalConfig()
2343
c.set_user_option('email', name)
2344
1346
print config.username()
2345
1347
2346
1348
class cmd_nick(Command):
2347
"""Print or set the branch nickname.
2348
1349
"""\
1350
Print or set the branch nickname.
2349
1351
If unset, the tree root directory name is used as the nickname
2350
1352
To print the current nickname, execute with no argument.
2351
1353
"""
2352
2353
_see_also = ['info']
2354
1354
takes_args = ['nickname?']
2355
1355
def run(self, nickname=None):
2356
1356
branch = Branch.open_containing(u'.')[0]
2361
1361
2362
1362
@display_command
2363
1363
def printme(self, branch):
2364
print branch.nick
2365
1364
print branch.nick
2366
1365
2367
1366
class cmd_selftest(Command):
2368
1367
"""Run internal test suite.
2369
1368
2370
This creates temporary test directories in the working directory, but no
2371
existing data is affected. These directories are deleted if the tests
2372
pass, or left behind to help in debugging if they fail and --keep-output
2373
is specified.
1369
This creates temporary test directories in the working directory,
1370
but not existing data is affected. These directories are deleted
1371
if the tests pass, or left behind to help in debugging if they
1372
fail and --keep-output is specified.
2374
1373
2375
If arguments are given, they are regular expressions that say which tests
2376
should run. Tests matching any expression are run, and other tests are
2377
not run.
2378
2379
Alternatively if --first is given, matching tests are run first and then
2380
all other tests are run. This is useful if you have been working in a
2381
particular area, but want to make sure nothing else was broken.
2382
2383
If --exclude is given, tests that match that regular expression are
2384
excluded, regardless of whether they match --first or not.
2385
2386
To help catch accidential dependencies between tests, the --randomize
2387
option is useful. In most cases, the argument used is the word 'now'.
2388
Note that the seed used for the random number generator is displayed
2389
when this option is used. The seed can be explicitly passed as the
2390
argument to this option if required. This enables reproduction of the
2391
actual ordering used if and when an order sensitive problem is encountered.
2392
2393
If --list-only is given, the tests that would be run are listed. This is
2394
useful when combined with --first, --exclude and/or --randomize to
2395
understand their impact. The test harness reports "Listed nn tests in ..."
2396
instead of "Ran nn tests in ..." when list mode is enabled.
2397
2398
If the global option '--no-plugins' is given, plugins are not loaded
2399
before running the selftests. This has two effects: features provided or
2400
modified by plugins will not be tested, and tests provided by plugins will
2401
not be run.
2402
2403
examples::
2404
bzr selftest ignore
2405
run only tests relating to 'ignore'
2406
bzr --no-plugins selftest -v
2407
disable plugins and list tests as they're run
2408
2409
For each test, that needs actual disk access, bzr create their own
2410
subdirectory in the temporary testing directory (testXXXX.tmp).
2411
By default the name of such subdirectory is based on the name of the test.
2412
If option '--numbered-dirs' is given, bzr will use sequent numbers
2413
of running tests to create such subdirectories. This is default behavior
2414
on Windows because of path length limitation.
1374
If arguments are given, they are regular expressions that say
1375
which tests should run.
2415
1376
"""
2416
# NB: this is used from the class without creating an instance, which is
2417
# why it does not have a self parameter.
2418
def get_transport_type(typestring):
2419
"""Parse and return a transport specifier."""
2420
if typestring == "sftp":
2421
from bzrlib.transport.sftp import SFTPAbsoluteServer
2422
return SFTPAbsoluteServer
2423
if typestring == "memory":
2424
from bzrlib.transport.memory import MemoryServer
2425
return MemoryServer
2426
if typestring == "fakenfs":
2427
from bzrlib.transport.fakenfs import FakeNFSServer
2428
return FakeNFSServer
2429
msg = "No known transport type %s. Supported types are: sftp\n" %\
2430
(typestring)
2431
raise errors.BzrCommandError(msg)
2432
1377
# TODO: --list should give a list of all available tests
2433
1378
hidden = True
2434
1379
takes_args = ['testspecs*']
2435
takes_options = ['verbose',
2436
Option('one',
2437
help='stop when one test fails',
2438
short_name='1',
2439
),
2440
Option('keep-output',
2441
help='keep output directories when tests fail'),
2442
Option('transport',
2443
help='Use a different transport by default '
2444
'throughout the test suite.',
2445
type=get_transport_type),
2446
Option('benchmark', help='run the bzr benchmarks.'),
2447
Option('lsprof-timed',
2448
help='generate lsprof output for benchmarked'
2449
' sections of code.'),
2450
Option('cache-dir', type=str,
2451
help='a directory to cache intermediate'
2452
' benchmark steps'),
2453
Option('clean-output',
2454
help='clean temporary tests directories'
2455
' without running tests'),
2456
Option('first',
2457
help='run all tests, but run specified tests first',
2458
short_name='f',
2459
),
2460
Option('numbered-dirs',
2461
help='use numbered dirs for TestCaseInTempDir'),
2462
Option('list-only',
2463
help='list the tests instead of running them'),
2464
Option('randomize', type=str, argname="SEED",
2465
help='randomize the order of tests using the given'
2466
' seed or "now" for the current time'),
2467
Option('exclude', type=str, argname="PATTERN",
2468
short_name='x',
2469
help='exclude tests that match this regular'
2470
' expression'),
2471
]
2472
encoding_type = 'replace'
1380
takes_options = ['verbose',
1381
Option('one', help='stop when one test fails'),
1382
Option('keep-output',
1383
help='keep output directories when tests fail')
1384
]
2473
1385
2474
def run(self, testspecs_list=None, verbose=None, one=False,
2475
keep_output=False, transport=None, benchmark=None,
2476
lsprof_timed=None, cache_dir=None, clean_output=False,
2477
first=False, numbered_dirs=None, list_only=False,
2478
randomize=None, exclude=None):
1386
def run(self, testspecs_list=None, verbose=False, one=False,
1387
keep_output=False):
2479
1388
import bzrlib.ui
2480
1389
from bzrlib.tests import selftest
2481
import bzrlib.benchmarks as benchmarks
2482
from bzrlib.benchmarks import tree_creator
2483
2484
if clean_output:
2485
from bzrlib.tests import clean_selftest_output
2486
clean_selftest_output()
2487
return 0
2488
2489
if numbered_dirs is None and sys.platform == 'win32':
2490
numbered_dirs = True
2491
2492
if cache_dir is not None:
2493
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2494
print '%10s: %s' % ('bzr', osutils.realpath(sys.argv[0]))
2495
print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
2496
print
2497
if testspecs_list is not None:
2498
pattern = '|'.join(testspecs_list)
2499
else:
2500
pattern = ".*"
2501
if benchmark:
2502
test_suite_factory = benchmarks.test_suite
2503
if verbose is None:
2504
verbose = True
2505
# TODO: should possibly lock the history file...
2506
benchfile = open(".perf_history", "at", buffering=1)
2507
else:
2508
test_suite_factory = None
2509
if verbose is None:
2510
verbose = False
2511
benchfile = None
1390
# we don't want progress meters from the tests to go to the
1391
# real output; and we don't want log messages cluttering up
1392
# the real logs.
1393
save_ui = bzrlib.ui.ui_factory
1394
bzrlib.trace.info('running tests...')
2512
1395
try:
1396
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1397
if testspecs_list is not None:
1398
pattern = '|'.join(testspecs_list)
1399
else:
1400
pattern = ".*"
2513
1401
result = selftest(verbose=verbose,
2514
1402
pattern=pattern,
2515
1403
stop_on_failure=one,
2516
keep_output=keep_output,
2517
transport=transport,
2518
test_suite_factory=test_suite_factory,
2519
lsprof_timed=lsprof_timed,
2520
bench_history=benchfile,
2521
matching_tests_first=first,
2522
numbered_dirs=numbered_dirs,
2523
list_only=list_only,
2524
random_seed=randomize,
2525
exclude_pattern=exclude
2526
)
1404
keep_output=keep_output)
1405
if result:
1406
bzrlib.trace.info('tests passed')
1407
else:
1408
bzrlib.trace.info('tests failed')
1409
return int(not result)
2527
1410
finally:
2528
if benchfile is not None:
2529
benchfile.close()
2530
if result:
2531
info('tests passed')
2532
else:
2533
info('tests failed')
2534
return int(not result)
1411
bzrlib.ui.ui_factory = save_ui
1412
1413
1414
def show_version():
1415
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1416
# is bzrlib itself in a branch?
1417
bzrrev = bzrlib.get_bzr_revision()
1418
if bzrrev:
1419
print " (bzr checkout, revision %d {%s})" % bzrrev
1420
print bzrlib.__copyright__
1421
print "http://bazaar-ng.org/"
1422
print
1423
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
1424
print "you may use, modify and redistribute it under the terms of the GNU"
1425
print "General Public License version 2 or later."
2535
1426
2536
1427
2537
1428
class cmd_version(Command):
2538
1429
"""Show version of bzr."""
2539
2540
1430
@display_command
2541
1431
def run(self):
2542
from bzrlib.version import show_version
2543
1432
show_version()
2544
1433
2545
2546
1434
class cmd_rocks(Command):
2547
1435
"""Statement of optimism."""
2548
2549
1436
hidden = True
2550
2551
1437
@display_command
2552
1438
def run(self):
2553
print "It sure does!"
1439
print "it sure does!"
2554
1440
2555
1441
2556
1442
class cmd_find_merge_base(Command):
2557
"""Find and print a base revision for merging two branches."""
1443
"""Find and print a base revision for merging two branches.
1444
"""
2558
1445
# TODO: Options to specify revisions on either side, as if
2559
1446
# merging only part of the history.
2560
1447
takes_args = ['branch', 'other']
2562
1449
2563
1450
@display_command
2564
1451
def run(self, branch, other):
2565
from bzrlib.revision import MultipleRevisionSources
1452
from bzrlib.revision import common_ancestor, MultipleRevisionSources
2566
1453
2567
1454
branch1 = Branch.open_containing(branch)[0]
2568
1455
branch2 = Branch.open_containing(other)[0]
2569
1456
1457
history_1 = branch1.revision_history()
1458
history_2 = branch2.revision_history()
1459
2570
1460
last1 = branch1.last_revision()
2571
1461
last2 = branch2.last_revision()
2572
1462
2573
source = MultipleRevisionSources(branch1.repository,
2574
branch2.repository)
1463
source = MultipleRevisionSources(branch1, branch2)
2575
1464
2576
1465
base_rev_id = common_ancestor(last1, last2, source)
2577
1466
2578
1467
print 'merge base is revision %s' % base_rev_id
1468
1469
return
1470
1471
if base_revno is None:
1472
raise bzrlib.errors.UnrelatedBranches()
1473
1474
print ' r%-6d in %s' % (base_revno, branch)
1475
1476
other_revno = branch2.revision_id_to_revno(base_revid)
1477
1478
print ' r%-6d in %s' % (other_revno, other)
1479
2579
1480
2580
1481
2581
1482
class cmd_merge(Command):
2582
1483
"""Perform a three-way merge.
2583
1484
2584
The branch is the branch you will merge from. By default, it will merge
2585
the latest revision. If you specify a revision, that revision will be
2586
merged. If you specify two revisions, the first will be used as a BASE,
2587
and the second one as OTHER. Revision numbers are always relative to the
2588
specified branch.
1485
The branch is the branch you will merge from. By default, it will
1486
merge the latest revision. If you specify a revision, that
1487
revision will be merged. If you specify two revisions, the first
1488
will be used as a BASE, and the second one as OTHER. Revision
1489
numbers are always relative to the specified branch.
2589
1490
2590
By default, bzr will try to merge in all new work from the other
1491
By default bzr will try to merge in all new work from the other
2591
1492
branch, automatically determining an appropriate base. If this
2592
1493
fails, you may need to give an explicit base.
2593
1494
2594
Merge will do its best to combine the changes in two branches, but there
2595
are some kinds of problems only a human can fix. When it encounters those,
2596
it will mark a conflict. A conflict means that you need to fix something,
2597
before you should commit.
2598
2599
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
2600
2601
If there is no default branch set, the first merge will set it. After
2602
that, you can omit the branch to use the default. To change the
2603
default, use --remember. The value will only be saved if the remote
2604
location can be accessed.
2605
2606
The results of the merge are placed into the destination working
2607
directory, where they can be reviewed (with bzr diff), tested, and then
2608
committed to record the result of the merge.
2609
2610
1495
Examples:
2611
1496
2612
To merge the latest revision from bzr.dev:
2613
bzr merge ../bzr.dev
1497
To merge the latest revision from bzr.dev
1498
bzr merge ../bzr.dev
2614
1499
2615
To merge changes up to and including revision 82 from bzr.dev:
2616
bzr merge -r 82 ../bzr.dev
1500
To merge changes up to and including revision 82 from bzr.dev
1501
bzr merge -r 82 ../bzr.dev
2617
1502
2618
1503
To merge the changes introduced by 82, without previous changes:
2619
bzr merge -r 81..82 ../bzr.dev
1504
bzr merge -r 81..82 ../bzr.dev
2620
1505
2621
1506
merge refuses to run if there are any uncommitted changes, unless
2622
1507
--force is given.
2623
1508
"""
2624
2625
_see_also = ['update', 'remerge']
2626
1509
takes_args = ['branch?']
2627
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
2628
Option('show-base', help="Show base revision text in "
2629
"conflicts"),
2630
Option('uncommitted', help='Apply uncommitted changes'
2631
' from a working copy, instead of branch changes'),
2632
Option('pull', help='If the destination is already'
2633
' completely merged into the source, pull from the'
2634
' source rather than merging. When this happens,'
2635
' you do not need to commit the result.'),
2636
Option('directory',
2637
help='Branch to merge into, '
2638
'rather than the one containing the working directory',
2639
short_name='d',
2640
type=unicode,
2641
),
2642
]
1510
takes_options = ['revision', 'force', 'merge-type', 'reprocess',
1511
Option('show-base', help="Show base revision text in "
1512
"conflicts")]
2643
1513
2644
1514
def run(self, branch=None, revision=None, force=False, merge_type=None,
2645
show_base=False, reprocess=False, remember=False,
2646
uncommitted=False, pull=False,
2647
directory=None,
2648
):
2649
from bzrlib.tag import _merge_tags_if_possible
2650
other_revision_id = None
1515
show_base=False, reprocess=False):
1516
from bzrlib.merge import merge
1517
from bzrlib.merge_core import ApplyMerge3
2651
1518
if merge_type is None:
2652
merge_type = _mod_merge.Merge3Merger
2653
2654
if directory is None: directory = u'.'
2655
# XXX: jam 20070225 WorkingTree should be locked before you extract its
2656
# inventory. Because merge is a mutating operation, it really
2657
# should be a lock_write() for the whole cmd_merge operation.
2658
# However, cmd_merge open's its own tree in _merge_helper, which
2659
# means if we lock here, the later lock_write() will always block.
2660
# Either the merge helper code should be updated to take a tree,
2661
# (What about tree.merge_from_branch?)
2662
tree = WorkingTree.open_containing(directory)[0]
2663
change_reporter = delta._ChangeReporter(
2664
unversioned_filter=tree.is_ignored)
2665
2666
if branch is not None:
2667
try:
2668
mergeable = bundle.read_mergeable_from_url(
2669
branch)
2670
except errors.NotABundle:
2671
pass # Continue on considering this url a Branch
1519
merge_type = ApplyMerge3
1520
if branch is None:
1521
branch = WorkingTree.open_containing(u'.')[0].branch.get_parent()
1522
if branch is None:
1523
raise BzrCommandError("No merge location known or specified.")
2672
1524
else:
2673
if revision is not None:
2674
raise errors.BzrCommandError(
2675
'Cannot use -r with merge directives or bundles')
2676
other_revision_id = mergeable.install_revisions(
2677
tree.branch.repository)
2678
revision = [RevisionSpec.from_string(
2679
'revid:' + other_revision_id)]
2680
2681
if revision is None \
2682
or len(revision) < 1 or revision[0].needs_branch():
2683
branch = self._get_remembered_parent(tree, branch, 'Merging from')
2684
1525
print "Using saved location: %s" % branch
2685
1526
if revision is None or len(revision) < 1:
2686
if uncommitted:
2687
base = [branch, -1]
2688
other = [branch, None]
2689
else:
2690
base = [None, None]
2691
other = [branch, -1]
2692
other_branch, path = Branch.open_containing(branch)
1527
base = [None, None]
1528
other = [branch, -1]
2693
1529
else:
2694
if uncommitted:
2695
raise errors.BzrCommandError('Cannot use --uncommitted and'
2696
' --revision at the same time.')
2697
branch = revision[0].get_branch() or branch
2698
1530
if len(revision) == 1:
2699
1531
base = [None, None]
2700
if other_revision_id is not None:
2701
other_branch = None
2702
path = ""
2703
other = None
2704
else:
2705
other_branch, path = Branch.open_containing(branch)
2706
revno = revision[0].in_history(other_branch).revno
2707
other = [branch, revno]
1532
other_branch = Branch.open_containing(branch)[0]
1533
revno = revision[0].in_history(other_branch).revno
1534
other = [branch, revno]
2708
1535
else:
2709
1536
assert len(revision) == 2
2710
1537
if None in revision:
2711
raise errors.BzrCommandError(
2712
"Merge doesn't permit empty revision specifier.")
2713
base_branch, path = Branch.open_containing(branch)
2714
branch1 = revision[1].get_branch() or branch
2715
other_branch, path1 = Branch.open_containing(branch1)
2716
if revision[0].get_branch() is not None:
2717
# then path was obtained from it, and is None.
2718
path = path1
2719
2720
base = [branch, revision[0].in_history(base_branch).revno]
2721
other = [branch1, revision[1].in_history(other_branch).revno]
2722
2723
if ((tree.branch.get_parent() is None or remember) and
2724
other_branch is not None):
2725
tree.branch.set_parent(other_branch.base)
2726
2727
# pull tags now... it's a bit inconsistent to do it ahead of copying
2728
# the history but that's done inside the merge code
2729
if other_branch is not None:
2730
_merge_tags_if_possible(other_branch, tree.branch)
2731
2732
if path != "":
2733
interesting_files = [path]
2734
else:
2735
interesting_files = None
2736
pb = ui.ui_factory.nested_progress_bar()
1538
raise BzrCommandError(
1539
"Merge doesn't permit that revision specifier.")
1540
b = Branch.open_containing(branch)[0]
1541
1542
base = [branch, revision[0].in_history(b).revno]
1543
other = [branch, revision[1].in_history(b).revno]
1544
2737
1545
try:
2738
try:
2739
conflict_count = _merge_helper(
2740
other, base, other_rev_id=other_revision_id,
2741
check_clean=(not force),
2742
merge_type=merge_type,
2743
reprocess=reprocess,
2744
show_base=show_base,
2745
pull=pull,
2746
this_dir=directory,
2747
pb=pb, file_list=interesting_files,
2748
change_reporter=change_reporter)
2749
finally:
2750
pb.finished()
1546
conflict_count = merge(other, base, check_clean=(not force),
1547
merge_type=merge_type, reprocess=reprocess,
1548
show_base=show_base)
2751
1549
if conflict_count != 0:
2752
1550
return 1
2753
1551
else:
2754
1552
return 0
2755
except errors.AmbiguousBase, e:
1553
except bzrlib.errors.AmbiguousBase, e:
2756
1554
m = ("sorry, bzr can't determine the right merge base yet\n"
2757
1555
"candidates are:\n "
2758
1556
+ "\n ".join(e.bases)
2761
1559
"and (if you want) report this to the bzr developers\n")
2762
1560
log_error(m)
2763
1561
2764
# TODO: move up to common parent; this isn't merge-specific anymore.
2765
def _get_remembered_parent(self, tree, supplied_location, verb_string):
2766
"""Use tree.branch's parent if none was supplied.
2767
2768
Report if the remembered location was used.
2769
"""
2770
if supplied_location is not None:
2771
return supplied_location
2772
stored_location = tree.branch.get_parent()
2773
mutter("%s", stored_location)
2774
if stored_location is None:
2775
raise errors.BzrCommandError("No location specified or remembered")
2776
display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2777
self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
2778
return stored_location
2779
2780
1562
2781
1563
class cmd_remerge(Command):
2782
1564
"""Redo a merge.
2783
2784
Use this if you want to try a different merge technique while resolving
2785
conflicts. Some merge techniques are better than others, and remerge
2786
lets you try different ones on different files.
2787
2788
The options for remerge have the same meaning and defaults as the ones for
2789
merge. The difference is that remerge can (only) be run when there is a
2790
pending merge, and it lets you specify particular files.
2791
2792
Examples:
2793
2794
$ bzr remerge --show-base
2795
Re-do the merge of all conflicted files, and show the base text in
2796
conflict regions, in addition to the usual THIS and OTHER texts.
2797
2798
$ bzr remerge --merge-type weave --reprocess foobar
2799
Re-do the merge of "foobar", using the weave merge algorithm, with
2800
additional processing to reduce the size of conflict regions.
2801
1565
"""
2802
1566
takes_args = ['file*']
2803
1567
takes_options = ['merge-type', 'reprocess',
2806
1570
2807
1571
def run(self, file_list=None, merge_type=None, show_base=False,
2808
1572
reprocess=False):
1573
from bzrlib.merge import merge_inner, transform_tree
1574
from bzrlib.merge_core import ApplyMerge3
2809
1575
if merge_type is None:
2810
merge_type = _mod_merge.Merge3Merger
1576
merge_type = ApplyMerge3
2811
1577
tree, file_list = tree_files(file_list)
2812
1578
tree.lock_write()
2813
1579
try:
2814
parents = tree.get_parent_ids()
2815
if len(parents) != 2:
2816
raise errors.BzrCommandError("Sorry, remerge only works after normal"
2817
" merges. Not cherrypicking or"
2818
" multi-merges.")
2819
repository = tree.branch.repository
2820
base_revision = common_ancestor(parents[0],
2821
parents[1], repository)
2822
base_tree = repository.revision_tree(base_revision)
2823
other_tree = repository.revision_tree(parents[1])
1580
pending_merges = tree.pending_merges()
1581
if len(pending_merges) != 1:
1582
raise BzrCommandError("Sorry, remerge only works after normal"
1583
+ " merges. Not cherrypicking or"
1584
+ "multi-merges.")
1585
base_revision = common_ancestor(tree.branch.last_revision(),
1586
pending_merges[0], tree.branch)
1587
base_tree = tree.branch.revision_tree(base_revision)
1588
other_tree = tree.branch.revision_tree(pending_merges[0])
2824
1589
interesting_ids = None
2825
new_conflicts = []
2826
conflicts = tree.conflicts()
2827
1590
if file_list is not None:
2828
1591
interesting_ids = set()
2829
1592
for filename in file_list:
2830
1593
file_id = tree.path2id(filename)
2831
if file_id is None:
2832
raise errors.NotVersionedError(filename)
2833
1594
interesting_ids.add(file_id)
2834
1595
if tree.kind(file_id) != "directory":
2835
1596
continue
2836
1597
2837
1598
for name, ie in tree.inventory.iter_entries(file_id):
2838
1599
interesting_ids.add(ie.file_id)
2839
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
1600
transform_tree(tree, tree.branch.basis_tree(), interesting_ids)
1601
if file_list is None:
1602
restore_files = list(tree.iter_conflicts())
2840
1603
else:
2841
# Remerge only supports resolving contents conflicts
2842
allowed_conflicts = ('text conflict', 'contents conflict')
2843
restore_files = [c.path for c in conflicts
2844
if c.typestring in allowed_conflicts]
2845
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
2846
tree.set_conflicts(ConflictList(new_conflicts))
2847
if file_list is not None:
2848
1604
restore_files = file_list
2849
1605
for filename in restore_files:
2850
1606
try:
2851
1607
restore(tree.abspath(filename))
2852
except errors.NotConflicted:
1608
except NotConflicted:
2853
1609
pass
2854
conflicts = _mod_merge.merge_inner(
2855
tree.branch, other_tree, base_tree,
2856
this_tree=tree,
2857
interesting_ids=interesting_ids,
2858
other_rev_id=parents[1],
2859
merge_type=merge_type,
2860
show_base=show_base,
2861
reprocess=reprocess)
1610
conflicts = merge_inner(tree.branch, other_tree, base_tree,
1611
interesting_ids = interesting_ids,
1612
other_rev_id=pending_merges[0],
1613
merge_type=merge_type,
1614
show_base=show_base,
1615
reprocess=reprocess)
2862
1616
finally:
2863
1617
tree.unlock()
2864
1618
if conflicts > 0:
2866
1620
else:
2867
1621
return 0
2868
1622
2869
2870
1623
class cmd_revert(Command):
2871
"""Revert files to a previous revision.
2872
2873
Giving a list of files will revert only those files. Otherwise, all files
2874
will be reverted. If the revision is not specified with '--revision', the
2875
last committed revision is used.
2876
2877
To remove only some changes, without reverting to a prior version, use
2878
merge instead. For example, "merge . --r-2..-3" will remove the changes
2879
introduced by -2, without affecting the changes introduced by -1. Or
2880
to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
2881
2882
By default, any files that have been manually changed will be backed up
2883
first. (Files changed only by merge are not backed up.) Backup files have
2884
'.~#~' appended to their name, where # is a number.
2885
2886
When you provide files, you can use their current pathname or the pathname
2887
from the target revision. So you can use revert to "undelete" a file by
2888
name. If you name a directory, all the contents of that directory will be
2889
reverted.
1624
"""Reverse all changes since the last commit.
1625
1626
Only versioned files are affected. Specify filenames to revert only
1627
those files. By default, any files that are changed will be backed up
1628
first. Backup files have a '~' appended to their name.
2890
1629
"""
2891
2892
_see_also = ['cat', 'export']
2893
1630
takes_options = ['revision', 'no-backup']
2894
1631
takes_args = ['file*']
1632
aliases = ['merge-revert']
2895
1633
2896
1634
def run(self, revision=None, no_backup=False, file_list=None):
1635
from bzrlib.merge import merge_inner
1636
from bzrlib.commands import parse_spec
2897
1637
if file_list is not None:
2898
1638
if len(file_list) == 0:
2899
raise errors.BzrCommandError("No files specified")
1639
raise BzrCommandError("No files specified")
2900
1640
else:
2901
1641
file_list = []
2902
2903
tree, file_list = tree_files(file_list)
2904
1642
if revision is None:
1643
revno = -1
1644
tree = WorkingTree.open_containing(u'.')[0]
2905
1645
# FIXME should be tree.last_revision
2906
rev_id = tree.last_revision()
1646
rev_id = tree.branch.last_revision()
2907
1647
elif len(revision) != 1:
2908
raise errors.BzrCommandError('bzr revert --revision takes exactly 1 argument')
1648
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
2909
1649
else:
1650
tree, file_list = tree_files(file_list)
2910
1651
rev_id = revision[0].in_history(tree.branch).rev_id
2911
pb = ui.ui_factory.nested_progress_bar()
2912
try:
2913
tree.revert(file_list,
2914
tree.branch.repository.revision_tree(rev_id),
2915
not no_backup, pb, report_changes=True)
2916
finally:
2917
pb.finished()
1652
tree.revert(file_list, tree.branch.revision_tree(rev_id),
1653
not no_backup)
2918
1654
2919
1655
2920
1656
class cmd_assert_fail(Command):
2921
1657
"""Test reporting of assertion failures"""
2922
# intended just for use in testing
2923
2924
1658
hidden = True
2925
2926
1659
def run(self):
2927
raise AssertionError("always fails")
1660
assert False, "always fails"
2928
1661
2929
1662
2930
1663
class cmd_help(Command):
2931
1664
"""Show help on a command or other topic.
2932
"""
2933
1665
2934
_see_also = ['topics']
2935
takes_options = [Option('long', 'show help on all commands')]
1666
For a list of all available commands, say 'bzr help commands'."""
1667
takes_options = ['long']
2936
1668
takes_args = ['topic?']
2937
aliases = ['?', '--help', '-?', '-h']
1669
aliases = ['?']
2938
1670
2939
1671
@display_command
2940
1672
def run(self, topic=None, long=False):
2941
import bzrlib.help
1673
import help
2942
1674
if topic is None and long:
2943
1675
topic = "commands"
2944
bzrlib.help.help(topic)
1676
help.help(topic)
2945
1677
2946
1678
2947
1679
class cmd_shell_complete(Command):
2948
1680
"""Show appropriate completions for context.
2949
1681
2950
For a list of all available commands, say 'bzr shell-complete'.
2951
"""
1682
For a list of all available commands, say 'bzr shell-complete'."""
2952
1683
takes_args = ['context?']
2953
1684
aliases = ['s-c']
2954
1685
hidden = True
2962
1693
class cmd_fetch(Command):
2963
1694
"""Copy in history from another branch but don't merge it.
2964
1695
2965
This is an internal method used for pull and merge.
2966
"""
1696
This is an internal method used for pull and merge."""
2967
1697
hidden = True
2968
1698
takes_args = ['from_branch', 'to_branch']
2969
1699
def run(self, from_branch, to_branch):
2970
1700
from bzrlib.fetch import Fetcher
1701
from bzrlib.branch import Branch
2971
1702
from_b = Branch.open(from_branch)
2972
1703
to_b = Branch.open(to_branch)
2973
Fetcher(to_b, from_b)
1704
from_b.lock_read()
1705
try:
1706
to_b.lock_write()
1707
try:
1708
Fetcher(to_b, from_b)
1709
finally:
1710
to_b.unlock()
1711
finally:
1712
from_b.unlock()
2974
1713
2975
1714
2976
1715
class cmd_missing(Command):
2977
"""Show unmerged/unpulled revisions between two branches.
2978
2979
OTHER_BRANCH may be local or remote.
1716
"""What is missing in this branch relative to other branch.
2980
1717
"""
2981
2982
_see_also = ['merge', 'pull']
2983
takes_args = ['other_branch?']
2984
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2985
Option('mine-only',
2986
'Display changes in the local branch only'),
2987
Option('theirs-only',
2988
'Display changes in the remote branch only'),
2989
'log-format',
2990
'show-ids',
2991
'verbose'
2992
]
2993
encoding_type = 'replace'
1718
# TODO: rewrite this in terms of ancestry so that it shows only
1719
# unmerged things
1720
1721
takes_args = ['remote?']
1722
aliases = ['mis', 'miss']
1723
takes_options = ['verbose']
2994
1724
2995
1725
@display_command
2996
def run(self, other_branch=None, reverse=False, mine_only=False,
2997
theirs_only=False, log_format=None, long=False, short=False, line=False,
2998
show_ids=False, verbose=False):
2999
from bzrlib.missing import find_unmerged, iter_log_revisions
3000
from bzrlib.log import log_formatter
3001
local_branch = Branch.open_containing(u".")[0]
3002
parent = local_branch.get_parent()
3003
if other_branch is None:
3004
other_branch = parent
3005
if other_branch is None:
3006
raise errors.BzrCommandError("No peer location known or specified.")
3007
display_url = urlutils.unescape_for_display(parent,
3008
self.outf.encoding)
3009
print "Using last location: " + display_url
3010
3011
remote_branch = Branch.open(other_branch)
3012
if remote_branch.base == local_branch.base:
3013
remote_branch = local_branch
3014
local_branch.lock_read()
3015
try:
3016
remote_branch.lock_read()
3017
try:
3018
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
3019
if (log_format is None):
3020
log_format = log.log_formatter_registry.get_default(
3021
local_branch)
3022
lf = log_format(to_file=self.outf,
3023
show_ids=show_ids,
3024
show_timezone='original')
3025
if reverse is False:
3026
local_extra.reverse()
3027
remote_extra.reverse()
3028
if local_extra and not theirs_only:
3029
print "You have %d extra revision(s):" % len(local_extra)
3030
for revision in iter_log_revisions(local_extra,
3031
local_branch.repository,
3032
verbose):
3033
lf.log_revision(revision)
3034
printed_local = True
3035
else:
3036
printed_local = False
3037
if remote_extra and not mine_only:
3038
if printed_local is True:
3039
print "\n\n"
3040
print "You are missing %d revision(s):" % len(remote_extra)
3041
for revision in iter_log_revisions(remote_extra,
3042
remote_branch.repository,
3043
verbose):
3044
lf.log_revision(revision)
3045
if not remote_extra and not local_extra:
3046
status_code = 0
3047
print "Branches are up to date."
3048
else:
3049
status_code = 1
3050
finally:
3051
remote_branch.unlock()
3052
finally:
3053
local_branch.unlock()
3054
if not status_code and parent is None and other_branch is not None:
3055
local_branch.lock_write()
3056
try:
3057
# handle race conditions - a parent might be set while we run.
3058
if local_branch.get_parent() is None:
3059
local_branch.set_parent(remote_branch.base)
3060
finally:
3061
local_branch.unlock()
3062
return status_code
1726
def run(self, remote=None, verbose=False):
1727
from bzrlib.errors import BzrCommandError
1728
from bzrlib.missing import show_missing
1729
1730
if verbose and is_quiet():
1731
raise BzrCommandError('Cannot pass both quiet and verbose')
1732
1733
tree = WorkingTree.open_containing(u'.')[0]
1734
parent = tree.branch.get_parent()
1735
if remote is None:
1736
if parent is None:
1737
raise BzrCommandError("No missing location known or specified.")
1738
else:
1739
if not is_quiet():
1740
print "Using last location: %s" % parent
1741
remote = parent
1742
elif parent is None:
1743
# We only update parent if it did not exist, missing
1744
# should not change the parent
1745
tree.branch.set_parent(remote)
1746
br_remote = Branch.open_containing(remote)[0]
1747
return show_missing(tree.branch, br_remote, verbose=verbose,
1748
quiet=is_quiet())
3063
1749
3064
1750
3065
1751
class cmd_plugins(Command):
3069
1755
def run(self):
3070
1756
import bzrlib.plugin
3071
1757
from inspect import getdoc
3072
for name, plugin in bzrlib.plugin.all_plugins().items():
3073
if getattr(plugin, '__path__', None) is not None:
1758
for plugin in bzrlib.plugin.all_plugins:
1759
if hasattr(plugin, '__path__'):
3074
1760
print plugin.__path__[0]
3075
elif getattr(plugin, '__file__', None) is not None:
1761
elif hasattr(plugin, '__file__'):
3076
1762
print plugin.__file__
3077
1763
else:
3078
print repr(plugin)
1764
print `plugin`
3079
1765
3080
1766
d = getdoc(plugin)
3081
1767
if d:
3084
1770
3085
1771
class cmd_testament(Command):
3086
1772
"""Show testament (signing-form) of a revision."""
3087
takes_options = ['revision',
3088
Option('long', help='Produce long-format testament'),
3089
Option('strict', help='Produce a strict-format'
3090
' testament')]
1773
takes_options = ['revision', 'long']
3091
1774
takes_args = ['branch?']
3092
1775
@display_command
3093
def run(self, branch=u'.', revision=None, long=False, strict=False):
3094
from bzrlib.testament import Testament, StrictTestament
3095
if strict is True:
3096
testament_class = StrictTestament
3097
else:
3098
testament_class = Testament
1776
def run(self, branch=u'.', revision=None, long=False):
1777
from bzrlib.testament import Testament
3099
1778
b = WorkingTree.open_containing(branch)[0].branch
3100
1779
b.lock_read()
3101
1780
try:
3103
1782
rev_id = b.last_revision()
3104
1783
else:
3105
1784
rev_id = revision[0].in_history(b).rev_id
3106
t = testament_class.from_revision(b.repository, rev_id)
1785
t = Testament.from_revision(b, rev_id)
3107
1786
if long:
3108
1787
sys.stdout.writelines(t.as_text_lines())
3109
1788
else:
3122
1801
shown only at the top, unless the --all option is given.
3123
1802
"""
3124
1803
# TODO: annotate directories; showing when each file was last changed
1804
# TODO: annotate a previous version of a file
3125
1805
# TODO: if the working copy is modified, show annotations on that
3126
1806
# with new uncommitted lines marked
3127
aliases = ['ann', 'blame', 'praise']
1807
aliases = ['blame', 'praise']
3128
1808
takes_args = ['filename']
3129
1809
takes_options = [Option('all', help='show annotations on all lines'),
3130
1810
Option('long', help='show date in annotations'),
3131
'revision',
3132
'show-ids',
3133
1811
]
3134
1812
3135
1813
@display_command
3136
def run(self, filename, all=False, long=False, revision=None,
3137
show_ids=False):
1814
def run(self, filename, all=False, long=False):
3138
1815
from bzrlib.annotate import annotate_file
3139
1816
tree, relpath = WorkingTree.open_containing(filename)
3140
1817
branch = tree.branch
3141
1818
branch.lock_read()
3142
1819
try:
3143
if revision is None:
3144
revision_id = branch.last_revision()
3145
elif len(revision) != 1:
3146
raise errors.BzrCommandError('bzr annotate --revision takes exactly 1 argument')
3147
else:
3148
revision_id = revision[0].in_history(branch).rev_id
3149
file_id = tree.path2id(relpath)
3150
tree = branch.repository.revision_tree(revision_id)
1820
file_id = tree.inventory.path2id(relpath)
1821
tree = branch.revision_tree(branch.last_revision())
3151
1822
file_version = tree.inventory[file_id].revision
3152
annotate_file(branch, file_version, file_id, long, all, sys.stdout,
3153
show_ids=show_ids)
1823
annotate_file(branch, file_version, file_id, long, all, sys.stdout)
3154
1824
finally:
3155
1825
branch.unlock()
3156
1826
3160
1830
# TODO be able to replace existing ones.
3161
1831
3162
1832
hidden = True # is this right ?
3163
takes_args = ['revision_id*']
1833
takes_args = ['revision_id?']
3164
1834
takes_options = ['revision']
3165
1835
3166
def run(self, revision_id_list=None, revision=None):
1836
def run(self, revision_id=None, revision=None):
1837
import bzrlib.config as config
3167
1838
import bzrlib.gpg as gpg
3168
if revision_id_list is not None and revision is not None:
3169
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
3170
if revision_id_list is None and revision is None:
3171
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
1839
if revision_id is not None and revision is not None:
1840
raise BzrCommandError('You can only supply one of revision_id or --revision')
1841
if revision_id is None and revision is None:
1842
raise BzrCommandError('You must supply either --revision or a revision_id')
3172
1843
b = WorkingTree.open_containing(u'.')[0].branch
3173
gpg_strategy = gpg.GPGStrategy(b.get_config())
3174
if revision_id_list is not None:
3175
for revision_id in revision_id_list:
3176
b.repository.sign_revision(revision_id, gpg_strategy)
1844
gpg_strategy = gpg.GPGStrategy(config.BranchConfig(b))
1845
if revision_id is not None:
1846
b.sign_revision(revision_id, gpg_strategy)
3177
1847
elif revision is not None:
3178
1848
if len(revision) == 1:
3179
1849
revno, rev_id = revision[0].in_history(b)
3180
b.repository.sign_revision(rev_id, gpg_strategy)
1850
b.sign_revision(rev_id, gpg_strategy)
3181
1851
elif len(revision) == 2:
3182
1852
# are they both on rh- if so we can walk between them
3183
1853
# might be nice to have a range helper for arbitrary
3187
1857
if to_revid is None:
3188
1858
to_revno = b.revno()
3189
1859
if from_revno is None or to_revno is None:
3190
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
1860
raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
3191
1861
for revno in range(from_revno, to_revno + 1):
3192
b.repository.sign_revision(b.get_rev_id(revno),
3193
gpg_strategy)
3194
else:
3195
raise errors.BzrCommandError('Please supply either one revision, or a range.')
3196
3197
3198
class cmd_bind(Command):
3199
"""Convert the current branch into a checkout of the supplied branch.
3200
3201
Once converted into a checkout, commits must succeed on the master branch
3202
before they will be applied to the local branch.
3203
"""
3204
3205
_see_also = ['checkouts', 'unbind']
3206
takes_args = ['location?']
3207
takes_options = []
3208
3209
def run(self, location=None):
3210
b, relpath = Branch.open_containing(u'.')
3211
if location is None:
3212
try:
3213
location = b.get_old_bound_location()
3214
except errors.UpgradeRequired:
3215
raise errors.BzrCommandError('No location supplied. '
3216
'This format does not remember old locations.')
3217
else:
3218
if location is None:
3219
raise errors.BzrCommandError('No location supplied and no '
3220
'previous location known')
3221
b_other = Branch.open(location)
3222
try:
3223
b.bind(b_other)
3224
except errors.DivergedBranches:
3225
raise errors.BzrCommandError('These branches have diverged.'
3226
' Try merging, and then bind again.')
3227
3228
3229
class cmd_unbind(Command):
3230
"""Convert the current checkout into a regular branch.
3231
3232
After unbinding, the local branch is considered independent and subsequent
3233
commits will be local only.
3234
"""
3235
3236
_see_also = ['checkouts', 'bind']
3237
takes_args = []
3238
takes_options = []
3239
3240
def run(self):
3241
b, relpath = Branch.open_containing(u'.')
3242
if not b.unbind():
3243
raise errors.BzrCommandError('Local branch is not bound')
3244
3245
3246
class cmd_uncommit(Command):
1862
b.sign_revision(b.get_rev_id(revno), gpg_strategy)
1863
else:
1864
raise BzrCommandError('Please supply either one revision, or a range.')
1865
1866
1867
class cmd_uncommit(bzrlib.commands.Command):
3247
1868
"""Remove the last committed revision.
3248
1869
1870
By supplying the --all flag, it will not only remove the entry
1871
from revision_history, but also remove all of the entries in the
1872
stores.
1873
3249
1874
--verbose will print out what is being removed.
3250
1875
--dry-run will go through all the motions, but not actually
3251
1876
remove anything.
3252
1877
3253
In the future, uncommit will create a revision bundle, which can then
1878
In the future, uncommit will create a changeset, which can then
3254
1879
be re-applied.
3255
1880
"""
3256
3257
# TODO: jam 20060108 Add an option to allow uncommit to remove
3258
# unreferenced information in 'branch-as-repository' branches.
3259
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
3260
# information in shared branches as well.
3261
_see_also = ['commit']
3262
takes_options = ['verbose', 'revision',
1881
takes_options = ['all', 'verbose', 'revision',
3263
1882
Option('dry-run', help='Don\'t actually make changes'),
3264
1883
Option('force', help='Say yes to all questions.')]
3265
1884
takes_args = ['location?']
3266
1885
aliases = []
3267
1886
3268
def run(self, location=None,
1887
def run(self, location=None, all=False,
3269
1888
dry_run=False, verbose=False,
3270
1889
revision=None, force=False):
3271
from bzrlib.log import log_formatter, show_log
1890
from bzrlib.branch import Branch
1891
from bzrlib.log import log_formatter
3272
1892
import sys
3273
1893
from bzrlib.uncommit import uncommit
3274
1894
3275
1895
if location is None:
3276
1896
location = u'.'
3277
control, relpath = bzrdir.BzrDir.open_containing(location)
3278
try:
3279
tree = control.open_workingtree()
3280
b = tree.branch
3281
except (errors.NoWorkingTree, errors.NotLocalUrl):
3282
tree = None
3283
b = control.open_branch()
1897
b, relpath = Branch.open_containing(location)
3284
1898
3285
rev_id = None
3286
1899
if revision is None:
3287
1900
revno = b.revno()
1901
rev_id = b.last_revision()
3288
1902
else:
3289
# 'bzr uncommit -r 10' actually means uncommit
3290
# so that the final tree is at revno 10.
3291
# but bzrlib.uncommit.uncommit() actually uncommits
3292
# the revisions that are supplied.
3293
# So we need to offset it by one
3294
revno = revision[0].in_history(b).revno+1
3295
3296
if revno <= b.revno():
3297
rev_id = b.get_rev_id(revno)
1903
revno, rev_id = revision[0].in_history(b)
3298
1904
if rev_id is None:
3299
self.outf.write('No revisions to uncommit.\n')
3300
return 1
3301
3302
lf = log_formatter('short',
3303
to_file=self.outf,
3304
show_timezone='original')
3305
3306
show_log(b,
3307
lf,
3308
verbose=False,
3309
direction='forward',
3310
start_revision=revno,
3311
end_revision=b.revno())
1905
print 'No revisions to uncommit.'
1906
1907
for r in range(revno, b.revno()+1):
1908
rev_id = b.get_rev_id(r)
1909
lf = log_formatter('short', to_file=sys.stdout,show_timezone='original')
1910
lf.show(r, b.get_revision(rev_id), None)
3312
1911
3313
1912
if dry_run:
3314
1913
print 'Dry-run, pretending to remove the above revisions.'
3322
1921
print 'Canceled'
3323
1922
return 0
3324
1923
3325
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
1924
uncommit(b, remove_files=all,
1925
dry_run=dry_run, verbose=verbose,
3326
1926
revno=revno)
3327
1927
3328
1928
3329
class cmd_break_lock(Command):
3330
"""Break a dead lock on a repository, branch or working directory.
3331
3332
CAUTION: Locks should only be broken when you are sure that the process
3333
holding the lock has been stopped.
3334
3335
You can get information on what locks are open via the 'bzr info' command.
3336
3337
example:
3338
bzr break-lock
3339
"""
3340
takes_args = ['location?']
3341
3342
def run(self, location=None, show=False):
3343
if location is None:
3344
location = u'.'
3345
control, relpath = bzrdir.BzrDir.open_containing(location)
3346
try:
3347
control.break_lock()
3348
except NotImplementedError:
3349
pass
3350
3351
3352
class cmd_wait_until_signalled(Command):
3353
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
3354
3355
This just prints a line to signal when it is ready, then blocks on stdin.
3356
"""
3357
3358
hidden = True
3359
3360
def run(self):
3361
sys.stdout.write("running\n")
3362
sys.stdout.flush()
3363
sys.stdin.readline()
3364
3365
3366
class cmd_serve(Command):
3367
"""Run the bzr server."""
3368
3369
aliases = ['server']
3370
3371
takes_options = [
3372
Option('inet',
3373
help='serve on stdin/out for use from inetd or sshd'),
3374
Option('port',
3375
help='listen for connections on nominated port of the form '
3376
'[hostname:]portnumber. Passing 0 as the port number will '
3377
'result in a dynamically allocated port. Default port is '
3378
'4155.',
3379
type=str),
3380
Option('directory',
3381
help='serve contents of directory',
3382
type=unicode),
3383
Option('allow-writes',
3384
help='By default the server is a readonly server. Supplying '
3385
'--allow-writes enables write access to the contents of '
3386
'the served directory and below. '
3387
),
3388
]
3389
3390
def run(self, port=None, inet=False, directory=None, allow_writes=False):
3391
from bzrlib.smart import medium, server
3392
from bzrlib.transport import get_transport
3393
from bzrlib.transport.chroot import ChrootServer
3394
from bzrlib.transport.remote import BZR_DEFAULT_PORT, BZR_DEFAULT_INTERFACE
3395
if directory is None:
3396
directory = os.getcwd()
3397
url = urlutils.local_path_to_url(directory)
3398
if not allow_writes:
3399
url = 'readonly+' + url
3400
chroot_server = ChrootServer(get_transport(url))
3401
chroot_server.setUp()
3402
t = get_transport(chroot_server.get_url())
3403
if inet:
3404
smart_server = medium.SmartServerPipeStreamMedium(
3405
sys.stdin, sys.stdout, t)
3406
else:
3407
host = BZR_DEFAULT_INTERFACE
3408
if port is None:
3409
port = BZR_DEFAULT_PORT
3410
else:
3411
if ':' in port:
3412
host, port = port.split(':')
3413
port = int(port)
3414
smart_server = server.SmartTCPServer(t, host=host, port=port)
3415
print 'listening on port: ', smart_server.port
3416
sys.stdout.flush()
3417
# for the duration of this server, no UI output is permitted.
3418
# note that this may cause problems with blackbox tests. This should
3419
# be changed with care though, as we dont want to use bandwidth sending
3420
# progress over stderr to smart server clients!
3421
old_factory = ui.ui_factory
3422
try:
3423
ui.ui_factory = ui.SilentUIFactory()
3424
smart_server.serve()
3425
finally:
3426
ui.ui_factory = old_factory
3427
3428
3429
class cmd_join(Command):
3430
"""Combine a subtree into its containing tree.
3431
3432
This command is for experimental use only. It requires the target tree
3433
to be in dirstate-with-subtree format, which cannot be converted into
3434
earlier formats.
3435
3436
The TREE argument should be an independent tree, inside another tree, but
3437
not part of it. (Such trees can be produced by "bzr split", but also by
3438
running "bzr branch" with the target inside a tree.)
3439
3440
The result is a combined tree, with the subtree no longer an independant
3441
part. This is marked as a merge of the subtree into the containing tree,
3442
and all history is preserved.
3443
3444
If --reference is specified, the subtree retains its independence. It can
3445
be branched by itself, and can be part of multiple projects at the same
3446
time. But operations performed in the containing tree, such as commit
3447
and merge, will recurse into the subtree.
3448
"""
3449
3450
_see_also = ['split']
3451
takes_args = ['tree']
3452
takes_options = [Option('reference', 'join by reference')]
3453
hidden = True
3454
3455
def run(self, tree, reference=False):
3456
sub_tree = WorkingTree.open(tree)
3457
parent_dir = osutils.dirname(sub_tree.basedir)
3458
containing_tree = WorkingTree.open_containing(parent_dir)[0]
3459
repo = containing_tree.branch.repository
3460
if not repo.supports_rich_root():
3461
raise errors.BzrCommandError(
3462
"Can't join trees because %s doesn't support rich root data.\n"
3463
"You can use bzr upgrade on the repository."
3464
% (repo,))
3465
if reference:
3466
try:
3467
containing_tree.add_reference(sub_tree)
3468
except errors.BadReferenceTarget, e:
3469
# XXX: Would be better to just raise a nicely printable
3470
# exception from the real origin. Also below. mbp 20070306
3471
raise errors.BzrCommandError("Cannot join %s. %s" %
3472
(tree, e.reason))
3473
else:
3474
try:
3475
containing_tree.subsume(sub_tree)
3476
except errors.BadSubsumeSource, e:
3477
raise errors.BzrCommandError("Cannot join %s. %s" %
3478
(tree, e.reason))
3479
3480
3481
class cmd_split(Command):
3482
"""Split a tree into two trees.
3483
3484
This command is for experimental use only. It requires the target tree
3485
to be in dirstate-with-subtree format, which cannot be converted into
3486
earlier formats.
3487
3488
The TREE argument should be a subdirectory of a working tree. That
3489
subdirectory will be converted into an independent tree, with its own
3490
branch. Commits in the top-level tree will not apply to the new subtree.
3491
If you want that behavior, do "bzr join --reference TREE".
3492
"""
3493
3494
_see_also = ['join']
3495
takes_args = ['tree']
3496
3497
hidden = True
3498
3499
def run(self, tree):
3500
containing_tree, subdir = WorkingTree.open_containing(tree)
3501
sub_id = containing_tree.path2id(subdir)
3502
if sub_id is None:
3503
raise errors.NotVersionedError(subdir)
3504
try:
3505
containing_tree.extract(sub_id)
3506
except errors.RootNotRich:
3507
raise errors.UpgradeRequired(containing_tree.branch.base)
3508
3509
3510
3511
class cmd_merge_directive(Command):
3512
"""Generate a merge directive for auto-merge tools.
3513
3514
A directive requests a merge to be performed, and also provides all the
3515
information necessary to do so. This means it must either include a
3516
revision bundle, or the location of a branch containing the desired
3517
revision.
3518
3519
A submit branch (the location to merge into) must be supplied the first
3520
time the command is issued. After it has been supplied once, it will
3521
be remembered as the default.
3522
3523
A public branch is optional if a revision bundle is supplied, but required
3524
if --diff or --plain is specified. It will be remembered as the default
3525
after the first use.
3526
"""
3527
3528
takes_args = ['submit_branch?', 'public_branch?']
3529
3530
takes_options = [
3531
RegistryOption.from_kwargs('patch-type',
3532
'The type of patch to include in the directive',
3533
title='Patch type', value_switches=True, enum_switch=False,
3534
bundle='Bazaar revision bundle (default)',
3535
diff='Normal unified diff',
3536
plain='No patch, just directive'),
3537
Option('sign', help='GPG-sign the directive'), 'revision',
3538
Option('mail-to', type=str,
3539
help='Instead of printing the directive, email to this address'),
3540
Option('message', type=str, short_name='m',
3541
help='Message to use when committing this merge')
3542
]
3543
3544
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
3545
sign=False, revision=None, mail_to=None, message=None):
3546
if patch_type == 'plain':
3547
patch_type = None
3548
branch = Branch.open('.')
3549
stored_submit_branch = branch.get_submit_branch()
3550
if submit_branch is None:
3551
submit_branch = stored_submit_branch
3552
else:
3553
if stored_submit_branch is None:
3554
branch.set_submit_branch(submit_branch)
3555
if submit_branch is None:
3556
submit_branch = branch.get_parent()
3557
if submit_branch is None:
3558
raise errors.BzrCommandError('No submit branch specified or known')
3559
3560
stored_public_branch = branch.get_public_branch()
3561
if public_branch is None:
3562
public_branch = stored_public_branch
3563
elif stored_public_branch is None:
3564
branch.set_public_branch(public_branch)
3565
if patch_type != "bundle" and public_branch is None:
3566
raise errors.BzrCommandError('No public branch specified or'
3567
' known')
3568
if revision is not None:
3569
if len(revision) != 1:
3570
raise errors.BzrCommandError('bzr merge-directive takes '
3571
'exactly one revision identifier')
3572
else:
3573
revision_id = revision[0].in_history(branch).rev_id
3574
else:
3575
revision_id = branch.last_revision()
3576
directive = merge_directive.MergeDirective.from_objects(
3577
branch.repository, revision_id, time.time(),
3578
osutils.local_time_offset(), submit_branch,
3579
public_branch=public_branch, patch_type=patch_type,
3580
message=message)
3581
if mail_to is None:
3582
if sign:
3583
self.outf.write(directive.to_signed(branch))
3584
else:
3585
self.outf.writelines(directive.to_lines())
3586
else:
3587
message = directive.to_email(mail_to, branch, sign)
3588
s = smtplib.SMTP()
3589
server = branch.get_config().get_user_option('smtp_server')
3590
if not server:
3591
server = 'localhost'
3592
s.connect(server)
3593
s.sendmail(message['From'], message['To'], message.as_string())
3594
3595
3596
class cmd_tag(Command):
3597
"""Create a tag naming a revision.
3598
3599
Tags give human-meaningful names to revisions. Commands that take a -r
3600
(--revision) option can be given -rtag:X, where X is any previously
3601
created tag.
3602
3603
Tags are stored in the branch. Tags are copied from one branch to another
3604
along when you branch, push, pull or merge.
3605
3606
It is an error to give a tag name that already exists unless you pass
3607
--force, in which case the tag is moved to point to the new revision.
3608
"""
3609
3610
_see_also = ['commit', 'tags']
3611
takes_args = ['tag_name']
3612
takes_options = [
3613
Option('delete',
3614
help='Delete this tag rather than placing it.',
3615
),
3616
Option('directory',
3617
help='Branch in which to place the tag.',
3618
short_name='d',
3619
type=unicode,
3620
),
3621
Option('force',
3622
help='Replace existing tags',
3623
),
3624
'revision',
3625
]
3626
3627
def run(self, tag_name,
3628
delete=None,
3629
directory='.',
3630
force=None,
3631
revision=None,
3632
):
3633
branch, relpath = Branch.open_containing(directory)
3634
branch.lock_write()
3635
try:
3636
if delete:
3637
branch.tags.delete_tag(tag_name)
3638
self.outf.write('Deleted tag %s.\n' % tag_name)
3639
else:
3640
if revision:
3641
if len(revision) != 1:
3642
raise errors.BzrCommandError(
3643
"Tags can only be placed on a single revision, "
3644
"not on a range")
3645
revision_id = revision[0].in_history(branch).rev_id
3646
else:
3647
revision_id = branch.last_revision()
3648
if (not force) and branch.tags.has_tag(tag_name):
3649
raise errors.TagAlreadyExists(tag_name)
3650
branch.tags.set_tag(tag_name, revision_id)
3651
self.outf.write('Created tag %s.\n' % tag_name)
3652
finally:
3653
branch.unlock()
3654
3655
3656
class cmd_tags(Command):
3657
"""List tags.
3658
3659
This tag shows a table of tag names and the revisions they reference.
3660
"""
3661
3662
_see_also = ['tag']
3663
takes_options = [
3664
Option('directory',
3665
help='Branch whose tags should be displayed',
3666
short_name='d',
3667
type=unicode,
3668
),
3669
]
3670
3671
@display_command
3672
def run(self,
3673
directory='.',
3674
):
3675
branch, relpath = Branch.open_containing(directory)
3676
for tag_name, target in sorted(branch.tags.get_tag_dict().items()):
3677
self.outf.write('%-20s %s\n' % (tag_name, target))
3678
3679
3680
# command-line interpretation helper for merge-related commands
3681
def _merge_helper(other_revision, base_revision,
3682
check_clean=True, ignore_zero=False,
3683
this_dir=None, backup_files=False,
3684
merge_type=None,
3685
file_list=None, show_base=False, reprocess=False,
3686
pull=False,
3687
pb=DummyProgress(),
3688
change_reporter=None,
3689
other_rev_id=None):
3690
"""Merge changes into a tree.
3691
3692
base_revision
3693
list(path, revno) Base for three-way merge.
3694
If [None, None] then a base will be automatically determined.
3695
other_revision
3696
list(path, revno) Other revision for three-way merge.
3697
this_dir
3698
Directory to merge changes into; '.' by default.
3699
check_clean
3700
If true, this_dir must have no uncommitted changes before the
3701
merge begins.
3702
ignore_zero - If true, suppress the "zero conflicts" message when
3703
there are no conflicts; should be set when doing something we expect
3704
to complete perfectly.
3705
file_list - If supplied, merge only changes to selected files.
3706
3707
All available ancestors of other_revision and base_revision are
3708
automatically pulled into the branch.
3709
3710
The revno may be -1 to indicate the last revision on the branch, which is
3711
the typical case.
3712
3713
This function is intended for use from the command line; programmatic
3714
clients might prefer to call merge.merge_inner(), which has less magic
3715
behavior.
3716
"""
3717
# Loading it late, so that we don't always have to import bzrlib.merge
3718
if merge_type is None:
3719
merge_type = _mod_merge.Merge3Merger
3720
if this_dir is None:
3721
this_dir = u'.'
3722
this_tree = WorkingTree.open_containing(this_dir)[0]
3723
if show_base and not merge_type is _mod_merge.Merge3Merger:
3724
raise errors.BzrCommandError("Show-base is not supported for this merge"
3725
" type. %s" % merge_type)
3726
if reprocess and not merge_type.supports_reprocess:
3727
raise errors.BzrCommandError("Conflict reduction is not supported for merge"
3728
" type %s." % merge_type)
3729
if reprocess and show_base:
3730
raise errors.BzrCommandError("Cannot do conflict reduction and show base.")
3731
# TODO: jam 20070226 We should really lock these trees earlier. However, we
3732
# only want to take out a lock_tree_write() if we don't have to pull
3733
# any ancestry. But merge might fetch ancestry in the middle, in
3734
# which case we would need a lock_write().
3735
# Because we cannot upgrade locks, for now we live with the fact that
3736
# the tree will be locked multiple times during a merge. (Maybe
3737
# read-only some of the time, but it means things will get read
3738
# multiple times.)
3739
try:
3740
merger = _mod_merge.Merger(this_tree.branch, this_tree=this_tree,
3741
pb=pb, change_reporter=change_reporter)
3742
merger.pp = ProgressPhase("Merge phase", 5, pb)
3743
merger.pp.next_phase()
3744
merger.check_basis(check_clean)
3745
if other_rev_id is not None:
3746
merger.set_other_revision(other_rev_id, this_tree.branch)
3747
else:
3748
merger.set_other(other_revision)
3749
merger.pp.next_phase()
3750
merger.set_base(base_revision)
3751
if merger.base_rev_id == merger.other_rev_id:
3752
note('Nothing to do.')
3753
return 0
3754
if file_list is None:
3755
if pull and merger.base_rev_id == merger.this_rev_id:
3756
# FIXME: deduplicate with pull
3757
result = merger.this_tree.pull(merger.this_branch,
3758
False, merger.other_rev_id)
3759
if result.old_revid == result.new_revid:
3760
note('No revisions to pull.')
3761
else:
3762
note('Now on revision %d.' % result.new_revno)
3763
return 0
3764
merger.backup_files = backup_files
3765
merger.merge_type = merge_type
3766
merger.set_interesting_files(file_list)
3767
merger.show_base = show_base
3768
merger.reprocess = reprocess
3769
conflicts = merger.do_merge()
3770
if file_list is None:
3771
merger.set_pending()
3772
finally:
3773
pb.clear()
3774
return conflicts
3775
3776
3777
# Compatibility
3778
merge = _merge_helper
3779
3780
3781
1929
# these get imported and then picked up by the scan for cmd_*
3782
1930
# TODO: Some more consistent way to split command definitions across files;
3783
1931
# we do need to load at least some information about them to know of
3784
# aliases. ideally we would avoid loading the implementation until the
3785
# details were needed.
3786
from bzrlib.cmd_version_info import cmd_version_info
1932
# aliases.
3787
1933
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
3788
from bzrlib.bundle.commands import cmd_bundle_revisions
3789
from bzrlib.sign_my_commits import cmd_sign_my_commits
3790
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
3791
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.1