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