(root)/brz/remove-bazaar
» Revision
1551.6.26
(compared to revision 0.200.1036)
: bzrlib/builtins.py
To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 1551.6.26
- compare with another revision
- download diff
- download tarball
- view history from revision 1551.6.26
- Committer: Aaron Bentley
- Date: 2006-05-30 02:05:08 UTC
- mto: (1731.2.9 nested-trees) (2234.6.1 bzr.0.14) (2229.2.4 reserved-ids) (2323.6.9 0.15-integration) (1551.19.24 Aaron's mergeable stuff)
- mto: This revision was merged to the branch mainline in revision 1735.
- Revision ID: aaron.bentley@utoronto.ca-20060530020508-c2713ae02b28ee62
Add support for remove --new
- files added:
- .bzrignore
- bzrlib
- bzrlib/benchmarks
- bzrlib/doc
- bzrlib/doc/api
- bzrlib/export
- bzrlib/plugins
- bzrlib/plugins/launchpad
- bzrlib/store
- bzrlib/store/revision
- bzrlib/store/versioned
- bzrlib/tests
- bzrlib/tests/blackbox
- bzrlib/tests/branch_implementations
- bzrlib/tests/bzrdir_implementations
- bzrlib/tests/interrepository_implementations
- bzrlib/tests/interversionedfile_implementations
- bzrlib/tests/repository_implementations
- bzrlib/tests/revisionstore_implementations
- bzrlib/tests/workingtree_implementations
- bzrlib/transport
- bzrlib/transport/http
- bzrlib/ui
- bzrlib/util
- bzrlib/util/configobj
- bzrlib/util/configobj/docs
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- bzrlib/util/urlgrabber
- contrib
- contrib/bash
- contrib/emacs
- contrib/zsh
- doc
- tools
- tools/doc_generate
- files removed:
- .bzrignore
- notes
- tests
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2004, 2005, 2006 by Canonical Ltd
2
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
12
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
17
"""builtin bzr commands"""
18
19
20
import errno
21
import os
22
import sys
23
24
import bzrlib
25
import bzrlib.branch
26
from bzrlib.branch import Branch
27
import bzrlib.bzrdir as bzrdir
28
from bzrlib.commands import Command, display_command
29
import bzrlib.errors as errors
30
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError,
31
NotBranchError, DivergedBranches, NotConflicted,
32
NoSuchFile, NoWorkingTree, FileInWrongBranch,
33
NotVersionedError)
34
from bzrlib.log import show_one_log
35
from bzrlib.merge import Merge3Merger
36
from bzrlib.option import Option
37
from bzrlib.progress import DummyProgress, ProgressPhase
38
from bzrlib.revision import common_ancestor
39
from bzrlib.revisionspec import RevisionSpec
40
import bzrlib.trace
41
from bzrlib.trace import mutter, note, log_error, warning, is_quiet
42
from bzrlib.transport.local import LocalTransport
43
import bzrlib.ui
44
from bzrlib.workingtree import WorkingTree
45
46
47
def tree_files(file_list, default_branch=u'.'):
48
try:
49
return internal_tree_files(file_list, default_branch)
50
except FileInWrongBranch, e:
51
raise BzrCommandError("%s is not in the same branch as %s" %
52
(e.path, file_list[0]))
53
54
55
# XXX: Bad function name; should possibly also be a class method of
56
# WorkingTree rather than a function.
57
def internal_tree_files(file_list, default_branch=u'.'):
58
"""Convert command-line paths to a WorkingTree and relative paths.
59
60
This is typically used for command-line processors that take one or
61
more filenames, and infer the workingtree that contains them.
62
63
The filenames given are not required to exist.
64
65
:param file_list: Filenames to convert.
66
67
:param default_branch: Fallback tree path to use if file_list is empty or None.
68
69
:return: workingtree, [relative_paths]
70
"""
71
if file_list is None or len(file_list) == 0:
72
return WorkingTree.open_containing(default_branch)[0], file_list
73
tree = WorkingTree.open_containing(file_list[0])[0]
74
new_list = []
75
for filename in file_list:
76
try:
77
new_list.append(tree.relpath(filename))
78
except errors.PathNotChild:
79
raise FileInWrongBranch(tree.branch, filename)
80
return tree, new_list
81
82
83
def get_format_type(typestring):
84
"""Parse and return a format specifier."""
85
if typestring == "weave":
86
return bzrdir.BzrDirFormat6()
87
if typestring == "default":
88
return bzrdir.BzrDirMetaFormat1()
89
if typestring == "metaweave":
90
format = bzrdir.BzrDirMetaFormat1()
91
format.repository_format = bzrlib.repository.RepositoryFormat7()
92
return format
93
if typestring == "knit":
94
format = bzrdir.BzrDirMetaFormat1()
95
format.repository_format = bzrlib.repository.RepositoryFormatKnit1()
96
return format
97
msg = "Unknown bzr format %s. Current formats are: default, knit,\n" \
98
"metaweave and weave" % typestring
99
raise BzrCommandError(msg)
100
101
102
# TODO: Make sure no commands unconditionally use the working directory as a
103
# branch. If a filename argument is used, the first of them should be used to
104
# specify the branch. (Perhaps this can be factored out into some kind of
105
# Argument class, representing a file in a branch, where the first occurrence
106
# opens the branch?)
107
108
class cmd_status(Command):
109
"""Display status summary.
110
111
This reports on versioned and unknown files, reporting them
112
grouped by state. Possible states are:
113
114
added
115
Versioned in the working copy but not in the previous revision.
116
117
removed
118
Versioned in the previous revision but removed or deleted
119
in the working copy.
120
121
renamed
122
Path of this file changed from the previous revision;
123
the text may also have changed. This includes files whose
124
parent directory was renamed.
125
126
modified
127
Text has changed since the previous revision.
128
129
unchanged
130
Nothing about this file has changed since the previous revision.
131
Only shown with --all.
132
133
unknown
134
Not versioned and not matching an ignore pattern.
135
136
To see ignored files use 'bzr ignored'. For details in the
137
changes to file texts, use 'bzr diff'.
138
139
If no arguments are specified, the status of the entire working
140
directory is shown. Otherwise, only the status of the specified
141
files or directories is reported. If a directory is given, status
142
is reported for everything inside that directory.
143
144
If a revision argument is given, the status is calculated against
145
that revision, or between two revisions if two are provided.
146
"""
147
148
# TODO: --no-recurse, --recurse options
149
150
takes_args = ['file*']
151
takes_options = ['all', 'show-ids', 'revision']
152
aliases = ['st', 'stat']
153
154
@display_command
155
def run(self, all=False, show_ids=False, file_list=None, revision=None):
156
tree, file_list = tree_files(file_list)
157
158
from bzrlib.status import show_tree_status
159
show_tree_status(tree, show_unchanged=all, show_ids=show_ids,
160
specific_files=file_list, revision=revision)
161
162
163
class cmd_cat_revision(Command):
164
"""Write out metadata for a revision.
165
166
The revision to print can either be specified by a specific
167
revision identifier, or you can use --revision.
168
"""
169
170
hidden = True
171
takes_args = ['revision_id?']
172
takes_options = ['revision']
173
174
@display_command
175
def run(self, revision_id=None, revision=None):
176
177
if revision_id is not None and revision is not None:
178
raise BzrCommandError('You can only supply one of revision_id or --revision')
179
if revision_id is None and revision is None:
180
raise BzrCommandError('You must supply either --revision or a revision_id')
181
b = WorkingTree.open_containing(u'.')[0].branch
182
if revision_id is not None:
183
sys.stdout.write(b.repository.get_revision_xml(revision_id))
184
elif revision is not None:
185
for rev in revision:
186
if rev is None:
187
raise BzrCommandError('You cannot specify a NULL revision.')
188
revno, rev_id = rev.in_history(b)
189
sys.stdout.write(b.repository.get_revision_xml(rev_id))
190
191
192
class cmd_revno(Command):
193
"""Show current revision number.
194
195
This is equal to the number of revisions on this branch."""
196
takes_args = ['location?']
197
@display_command
198
def run(self, location=u'.'):
199
print Branch.open_containing(location)[0].revno()
200
201
202
class cmd_revision_info(Command):
203
"""Show revision number and revision id for a given revision identifier.
204
"""
205
hidden = True
206
takes_args = ['revision_info*']
207
takes_options = ['revision']
208
@display_command
209
def run(self, revision=None, revision_info_list=[]):
210
211
revs = []
212
if revision is not None:
213
revs.extend(revision)
214
if revision_info_list is not None:
215
for rev in revision_info_list:
216
revs.append(RevisionSpec(rev))
217
if len(revs) == 0:
218
raise BzrCommandError('You must supply a revision identifier')
219
220
b = WorkingTree.open_containing(u'.')[0].branch
221
222
for rev in revs:
223
revinfo = rev.in_history(b)
224
if revinfo.revno is None:
225
print ' %s' % revinfo.rev_id
226
else:
227
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
228
229
230
class cmd_add(Command):
231
"""Add specified files or directories.
232
233
In non-recursive mode, all the named items are added, regardless
234
of whether they were previously ignored. A warning is given if
235
any of the named files are already versioned.
236
237
In recursive mode (the default), files are treated the same way
238
but the behaviour for directories is different. Directories that
239
are already versioned do not give a warning. All directories,
240
whether already versioned or not, are searched for files or
241
subdirectories that are neither versioned or ignored, and these
242
are added. This search proceeds recursively into versioned
243
directories. If no names are given '.' is assumed.
244
245
Therefore simply saying 'bzr add' will version all files that
246
are currently unknown.
247
248
Adding a file whose parent directory is not versioned will
249
implicitly add the parent, and so on up to the root. This means
250
you should never need to explictly add a directory, they'll just
251
get added when you add a file in the directory.
252
253
--dry-run will show which files would be added, but not actually
254
add them.
255
"""
256
takes_args = ['file*']
257
takes_options = ['no-recurse', 'dry-run', 'verbose']
258
259
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False):
260
import bzrlib.add
261
262
if dry_run:
263
if is_quiet():
264
# This is pointless, but I'd rather not raise an error
265
action = bzrlib.add.add_action_null
266
else:
267
action = bzrlib.add.add_action_print
268
elif is_quiet():
269
action = bzrlib.add.add_action_add
270
else:
271
action = bzrlib.add.add_action_add_and_print
272
273
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
274
action)
275
if len(ignored) > 0:
276
if verbose:
277
for glob in sorted(ignored.keys()):
278
for path in ignored[glob]:
279
print "ignored %s matching \"%s\"" % (path, glob)
280
else:
281
match_len = 0
282
for glob, paths in ignored.items():
283
match_len += len(paths)
284
print "ignored %d file(s)." % match_len
285
print "If you wish to add some of these files, please add them"\
286
" by name."
287
288
289
class cmd_mkdir(Command):
290
"""Create a new versioned directory.
291
292
This is equivalent to creating the directory and then adding it.
293
"""
294
takes_args = ['dir+']
295
296
def run(self, dir_list):
297
for d in dir_list:
298
os.mkdir(d)
299
wt, dd = WorkingTree.open_containing(d)
300
wt.add([dd])
301
print 'added', d
302
303
304
class cmd_relpath(Command):
305
"""Show path of a file relative to root"""
306
takes_args = ['filename']
307
hidden = True
308
309
@display_command
310
def run(self, filename):
311
tree, relpath = WorkingTree.open_containing(filename)
312
print relpath
313
314
315
class cmd_inventory(Command):
316
"""Show inventory of the current working copy or a revision.
317
318
It is possible to limit the output to a particular entry
319
type using the --kind option. For example; --kind file.
320
"""
321
takes_options = ['revision', 'show-ids', 'kind']
322
323
@display_command
324
def run(self, revision=None, show_ids=False, kind=None):
325
if kind and kind not in ['file', 'directory', 'symlink']:
326
raise BzrCommandError('invalid kind specified')
327
tree = WorkingTree.open_containing(u'.')[0]
328
if revision is None:
329
inv = tree.read_working_inventory()
330
else:
331
if len(revision) > 1:
332
raise BzrCommandError('bzr inventory --revision takes'
333
' exactly one revision identifier')
334
inv = tree.branch.repository.get_revision_inventory(
335
revision[0].in_history(tree.branch).rev_id)
336
337
for path, entry in inv.entries():
338
if kind and kind != entry.kind:
339
continue
340
if show_ids:
341
print '%-50s %s' % (path, entry.file_id)
342
else:
343
print path
344
345
346
class cmd_mv(Command):
347
"""Move or rename a file.
348
349
usage:
350
bzr mv OLDNAME NEWNAME
351
bzr mv SOURCE... DESTINATION
352
353
If the last argument is a versioned directory, all the other names
354
are moved into it. Otherwise, there must be exactly two arguments
355
and the file is changed to a new name, which must not already exist.
356
357
Files cannot be moved between branches.
358
"""
359
takes_args = ['names*']
360
aliases = ['move', 'rename']
361
362
def run(self, names_list):
363
if len(names_list) < 2:
364
raise BzrCommandError("missing file argument")
365
tree, rel_names = tree_files(names_list)
366
367
if os.path.isdir(names_list[-1]):
368
# move into existing directory
369
for pair in tree.move(rel_names[:-1], rel_names[-1]):
370
print "%s => %s" % pair
371
else:
372
if len(names_list) != 2:
373
raise BzrCommandError('to mv multiple files the destination '
374
'must be a versioned directory')
375
tree.rename_one(rel_names[0], rel_names[1])
376
print "%s => %s" % (rel_names[0], rel_names[1])
377
378
379
class cmd_pull(Command):
380
"""Turn this branch into a mirror of another branch.
381
382
This command only works on branches that have not diverged. Branches are
383
considered diverged if the destination branch's most recent commit is one
384
that has not been merged (directly or indirectly) into the parent.
385
386
If branches have diverged, you can use 'bzr merge' to integrate the changes
387
from one into the other. Once one branch has merged, the other should
388
be able to pull it again.
389
390
If branches have diverged, you can use 'bzr merge' to pull the text changes
391
from one into the other. Once one branch has merged, the other should
392
be able to pull it again.
393
394
If you want to forget your local changes and just update your branch to
395
match the remote one, use pull --overwrite.
396
397
If there is no default location set, the first pull will set it. After
398
that, you can omit the location to use the default. To change the
399
default, use --remember.
400
"""
401
takes_options = ['remember', 'overwrite', 'revision', 'verbose']
402
takes_args = ['location?']
403
404
def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
405
# FIXME: too much stuff is in the command class
406
try:
407
tree_to = WorkingTree.open_containing(u'.')[0]
408
branch_to = tree_to.branch
409
except NoWorkingTree:
410
tree_to = None
411
branch_to = Branch.open_containing(u'.')[0]
412
stored_loc = branch_to.get_parent()
413
if location is None:
414
if stored_loc is None:
415
raise BzrCommandError("No pull location known or specified.")
416
else:
417
print "Using saved location: %s" % stored_loc
418
location = stored_loc
419
420
if branch_to.get_parent() is None or remember:
421
branch_to.set_parent(location)
422
423
branch_from = Branch.open(location)
424
425
if revision is None:
426
rev_id = None
427
elif len(revision) == 1:
428
rev_id = revision[0].in_history(branch_from).rev_id
429
else:
430
raise BzrCommandError('bzr pull --revision takes one value.')
431
432
old_rh = branch_to.revision_history()
433
if tree_to is not None:
434
count = tree_to.pull(branch_from, overwrite, rev_id)
435
else:
436
count = branch_to.pull(branch_from, overwrite, rev_id)
437
note('%d revision(s) pulled.' % (count,))
438
439
if verbose:
440
new_rh = branch_to.revision_history()
441
if old_rh != new_rh:
442
# Something changed
443
from bzrlib.log import show_changed_revisions
444
show_changed_revisions(branch_to, old_rh, new_rh)
445
446
447
class cmd_push(Command):
448
"""Update a mirror of this branch.
449
450
The target branch will not have its working tree populated because this
451
is both expensive, and is not supported on remote file systems.
452
453
Some smart servers or protocols *may* put the working tree in place in
454
the future.
455
456
This command only works on branches that have not diverged. Branches are
457
considered diverged if the destination branch's most recent commit is one
458
that has not been merged (directly or indirectly) by the source branch.
459
460
If branches have diverged, you can use 'bzr push --overwrite' to replace
461
the other branch completely, discarding its unmerged changes.
462
463
If you want to ensure you have the different changes in the other branch,
464
do a merge (see bzr help merge) from the other branch, and commit that.
465
After that you will be able to do a push without '--overwrite'.
466
467
If there is no default push location set, the first push will set it.
468
After that, you can omit the location to use the default. To change the
469
default, use --remember.
470
"""
471
takes_options = ['remember', 'overwrite',
472
Option('create-prefix',
473
help='Create the path leading up to the branch '
474
'if it does not already exist')]
475
takes_args = ['location?']
476
477
def run(self, location=None, remember=False, overwrite=False,
478
create_prefix=False, verbose=False):
479
# FIXME: Way too big! Put this into a function called from the
480
# command.
481
from bzrlib.transport import get_transport
482
483
br_from = Branch.open_containing('.')[0]
484
stored_loc = br_from.get_push_location()
485
if location is None:
486
if stored_loc is None:
487
raise BzrCommandError("No push location known or specified.")
488
else:
489
print "Using saved location: %s" % stored_loc
490
location = stored_loc
491
if br_from.get_push_location() is None or remember:
492
br_from.set_push_location(location)
493
try:
494
dir_to = bzrlib.bzrdir.BzrDir.open(location)
495
br_to = dir_to.open_branch()
496
except NotBranchError:
497
# create a branch.
498
transport = get_transport(location).clone('..')
499
if not create_prefix:
500
try:
501
transport.mkdir(transport.relpath(location))
502
except NoSuchFile:
503
raise BzrCommandError("Parent directory of %s "
504
"does not exist." % location)
505
else:
506
current = transport.base
507
needed = [(transport, transport.relpath(location))]
508
while needed:
509
try:
510
transport, relpath = needed[-1]
511
transport.mkdir(relpath)
512
needed.pop()
513
except NoSuchFile:
514
new_transport = transport.clone('..')
515
needed.append((new_transport,
516
new_transport.relpath(transport.base)))
517
if new_transport.base == transport.base:
518
raise BzrCommandError("Could not create "
519
"path prefix.")
520
dir_to = br_from.bzrdir.clone(location,
521
revision_id=br_from.last_revision())
522
br_to = dir_to.open_branch()
523
count = len(br_to.revision_history())
524
else:
525
old_rh = br_to.revision_history()
526
try:
527
try:
528
tree_to = dir_to.open_workingtree()
529
except errors.NotLocalUrl:
530
warning('This transport does not update the working '
531
'tree of: %s' % (br_to.base,))
532
count = br_to.pull(br_from, overwrite)
533
except NoWorkingTree:
534
count = br_to.pull(br_from, overwrite)
535
else:
536
count = tree_to.pull(br_from, overwrite)
537
except DivergedBranches:
538
raise BzrCommandError("These branches have diverged."
539
" Try a merge then push with overwrite.")
540
note('%d revision(s) pushed.' % (count,))
541
542
if verbose:
543
new_rh = br_to.revision_history()
544
if old_rh != new_rh:
545
# Something changed
546
from bzrlib.log import show_changed_revisions
547
show_changed_revisions(br_to, old_rh, new_rh)
548
549
550
class cmd_branch(Command):
551
"""Create a new copy of a branch.
552
553
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
554
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
555
556
To retrieve the branch as of a particular revision, supply the --revision
557
parameter, as in "branch foo/bar -r 5".
558
559
--basis is to speed up branching from remote branches. When specified, it
560
copies all the file-contents, inventory and revision data from the basis
561
branch before copying anything from the remote branch.
562
"""
563
takes_args = ['from_location', 'to_location?']
564
takes_options = ['revision', 'basis']
565
aliases = ['get', 'clone']
566
567
def run(self, from_location, to_location=None, revision=None, basis=None):
568
from bzrlib.osutils import rmtree
569
if revision is None:
570
revision = [None]
571
elif len(revision) > 1:
572
raise BzrCommandError(
573
'bzr branch --revision takes exactly 1 revision value')
574
try:
575
br_from = Branch.open(from_location)
576
except OSError, e:
577
if e.errno == errno.ENOENT:
578
raise BzrCommandError('Source location "%s" does not'
579
' exist.' % to_location)
580
else:
581
raise
582
br_from.lock_read()
583
try:
584
if basis is not None:
585
basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
586
else:
587
basis_dir = None
588
if len(revision) == 1 and revision[0] is not None:
589
revision_id = revision[0].in_history(br_from)[1]
590
else:
591
# FIXME - wt.last_revision, fallback to branch, fall back to
592
# None or perhaps NULL_REVISION to mean copy nothing
593
# RBC 20060209
594
revision_id = br_from.last_revision()
595
if to_location is None:
596
to_location = os.path.basename(from_location.rstrip("/\\"))
597
name = None
598
else:
599
name = os.path.basename(to_location) + '\n'
600
try:
601
os.mkdir(to_location)
602
except OSError, e:
603
if e.errno == errno.EEXIST:
604
raise BzrCommandError('Target directory "%s" already'
605
' exists.' % to_location)
606
if e.errno == errno.ENOENT:
607
raise BzrCommandError('Parent of "%s" does not exist.' %
608
to_location)
609
else:
610
raise
611
try:
612
# preserve whatever source format we have.
613
dir = br_from.bzrdir.sprout(to_location, revision_id, basis_dir)
614
branch = dir.open_branch()
615
except bzrlib.errors.NoSuchRevision:
616
rmtree(to_location)
617
msg = "The branch %s has no revision %s." % (from_location, revision[0])
618
raise BzrCommandError(msg)
619
except bzrlib.errors.UnlistableBranch:
620
rmtree(to_location)
621
msg = "The branch %s cannot be used as a --basis" % (basis,)
622
raise BzrCommandError(msg)
623
if name:
624
branch.control_files.put_utf8('branch-name', name)
625
626
note('Branched %d revision(s).' % branch.revno())
627
finally:
628
br_from.unlock()
629
630
631
class cmd_checkout(Command):
632
"""Create a new checkout of an existing branch.
633
634
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
635
the branch found in '.'. This is useful if you have removed the working tree
636
or if it was never created - i.e. if you pushed the branch to its current
637
location using SFTP.
638
639
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
640
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
641
642
To retrieve the branch as of a particular revision, supply the --revision
643
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
644
out of date [so you cannot commit] but it may be useful (i.e. to examine old
645
code.)
646
647
--basis is to speed up checking out from remote branches. When specified, it
648
uses the inventory and file contents from the basis branch in preference to the
649
branch being checked out.
650
"""
651
takes_args = ['branch_location?', 'to_location?']
652
takes_options = ['revision', # , 'basis']
653
Option('lightweight',
654
help="perform a lightweight checkout. Lightweight "
655
"checkouts depend on access to the branch for "
656
"every operation. Normal checkouts can perform "
657
"common operations like diff and status without "
658
"such access, and also support local commits."
659
),
660
]
661
662
def run(self, branch_location=None, to_location=None, revision=None, basis=None,
663
lightweight=False):
664
if revision is None:
665
revision = [None]
666
elif len(revision) > 1:
667
raise BzrCommandError(
668
'bzr checkout --revision takes exactly 1 revision value')
669
if branch_location is None:
670
branch_location = bzrlib.osutils.getcwd()
671
to_location = branch_location
672
source = Branch.open(branch_location)
673
if len(revision) == 1 and revision[0] is not None:
674
revision_id = revision[0].in_history(source)[1]
675
else:
676
revision_id = None
677
if to_location is None:
678
to_location = os.path.basename(branch_location.rstrip("/\\"))
679
# if the source and to_location are the same,
680
# and there is no working tree,
681
# then reconstitute a branch
682
if (bzrlib.osutils.abspath(to_location) ==
683
bzrlib.osutils.abspath(branch_location)):
684
try:
685
source.bzrdir.open_workingtree()
686
except errors.NoWorkingTree:
687
source.bzrdir.create_workingtree()
688
return
689
try:
690
os.mkdir(to_location)
691
except OSError, e:
692
if e.errno == errno.EEXIST:
693
raise BzrCommandError('Target directory "%s" already'
694
' exists.' % to_location)
695
if e.errno == errno.ENOENT:
696
raise BzrCommandError('Parent of "%s" does not exist.' %
697
to_location)
698
else:
699
raise
700
old_format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
701
bzrlib.bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
702
try:
703
if lightweight:
704
checkout = bzrdir.BzrDirMetaFormat1().initialize(to_location)
705
bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
706
else:
707
checkout_branch = bzrlib.bzrdir.BzrDir.create_branch_convenience(
708
to_location, force_new_tree=False)
709
checkout = checkout_branch.bzrdir
710
checkout_branch.bind(source)
711
if revision_id is not None:
712
rh = checkout_branch.revision_history()
713
checkout_branch.set_revision_history(rh[:rh.index(revision_id) + 1])
714
checkout.create_workingtree(revision_id)
715
finally:
716
bzrlib.bzrdir.BzrDirFormat.set_default_format(old_format)
717
718
719
class cmd_renames(Command):
720
"""Show list of renamed files.
721
"""
722
# TODO: Option to show renames between two historical versions.
723
724
# TODO: Only show renames under dir, rather than in the whole branch.
725
takes_args = ['dir?']
726
727
@display_command
728
def run(self, dir=u'.'):
729
tree = WorkingTree.open_containing(dir)[0]
730
old_inv = tree.basis_tree().inventory
731
new_inv = tree.read_working_inventory()
732
733
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
734
renames.sort()
735
for old_name, new_name in renames:
736
print "%s => %s" % (old_name, new_name)
737
738
739
class cmd_update(Command):
740
"""Update a tree to have the latest code committed to its branch.
741
742
This will perform a merge into the working tree, and may generate
743
conflicts. If you have any local changes, you will still
744
need to commit them after the update for the update to be complete.
745
746
If you want to discard your local changes, you can just do a
747
'bzr revert' instead of 'bzr commit' after the update.
748
"""
749
takes_args = ['dir?']
750
751
def run(self, dir='.'):
752
tree = WorkingTree.open_containing(dir)[0]
753
tree.lock_write()
754
try:
755
if tree.last_revision() == tree.branch.last_revision():
756
# may be up to date, check master too.
757
master = tree.branch.get_master_branch()
758
if master is None or master.last_revision == tree.last_revision():
759
note("Tree is up to date.")
760
return
761
conflicts = tree.update()
762
note('Updated to revision %d.' %
763
(tree.branch.revision_id_to_revno(tree.last_revision()),))
764
if conflicts != 0:
765
return 1
766
else:
767
return 0
768
finally:
769
tree.unlock()
770
771
772
class cmd_info(Command):
773
"""Show information about a working tree, branch or repository.
774
775
This command will show all known locations and formats associated to the
776
tree, branch or repository. Statistical information is included with
777
each report.
778
779
Branches and working trees will also report any missing revisions.
780
"""
781
takes_args = ['location?']
782
takes_options = ['verbose']
783
784
@display_command
785
def run(self, location=None, verbose=False):
786
from bzrlib.info import show_bzrdir_info
787
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
788
verbose=verbose)
789
790
791
class cmd_remove(Command):
792
"""Make a file unversioned.
793
794
This makes bzr stop tracking changes to a versioned file. It does
795
not delete the working copy.
796
797
You can specify one or more files, and/or --new. If you specify --new,
798
only 'added' files will be removed. If you specify both, then new files
799
in the specified directories will be removed. If the directories are
800
also new, they will also be removed.
801
"""
802
takes_args = ['file*']
803
takes_options = ['verbose', Option('new', help='remove newly-added files')]
804
aliases = ['rm']
805
806
def run(self, file_list, verbose=False, new=False):
807
tree, file_list = tree_files(file_list)
808
if new is False:
809
if file_list is None:
810
raise BzrCommandError('Specify one or more files to remove, or'
811
' use --new.')
812
else:
813
from bzrlib.delta import compare_trees
814
added = [compare_trees(tree.basis_tree(), tree,
815
specific_files=file_list).added]
816
file_list = sorted([f[0] for f in added[0]], reverse=True)
817
if len(file_list) == 0:
818
raise BzrCommandError('No matching files.')
819
tree.remove(file_list, verbose=verbose)
820
821
822
class cmd_file_id(Command):
823
"""Print file_id of a particular file or directory.
824
825
The file_id is assigned when the file is first added and remains the
826
same through all revisions where the file exists, even when it is
827
moved or renamed.
828
"""
829
hidden = True
830
takes_args = ['filename']
831
@display_command
832
def run(self, filename):
833
tree, relpath = WorkingTree.open_containing(filename)
834
i = tree.inventory.path2id(relpath)
835
if i == None:
836
raise BzrError("%r is not a versioned file" % filename)
837
else:
838
print i
839
840
841
class cmd_file_path(Command):
842
"""Print path of file_ids to a file or directory.
843
844
This prints one line for each directory down to the target,
845
starting at the branch root."""
846
hidden = True
847
takes_args = ['filename']
848
@display_command
849
def run(self, filename):
850
tree, relpath = WorkingTree.open_containing(filename)
851
inv = tree.inventory
852
fid = inv.path2id(relpath)
853
if fid == None:
854
raise BzrError("%r is not a versioned file" % filename)
855
for fip in inv.get_idpath(fid):
856
print fip
857
858
859
class cmd_reconcile(Command):
860
"""Reconcile bzr metadata in a branch.
861
862
This can correct data mismatches that may have been caused by
863
previous ghost operations or bzr upgrades. You should only
864
need to run this command if 'bzr check' or a bzr developer
865
advises you to run it.
866
867
If a second branch is provided, cross-branch reconciliation is
868
also attempted, which will check that data like the tree root
869
id which was not present in very early bzr versions is represented
870
correctly in both branches.
871
872
At the same time it is run it may recompress data resulting in
873
a potential saving in disk space or performance gain.
874
875
The branch *MUST* be on a listable system such as local disk or sftp.
876
"""
877
takes_args = ['branch?']
878
879
def run(self, branch="."):
880
from bzrlib.reconcile import reconcile
881
dir = bzrlib.bzrdir.BzrDir.open(branch)
882
reconcile(dir)
883
884
885
class cmd_revision_history(Command):
886
"""Display list of revision ids on this branch."""
887
hidden = True
888
@display_command
889
def run(self):
890
branch = WorkingTree.open_containing(u'.')[0].branch
891
for patchid in branch.revision_history():
892
print patchid
893
894
895
class cmd_ancestry(Command):
896
"""List all revisions merged into this branch."""
897
hidden = True
898
@display_command
899
def run(self):
900
tree = WorkingTree.open_containing(u'.')[0]
901
b = tree.branch
902
# FIXME. should be tree.last_revision
903
revision_ids = b.repository.get_ancestry(b.last_revision())
904
assert revision_ids[0] == None
905
revision_ids.pop(0)
906
for revision_id in revision_ids:
907
print revision_id
908
909
910
class cmd_init(Command):
911
"""Make a directory into a versioned branch.
912
913
Use this to create an empty branch, or before importing an
914
existing project.
915
916
If there is a repository in a parent directory of the location, then
917
the history of the branch will be stored in the repository. Otherwise
918
init creates a standalone branch which carries its own history in
919
.bzr.
920
921
If there is already a branch at the location but it has no working tree,
922
the tree can be populated with 'bzr checkout'.
923
924
Recipe for importing a tree of files:
925
cd ~/project
926
bzr init
927
bzr add .
928
bzr status
929
bzr commit -m 'imported project'
930
"""
931
takes_args = ['location?']
932
takes_options = [
933
Option('format',
934
help='Specify a format for this branch. Current'
935
' formats are: default, knit, metaweave and'
936
' weave. Default is knit; metaweave and'
937
' weave are deprecated',
938
type=get_format_type),
939
]
940
def run(self, location=None, format=None):
941
from bzrlib.branch import Branch
942
if format is None:
943
format = get_format_type('default')
944
if location is None:
945
location = u'.'
946
else:
947
# The path has to exist to initialize a
948
# branch inside of it.
949
# Just using os.mkdir, since I don't
950
# believe that we want to create a bunch of
951
# locations if the user supplies an extended path
952
if not os.path.exists(location):
953
os.mkdir(location)
954
try:
955
existing_bzrdir = bzrdir.BzrDir.open(location)
956
except NotBranchError:
957
# really a NotBzrDir error...
958
bzrdir.BzrDir.create_branch_convenience(location, format=format)
959
else:
960
if existing_bzrdir.has_branch():
961
if existing_bzrdir.has_workingtree():
962
raise errors.AlreadyBranchError(location)
963
else:
964
raise errors.BranchExistsWithoutWorkingTree(location)
965
else:
966
existing_bzrdir.create_branch()
967
existing_bzrdir.create_workingtree()
968
969
970
class cmd_init_repository(Command):
971
"""Create a shared repository to hold branches.
972
973
New branches created under the repository directory will store their revisions
974
in the repository, not in the branch directory, if the branch format supports
975
shared storage.
976
977
example:
978
bzr init-repo repo
979
bzr init repo/trunk
980
bzr checkout --lightweight repo/trunk trunk-checkout
981
cd trunk-checkout
982
(add files here)
983
"""
984
takes_args = ["location"]
985
takes_options = [Option('format',
986
help='Specify a format for this repository.'
987
' Current formats are: default, knit,'
988
' metaweave and weave. Default is knit;'
989
' metaweave and weave are deprecated',
990
type=get_format_type),
991
Option('trees',
992
help='Allows branches in repository to have'
993
' a working tree')]
994
aliases = ["init-repo"]
995
def run(self, location, format=None, trees=False):
996
from bzrlib.transport import get_transport
997
if format is None:
998
format = get_format_type('default')
999
transport = get_transport(location)
1000
if not transport.has('.'):
1001
transport.mkdir('')
1002
newdir = format.initialize_on_transport(transport)
1003
repo = newdir.create_repository(shared=True)
1004
repo.set_make_working_trees(trees)
1005
1006
1007
class cmd_diff(Command):
1008
"""Show differences in working tree.
1009
1010
If files are listed, only the changes in those files are listed.
1011
Otherwise, all changes for the tree are listed.
1012
1013
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1014
produces patches suitable for "patch -p1".
1015
1016
examples:
1017
bzr diff
1018
bzr diff -r1
1019
bzr diff -r1..2
1020
bzr diff --diff-prefix old/:new/
1021
bzr diff bzr.mine bzr.dev
1022
bzr diff foo.c
1023
"""
1024
# TODO: Option to use external diff command; could be GNU diff, wdiff,
1025
# or a graphical diff.
1026
1027
# TODO: Python difflib is not exactly the same as unidiff; should
1028
# either fix it up or prefer to use an external diff.
1029
1030
# TODO: Selected-file diff is inefficient and doesn't show you
1031
# deleted files.
1032
1033
# TODO: This probably handles non-Unix newlines poorly.
1034
1035
takes_args = ['file*']
1036
takes_options = ['revision', 'diff-options', 'prefix']
1037
aliases = ['di', 'dif']
1038
1039
@display_command
1040
def run(self, revision=None, file_list=None, diff_options=None,
1041
prefix=None):
1042
from bzrlib.diff import diff_cmd_helper, show_diff_trees
1043
1044
if (prefix is None) or (prefix == '0'):
1045
# diff -p0 format
1046
old_label = ''
1047
new_label = ''
1048
elif prefix == '1':
1049
old_label = 'old/'
1050
new_label = 'new/'
1051
else:
1052
if not ':' in prefix:
1053
raise BzrError("--diff-prefix expects two values separated by a colon")
1054
old_label, new_label = prefix.split(":")
1055
1056
try:
1057
tree1, file_list = internal_tree_files(file_list)
1058
tree2 = None
1059
b = None
1060
b2 = None
1061
except FileInWrongBranch:
1062
if len(file_list) != 2:
1063
raise BzrCommandError("Files are in different branches")
1064
1065
tree1, file1 = WorkingTree.open_containing(file_list[0])
1066
tree2, file2 = WorkingTree.open_containing(file_list[1])
1067
if file1 != "" or file2 != "":
1068
# FIXME diff those two files. rbc 20051123
1069
raise BzrCommandError("Files are in different branches")
1070
file_list = None
1071
if revision is not None:
1072
if tree2 is not None:
1073
raise BzrCommandError("Can't specify -r with two branches")
1074
if (len(revision) == 1) or (revision[1].spec is None):
1075
return diff_cmd_helper(tree1, file_list, diff_options,
1076
revision[0],
1077
old_label=old_label, new_label=new_label)
1078
elif len(revision) == 2:
1079
return diff_cmd_helper(tree1, file_list, diff_options,
1080
revision[0], revision[1],
1081
old_label=old_label, new_label=new_label)
1082
else:
1083
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
1084
else:
1085
if tree2 is not None:
1086
return show_diff_trees(tree1, tree2, sys.stdout,
1087
specific_files=file_list,
1088
external_diff_options=diff_options,
1089
old_label=old_label, new_label=new_label)
1090
else:
1091
return diff_cmd_helper(tree1, file_list, diff_options,
1092
old_label=old_label, new_label=new_label)
1093
1094
1095
class cmd_deleted(Command):
1096
"""List files deleted in the working tree.
1097
"""
1098
# TODO: Show files deleted since a previous revision, or
1099
# between two revisions.
1100
# TODO: Much more efficient way to do this: read in new
1101
# directories with readdir, rather than stating each one. Same
1102
# level of effort but possibly much less IO. (Or possibly not,
1103
# if the directories are very large...)
1104
@display_command
1105
def run(self, show_ids=False):
1106
tree = WorkingTree.open_containing(u'.')[0]
1107
old = tree.basis_tree()
1108
for path, ie in old.inventory.iter_entries():
1109
if not tree.has_id(ie.file_id):
1110
if show_ids:
1111
print '%-50s %s' % (path, ie.file_id)
1112
else:
1113
print path
1114
1115
1116
class cmd_modified(Command):
1117
"""List files modified in working tree."""
1118
hidden = True
1119
@display_command
1120
def run(self):
1121
from bzrlib.delta import compare_trees
1122
1123
tree = WorkingTree.open_containing(u'.')[0]
1124
td = compare_trees(tree.basis_tree(), tree)
1125
1126
for path, id, kind, text_modified, meta_modified in td.modified:
1127
print path
1128
1129
1130
1131
class cmd_added(Command):
1132
"""List files added in working tree."""
1133
hidden = True
1134
@display_command
1135
def run(self):
1136
wt = WorkingTree.open_containing(u'.')[0]
1137
basis_inv = wt.basis_tree().inventory
1138
inv = wt.inventory
1139
for file_id in inv:
1140
if file_id in basis_inv:
1141
continue
1142
path = inv.id2path(file_id)
1143
if not os.access(bzrlib.osutils.abspath(path), os.F_OK):
1144
continue
1145
print path
1146
1147
1148
1149
class cmd_root(Command):
1150
"""Show the tree root directory.
1151
1152
The root is the nearest enclosing directory with a .bzr control
1153
directory."""
1154
takes_args = ['filename?']
1155
@display_command
1156
def run(self, filename=None):
1157
"""Print the branch root."""
1158
tree = WorkingTree.open_containing(filename)[0]
1159
print tree.basedir
1160
1161
1162
class cmd_log(Command):
1163
"""Show log of a branch, file, or directory.
1164
1165
By default show the log of the branch containing the working directory.
1166
1167
To request a range of logs, you can use the command -r begin..end
1168
-r revision requests a specific revision, -r ..end or -r begin.. are
1169
also valid.
1170
1171
examples:
1172
bzr log
1173
bzr log foo.c
1174
bzr log -r -10.. http://server/branch
1175
"""
1176
1177
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1178
1179
takes_args = ['location?']
1180
takes_options = [Option('forward',
1181
help='show from oldest to newest'),
1182
'timezone',
1183
Option('verbose',
1184
help='show files changed in each revision'),
1185
'show-ids', 'revision',
1186
'log-format',
1187
'line', 'long',
1188
Option('message',
1189
help='show revisions whose message matches this regexp',
1190
type=str),
1191
'short',
1192
]
1193
@display_command
1194
def run(self, location=None, timezone='original',
1195
verbose=False,
1196
show_ids=False,
1197
forward=False,
1198
revision=None,
1199
log_format=None,
1200
message=None,
1201
long=False,
1202
short=False,
1203
line=False):
1204
from bzrlib.log import log_formatter, show_log
1205
import codecs
1206
assert message is None or isinstance(message, basestring), \
1207
"invalid message argument %r" % message
1208
direction = (forward and 'forward') or 'reverse'
1209
1210
# log everything
1211
file_id = None
1212
if location:
1213
# find the file id to log:
1214
1215
dir, fp = bzrdir.BzrDir.open_containing(location)
1216
b = dir.open_branch()
1217
if fp != '':
1218
try:
1219
# might be a tree:
1220
inv = dir.open_workingtree().inventory
1221
except (errors.NotBranchError, errors.NotLocalUrl):
1222
# either no tree, or is remote.
1223
inv = b.basis_tree().inventory
1224
file_id = inv.path2id(fp)
1225
else:
1226
# local dir only
1227
# FIXME ? log the current subdir only RBC 20060203
1228
dir, relpath = bzrdir.BzrDir.open_containing('.')
1229
b = dir.open_branch()
1230
1231
if revision is None:
1232
rev1 = None
1233
rev2 = None
1234
elif len(revision) == 1:
1235
rev1 = rev2 = revision[0].in_history(b).revno
1236
elif len(revision) == 2:
1237
if revision[0].spec is None:
1238
# missing begin-range means first revision
1239
rev1 = 1
1240
else:
1241
rev1 = revision[0].in_history(b).revno
1242
1243
if revision[1].spec is None:
1244
# missing end-range means last known revision
1245
rev2 = b.revno()
1246
else:
1247
rev2 = revision[1].in_history(b).revno
1248
else:
1249
raise BzrCommandError('bzr log --revision takes one or two values.')
1250
1251
# By this point, the revision numbers are converted to the +ve
1252
# form if they were supplied in the -ve form, so we can do
1253
# this comparison in relative safety
1254
if rev1 > rev2:
1255
(rev2, rev1) = (rev1, rev2)
1256
1257
mutter('encoding log as %r', bzrlib.user_encoding)
1258
1259
# use 'replace' so that we don't abort if trying to write out
1260
# in e.g. the default C locale.
1261
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
1262
1263
if (log_format == None):
1264
default = bzrlib.config.BranchConfig(b).log_format()
1265
log_format = get_log_format(long=long, short=short, line=line, default=default)
1266
1267
lf = log_formatter(log_format,
1268
show_ids=show_ids,
1269
to_file=outf,
1270
show_timezone=timezone)
1271
1272
show_log(b,
1273
lf,
1274
file_id,
1275
verbose=verbose,
1276
direction=direction,
1277
start_revision=rev1,
1278
end_revision=rev2,
1279
search=message)
1280
1281
1282
def get_log_format(long=False, short=False, line=False, default='long'):
1283
log_format = default
1284
if long:
1285
log_format = 'long'
1286
if short:
1287
log_format = 'short'
1288
if line:
1289
log_format = 'line'
1290
return log_format
1291
1292
1293
class cmd_touching_revisions(Command):
1294
"""Return revision-ids which affected a particular file.
1295
1296
A more user-friendly interface is "bzr log FILE"."""
1297
hidden = True
1298
takes_args = ["filename"]
1299
@display_command
1300
def run(self, filename):
1301
tree, relpath = WorkingTree.open_containing(filename)
1302
b = tree.branch
1303
inv = tree.read_working_inventory()
1304
file_id = inv.path2id(relpath)
1305
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1306
print "%6d %s" % (revno, what)
1307
1308
1309
class cmd_ls(Command):
1310
"""List files in a tree.
1311
"""
1312
# TODO: Take a revision or remote path and list that tree instead.
1313
hidden = True
1314
takes_options = ['verbose', 'revision',
1315
Option('non-recursive',
1316
help='don\'t recurse into sub-directories'),
1317
Option('from-root',
1318
help='Print all paths from the root of the branch.'),
1319
Option('unknown', help='Print unknown files'),
1320
Option('versioned', help='Print versioned files'),
1321
Option('ignored', help='Print ignored files'),
1322
1323
Option('null', help='Null separate the files'),
1324
]
1325
@display_command
1326
def run(self, revision=None, verbose=False,
1327
non_recursive=False, from_root=False,
1328
unknown=False, versioned=False, ignored=False,
1329
null=False):
1330
1331
if verbose and null:
1332
raise BzrCommandError('Cannot set both --verbose and --null')
1333
all = not (unknown or versioned or ignored)
1334
1335
selection = {'I':ignored, '?':unknown, 'V':versioned}
1336
1337
tree, relpath = WorkingTree.open_containing(u'.')
1338
if from_root:
1339
relpath = u''
1340
elif relpath:
1341
relpath += '/'
1342
if revision is not None:
1343
tree = tree.branch.repository.revision_tree(
1344
revision[0].in_history(tree.branch).rev_id)
1345
for fp, fc, kind, fid, entry in tree.list_files():
1346
if fp.startswith(relpath):
1347
fp = fp[len(relpath):]
1348
if non_recursive and '/' in fp:
1349
continue
1350
if not all and not selection[fc]:
1351
continue
1352
if verbose:
1353
kindch = entry.kind_character()
1354
print '%-8s %s%s' % (fc, fp, kindch)
1355
elif null:
1356
sys.stdout.write(fp)
1357
sys.stdout.write('\0')
1358
sys.stdout.flush()
1359
else:
1360
print fp
1361
1362
1363
class cmd_unknowns(Command):
1364
"""List unknown files."""
1365
@display_command
1366
def run(self):
1367
from bzrlib.osutils import quotefn
1368
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1369
print quotefn(f)
1370
1371
1372
class cmd_ignore(Command):
1373
"""Ignore a command or pattern.
1374
1375
To remove patterns from the ignore list, edit the .bzrignore file.
1376
1377
If the pattern contains a slash, it is compared to the whole path
1378
from the branch root. Otherwise, it is compared to only the last
1379
component of the path. To match a file only in the root directory,
1380
prepend './'.
1381
1382
Ignore patterns are case-insensitive on case-insensitive systems.
1383
1384
Note: wildcards must be quoted from the shell on Unix.
1385
1386
examples:
1387
bzr ignore ./Makefile
1388
bzr ignore '*.class'
1389
"""
1390
# TODO: Complain if the filename is absolute
1391
takes_args = ['name_pattern']
1392
1393
def run(self, name_pattern):
1394
from bzrlib.atomicfile import AtomicFile
1395
import os.path
1396
1397
tree, relpath = WorkingTree.open_containing(u'.')
1398
ifn = tree.abspath('.bzrignore')
1399
1400
if os.path.exists(ifn):
1401
f = open(ifn, 'rt')
1402
try:
1403
igns = f.read().decode('utf-8')
1404
finally:
1405
f.close()
1406
else:
1407
igns = ''
1408
1409
# TODO: If the file already uses crlf-style termination, maybe
1410
# we should use that for the newly added lines?
1411
1412
if igns and igns[-1] != '\n':
1413
igns += '\n'
1414
igns += name_pattern + '\n'
1415
1416
f = AtomicFile(ifn, 'wt')
1417
try:
1418
f.write(igns.encode('utf-8'))
1419
f.commit()
1420
finally:
1421
f.close()
1422
1423
inv = tree.inventory
1424
if inv.path2id('.bzrignore'):
1425
mutter('.bzrignore is already versioned')
1426
else:
1427
mutter('need to make new .bzrignore file versioned')
1428
tree.add(['.bzrignore'])
1429
1430
1431
class cmd_ignored(Command):
1432
"""List ignored files and the patterns that matched them.
1433
1434
See also: bzr ignore"""
1435
@display_command
1436
def run(self):
1437
tree = WorkingTree.open_containing(u'.')[0]
1438
for path, file_class, kind, file_id, entry in tree.list_files():
1439
if file_class != 'I':
1440
continue
1441
## XXX: Slightly inefficient since this was already calculated
1442
pat = tree.is_ignored(path)
1443
print '%-50s %s' % (path, pat)
1444
1445
1446
class cmd_lookup_revision(Command):
1447
"""Lookup the revision-id from a revision-number
1448
1449
example:
1450
bzr lookup-revision 33
1451
"""
1452
hidden = True
1453
takes_args = ['revno']
1454
1455
@display_command
1456
def run(self, revno):
1457
try:
1458
revno = int(revno)
1459
except ValueError:
1460
raise BzrCommandError("not a valid revision-number: %r" % revno)
1461
1462
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1463
1464
1465
class cmd_export(Command):
1466
"""Export past revision to destination directory.
1467
1468
If no revision is specified this exports the last committed revision.
1469
1470
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1471
given, try to find the format with the extension. If no extension
1472
is found exports to a directory (equivalent to --format=dir).
1473
1474
Root may be the top directory for tar, tgz and tbz2 formats. If none
1475
is given, the top directory will be the root name of the file.
1476
1477
Note: export of tree with non-ascii filenames to zip is not supported.
1478
1479
Supported formats Autodetected by extension
1480
----------------- -------------------------
1481
dir -
1482
tar .tar
1483
tbz2 .tar.bz2, .tbz2
1484
tgz .tar.gz, .tgz
1485
zip .zip
1486
"""
1487
takes_args = ['dest']
1488
takes_options = ['revision', 'format', 'root']
1489
def run(self, dest, revision=None, format=None, root=None):
1490
import os.path
1491
from bzrlib.export import export
1492
tree = WorkingTree.open_containing(u'.')[0]
1493
b = tree.branch
1494
if revision is None:
1495
# should be tree.last_revision FIXME
1496
rev_id = b.last_revision()
1497
else:
1498
if len(revision) != 1:
1499
raise BzrError('bzr export --revision takes exactly 1 argument')
1500
rev_id = revision[0].in_history(b).rev_id
1501
t = b.repository.revision_tree(rev_id)
1502
try:
1503
export(t, dest, format, root)
1504
except errors.NoSuchExportFormat, e:
1505
raise BzrCommandError('Unsupported export format: %s' % e.format)
1506
1507
1508
class cmd_cat(Command):
1509
"""Write a file's text from a previous revision."""
1510
1511
takes_options = ['revision']
1512
takes_args = ['filename']
1513
1514
@display_command
1515
def run(self, filename, revision=None):
1516
if revision is not None and len(revision) != 1:
1517
raise BzrCommandError("bzr cat --revision takes exactly one number")
1518
tree = None
1519
try:
1520
tree, relpath = WorkingTree.open_containing(filename)
1521
b = tree.branch
1522
except NotBranchError:
1523
pass
1524
1525
if tree is None:
1526
b, relpath = Branch.open_containing(filename)
1527
if revision is None:
1528
revision_id = b.last_revision()
1529
else:
1530
revision_id = revision[0].in_history(b).rev_id
1531
b.print_file(relpath, revision_id)
1532
1533
1534
class cmd_local_time_offset(Command):
1535
"""Show the offset in seconds from GMT to local time."""
1536
hidden = True
1537
@display_command
1538
def run(self):
1539
print bzrlib.osutils.local_time_offset()
1540
1541
1542
1543
class cmd_commit(Command):
1544
"""Commit changes into a new revision.
1545
1546
If no arguments are given, the entire tree is committed.
1547
1548
If selected files are specified, only changes to those files are
1549
committed. If a directory is specified then the directory and everything
1550
within it is committed.
1551
1552
A selected-file commit may fail in some cases where the committed
1553
tree would be invalid, such as trying to commit a file in a
1554
newly-added directory that is not itself committed.
1555
"""
1556
# TODO: Run hooks on tree to-be-committed, and after commit.
1557
1558
# TODO: Strict commit that fails if there are deleted files.
1559
# (what does "deleted files" mean ??)
1560
1561
# TODO: Give better message for -s, --summary, used by tla people
1562
1563
# XXX: verbose currently does nothing
1564
1565
takes_args = ['selected*']
1566
takes_options = ['message', 'verbose',
1567
Option('unchanged',
1568
help='commit even if nothing has changed'),
1569
Option('file', type=str,
1570
argname='msgfile',
1571
help='file containing commit message'),
1572
Option('strict',
1573
help="refuse to commit if there are unknown "
1574
"files in the working tree."),
1575
Option('local',
1576
help="perform a local only commit in a bound "
1577
"branch. Such commits are not pushed to "
1578
"the master branch until a normal commit "
1579
"is performed."
1580
),
1581
]
1582
aliases = ['ci', 'checkin']
1583
1584
def run(self, message=None, file=None, verbose=True, selected_list=None,
1585
unchanged=False, strict=False, local=False):
1586
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1587
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1588
StrictCommitFailed)
1589
from bzrlib.msgeditor import edit_commit_message, \
1590
make_commit_message_template
1591
from tempfile import TemporaryFile
1592
import codecs
1593
1594
# TODO: Need a blackbox test for invoking the external editor; may be
1595
# slightly problematic to run this cross-platform.
1596
1597
# TODO: do more checks that the commit will succeed before
1598
# spending the user's valuable time typing a commit message.
1599
#
1600
# TODO: if the commit *does* happen to fail, then save the commit
1601
# message to a temporary file where it can be recovered
1602
tree, selected_list = tree_files(selected_list)
1603
if selected_list == ['']:
1604
# workaround - commit of root of tree should be exactly the same
1605
# as just default commit in that tree, and succeed even though
1606
# selected-file merge commit is not done yet
1607
selected_list = []
1608
1609
if local and not tree.branch.get_bound_location():
1610
raise errors.LocalRequiresBoundBranch()
1611
if message is None and not file:
1612
template = make_commit_message_template(tree, selected_list)
1613
message = edit_commit_message(template)
1614
if message is None:
1615
raise BzrCommandError("please specify a commit message"
1616
" with either --message or --file")
1617
elif message and file:
1618
raise BzrCommandError("please specify either --message or --file")
1619
1620
if file:
1621
import codecs
1622
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1623
1624
if message == "":
1625
raise BzrCommandError("empty commit message specified")
1626
1627
if verbose:
1628
reporter = ReportCommitToLog()
1629
else:
1630
reporter = NullCommitReporter()
1631
1632
try:
1633
tree.commit(message, specific_files=selected_list,
1634
allow_pointless=unchanged, strict=strict, local=local,
1635
reporter=reporter)
1636
except PointlessCommit:
1637
# FIXME: This should really happen before the file is read in;
1638
# perhaps prepare the commit; get the message; then actually commit
1639
raise BzrCommandError("no changes to commit",
1640
["use --unchanged to commit anyhow"])
1641
except ConflictsInTree:
1642
raise BzrCommandError("Conflicts detected in working tree. "
1643
'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1644
except StrictCommitFailed:
1645
raise BzrCommandError("Commit refused because there are unknown "
1646
"files in the working tree.")
1647
except errors.BoundBranchOutOfDate, e:
1648
raise BzrCommandError(str(e)
1649
+ ' Either unbind, update, or'
1650
' pass --local to commit.')
1651
1652
1653
class cmd_check(Command):
1654
"""Validate consistency of branch history.
1655
1656
This command checks various invariants about the branch storage to
1657
detect data corruption or bzr bugs.
1658
"""
1659
takes_args = ['branch?']
1660
takes_options = ['verbose']
1661
1662
def run(self, branch=None, verbose=False):
1663
from bzrlib.check import check
1664
if branch is None:
1665
tree = WorkingTree.open_containing()[0]
1666
branch = tree.branch
1667
else:
1668
branch = Branch.open(branch)
1669
check(branch, verbose)
1670
1671
1672
class cmd_scan_cache(Command):
1673
hidden = True
1674
def run(self):
1675
from bzrlib.hashcache import HashCache
1676
1677
c = HashCache(u'.')
1678
c.read()
1679
c.scan()
1680
1681
print '%6d stats' % c.stat_count
1682
print '%6d in hashcache' % len(c._cache)
1683
print '%6d files removed from cache' % c.removed_count
1684
print '%6d hashes updated' % c.update_count
1685
print '%6d files changed too recently to cache' % c.danger_count
1686
1687
if c.needs_write:
1688
c.write()
1689
1690
1691
class cmd_upgrade(Command):
1692
"""Upgrade branch storage to current format.
1693
1694
The check command or bzr developers may sometimes advise you to run
1695
this command. When the default format has changed you may also be warned
1696
during other operations to upgrade.
1697
"""
1698
takes_args = ['url?']
1699
takes_options = [
1700
Option('format',
1701
help='Upgrade to a specific format. Current formats'
1702
' are: default, knit, metaweave and weave.'
1703
' Default is knit; metaweave and weave are'
1704
' deprecated',
1705
type=get_format_type),
1706
]
1707
1708
1709
def run(self, url='.', format=None):
1710
from bzrlib.upgrade import upgrade
1711
if format is None:
1712
format = get_format_type('default')
1713
upgrade(url, format)
1714
1715
1716
class cmd_whoami(Command):
1717
"""Show bzr user id."""
1718
takes_options = ['email']
1719
1720
@display_command
1721
def run(self, email=False):
1722
try:
1723
b = WorkingTree.open_containing(u'.')[0].branch
1724
config = bzrlib.config.BranchConfig(b)
1725
except NotBranchError:
1726
config = bzrlib.config.GlobalConfig()
1727
1728
if email:
1729
print config.user_email()
1730
else:
1731
print config.username()
1732
1733
1734
class cmd_nick(Command):
1735
"""Print or set the branch nickname.
1736
1737
If unset, the tree root directory name is used as the nickname
1738
To print the current nickname, execute with no argument.
1739
"""
1740
takes_args = ['nickname?']
1741
def run(self, nickname=None):
1742
branch = Branch.open_containing(u'.')[0]
1743
if nickname is None:
1744
self.printme(branch)
1745
else:
1746
branch.nick = nickname
1747
1748
@display_command
1749
def printme(self, branch):
1750
print branch.nick
1751
1752
1753
class cmd_selftest(Command):
1754
"""Run internal test suite.
1755
1756
This creates temporary test directories in the working directory,
1757
but not existing data is affected. These directories are deleted
1758
if the tests pass, or left behind to help in debugging if they
1759
fail and --keep-output is specified.
1760
1761
If arguments are given, they are regular expressions that say
1762
which tests should run.
1763
1764
If the global option '--no-plugins' is given, plugins are not loaded
1765
before running the selftests. This has two effects: features provided or
1766
modified by plugins will not be tested, and tests provided by plugins will
1767
not be run.
1768
1769
examples:
1770
bzr selftest ignore
1771
bzr --no-plugins selftest -v
1772
"""
1773
# TODO: --list should give a list of all available tests
1774
1775
# NB: this is used from the class without creating an instance, which is
1776
# why it does not have a self parameter.
1777
def get_transport_type(typestring):
1778
"""Parse and return a transport specifier."""
1779
if typestring == "sftp":
1780
from bzrlib.transport.sftp import SFTPAbsoluteServer
1781
return SFTPAbsoluteServer
1782
if typestring == "memory":
1783
from bzrlib.transport.memory import MemoryServer
1784
return MemoryServer
1785
if typestring == "fakenfs":
1786
from bzrlib.transport.fakenfs import FakeNFSServer
1787
return FakeNFSServer
1788
msg = "No known transport type %s. Supported types are: sftp\n" %\
1789
(typestring)
1790
raise BzrCommandError(msg)
1791
1792
hidden = True
1793
takes_args = ['testspecs*']
1794
takes_options = ['verbose',
1795
Option('one', help='stop when one test fails'),
1796
Option('keep-output',
1797
help='keep output directories when tests fail'),
1798
Option('transport',
1799
help='Use a different transport by default '
1800
'throughout the test suite.',
1801
type=get_transport_type),
1802
Option('benchmark', help='run the bzr bencharks.'),
1803
Option('lsprof-timed',
1804
help='generate lsprof output for benchmarked'
1805
' sections of code.'),
1806
]
1807
1808
def run(self, testspecs_list=None, verbose=None, one=False,
1809
keep_output=False, transport=None, benchmark=None,
1810
lsprof_timed=None):
1811
import bzrlib.ui
1812
from bzrlib.tests import selftest
1813
import bzrlib.benchmarks as benchmarks
1814
# we don't want progress meters from the tests to go to the
1815
# real output; and we don't want log messages cluttering up
1816
# the real logs.
1817
save_ui = bzrlib.ui.ui_factory
1818
print '%10s: %s' % ('bzr', bzrlib.osutils.realpath(sys.argv[0]))
1819
print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
1820
print
1821
bzrlib.trace.info('running tests...')
1822
try:
1823
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1824
if testspecs_list is not None:
1825
pattern = '|'.join(testspecs_list)
1826
else:
1827
pattern = ".*"
1828
if benchmark:
1829
test_suite_factory = benchmarks.test_suite
1830
if verbose is None:
1831
verbose = True
1832
else:
1833
test_suite_factory = None
1834
if verbose is None:
1835
verbose = False
1836
result = selftest(verbose=verbose,
1837
pattern=pattern,
1838
stop_on_failure=one,
1839
keep_output=keep_output,
1840
transport=transport,
1841
test_suite_factory=test_suite_factory,
1842
lsprof_timed=lsprof_timed)
1843
if result:
1844
bzrlib.trace.info('tests passed')
1845
else:
1846
bzrlib.trace.info('tests failed')
1847
return int(not result)
1848
finally:
1849
bzrlib.ui.ui_factory = save_ui
1850
1851
1852
def _get_bzr_branch():
1853
"""If bzr is run from a branch, return Branch or None"""
1854
import bzrlib.errors
1855
from bzrlib.branch import Branch
1856
from bzrlib.osutils import abspath
1857
from os.path import dirname
1858
1859
try:
1860
branch = Branch.open(dirname(abspath(dirname(__file__))))
1861
return branch
1862
except bzrlib.errors.BzrError:
1863
return None
1864
1865
1866
def show_version():
1867
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1868
# is bzrlib itself in a branch?
1869
branch = _get_bzr_branch()
1870
if branch:
1871
rh = branch.revision_history()
1872
revno = len(rh)
1873
print " bzr checkout, revision %d" % (revno,)
1874
print " nick: %s" % (branch.nick,)
1875
if rh:
1876
print " revid: %s" % (rh[-1],)
1877
print bzrlib.__copyright__
1878
print "http://bazaar-vcs.org/"
1879
print
1880
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
1881
print "you may use, modify and redistribute it under the terms of the GNU"
1882
print "General Public License version 2 or later."
1883
1884
1885
class cmd_version(Command):
1886
"""Show version of bzr."""
1887
@display_command
1888
def run(self):
1889
show_version()
1890
1891
class cmd_rocks(Command):
1892
"""Statement of optimism."""
1893
hidden = True
1894
@display_command
1895
def run(self):
1896
print "it sure does!"
1897
1898
1899
class cmd_find_merge_base(Command):
1900
"""Find and print a base revision for merging two branches.
1901
"""
1902
# TODO: Options to specify revisions on either side, as if
1903
# merging only part of the history.
1904
takes_args = ['branch', 'other']
1905
hidden = True
1906
1907
@display_command
1908
def run(self, branch, other):
1909
from bzrlib.revision import common_ancestor, MultipleRevisionSources
1910
1911
branch1 = Branch.open_containing(branch)[0]
1912
branch2 = Branch.open_containing(other)[0]
1913
1914
history_1 = branch1.revision_history()
1915
history_2 = branch2.revision_history()
1916
1917
last1 = branch1.last_revision()
1918
last2 = branch2.last_revision()
1919
1920
source = MultipleRevisionSources(branch1.repository,
1921
branch2.repository)
1922
1923
base_rev_id = common_ancestor(last1, last2, source)
1924
1925
print 'merge base is revision %s' % base_rev_id
1926
1927
return
1928
1929
if base_revno is None:
1930
raise bzrlib.errors.UnrelatedBranches()
1931
1932
print ' r%-6d in %s' % (base_revno, branch)
1933
1934
other_revno = branch2.revision_id_to_revno(base_revid)
1935
1936
print ' r%-6d in %s' % (other_revno, other)
1937
1938
1939
1940
class cmd_merge(Command):
1941
"""Perform a three-way merge.
1942
1943
The branch is the branch you will merge from. By default, it will
1944
merge the latest revision. If you specify a revision, that
1945
revision will be merged. If you specify two revisions, the first
1946
will be used as a BASE, and the second one as OTHER. Revision
1947
numbers are always relative to the specified branch.
1948
1949
By default, bzr will try to merge in all new work from the other
1950
branch, automatically determining an appropriate base. If this
1951
fails, you may need to give an explicit base.
1952
1953
Merge will do its best to combine the changes in two branches, but there
1954
are some kinds of problems only a human can fix. When it encounters those,
1955
it will mark a conflict. A conflict means that you need to fix something,
1956
before you should commit.
1957
1958
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
1959
1960
If there is no default branch set, the first merge will set it. After
1961
that, you can omit the branch to use the default. To change the
1962
default, use --remember.
1963
1964
Examples:
1965
1966
To merge the latest revision from bzr.dev
1967
bzr merge ../bzr.dev
1968
1969
To merge changes up to and including revision 82 from bzr.dev
1970
bzr merge -r 82 ../bzr.dev
1971
1972
To merge the changes introduced by 82, without previous changes:
1973
bzr merge -r 81..82 ../bzr.dev
1974
1975
merge refuses to run if there are any uncommitted changes, unless
1976
--force is given.
1977
1978
The following merge types are available:
1979
"""
1980
takes_args = ['branch?']
1981
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
1982
Option('show-base', help="Show base revision text in "
1983
"conflicts")]
1984
1985
def help(self):
1986
from merge import merge_type_help
1987
from inspect import getdoc
1988
return getdoc(self) + '\n' + merge_type_help()
1989
1990
def run(self, branch=None, revision=None, force=False, merge_type=None,
1991
show_base=False, reprocess=False, remember=False):
1992
if merge_type is None:
1993
merge_type = Merge3Merger
1994
1995
tree = WorkingTree.open_containing(u'.')[0]
1996
stored_loc = tree.branch.get_parent()
1997
if branch is None:
1998
if stored_loc is None:
1999
raise BzrCommandError("No merge branch known or specified.")
2000
else:
2001
print "Using saved branch: %s" % stored_loc
2002
branch = stored_loc
2003
2004
if tree.branch.get_parent() is None or remember:
2005
tree.branch.set_parent(branch)
2006
2007
if revision is None or len(revision) < 1:
2008
base = [None, None]
2009
other = [branch, -1]
2010
other_branch, path = Branch.open_containing(branch)
2011
else:
2012
if len(revision) == 1:
2013
base = [None, None]
2014
other_branch, path = Branch.open_containing(branch)
2015
revno = revision[0].in_history(other_branch).revno
2016
other = [branch, revno]
2017
else:
2018
assert len(revision) == 2
2019
if None in revision:
2020
raise BzrCommandError(
2021
"Merge doesn't permit that revision specifier.")
2022
b, path = Branch.open_containing(branch)
2023
2024
base = [branch, revision[0].in_history(b).revno]
2025
other = [branch, revision[1].in_history(b).revno]
2026
if path != "":
2027
interesting_files = [path]
2028
else:
2029
interesting_files = None
2030
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2031
try:
2032
try:
2033
conflict_count = merge(other, base, check_clean=(not force),
2034
merge_type=merge_type,
2035
reprocess=reprocess,
2036
show_base=show_base,
2037
pb=pb, file_list=interesting_files)
2038
finally:
2039
pb.finished()
2040
if conflict_count != 0:
2041
return 1
2042
else:
2043
return 0
2044
except bzrlib.errors.AmbiguousBase, e:
2045
m = ("sorry, bzr can't determine the right merge base yet\n"
2046
"candidates are:\n "
2047
+ "\n ".join(e.bases)
2048
+ "\n"
2049
"please specify an explicit base with -r,\n"
2050
"and (if you want) report this to the bzr developers\n")
2051
log_error(m)
2052
2053
2054
class cmd_remerge(Command):
2055
"""Redo a merge.
2056
2057
Use this if you want to try a different merge technique while resolving
2058
conflicts. Some merge techniques are better than others, and remerge
2059
lets you try different ones on different files.
2060
2061
The options for remerge have the same meaning and defaults as the ones for
2062
merge. The difference is that remerge can (only) be run when there is a
2063
pending merge, and it lets you specify particular files.
2064
2065
Examples:
2066
$ bzr remerge --show-base
2067
Re-do the merge of all conflicted files, and show the base text in
2068
conflict regions, in addition to the usual THIS and OTHER texts.
2069
2070
$ bzr remerge --merge-type weave --reprocess foobar
2071
Re-do the merge of "foobar", using the weave merge algorithm, with
2072
additional processing to reduce the size of conflict regions.
2073
2074
The following merge types are available:"""
2075
takes_args = ['file*']
2076
takes_options = ['merge-type', 'reprocess',
2077
Option('show-base', help="Show base revision text in "
2078
"conflicts")]
2079
2080
def help(self):
2081
from merge import merge_type_help
2082
from inspect import getdoc
2083
return getdoc(self) + '\n' + merge_type_help()
2084
2085
def run(self, file_list=None, merge_type=None, show_base=False,
2086
reprocess=False):
2087
from bzrlib.merge import merge_inner, transform_tree
2088
if merge_type is None:
2089
merge_type = Merge3Merger
2090
tree, file_list = tree_files(file_list)
2091
tree.lock_write()
2092
try:
2093
pending_merges = tree.pending_merges()
2094
if len(pending_merges) != 1:
2095
raise BzrCommandError("Sorry, remerge only works after normal"
2096
+ " merges. Not cherrypicking or"
2097
+ "multi-merges.")
2098
repository = tree.branch.repository
2099
base_revision = common_ancestor(tree.branch.last_revision(),
2100
pending_merges[0], repository)
2101
base_tree = repository.revision_tree(base_revision)
2102
other_tree = repository.revision_tree(pending_merges[0])
2103
interesting_ids = None
2104
if file_list is not None:
2105
interesting_ids = set()
2106
for filename in file_list:
2107
file_id = tree.path2id(filename)
2108
if file_id is None:
2109
raise NotVersionedError(filename)
2110
interesting_ids.add(file_id)
2111
if tree.kind(file_id) != "directory":
2112
continue
2113
2114
for name, ie in tree.inventory.iter_entries(file_id):
2115
interesting_ids.add(ie.file_id)
2116
transform_tree(tree, tree.basis_tree(), interesting_ids)
2117
if file_list is None:
2118
restore_files = list(tree.iter_conflicts())
2119
else:
2120
restore_files = file_list
2121
for filename in restore_files:
2122
try:
2123
restore(tree.abspath(filename))
2124
except NotConflicted:
2125
pass
2126
conflicts = merge_inner(tree.branch, other_tree, base_tree,
2127
this_tree=tree,
2128
interesting_ids = interesting_ids,
2129
other_rev_id=pending_merges[0],
2130
merge_type=merge_type,
2131
show_base=show_base,
2132
reprocess=reprocess)
2133
finally:
2134
tree.unlock()
2135
if conflicts > 0:
2136
return 1
2137
else:
2138
return 0
2139
2140
class cmd_revert(Command):
2141
"""Reverse all changes since the last commit.
2142
2143
Only versioned files are affected. Specify filenames to revert only
2144
those files. By default, any files that are changed will be backed up
2145
first. Backup files have a '~' appended to their name.
2146
"""
2147
takes_options = ['revision', 'no-backup']
2148
takes_args = ['file*']
2149
aliases = ['merge-revert']
2150
2151
def run(self, revision=None, no_backup=False, file_list=None):
2152
from bzrlib.commands import parse_spec
2153
if file_list is not None:
2154
if len(file_list) == 0:
2155
raise BzrCommandError("No files specified")
2156
else:
2157
file_list = []
2158
2159
tree, file_list = tree_files(file_list)
2160
if revision is None:
2161
# FIXME should be tree.last_revision
2162
rev_id = tree.last_revision()
2163
elif len(revision) != 1:
2164
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
2165
else:
2166
rev_id = revision[0].in_history(tree.branch).rev_id
2167
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2168
try:
2169
tree.revert(file_list,
2170
tree.branch.repository.revision_tree(rev_id),
2171
not no_backup, pb)
2172
finally:
2173
pb.finished()
2174
2175
2176
class cmd_assert_fail(Command):
2177
"""Test reporting of assertion failures"""
2178
hidden = True
2179
def run(self):
2180
assert False, "always fails"
2181
2182
2183
class cmd_help(Command):
2184
"""Show help on a command or other topic.
2185
2186
For a list of all available commands, say 'bzr help commands'."""
2187
takes_options = [Option('long', 'show help on all commands')]
2188
takes_args = ['topic?']
2189
aliases = ['?', '--help', '-?', '-h']
2190
2191
@display_command
2192
def run(self, topic=None, long=False):
2193
import help
2194
if topic is None and long:
2195
topic = "commands"
2196
help.help(topic)
2197
2198
2199
class cmd_shell_complete(Command):
2200
"""Show appropriate completions for context.
2201
2202
For a list of all available commands, say 'bzr shell-complete'."""
2203
takes_args = ['context?']
2204
aliases = ['s-c']
2205
hidden = True
2206
2207
@display_command
2208
def run(self, context=None):
2209
import shellcomplete
2210
shellcomplete.shellcomplete(context)
2211
2212
2213
class cmd_fetch(Command):
2214
"""Copy in history from another branch but don't merge it.
2215
2216
This is an internal method used for pull and merge."""
2217
hidden = True
2218
takes_args = ['from_branch', 'to_branch']
2219
def run(self, from_branch, to_branch):
2220
from bzrlib.fetch import Fetcher
2221
from bzrlib.branch import Branch
2222
from_b = Branch.open(from_branch)
2223
to_b = Branch.open(to_branch)
2224
Fetcher(to_b, from_b)
2225
2226
2227
class cmd_missing(Command):
2228
"""Show unmerged/unpulled revisions between two branches.
2229
2230
OTHER_BRANCH may be local or remote."""
2231
takes_args = ['other_branch?']
2232
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2233
Option('mine-only',
2234
'Display changes in the local branch only'),
2235
Option('theirs-only',
2236
'Display changes in the remote branch only'),
2237
'log-format',
2238
'line',
2239
'long',
2240
'short',
2241
'show-ids',
2242
'verbose'
2243
]
2244
2245
def run(self, other_branch=None, reverse=False, mine_only=False,
2246
theirs_only=False, log_format=None, long=False, short=False, line=False,
2247
show_ids=False, verbose=False):
2248
from bzrlib.missing import find_unmerged, iter_log_data
2249
from bzrlib.log import log_formatter
2250
local_branch = bzrlib.branch.Branch.open_containing(u".")[0]
2251
parent = local_branch.get_parent()
2252
if other_branch is None:
2253
other_branch = parent
2254
if other_branch is None:
2255
raise BzrCommandError("No missing location known or specified.")
2256
print "Using last location: " + local_branch.get_parent()
2257
remote_branch = bzrlib.branch.Branch.open(other_branch)
2258
if remote_branch.base == local_branch.base:
2259
remote_branch = local_branch
2260
local_branch.lock_read()
2261
try:
2262
remote_branch.lock_read()
2263
try:
2264
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2265
if (log_format == None):
2266
default = bzrlib.config.BranchConfig(local_branch).log_format()
2267
log_format = get_log_format(long=long, short=short, line=line, default=default)
2268
lf = log_formatter(log_format, sys.stdout,
2269
show_ids=show_ids,
2270
show_timezone='original')
2271
if reverse is False:
2272
local_extra.reverse()
2273
remote_extra.reverse()
2274
if local_extra and not theirs_only:
2275
print "You have %d extra revision(s):" % len(local_extra)
2276
for data in iter_log_data(local_extra, local_branch.repository,
2277
verbose):
2278
lf.show(*data)
2279
printed_local = True
2280
else:
2281
printed_local = False
2282
if remote_extra and not mine_only:
2283
if printed_local is True:
2284
print "\n\n"
2285
print "You are missing %d revision(s):" % len(remote_extra)
2286
for data in iter_log_data(remote_extra, remote_branch.repository,
2287
verbose):
2288
lf.show(*data)
2289
if not remote_extra and not local_extra:
2290
status_code = 0
2291
print "Branches are up to date."
2292
else:
2293
status_code = 1
2294
finally:
2295
remote_branch.unlock()
2296
finally:
2297
local_branch.unlock()
2298
if not status_code and parent is None and other_branch is not None:
2299
local_branch.lock_write()
2300
try:
2301
# handle race conditions - a parent might be set while we run.
2302
if local_branch.get_parent() is None:
2303
local_branch.set_parent(other_branch)
2304
finally:
2305
local_branch.unlock()
2306
return status_code
2307
2308
2309
class cmd_plugins(Command):
2310
"""List plugins"""
2311
hidden = True
2312
@display_command
2313
def run(self):
2314
import bzrlib.plugin
2315
from inspect import getdoc
2316
for name, plugin in bzrlib.plugin.all_plugins().items():
2317
if hasattr(plugin, '__path__'):
2318
print plugin.__path__[0]
2319
elif hasattr(plugin, '__file__'):
2320
print plugin.__file__
2321
else:
2322
print `plugin`
2323
2324
d = getdoc(plugin)
2325
if d:
2326
print '\t', d.split('\n')[0]
2327
2328
2329
class cmd_testament(Command):
2330
"""Show testament (signing-form) of a revision."""
2331
takes_options = ['revision', 'long']
2332
takes_args = ['branch?']
2333
@display_command
2334
def run(self, branch=u'.', revision=None, long=False):
2335
from bzrlib.testament import Testament
2336
b = WorkingTree.open_containing(branch)[0].branch
2337
b.lock_read()
2338
try:
2339
if revision is None:
2340
rev_id = b.last_revision()
2341
else:
2342
rev_id = revision[0].in_history(b).rev_id
2343
t = Testament.from_revision(b.repository, rev_id)
2344
if long:
2345
sys.stdout.writelines(t.as_text_lines())
2346
else:
2347
sys.stdout.write(t.as_short_text())
2348
finally:
2349
b.unlock()
2350
2351
2352
class cmd_annotate(Command):
2353
"""Show the origin of each line in a file.
2354
2355
This prints out the given file with an annotation on the left side
2356
indicating which revision, author and date introduced the change.
2357
2358
If the origin is the same for a run of consecutive lines, it is
2359
shown only at the top, unless the --all option is given.
2360
"""
2361
# TODO: annotate directories; showing when each file was last changed
2362
# TODO: if the working copy is modified, show annotations on that
2363
# with new uncommitted lines marked
2364
aliases = ['blame', 'praise']
2365
takes_args = ['filename']
2366
takes_options = [Option('all', help='show annotations on all lines'),
2367
Option('long', help='show date in annotations'),
2368
'revision'
2369
]
2370
2371
@display_command
2372
def run(self, filename, all=False, long=False, revision=None):
2373
from bzrlib.annotate import annotate_file
2374
tree, relpath = WorkingTree.open_containing(filename)
2375
branch = tree.branch
2376
branch.lock_read()
2377
try:
2378
if revision is None:
2379
revision_id = branch.last_revision()
2380
elif len(revision) != 1:
2381
raise BzrCommandError('bzr annotate --revision takes exactly 1 argument')
2382
else:
2383
revision_id = revision[0].in_history(branch).rev_id
2384
file_id = tree.inventory.path2id(relpath)
2385
tree = branch.repository.revision_tree(revision_id)
2386
file_version = tree.inventory[file_id].revision
2387
annotate_file(branch, file_version, file_id, long, all, sys.stdout)
2388
finally:
2389
branch.unlock()
2390
2391
2392
class cmd_re_sign(Command):
2393
"""Create a digital signature for an existing revision."""
2394
# TODO be able to replace existing ones.
2395
2396
hidden = True # is this right ?
2397
takes_args = ['revision_id*']
2398
takes_options = ['revision']
2399
2400
def run(self, revision_id_list=None, revision=None):
2401
import bzrlib.config as config
2402
import bzrlib.gpg as gpg
2403
if revision_id_list is not None and revision is not None:
2404
raise BzrCommandError('You can only supply one of revision_id or --revision')
2405
if revision_id_list is None and revision is None:
2406
raise BzrCommandError('You must supply either --revision or a revision_id')
2407
b = WorkingTree.open_containing(u'.')[0].branch
2408
gpg_strategy = gpg.GPGStrategy(config.BranchConfig(b))
2409
if revision_id_list is not None:
2410
for revision_id in revision_id_list:
2411
b.repository.sign_revision(revision_id, gpg_strategy)
2412
elif revision is not None:
2413
if len(revision) == 1:
2414
revno, rev_id = revision[0].in_history(b)
2415
b.repository.sign_revision(rev_id, gpg_strategy)
2416
elif len(revision) == 2:
2417
# are they both on rh- if so we can walk between them
2418
# might be nice to have a range helper for arbitrary
2419
# revision paths. hmm.
2420
from_revno, from_revid = revision[0].in_history(b)
2421
to_revno, to_revid = revision[1].in_history(b)
2422
if to_revid is None:
2423
to_revno = b.revno()
2424
if from_revno is None or to_revno is None:
2425
raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
2426
for revno in range(from_revno, to_revno + 1):
2427
b.repository.sign_revision(b.get_rev_id(revno),
2428
gpg_strategy)
2429
else:
2430
raise BzrCommandError('Please supply either one revision, or a range.')
2431
2432
2433
class cmd_bind(Command):
2434
"""Bind the current branch to a master branch.
2435
2436
After binding, commits must succeed on the master branch
2437
before they are executed on the local one.
2438
"""
2439
2440
takes_args = ['location']
2441
takes_options = []
2442
2443
def run(self, location=None):
2444
b, relpath = Branch.open_containing(u'.')
2445
b_other = Branch.open(location)
2446
try:
2447
b.bind(b_other)
2448
except DivergedBranches:
2449
raise BzrCommandError('These branches have diverged.'
2450
' Try merging, and then bind again.')
2451
2452
2453
class cmd_unbind(Command):
2454
"""Unbind the current branch from its master branch.
2455
2456
After unbinding, the local branch is considered independent.
2457
All subsequent commits will be local.
2458
"""
2459
2460
takes_args = []
2461
takes_options = []
2462
2463
def run(self):
2464
b, relpath = Branch.open_containing(u'.')
2465
if not b.unbind():
2466
raise BzrCommandError('Local branch is not bound')
2467
2468
2469
class cmd_uncommit(bzrlib.commands.Command):
2470
"""Remove the last committed revision.
2471
2472
--verbose will print out what is being removed.
2473
--dry-run will go through all the motions, but not actually
2474
remove anything.
2475
2476
In the future, uncommit will create a changeset, which can then
2477
be re-applied.
2478
"""
2479
2480
# TODO: jam 20060108 Add an option to allow uncommit to remove
2481
# unreferenced information in 'branch-as-repostory' branches.
2482
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2483
# information in shared branches as well.
2484
takes_options = ['verbose', 'revision',
2485
Option('dry-run', help='Don\'t actually make changes'),
2486
Option('force', help='Say yes to all questions.')]
2487
takes_args = ['location?']
2488
aliases = []
2489
2490
def run(self, location=None,
2491
dry_run=False, verbose=False,
2492
revision=None, force=False):
2493
from bzrlib.branch import Branch
2494
from bzrlib.log import log_formatter
2495
import sys
2496
from bzrlib.uncommit import uncommit
2497
2498
if location is None:
2499
location = u'.'
2500
control, relpath = bzrdir.BzrDir.open_containing(location)
2501
try:
2502
tree = control.open_workingtree()
2503
b = tree.branch
2504
except (errors.NoWorkingTree, errors.NotLocalUrl):
2505
tree = None
2506
b = control.open_branch()
2507
2508
if revision is None:
2509
revno = b.revno()
2510
rev_id = b.last_revision()
2511
else:
2512
revno, rev_id = revision[0].in_history(b)
2513
if rev_id is None:
2514
print 'No revisions to uncommit.'
2515
2516
for r in range(revno, b.revno()+1):
2517
rev_id = b.get_rev_id(r)
2518
lf = log_formatter('short', to_file=sys.stdout,show_timezone='original')
2519
lf.show(r, b.repository.get_revision(rev_id), None)
2520
2521
if dry_run:
2522
print 'Dry-run, pretending to remove the above revisions.'
2523
if not force:
2524
val = raw_input('Press <enter> to continue')
2525
else:
2526
print 'The above revision(s) will be removed.'
2527
if not force:
2528
val = raw_input('Are you sure [y/N]? ')
2529
if val.lower() not in ('y', 'yes'):
2530
print 'Canceled'
2531
return 0
2532
2533
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
2534
revno=revno)
2535
2536
2537
class cmd_break_lock(Command):
2538
"""Break a dead lock on a repository, branch or working directory.
2539
2540
CAUTION: Locks should only be broken when you are sure that the process
2541
holding the lock has been stopped.
2542
2543
You can get information on what locks are open via the 'bzr info' command.
2544
2545
example:
2546
bzr break-lock
2547
"""
2548
takes_args = ['location?']
2549
2550
def run(self, location=None, show=False):
2551
if location is None:
2552
location = u'.'
2553
control, relpath = bzrdir.BzrDir.open_containing(location)
2554
try:
2555
control.break_lock()
2556
except NotImplementedError:
2557
pass
2558
2559
2560
2561
# command-line interpretation helper for merge-related commands
2562
def merge(other_revision, base_revision,
2563
check_clean=True, ignore_zero=False,
2564
this_dir=None, backup_files=False, merge_type=Merge3Merger,
2565
file_list=None, show_base=False, reprocess=False,
2566
pb=DummyProgress()):
2567
"""Merge changes into a tree.
2568
2569
base_revision
2570
list(path, revno) Base for three-way merge.
2571
If [None, None] then a base will be automatically determined.
2572
other_revision
2573
list(path, revno) Other revision for three-way merge.
2574
this_dir
2575
Directory to merge changes into; '.' by default.
2576
check_clean
2577
If true, this_dir must have no uncommitted changes before the
2578
merge begins.
2579
ignore_zero - If true, suppress the "zero conflicts" message when
2580
there are no conflicts; should be set when doing something we expect
2581
to complete perfectly.
2582
file_list - If supplied, merge only changes to selected files.
2583
2584
All available ancestors of other_revision and base_revision are
2585
automatically pulled into the branch.
2586
2587
The revno may be -1 to indicate the last revision on the branch, which is
2588
the typical case.
2589
2590
This function is intended for use from the command line; programmatic
2591
clients might prefer to call merge.merge_inner(), which has less magic
2592
behavior.
2593
"""
2594
from bzrlib.merge import Merger
2595
if this_dir is None:
2596
this_dir = u'.'
2597
this_tree = WorkingTree.open_containing(this_dir)[0]
2598
if show_base and not merge_type is Merge3Merger:
2599
raise BzrCommandError("Show-base is not supported for this merge"
2600
" type. %s" % merge_type)
2601
if reprocess and not merge_type.supports_reprocess:
2602
raise BzrCommandError("Conflict reduction is not supported for merge"
2603
" type %s." % merge_type)
2604
if reprocess and show_base:
2605
raise BzrCommandError("Cannot do conflict reduction and show base.")
2606
try:
2607
merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
2608
merger.pp = ProgressPhase("Merge phase", 5, pb)
2609
merger.pp.next_phase()
2610
merger.check_basis(check_clean)
2611
merger.set_other(other_revision)
2612
merger.pp.next_phase()
2613
merger.set_base(base_revision)
2614
if merger.base_rev_id == merger.other_rev_id:
2615
note('Nothing to do.')
2616
return 0
2617
merger.backup_files = backup_files
2618
merger.merge_type = merge_type
2619
merger.set_interesting_files(file_list)
2620
merger.show_base = show_base
2621
merger.reprocess = reprocess
2622
conflicts = merger.do_merge()
2623
if file_list is None:
2624
merger.set_pending()
2625
finally:
2626
pb.clear()
2627
return conflicts
2628
2629
2630
# these get imported and then picked up by the scan for cmd_*
2631
# TODO: Some more consistent way to split command definitions across files;
2632
# we do need to load at least some information about them to know of
2633
# aliases. ideally we would avoid loading the implementation until the
2634
# details were needed.
2635
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2636
from bzrlib.sign_my_commits import cmd_sign_my_commits
2637
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
2638
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0