« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 1185.12.2
- compare with another revision
- download diff
- download tarball
- view history from revision 1185.12.2
- Committer: Aaron Bentley
- Date: 2005-09-29 21:07:17 UTC
- mfrom: (1393.1.6)
- mto: (1185.25.1)
- mto: This revision was merged to the branch mainline in revision 1419.
- Revision ID: abentley@panoramicfeedback.com-20050929210717-cd73981590f17017
Merged the weave changes
- files added:
- NEWS.developers
- files removed:
- bzrlib/plugins/checkperms
- files renamed:
- tools/testweave.py => bzrlib/selftest/test_weave.py
- tools/history2weaves.py => bzrlib/upgrade.py
- bzrlib/newinventory.py => contrib/newinventory.py
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2004, 2005 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
18
import sys
19
import os
20
21
import bzrlib
22
import bzrlib.trace
23
from bzrlib.trace import mutter, note, log_error, warning
24
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError, NotBranchError
25
from bzrlib.branch import Branch
26
from bzrlib import BZRDIR
27
from bzrlib.commands import Command
28
29
30
class cmd_status(Command):
31
"""Display status summary.
32
33
This reports on versioned and unknown files, reporting them
34
grouped by state. Possible states are:
35
36
added
37
Versioned in the working copy but not in the previous revision.
38
39
removed
40
Versioned in the previous revision but removed or deleted
41
in the working copy.
42
43
renamed
44
Path of this file changed from the previous revision;
45
the text may also have changed. This includes files whose
46
parent directory was renamed.
47
48
modified
49
Text has changed since the previous revision.
50
51
unchanged
52
Nothing about this file has changed since the previous revision.
53
Only shown with --all.
54
55
unknown
56
Not versioned and not matching an ignore pattern.
57
58
To see ignored files use 'bzr ignored'. For details in the
59
changes to file texts, use 'bzr diff'.
60
61
If no arguments are specified, the status of the entire working
62
directory is shown. Otherwise, only the status of the specified
63
files or directories is reported. If a directory is given, status
64
is reported for everything inside that directory.
65
66
If a revision argument is given, the status is calculated against
67
that revision, or between two revisions if two are provided.
68
"""
69
# XXX: FIXME: bzr status should accept a -r option to show changes
70
# relative to a revision, or between revisions
71
72
takes_args = ['file*']
73
takes_options = ['all', 'show-ids', 'revision']
74
aliases = ['st', 'stat']
75
76
def run(self, all=False, show_ids=False, file_list=None, revision=None):
77
if file_list:
78
b = Branch.open_containing(file_list[0])
79
file_list = [b.relpath(x) for x in file_list]
80
# special case: only one path was given and it's the root
81
# of the branch
82
if file_list == ['']:
83
file_list = None
84
else:
85
b = Branch.open_containing('.')
86
87
from bzrlib.status import show_status
88
show_status(b, show_unchanged=all, show_ids=show_ids,
89
specific_files=file_list, revision=revision)
90
91
92
class cmd_cat_revision(Command):
93
"""Write out metadata for a revision.
94
95
The revision to print can either be specified by a specific
96
revision identifier, or you can use --revision.
97
"""
98
99
hidden = True
100
takes_args = ['revision_id?']
101
takes_options = ['revision']
102
103
def run(self, revision_id=None, revision=None):
104
from bzrlib.revisionspec import RevisionSpec
105
106
if revision_id is not None and revision is not None:
107
raise BzrCommandError('You can only supply one of revision_id or --revision')
108
if revision_id is None and revision is None:
109
raise BzrCommandError('You must supply either --revision or a revision_id')
110
b = Branch.open_containing('.')
111
if revision_id is not None:
112
sys.stdout.write(b.get_revision_xml_file(revision_id).read())
113
elif revision is not None:
114
for rev in revision:
115
if rev is None:
116
raise BzrCommandError('You cannot specify a NULL revision.')
117
revno, rev_id = rev.in_history(b)
118
sys.stdout.write(b.get_revision_xml_file(rev_id).read())
119
120
121
class cmd_revno(Command):
122
"""Show current revision number.
123
124
This is equal to the number of revisions on this branch."""
125
def run(self):
126
print Branch.open_containing('.').revno()
127
128
129
class cmd_revision_info(Command):
130
"""Show revision number and revision id for a given revision identifier.
131
"""
132
hidden = True
133
takes_args = ['revision_info*']
134
takes_options = ['revision']
135
def run(self, revision=None, revision_info_list=[]):
136
from bzrlib.revisionspec import RevisionSpec
137
138
revs = []
139
if revision is not None:
140
revs.extend(revision)
141
if revision_info_list is not None:
142
for rev in revision_info_list:
143
revs.append(RevisionSpec(rev))
144
if len(revs) == 0:
145
raise BzrCommandError('You must supply a revision identifier')
146
147
b = Branch.open_containing('.')
148
149
for rev in revs:
150
revinfo = rev.in_history(b)
151
if revinfo.revno is None:
152
print ' %s' % revinfo.rev_id
153
else:
154
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
155
156
157
class cmd_add(Command):
158
"""Add specified files or directories.
159
160
In non-recursive mode, all the named items are added, regardless
161
of whether they were previously ignored. A warning is given if
162
any of the named files are already versioned.
163
164
In recursive mode (the default), files are treated the same way
165
but the behaviour for directories is different. Directories that
166
are already versioned do not give a warning. All directories,
167
whether already versioned or not, are searched for files or
168
subdirectories that are neither versioned or ignored, and these
169
are added. This search proceeds recursively into versioned
170
directories. If no names are given '.' is assumed.
171
172
Therefore simply saying 'bzr add' will version all files that
173
are currently unknown.
174
175
Adding a file whose parent directory is not versioned will
176
implicitly add the parent, and so on up to the root. This means
177
you should never need to explictly add a directory, they'll just
178
get added when you add a file in the directory.
179
"""
180
takes_args = ['file*']
181
takes_options = ['verbose', 'no-recurse']
182
183
def run(self, file_list, verbose=False, no_recurse=False):
184
# verbose currently has no effect
185
from bzrlib.add import smart_add, add_reporter_print
186
smart_add(file_list, not no_recurse, add_reporter_print)
187
188
189
190
class cmd_mkdir(Command):
191
"""Create a new versioned directory.
192
193
This is equivalent to creating the directory and then adding it.
194
"""
195
takes_args = ['dir+']
196
197
def run(self, dir_list):
198
b = None
199
200
for d in dir_list:
201
os.mkdir(d)
202
if not b:
203
b = Branch.open_containing(d)
204
b.add([d])
205
print 'added', d
206
207
208
class cmd_relpath(Command):
209
"""Show path of a file relative to root"""
210
takes_args = ['filename']
211
hidden = True
212
213
def run(self, filename):
214
print Branch.open_containing(filename).relpath(filename)
215
216
217
218
class cmd_inventory(Command):
219
"""Show inventory of the current working copy or a revision."""
220
takes_options = ['revision', 'show-ids']
221
222
def run(self, revision=None, show_ids=False):
223
b = Branch.open_containing('.')
224
if revision is None:
225
inv = b.read_working_inventory()
226
else:
227
if len(revision) > 1:
228
raise BzrCommandError('bzr inventory --revision takes'
229
' exactly one revision identifier')
230
inv = b.get_revision_inventory(revision[0].in_history(b).rev_id)
231
232
for path, entry in inv.entries():
233
if show_ids:
234
print '%-50s %s' % (path, entry.file_id)
235
else:
236
print path
237
238
239
class cmd_move(Command):
240
"""Move files to a different directory.
241
242
examples:
243
bzr move *.txt doc
244
245
The destination must be a versioned directory in the same branch.
246
"""
247
takes_args = ['source$', 'dest']
248
def run(self, source_list, dest):
249
b = Branch.open_containing('.')
250
251
# TODO: glob expansion on windows?
252
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
253
254
255
class cmd_rename(Command):
256
"""Change the name of an entry.
257
258
examples:
259
bzr rename frob.c frobber.c
260
bzr rename src/frob.c lib/frob.c
261
262
It is an error if the destination name exists.
263
264
See also the 'move' command, which moves files into a different
265
directory without changing their name.
266
267
TODO: Some way to rename multiple files without invoking bzr for each
268
one?"""
269
takes_args = ['from_name', 'to_name']
270
271
def run(self, from_name, to_name):
272
b = Branch.open_containing('.')
273
b.rename_one(b.relpath(from_name), b.relpath(to_name))
274
275
276
277
class cmd_mv(Command):
278
"""Move or rename a file.
279
280
usage:
281
bzr mv OLDNAME NEWNAME
282
bzr mv SOURCE... DESTINATION
283
284
If the last argument is a versioned directory, all the other names
285
are moved into it. Otherwise, there must be exactly two arguments
286
and the file is changed to a new name, which must not already exist.
287
288
Files cannot be moved between branches.
289
"""
290
takes_args = ['names*']
291
def run(self, names_list):
292
if len(names_list) < 2:
293
raise BzrCommandError("missing file argument")
294
b = Branch.open_containing(names_list[0])
295
296
rel_names = [b.relpath(x) for x in names_list]
297
298
if os.path.isdir(names_list[-1]):
299
# move into existing directory
300
for pair in b.move(rel_names[:-1], rel_names[-1]):
301
print "%s => %s" % pair
302
else:
303
if len(names_list) != 2:
304
raise BzrCommandError('to mv multiple files the destination '
305
'must be a versioned directory')
306
b.rename_one(rel_names[0], rel_names[1])
307
print "%s => %s" % (rel_names[0], rel_names[1])
308
309
310
311
312
class cmd_pull(Command):
313
"""Pull any changes from another branch into the current one.
314
315
If the location is omitted, the last-used location will be used.
316
Both the revision history and the working directory will be
317
updated.
318
319
This command only works on branches that have not diverged. Branches are
320
considered diverged if both branches have had commits without first
321
pulling from the other.
322
323
If branches have diverged, you can use 'bzr merge' to pull the text changes
324
from one into the other.
325
"""
326
takes_args = ['location?']
327
328
def run(self, location=None):
329
from bzrlib.merge import merge
330
import tempfile
331
from shutil import rmtree
332
import errno
333
334
br_to = Branch.open_containing('.')
335
stored_loc = br_to.get_parent()
336
if location is None:
337
if stored_loc is None:
338
raise BzrCommandError("No pull location known or specified.")
339
else:
340
print "Using last location: %s" % stored_loc
341
location = stored_loc
342
cache_root = tempfile.mkdtemp()
343
from bzrlib.errors import DivergedBranches
344
br_from = Branch.open_containing(location)
345
location = br_from.base
346
old_revno = br_to.revno()
347
try:
348
from bzrlib.errors import DivergedBranches
349
br_from = Branch.open(location)
350
br_from.setup_caching(cache_root)
351
location = br_from.base
352
old_revno = br_to.revno()
353
try:
354
br_to.update_revisions(br_from)
355
except DivergedBranches:
356
raise BzrCommandError("These branches have diverged."
357
" Try merge.")
358
359
merge(('.', -1), ('.', old_revno), check_clean=False)
360
if location != stored_loc:
361
br_to.set_parent(location)
362
finally:
363
rmtree(cache_root)
364
365
366
367
class cmd_branch(Command):
368
"""Create a new copy of a branch.
369
370
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
371
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
372
373
To retrieve the branch as of a particular revision, supply the --revision
374
parameter, as in "branch foo/bar -r 5".
375
376
--basis is to speed up branching from remote branches. When specified, it
377
copies all the file-contents, inventory and revision data from the basis
378
branch before copying anything from the remote branch.
379
"""
380
takes_args = ['from_location', 'to_location?']
381
takes_options = ['revision', 'basis']
382
aliases = ['get', 'clone']
383
384
def run(self, from_location, to_location=None, revision=None, basis=None):
385
from bzrlib.clone import copy_branch
386
import tempfile
387
import errno
388
from shutil import rmtree
389
cache_root = tempfile.mkdtemp()
390
try:
391
if revision is None:
392
revision = [None]
393
elif len(revision) > 1:
394
raise BzrCommandError(
395
'bzr branch --revision takes exactly 1 revision value')
396
try:
397
br_from = Branch.open(from_location)
398
except OSError, e:
399
if e.errno == errno.ENOENT:
400
raise BzrCommandError('Source location "%s" does not'
401
' exist.' % to_location)
402
else:
403
raise
404
br_from.setup_caching(cache_root)
405
if basis is not None:
406
basis_branch = Branch.open_containing(basis)
407
else:
408
basis_branch = None
409
if len(revision) == 1 and revision[0] is not None:
410
revision_id = revision[0].in_history(br_from)[1]
411
else:
412
revision_id = None
413
if to_location is None:
414
to_location = os.path.basename(from_location.rstrip("/\\"))
415
try:
416
os.mkdir(to_location)
417
except OSError, e:
418
if e.errno == errno.EEXIST:
419
raise BzrCommandError('Target directory "%s" already'
420
' exists.' % to_location)
421
if e.errno == errno.ENOENT:
422
raise BzrCommandError('Parent of "%s" does not exist.' %
423
to_location)
424
else:
425
raise
426
try:
427
copy_branch(br_from, to_location, revision_id, basis_branch)
428
except bzrlib.errors.NoSuchRevision:
429
rmtree(to_location)
430
msg = "The branch %s has no revision %d." % (from_location, revision[0])
431
raise BzrCommandError(msg)
432
except bzrlib.errors.UnlistableBranch:
433
msg = "The branch %s cannot be used as a --basis"
434
finally:
435
rmtree(cache_root)
436
437
438
class cmd_renames(Command):
439
"""Show list of renamed files.
440
441
TODO: Option to show renames between two historical versions.
442
443
TODO: Only show renames under dir, rather than in the whole branch.
444
"""
445
takes_args = ['dir?']
446
447
def run(self, dir='.'):
448
b = Branch.open_containing(dir)
449
old_inv = b.basis_tree().inventory
450
new_inv = b.read_working_inventory()
451
452
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
453
renames.sort()
454
for old_name, new_name in renames:
455
print "%s => %s" % (old_name, new_name)
456
457
458
class cmd_info(Command):
459
"""Show statistical information about a branch."""
460
takes_args = ['branch?']
461
462
def run(self, branch=None):
463
import info
464
465
b = Branch.open_containing(branch)
466
info.show_info(b)
467
468
469
class cmd_remove(Command):
470
"""Make a file unversioned.
471
472
This makes bzr stop tracking changes to a versioned file. It does
473
not delete the working copy.
474
"""
475
takes_args = ['file+']
476
takes_options = ['verbose']
477
478
def run(self, file_list, verbose=False):
479
b = Branch.open_containing(file_list[0])
480
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
481
482
483
class cmd_file_id(Command):
484
"""Print file_id of a particular file or directory.
485
486
The file_id is assigned when the file is first added and remains the
487
same through all revisions where the file exists, even when it is
488
moved or renamed.
489
"""
490
hidden = True
491
takes_args = ['filename']
492
def run(self, filename):
493
b = Branch.open_containing(filename)
494
i = b.inventory.path2id(b.relpath(filename))
495
if i == None:
496
raise BzrError("%r is not a versioned file" % filename)
497
else:
498
print i
499
500
501
class cmd_file_path(Command):
502
"""Print path of file_ids to a file or directory.
503
504
This prints one line for each directory down to the target,
505
starting at the branch root."""
506
hidden = True
507
takes_args = ['filename']
508
def run(self, filename):
509
b = Branch.open_containing(filename)
510
inv = b.inventory
511
fid = inv.path2id(b.relpath(filename))
512
if fid == None:
513
raise BzrError("%r is not a versioned file" % filename)
514
for fip in inv.get_idpath(fid):
515
print fip
516
517
518
class cmd_revision_history(Command):
519
"""Display list of revision ids on this branch."""
520
hidden = True
521
def run(self):
522
for patchid in Branch.open_containing('.').revision_history():
523
print patchid
524
525
526
class cmd_ancestry(Command):
527
"""List all revisions merged into this branch."""
528
hidden = True
529
def run(self):
530
b = find_branch('.')
531
for revision_id in b.get_ancestry(b.last_revision()):
532
print revision_id
533
534
535
class cmd_directories(Command):
536
"""Display list of versioned directories in this branch."""
537
def run(self):
538
for name, ie in Branch.open_containing('.').read_working_inventory().directories():
539
if name == '':
540
print '.'
541
else:
542
print name
543
544
545
class cmd_init(Command):
546
"""Make a directory into a versioned branch.
547
548
Use this to create an empty branch, or before importing an
549
existing project.
550
551
Recipe for importing a tree of files:
552
cd ~/project
553
bzr init
554
bzr add -v .
555
bzr status
556
bzr commit -m 'imported project'
557
"""
558
def run(self):
559
from bzrlib.branch import Branch
560
Branch.initialize('.')
561
562
563
class cmd_diff(Command):
564
"""Show differences in working tree.
565
566
If files are listed, only the changes in those files are listed.
567
Otherwise, all changes for the tree are listed.
568
569
TODO: Allow diff across branches.
570
571
TODO: Option to use external diff command; could be GNU diff, wdiff,
572
or a graphical diff.
573
574
TODO: Python difflib is not exactly the same as unidiff; should
575
either fix it up or prefer to use an external diff.
576
577
TODO: If a directory is given, diff everything under that.
578
579
TODO: Selected-file diff is inefficient and doesn't show you
580
deleted files.
581
582
TODO: This probably handles non-Unix newlines poorly.
583
584
examples:
585
bzr diff
586
bzr diff -r1
587
bzr diff -r1..2
588
"""
589
590
takes_args = ['file*']
591
takes_options = ['revision', 'diff-options']
592
aliases = ['di', 'dif']
593
594
def run(self, revision=None, file_list=None, diff_options=None):
595
from bzrlib.diff import show_diff
596
597
if file_list:
598
b = Branch.open_containing(file_list[0])
599
file_list = [b.relpath(f) for f in file_list]
600
if file_list == ['']:
601
# just pointing to top-of-tree
602
file_list = None
603
else:
604
b = Branch.open_containing('.')
605
606
if revision is not None:
607
if len(revision) == 1:
608
show_diff(b, revision[0], specific_files=file_list,
609
external_diff_options=diff_options)
610
elif len(revision) == 2:
611
show_diff(b, revision[0], specific_files=file_list,
612
external_diff_options=diff_options,
613
revision2=revision[1])
614
else:
615
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
616
else:
617
show_diff(b, None, specific_files=file_list,
618
external_diff_options=diff_options)
619
620
621
622
623
class cmd_deleted(Command):
624
"""List files deleted in the working tree.
625
626
TODO: Show files deleted since a previous revision, or between two revisions.
627
"""
628
def run(self, show_ids=False):
629
b = Branch.open_containing('.')
630
old = b.basis_tree()
631
new = b.working_tree()
632
633
## TODO: Much more efficient way to do this: read in new
634
## directories with readdir, rather than stating each one. Same
635
## level of effort but possibly much less IO. (Or possibly not,
636
## if the directories are very large...)
637
638
for path, ie in old.inventory.iter_entries():
639
if not new.has_id(ie.file_id):
640
if show_ids:
641
print '%-50s %s' % (path, ie.file_id)
642
else:
643
print path
644
645
646
class cmd_modified(Command):
647
"""List files modified in working tree."""
648
hidden = True
649
def run(self):
650
from bzrlib.delta import compare_trees
651
652
b = Branch.open_containing('.')
653
td = compare_trees(b.basis_tree(), b.working_tree())
654
655
for path, id, kind in td.modified:
656
print path
657
658
659
660
class cmd_added(Command):
661
"""List files added in working tree."""
662
hidden = True
663
def run(self):
664
b = Branch.open_containing('.')
665
wt = b.working_tree()
666
basis_inv = b.basis_tree().inventory
667
inv = wt.inventory
668
for file_id in inv:
669
if file_id in basis_inv:
670
continue
671
path = inv.id2path(file_id)
672
if not os.access(b.abspath(path), os.F_OK):
673
continue
674
print path
675
676
677
678
class cmd_root(Command):
679
"""Show the tree root directory.
680
681
The root is the nearest enclosing directory with a .bzr control
682
directory."""
683
takes_args = ['filename?']
684
def run(self, filename=None):
685
"""Print the branch root."""
686
b = Branch.open_containing(filename)
687
print b.base
688
689
690
class cmd_log(Command):
691
"""Show log of this branch.
692
693
To request a range of logs, you can use the command -r begin:end
694
-r revision requests a specific revision, -r :end or -r begin: are
695
also valid.
696
697
--message allows you to give a regular expression, which will be evaluated
698
so that only matching entries will be displayed.
699
700
TODO: Make --revision support uuid: and hash: [future tag:] notation.
701
702
"""
703
704
takes_args = ['filename?']
705
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision',
706
'long', 'message', 'short',]
707
708
def run(self, filename=None, timezone='original',
709
verbose=False,
710
show_ids=False,
711
forward=False,
712
revision=None,
713
message=None,
714
long=False,
715
short=False):
716
from bzrlib.log import log_formatter, show_log
717
import codecs
718
719
direction = (forward and 'forward') or 'reverse'
720
721
if filename:
722
b = Branch.open_containing(filename)
723
fp = b.relpath(filename)
724
if fp:
725
file_id = b.read_working_inventory().path2id(fp)
726
else:
727
file_id = None # points to branch root
728
else:
729
b = Branch.open_containing('.')
730
file_id = None
731
732
if revision is None:
733
rev1 = None
734
rev2 = None
735
elif len(revision) == 1:
736
rev1 = rev2 = revision[0].in_history(b).revno
737
elif len(revision) == 2:
738
rev1 = revision[0].in_history(b).revno
739
rev2 = revision[1].in_history(b).revno
740
else:
741
raise BzrCommandError('bzr log --revision takes one or two values.')
742
743
if rev1 == 0:
744
rev1 = None
745
if rev2 == 0:
746
rev2 = None
747
748
mutter('encoding log as %r' % bzrlib.user_encoding)
749
750
# use 'replace' so that we don't abort if trying to write out
751
# in e.g. the default C locale.
752
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
753
754
if not short:
755
log_format = 'long'
756
else:
757
log_format = 'short'
758
lf = log_formatter(log_format,
759
show_ids=show_ids,
760
to_file=outf,
761
show_timezone=timezone)
762
763
show_log(b,
764
lf,
765
file_id,
766
verbose=verbose,
767
direction=direction,
768
start_revision=rev1,
769
end_revision=rev2,
770
search=message)
771
772
773
774
class cmd_touching_revisions(Command):
775
"""Return revision-ids which affected a particular file.
776
777
A more user-friendly interface is "bzr log FILE"."""
778
hidden = True
779
takes_args = ["filename"]
780
def run(self, filename):
781
b = Branch.open_containing(filename)
782
inv = b.read_working_inventory()
783
file_id = inv.path2id(b.relpath(filename))
784
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
785
print "%6d %s" % (revno, what)
786
787
788
class cmd_ls(Command):
789
"""List files in a tree.
790
791
TODO: Take a revision or remote path and list that tree instead.
792
"""
793
hidden = True
794
def run(self, revision=None, verbose=False):
795
b = Branch.open_containing('.')
796
if revision == None:
797
tree = b.working_tree()
798
else:
799
tree = b.revision_tree(revision.in_history(b).rev_id)
800
801
for fp, fc, kind, fid in tree.list_files():
802
if verbose:
803
if kind == 'directory':
804
kindch = '/'
805
elif kind == 'file':
806
kindch = ''
807
else:
808
kindch = '???'
809
810
print '%-8s %s%s' % (fc, fp, kindch)
811
else:
812
print fp
813
814
815
816
class cmd_unknowns(Command):
817
"""List unknown files."""
818
def run(self):
819
from bzrlib.osutils import quotefn
820
for f in Branch.open_containing('.').unknowns():
821
print quotefn(f)
822
823
824
825
class cmd_ignore(Command):
826
"""Ignore a command or pattern.
827
828
To remove patterns from the ignore list, edit the .bzrignore file.
829
830
If the pattern contains a slash, it is compared to the whole path
831
from the branch root. Otherwise, it is comapred to only the last
832
component of the path.
833
834
Ignore patterns are case-insensitive on case-insensitive systems.
835
836
Note: wildcards must be quoted from the shell on Unix.
837
838
examples:
839
bzr ignore ./Makefile
840
bzr ignore '*.class'
841
"""
842
takes_args = ['name_pattern']
843
844
def run(self, name_pattern):
845
from bzrlib.atomicfile import AtomicFile
846
import os.path
847
848
b = Branch.open_containing('.')
849
ifn = b.abspath('.bzrignore')
850
851
if os.path.exists(ifn):
852
f = open(ifn, 'rt')
853
try:
854
igns = f.read().decode('utf-8')
855
finally:
856
f.close()
857
else:
858
igns = ''
859
860
# TODO: If the file already uses crlf-style termination, maybe
861
# we should use that for the newly added lines?
862
863
if igns and igns[-1] != '\n':
864
igns += '\n'
865
igns += name_pattern + '\n'
866
867
try:
868
f = AtomicFile(ifn, 'wt')
869
f.write(igns.encode('utf-8'))
870
f.commit()
871
finally:
872
f.close()
873
874
inv = b.working_tree().inventory
875
if inv.path2id('.bzrignore'):
876
mutter('.bzrignore is already versioned')
877
else:
878
mutter('need to make new .bzrignore file versioned')
879
b.add(['.bzrignore'])
880
881
882
883
class cmd_ignored(Command):
884
"""List ignored files and the patterns that matched them.
885
886
See also: bzr ignore"""
887
def run(self):
888
tree = Branch.open_containing('.').working_tree()
889
for path, file_class, kind, file_id in tree.list_files():
890
if file_class != 'I':
891
continue
892
## XXX: Slightly inefficient since this was already calculated
893
pat = tree.is_ignored(path)
894
print '%-50s %s' % (path, pat)
895
896
897
class cmd_lookup_revision(Command):
898
"""Lookup the revision-id from a revision-number
899
900
example:
901
bzr lookup-revision 33
902
"""
903
hidden = True
904
takes_args = ['revno']
905
906
def run(self, revno):
907
try:
908
revno = int(revno)
909
except ValueError:
910
raise BzrCommandError("not a valid revision-number: %r" % revno)
911
912
print Branch.open_containing('.').get_rev_id(revno)
913
914
915
class cmd_export(Command):
916
"""Export past revision to destination directory.
917
918
If no revision is specified this exports the last committed revision.
919
920
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
921
given, try to find the format with the extension. If no extension
922
is found exports to a directory (equivalent to --format=dir).
923
924
Root may be the top directory for tar, tgz and tbz2 formats. If none
925
is given, the top directory will be the root name of the file."""
926
# TODO: list known exporters
927
takes_args = ['dest']
928
takes_options = ['revision', 'format', 'root']
929
def run(self, dest, revision=None, format=None, root=None):
930
import os.path
931
b = Branch.open_containing('.')
932
if revision is None:
933
rev_id = b.last_revision()
934
else:
935
if len(revision) != 1:
936
raise BzrError('bzr export --revision takes exactly 1 argument')
937
rev_id = revision[0].in_history(b).rev_id
938
t = b.revision_tree(rev_id)
939
arg_root, ext = os.path.splitext(os.path.basename(dest))
940
if ext in ('.gz', '.bz2'):
941
new_root, new_ext = os.path.splitext(arg_root)
942
if new_ext == '.tar':
943
arg_root = new_root
944
ext = new_ext + ext
945
if root is None:
946
root = arg_root
947
if not format:
948
if ext in (".tar",):
949
format = "tar"
950
elif ext in (".tar.gz", ".tgz"):
951
format = "tgz"
952
elif ext in (".tar.bz2", ".tbz2"):
953
format = "tbz2"
954
else:
955
format = "dir"
956
t.export(dest, format, root)
957
958
959
class cmd_cat(Command):
960
"""Write a file's text from a previous revision."""
961
962
takes_options = ['revision']
963
takes_args = ['filename']
964
965
def run(self, filename, revision=None):
966
if revision is None:
967
raise BzrCommandError("bzr cat requires a revision number")
968
elif len(revision) != 1:
969
raise BzrCommandError("bzr cat --revision takes exactly one number")
970
b = Branch.open_containing('.')
971
b.print_file(b.relpath(filename), revision[0].in_history(b).revno)
972
973
974
class cmd_local_time_offset(Command):
975
"""Show the offset in seconds from GMT to local time."""
976
hidden = True
977
def run(self):
978
print bzrlib.osutils.local_time_offset()
979
980
981
982
class cmd_commit(Command):
983
"""Commit changes into a new revision.
984
985
If no arguments are given, the entire tree is committed.
986
987
If selected files are specified, only changes to those files are
988
committed. If a directory is specified then the directory and everything
989
within it is committed.
990
991
A selected-file commit may fail in some cases where the committed
992
tree would be invalid, such as trying to commit a file in a
993
newly-added directory that is not itself committed.
994
995
TODO: Run hooks on tree to-be-committed, and after commit.
996
997
TODO: Strict commit that fails if there are unknown or deleted files.
998
"""
999
takes_args = ['selected*']
1000
takes_options = ['message', 'file', 'verbose', 'unchanged']
1001
aliases = ['ci', 'checkin']
1002
1003
# TODO: Give better message for -s, --summary, used by tla people
1004
1005
# XXX: verbose currently does nothing
1006
1007
def run(self, message=None, file=None, verbose=True, selected_list=None,
1008
unchanged=False):
1009
from bzrlib.errors import PointlessCommit
1010
from bzrlib.msgeditor import edit_commit_message
1011
from bzrlib.status import show_status
1012
from cStringIO import StringIO
1013
1014
b = Branch.open_containing('.')
1015
if selected_list:
1016
selected_list = [b.relpath(s) for s in selected_list]
1017
1018
if not message and not file:
1019
catcher = StringIO()
1020
show_status(b, specific_files=selected_list,
1021
to_file=catcher)
1022
message = edit_commit_message(catcher.getvalue())
1023
1024
if message is None:
1025
raise BzrCommandError("please specify a commit message"
1026
" with either --message or --file")
1027
elif message and file:
1028
raise BzrCommandError("please specify either --message or --file")
1029
1030
if file:
1031
import codecs
1032
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1033
1034
try:
1035
b.commit(message,
1036
specific_files=selected_list,
1037
allow_pointless=unchanged)
1038
except PointlessCommit:
1039
# FIXME: This should really happen before the file is read in;
1040
# perhaps prepare the commit; get the message; then actually commit
1041
raise BzrCommandError("no changes to commit",
1042
["use --unchanged to commit anyhow"])
1043
1044
1045
class cmd_check(Command):
1046
"""Validate consistency of branch history.
1047
1048
This command checks various invariants about the branch storage to
1049
detect data corruption or bzr bugs.
1050
"""
1051
takes_args = ['dir?']
1052
1053
def run(self, dir='.'):
1054
from bzrlib.check import check
1055
1056
check(Branch.open_containing(dir))
1057
1058
1059
class cmd_scan_cache(Command):
1060
hidden = True
1061
def run(self):
1062
from bzrlib.hashcache import HashCache
1063
1064
c = HashCache('.')
1065
c.read()
1066
c.scan()
1067
1068
print '%6d stats' % c.stat_count
1069
print '%6d in hashcache' % len(c._cache)
1070
print '%6d files removed from cache' % c.removed_count
1071
print '%6d hashes updated' % c.update_count
1072
print '%6d files changed too recently to cache' % c.danger_count
1073
1074
if c.needs_write:
1075
c.write()
1076
1077
1078
1079
class cmd_upgrade(Command):
1080
"""Upgrade branch storage to current format.
1081
1082
The check command or bzr developers may sometimes advise you to run
1083
this command.
1084
1085
This version of this command upgrades from the full-text storage
1086
used by bzr 0.0.8 and earlier to the weave format (v5).
1087
"""
1088
takes_args = ['dir?']
1089
1090
def run(self, dir='.'):
1091
from bzrlib.upgrade import upgrade
1092
upgrade(dir)
1093
1094
1095
class cmd_whoami(Command):
1096
"""Show bzr user id."""
1097
takes_options = ['email']
1098
1099
def run(self, email=False):
1100
try:
1101
b = bzrlib.branch.Branch.open_containing('.')
1102
except NotBranchError:
1103
b = None
1104
1105
if email:
1106
print bzrlib.osutils.user_email(b)
1107
else:
1108
print bzrlib.osutils.username(b)
1109
1110
1111
class cmd_selftest(Command):
1112
"""Run internal test suite"""
1113
hidden = True
1114
takes_options = ['verbose', 'pattern']
1115
def run(self, verbose=False, pattern=".*"):
1116
import bzrlib.ui
1117
from bzrlib.selftest import selftest
1118
# we don't want progress meters from the tests to go to the
1119
# real output; and we don't want log messages cluttering up
1120
# the real logs.
1121
save_ui = bzrlib.ui.ui_factory
1122
bzrlib.trace.info('running tests...')
1123
try:
1124
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1125
result = selftest(verbose=verbose, pattern=pattern)
1126
if result:
1127
bzrlib.trace.info('tests passed')
1128
else:
1129
bzrlib.trace.info('tests failed')
1130
return int(not result)
1131
finally:
1132
bzrlib.ui.ui_factory = save_ui
1133
1134
1135
def show_version():
1136
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1137
# is bzrlib itself in a branch?
1138
bzrrev = bzrlib.get_bzr_revision()
1139
if bzrrev:
1140
print " (bzr checkout, revision %d {%s})" % bzrrev
1141
print bzrlib.__copyright__
1142
print "http://bazaar-ng.org/"
1143
print
1144
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
1145
print "you may use, modify and redistribute it under the terms of the GNU"
1146
print "General Public License version 2 or later."
1147
1148
1149
class cmd_version(Command):
1150
"""Show version of bzr."""
1151
def run(self):
1152
show_version()
1153
1154
class cmd_rocks(Command):
1155
"""Statement of optimism."""
1156
hidden = True
1157
def run(self):
1158
print "it sure does!"
1159
1160
1161
class cmd_find_merge_base(Command):
1162
"""Find and print a base revision for merging two branches.
1163
1164
TODO: Options to specify revisions on either side, as if
1165
merging only part of the history.
1166
"""
1167
takes_args = ['branch', 'other']
1168
hidden = True
1169
1170
def run(self, branch, other):
1171
from bzrlib.revision import common_ancestor, MultipleRevisionSources
1172
1173
branch1 = Branch.open_containing(branch)
1174
branch2 = Branch.open_containing(other)
1175
1176
history_1 = branch1.revision_history()
1177
history_2 = branch2.revision_history()
1178
1179
last1 = branch1.last_revision()
1180
last2 = branch2.last_revision()
1181
1182
source = MultipleRevisionSources(branch1, branch2)
1183
1184
base_rev_id = common_ancestor(last1, last2, source)
1185
1186
print 'merge base is revision %s' % base_rev_id
1187
1188
return
1189
1190
if base_revno is None:
1191
raise bzrlib.errors.UnrelatedBranches()
1192
1193
print ' r%-6d in %s' % (base_revno, branch)
1194
1195
other_revno = branch2.revision_id_to_revno(base_revid)
1196
1197
print ' r%-6d in %s' % (other_revno, other)
1198
1199
1200
1201
class cmd_merge(Command):
1202
"""Perform a three-way merge.
1203
1204
The branch is the branch you will merge from. By default, it will
1205
merge the latest revision. If you specify a revision, that
1206
revision will be merged. If you specify two revisions, the first
1207
will be used as a BASE, and the second one as OTHER. Revision
1208
numbers are always relative to the specified branch.
1209
1210
By default bzr will try to merge in all new work from the other
1211
branch, automatically determining an appropriate base. If this
1212
fails, you may need to give an explicit base.
1213
1214
Examples:
1215
1216
To merge the latest revision from bzr.dev
1217
bzr merge ../bzr.dev
1218
1219
To merge changes up to and including revision 82 from bzr.dev
1220
bzr merge -r 82 ../bzr.dev
1221
1222
To merge the changes introduced by 82, without previous changes:
1223
bzr merge -r 81..82 ../bzr.dev
1224
1225
merge refuses to run if there are any uncommitted changes, unless
1226
--force is given.
1227
"""
1228
takes_args = ['branch?']
1229
takes_options = ['revision', 'force', 'merge-type']
1230
1231
def run(self, branch='.', revision=None, force=False,
1232
merge_type=None):
1233
from bzrlib.merge import merge
1234
from bzrlib.merge_core import ApplyMerge3
1235
if merge_type is None:
1236
merge_type = ApplyMerge3
1237
1238
if revision is None or len(revision) < 1:
1239
base = [None, None]
1240
other = [branch, -1]
1241
else:
1242
if len(revision) == 1:
1243
base = [None, None]
1244
other = [branch, revision[0].in_history(branch).revno]
1245
else:
1246
assert len(revision) == 2
1247
if None in revision:
1248
raise BzrCommandError(
1249
"Merge doesn't permit that revision specifier.")
1250
from bzrlib.branch import Branch
1251
b = Branch.open(branch)
1252
1253
base = [branch, revision[0].in_history(b).revno]
1254
other = [branch, revision[1].in_history(b).revno]
1255
1256
try:
1257
merge(other, base, check_clean=(not force), merge_type=merge_type)
1258
except bzrlib.errors.AmbiguousBase, e:
1259
m = ("sorry, bzr can't determine the right merge base yet\n"
1260
"candidates are:\n "
1261
+ "\n ".join(e.bases)
1262
+ "\n"
1263
"please specify an explicit base with -r,\n"
1264
"and (if you want) report this to the bzr developers\n")
1265
log_error(m)
1266
1267
1268
class cmd_revert(Command):
1269
"""Reverse all changes since the last commit.
1270
1271
Only versioned files are affected. Specify filenames to revert only
1272
those files. By default, any files that are changed will be backed up
1273
first. Backup files have a '~' appended to their name.
1274
"""
1275
takes_options = ['revision', 'no-backup']
1276
takes_args = ['file*']
1277
aliases = ['merge-revert']
1278
1279
def run(self, revision=None, no_backup=False, file_list=None):
1280
from bzrlib.merge import merge
1281
from bzrlib.branch import Branch
1282
from bzrlib.commands import parse_spec
1283
1284
if file_list is not None:
1285
if len(file_list) == 0:
1286
raise BzrCommandError("No files specified")
1287
if revision is None:
1288
revno = -1
1289
elif len(revision) != 1:
1290
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1291
else:
1292
b = Branch.open_containing('.')
1293
revno = revision[0].in_history(b).revno
1294
merge(('.', revno), parse_spec('.'),
1295
check_clean=False,
1296
ignore_zero=True,
1297
backup_files=not no_backup,
1298
file_list=file_list)
1299
if not file_list:
1300
Branch.open_containing('.').set_pending_merges([])
1301
1302
1303
class cmd_assert_fail(Command):
1304
"""Test reporting of assertion failures"""
1305
hidden = True
1306
def run(self):
1307
assert False, "always fails"
1308
1309
1310
class cmd_help(Command):
1311
"""Show help on a command or other topic.
1312
1313
For a list of all available commands, say 'bzr help commands'."""
1314
takes_options = ['long']
1315
takes_args = ['topic?']
1316
aliases = ['?']
1317
1318
def run(self, topic=None, long=False):
1319
import help
1320
if topic is None and long:
1321
topic = "commands"
1322
help.help(topic)
1323
1324
1325
class cmd_shell_complete(Command):
1326
"""Show appropriate completions for context.
1327
1328
For a list of all available commands, say 'bzr shell-complete'."""
1329
takes_args = ['context?']
1330
aliases = ['s-c']
1331
hidden = True
1332
1333
def run(self, context=None):
1334
import shellcomplete
1335
shellcomplete.shellcomplete(context)
1336
1337
1338
class cmd_fetch(Command):
1339
"""Copy in history from another branch but don't merge it.
1340
1341
This is an internal method used for pull and merge."""
1342
hidden = True
1343
takes_args = ['from_branch', 'to_branch']
1344
def run(self, from_branch, to_branch):
1345
from bzrlib.fetch import Fetcher
1346
from bzrlib.branch import Branch
1347
from_b = Branch(from_branch)
1348
to_b = Branch(to_branch)
1349
Fetcher(to_b, from_b)
1350
1351
1352
1353
class cmd_missing(Command):
1354
"""What is missing in this branch relative to other branch.
1355
"""
1356
# TODO: rewrite this in terms of ancestry so that it shows only
1357
# unmerged things
1358
1359
takes_args = ['remote?']
1360
aliases = ['mis', 'miss']
1361
# We don't have to add quiet to the list, because
1362
# unknown options are parsed as booleans
1363
takes_options = ['verbose', 'quiet']
1364
1365
def run(self, remote=None, verbose=False, quiet=False):
1366
from bzrlib.errors import BzrCommandError
1367
from bzrlib.missing import show_missing
1368
1369
if verbose and quiet:
1370
raise BzrCommandError('Cannot pass both quiet and verbose')
1371
1372
b = Branch.open_containing('.')
1373
parent = b.get_parent()
1374
if remote is None:
1375
if parent is None:
1376
raise BzrCommandError("No missing location known or specified.")
1377
else:
1378
if not quiet:
1379
print "Using last location: %s" % parent
1380
remote = parent
1381
elif parent is None:
1382
# We only update parent if it did not exist, missing
1383
# should not change the parent
1384
b.set_parent(remote)
1385
br_remote = Branch.open_containing(remote)
1386
1387
return show_missing(b, br_remote, verbose=verbose, quiet=quiet)
1388
1389
1390
1391
class cmd_plugins(Command):
1392
"""List plugins"""
1393
hidden = True
1394
def run(self):
1395
import bzrlib.plugin
1396
from inspect import getdoc
1397
for plugin in bzrlib.plugin.all_plugins:
1398
if hasattr(plugin, '__path__'):
1399
print plugin.__path__[0]
1400
elif hasattr(plugin, '__file__'):
1401
print plugin.__file__
1402
else:
1403
print `plugin`
1404
1405
d = getdoc(plugin)
1406
if d:
1407
print '\t', d.split('\n')[0]
1408
1409
Loggerhead is a web-based interface for Breezy
Version: 2.0.1