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 1704.2.14
- compare with another revision
- download diff
- download tarball
- view history from revision 1704.2.14
- Committer: Martin Pool
- Date: 2006-05-12 08:29:23 UTC
- mfrom: (1668.1.7 bzr-0.8.mbp)
- mto: This revision was merged to the branch mainline in revision 1710.
- Revision ID: mbp@sourcefrog.net-20060512082923-38e14b057e08246e
[merge] work from 0.8 fixes
- files added:
- .bzrignore
- bzrlib
- bzrlib/doc
- bzrlib/doc/api
- bzrlib/export
- bzrlib/plugins
- 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
- foreign
- 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
from bzrlib.revision import common_ancestor
30
import bzrlib.errors as errors
31
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError,
32
NotBranchError, DivergedBranches, NotConflicted,
33
NoSuchFile, NoWorkingTree, FileInWrongBranch,
34
NotVersionedError)
35
from bzrlib.log import show_one_log
36
from bzrlib.merge import Merge3Merger
37
from bzrlib.option import Option
38
from bzrlib.progress import DummyProgress, ProgressPhase
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
for glob in sorted(ignored.keys()):
277
match_len = len(ignored[glob])
278
if verbose:
279
for path in ignored[glob]:
280
print "ignored %s matching \"%s\"" % (path, glob)
281
else:
282
print "ignored %d file(s) matching \"%s\"" % (match_len,
283
glob)
284
print "If you wish to add some of these files, please add them"\
285
" by name."
286
287
288
class cmd_mkdir(Command):
289
"""Create a new versioned directory.
290
291
This is equivalent to creating the directory and then adding it.
292
"""
293
takes_args = ['dir+']
294
295
def run(self, dir_list):
296
for d in dir_list:
297
os.mkdir(d)
298
wt, dd = WorkingTree.open_containing(d)
299
wt.add([dd])
300
print 'added', d
301
302
303
class cmd_relpath(Command):
304
"""Show path of a file relative to root"""
305
takes_args = ['filename']
306
hidden = True
307
308
@display_command
309
def run(self, filename):
310
tree, relpath = WorkingTree.open_containing(filename)
311
print relpath
312
313
314
class cmd_inventory(Command):
315
"""Show inventory of the current working copy or a revision.
316
317
It is possible to limit the output to a particular entry
318
type using the --kind option. For example; --kind file.
319
"""
320
takes_options = ['revision', 'show-ids', 'kind']
321
322
@display_command
323
def run(self, revision=None, show_ids=False, kind=None):
324
if kind and kind not in ['file', 'directory', 'symlink']:
325
raise BzrCommandError('invalid kind specified')
326
tree = WorkingTree.open_containing(u'.')[0]
327
if revision is None:
328
inv = tree.read_working_inventory()
329
else:
330
if len(revision) > 1:
331
raise BzrCommandError('bzr inventory --revision takes'
332
' exactly one revision identifier')
333
inv = tree.branch.repository.get_revision_inventory(
334
revision[0].in_history(tree.branch).rev_id)
335
336
for path, entry in inv.entries():
337
if kind and kind != entry.kind:
338
continue
339
if show_ids:
340
print '%-50s %s' % (path, entry.file_id)
341
else:
342
print path
343
344
345
class cmd_mv(Command):
346
"""Move or rename a file.
347
348
usage:
349
bzr mv OLDNAME NEWNAME
350
bzr mv SOURCE... DESTINATION
351
352
If the last argument is a versioned directory, all the other names
353
are moved into it. Otherwise, there must be exactly two arguments
354
and the file is changed to a new name, which must not already exist.
355
356
Files cannot be moved between branches.
357
"""
358
takes_args = ['names*']
359
aliases = ['move', 'rename']
360
361
def run(self, names_list):
362
if len(names_list) < 2:
363
raise BzrCommandError("missing file argument")
364
tree, rel_names = tree_files(names_list)
365
366
if os.path.isdir(names_list[-1]):
367
# move into existing directory
368
for pair in tree.move(rel_names[:-1], rel_names[-1]):
369
print "%s => %s" % pair
370
else:
371
if len(names_list) != 2:
372
raise BzrCommandError('to mv multiple files the destination '
373
'must be a versioned directory')
374
tree.rename_one(rel_names[0], rel_names[1])
375
print "%s => %s" % (rel_names[0], rel_names[1])
376
377
378
class cmd_pull(Command):
379
"""Turn this branch into a mirror of another branch.
380
381
This command only works on branches that have not diverged. Branches are
382
considered diverged if the destination branch's most recent commit is one
383
that has not been merged (directly or indirectly) into the parent.
384
385
If branches have diverged, you can use 'bzr merge' to integrate the changes
386
from one into the other. Once one branch has merged, the other should
387
be able to pull it again.
388
389
If branches have diverged, you can use 'bzr merge' to pull the text changes
390
from one into the other. Once one branch has merged, the other should
391
be able to pull it again.
392
393
If you want to forget your local changes and just update your branch to
394
match the remote one, use pull --overwrite.
395
396
If there is no default location set, the first pull will set it. After
397
that, you can omit the location to use the default. To change the
398
default, use --remember.
399
"""
400
takes_options = ['remember', 'overwrite', 'revision', 'verbose']
401
takes_args = ['location?']
402
403
def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
404
# FIXME: too much stuff is in the command class
405
try:
406
tree_to = WorkingTree.open_containing(u'.')[0]
407
branch_to = tree_to.branch
408
except NoWorkingTree:
409
tree_to = None
410
branch_to = Branch.open_containing(u'.')[0]
411
stored_loc = branch_to.get_parent()
412
if location is None:
413
if stored_loc is None:
414
raise BzrCommandError("No pull location known or specified.")
415
else:
416
print "Using saved location: %s" % stored_loc
417
location = stored_loc
418
419
if branch_to.get_parent() is None or remember:
420
branch_to.set_parent(location)
421
422
branch_from = Branch.open(location)
423
424
if revision is None:
425
rev_id = None
426
elif len(revision) == 1:
427
rev_id = revision[0].in_history(branch_from).rev_id
428
else:
429
raise BzrCommandError('bzr pull --revision takes one value.')
430
431
old_rh = branch_to.revision_history()
432
if tree_to is not None:
433
count = tree_to.pull(branch_from, overwrite, rev_id)
434
else:
435
count = branch_to.pull(branch_from, overwrite, rev_id)
436
note('%d revision(s) pulled.' % (count,))
437
438
if verbose:
439
new_rh = branch_to.revision_history()
440
if old_rh != new_rh:
441
# Something changed
442
from bzrlib.log import show_changed_revisions
443
show_changed_revisions(branch_to, old_rh, new_rh)
444
445
446
class cmd_push(Command):
447
"""Update a mirror of this branch.
448
449
The target branch will not have its working tree populated because this
450
is both expensive, and is not supported on remote file systems.
451
452
Some smart servers or protocols *may* put the working tree in place in
453
the future.
454
455
This command only works on branches that have not diverged. Branches are
456
considered diverged if the destination branch's most recent commit is one
457
that has not been merged (directly or indirectly) by the source branch.
458
459
If branches have diverged, you can use 'bzr push --overwrite' to replace
460
the other branch completely, discarding its unmerged changes.
461
462
If you want to ensure you have the different changes in the other branch,
463
do a merge (see bzr help merge) from the other branch, and commit that.
464
After that you will be able to do a push without '--overwrite'.
465
466
If there is no default push location set, the first push will set it.
467
After that, you can omit the location to use the default. To change the
468
default, use --remember.
469
"""
470
takes_options = ['remember', 'overwrite',
471
Option('create-prefix',
472
help='Create the path leading up to the branch '
473
'if it does not already exist')]
474
takes_args = ['location?']
475
476
def run(self, location=None, remember=False, overwrite=False,
477
create_prefix=False, verbose=False):
478
# FIXME: Way too big! Put this into a function called from the
479
# command.
480
from bzrlib.transport import get_transport
481
482
br_from = Branch.open_containing('.')[0]
483
stored_loc = br_from.get_push_location()
484
if location is None:
485
if stored_loc is None:
486
raise BzrCommandError("No push location known or specified.")
487
else:
488
print "Using saved location: %s" % stored_loc
489
location = stored_loc
490
if br_from.get_push_location() is None or remember:
491
br_from.set_push_location(location)
492
try:
493
dir_to = bzrlib.bzrdir.BzrDir.open(location)
494
br_to = dir_to.open_branch()
495
except NotBranchError:
496
# create a branch.
497
transport = get_transport(location).clone('..')
498
if not create_prefix:
499
try:
500
transport.mkdir(transport.relpath(location))
501
except NoSuchFile:
502
raise BzrCommandError("Parent directory of %s "
503
"does not exist." % location)
504
else:
505
current = transport.base
506
needed = [(transport, transport.relpath(location))]
507
while needed:
508
try:
509
transport, relpath = needed[-1]
510
transport.mkdir(relpath)
511
needed.pop()
512
except NoSuchFile:
513
new_transport = transport.clone('..')
514
needed.append((new_transport,
515
new_transport.relpath(transport.base)))
516
if new_transport.base == transport.base:
517
raise BzrCommandError("Could not create "
518
"path prefix.")
519
dir_to = br_from.bzrdir.clone(location)
520
br_to = dir_to.open_branch()
521
old_rh = br_to.revision_history()
522
try:
523
try:
524
tree_to = dir_to.open_workingtree()
525
except errors.NotLocalUrl:
526
# TODO: This should be updated for branches which don't have a
527
# working tree, as opposed to ones where we just couldn't
528
# update the tree.
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
for revision_id in b.repository.get_ancestry(b.last_revision()):
887
print revision_id
888
889
890
class cmd_init(Command):
891
"""Make a directory into a versioned branch.
892
893
Use this to create an empty branch, or before importing an
894
existing project.
895
896
If there is a repository in a parent directory of the location, then
897
the history of the branch will be stored in the repository. Otherwise
898
init creates a standalone branch which carries its own history in
899
.bzr.
900
901
If there is already a branch at the location but it has no working tree,
902
the tree can be populated with 'bzr checkout'.
903
904
Recipe for importing a tree of files:
905
cd ~/project
906
bzr init
907
bzr add .
908
bzr status
909
bzr commit -m 'imported project'
910
"""
911
takes_args = ['location?']
912
takes_options = [
913
Option('format',
914
help='Specify a format for this branch. Current'
915
' formats are: default, knit, metaweave and'
916
' weave. Default is knit; metaweave and'
917
' weave are deprecated',
918
type=get_format_type),
919
]
920
def run(self, location=None, format=None):
921
from bzrlib.branch import Branch
922
if format is None:
923
format = get_format_type('default')
924
if location is None:
925
location = u'.'
926
else:
927
# The path has to exist to initialize a
928
# branch inside of it.
929
# Just using os.mkdir, since I don't
930
# believe that we want to create a bunch of
931
# locations if the user supplies an extended path
932
if not os.path.exists(location):
933
os.mkdir(location)
934
try:
935
existing_bzrdir = bzrdir.BzrDir.open(location)
936
except NotBranchError:
937
# really a NotBzrDir error...
938
bzrdir.BzrDir.create_branch_convenience(location, format=format)
939
else:
940
if existing_bzrdir.has_branch():
941
if existing_bzrdir.has_workingtree():
942
raise errors.AlreadyBranchError(location)
943
else:
944
raise errors.BranchExistsWithoutWorkingTree(location)
945
else:
946
existing_bzrdir.create_branch()
947
existing_bzrdir.create_workingtree()
948
949
950
class cmd_init_repository(Command):
951
"""Create a shared repository to hold branches.
952
953
New branches created under the repository directory will store their revisions
954
in the repository, not in the branch directory, if the branch format supports
955
shared storage.
956
957
example:
958
bzr init-repo repo
959
bzr init repo/trunk
960
bzr checkout --lightweight repo/trunk trunk-checkout
961
cd trunk-checkout
962
(add files here)
963
"""
964
takes_args = ["location"]
965
takes_options = [Option('format',
966
help='Specify a format for this repository.'
967
' Current formats are: default, knit,'
968
' metaweave and weave. Default is knit;'
969
' metaweave and weave are deprecated',
970
type=get_format_type),
971
Option('trees',
972
help='Allows branches in repository to have'
973
' a working tree')]
974
aliases = ["init-repo"]
975
def run(self, location, format=None, trees=False):
976
from bzrlib.transport import get_transport
977
if format is None:
978
format = get_format_type('default')
979
transport = get_transport(location)
980
if not transport.has('.'):
981
transport.mkdir('')
982
newdir = format.initialize_on_transport(transport)
983
repo = newdir.create_repository(shared=True)
984
repo.set_make_working_trees(trees)
985
986
987
class cmd_diff(Command):
988
"""Show differences in working tree.
989
990
If files are listed, only the changes in those files are listed.
991
Otherwise, all changes for the tree are listed.
992
993
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
994
produces patches suitable for "patch -p1".
995
996
examples:
997
bzr diff
998
bzr diff -r1
999
bzr diff -r1..2
1000
bzr diff --diff-prefix old/:new/
1001
bzr diff bzr.mine bzr.dev
1002
bzr diff foo.c
1003
"""
1004
# TODO: Option to use external diff command; could be GNU diff, wdiff,
1005
# or a graphical diff.
1006
1007
# TODO: Python difflib is not exactly the same as unidiff; should
1008
# either fix it up or prefer to use an external diff.
1009
1010
# TODO: Selected-file diff is inefficient and doesn't show you
1011
# deleted files.
1012
1013
# TODO: This probably handles non-Unix newlines poorly.
1014
1015
takes_args = ['file*']
1016
takes_options = ['revision', 'diff-options', 'prefix']
1017
aliases = ['di', 'dif']
1018
1019
@display_command
1020
def run(self, revision=None, file_list=None, diff_options=None,
1021
prefix=None):
1022
from bzrlib.diff import diff_cmd_helper, show_diff_trees
1023
1024
if (prefix is None) or (prefix == '0'):
1025
# diff -p0 format
1026
old_label = ''
1027
new_label = ''
1028
elif prefix == '1':
1029
old_label = 'old/'
1030
new_label = 'new/'
1031
else:
1032
if not ':' in prefix:
1033
raise BzrError("--diff-prefix expects two values separated by a colon")
1034
old_label, new_label = prefix.split(":")
1035
1036
try:
1037
tree1, file_list = internal_tree_files(file_list)
1038
tree2 = None
1039
b = None
1040
b2 = None
1041
except FileInWrongBranch:
1042
if len(file_list) != 2:
1043
raise BzrCommandError("Files are in different branches")
1044
1045
tree1, file1 = WorkingTree.open_containing(file_list[0])
1046
tree2, file2 = WorkingTree.open_containing(file_list[1])
1047
if file1 != "" or file2 != "":
1048
# FIXME diff those two files. rbc 20051123
1049
raise BzrCommandError("Files are in different branches")
1050
file_list = None
1051
if revision is not None:
1052
if tree2 is not None:
1053
raise BzrCommandError("Can't specify -r with two branches")
1054
if (len(revision) == 1) or (revision[1].spec is None):
1055
return diff_cmd_helper(tree1, file_list, diff_options,
1056
revision[0],
1057
old_label=old_label, new_label=new_label)
1058
elif len(revision) == 2:
1059
return diff_cmd_helper(tree1, file_list, diff_options,
1060
revision[0], revision[1],
1061
old_label=old_label, new_label=new_label)
1062
else:
1063
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
1064
else:
1065
if tree2 is not None:
1066
return show_diff_trees(tree1, tree2, sys.stdout,
1067
specific_files=file_list,
1068
external_diff_options=diff_options,
1069
old_label=old_label, new_label=new_label)
1070
else:
1071
return diff_cmd_helper(tree1, file_list, diff_options,
1072
old_label=old_label, new_label=new_label)
1073
1074
1075
class cmd_deleted(Command):
1076
"""List files deleted in the working tree.
1077
"""
1078
# TODO: Show files deleted since a previous revision, or
1079
# between two revisions.
1080
# TODO: Much more efficient way to do this: read in new
1081
# directories with readdir, rather than stating each one. Same
1082
# level of effort but possibly much less IO. (Or possibly not,
1083
# if the directories are very large...)
1084
@display_command
1085
def run(self, show_ids=False):
1086
tree = WorkingTree.open_containing(u'.')[0]
1087
old = tree.basis_tree()
1088
for path, ie in old.inventory.iter_entries():
1089
if not tree.has_id(ie.file_id):
1090
if show_ids:
1091
print '%-50s %s' % (path, ie.file_id)
1092
else:
1093
print path
1094
1095
1096
class cmd_modified(Command):
1097
"""List files modified in working tree."""
1098
hidden = True
1099
@display_command
1100
def run(self):
1101
from bzrlib.delta import compare_trees
1102
1103
tree = WorkingTree.open_containing(u'.')[0]
1104
td = compare_trees(tree.basis_tree(), tree)
1105
1106
for path, id, kind, text_modified, meta_modified in td.modified:
1107
print path
1108
1109
1110
1111
class cmd_added(Command):
1112
"""List files added in working tree."""
1113
hidden = True
1114
@display_command
1115
def run(self):
1116
wt = WorkingTree.open_containing(u'.')[0]
1117
basis_inv = wt.basis_tree().inventory
1118
inv = wt.inventory
1119
for file_id in inv:
1120
if file_id in basis_inv:
1121
continue
1122
path = inv.id2path(file_id)
1123
if not os.access(bzrlib.osutils.abspath(path), os.F_OK):
1124
continue
1125
print path
1126
1127
1128
1129
class cmd_root(Command):
1130
"""Show the tree root directory.
1131
1132
The root is the nearest enclosing directory with a .bzr control
1133
directory."""
1134
takes_args = ['filename?']
1135
@display_command
1136
def run(self, filename=None):
1137
"""Print the branch root."""
1138
tree = WorkingTree.open_containing(filename)[0]
1139
print tree.basedir
1140
1141
1142
class cmd_log(Command):
1143
"""Show log of a branch, file, or directory.
1144
1145
By default show the log of the branch containing the working directory.
1146
1147
To request a range of logs, you can use the command -r begin..end
1148
-r revision requests a specific revision, -r ..end or -r begin.. are
1149
also valid.
1150
1151
examples:
1152
bzr log
1153
bzr log foo.c
1154
bzr log -r -10.. http://server/branch
1155
"""
1156
1157
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1158
1159
takes_args = ['location?']
1160
takes_options = [Option('forward',
1161
help='show from oldest to newest'),
1162
'timezone',
1163
Option('verbose',
1164
help='show files changed in each revision'),
1165
'show-ids', 'revision',
1166
'log-format',
1167
'line', 'long',
1168
Option('message',
1169
help='show revisions whose message matches this regexp',
1170
type=str),
1171
'short',
1172
]
1173
@display_command
1174
def run(self, location=None, timezone='original',
1175
verbose=False,
1176
show_ids=False,
1177
forward=False,
1178
revision=None,
1179
log_format=None,
1180
message=None,
1181
long=False,
1182
short=False,
1183
line=False):
1184
from bzrlib.log import log_formatter, show_log
1185
import codecs
1186
assert message is None or isinstance(message, basestring), \
1187
"invalid message argument %r" % message
1188
direction = (forward and 'forward') or 'reverse'
1189
1190
# log everything
1191
file_id = None
1192
if location:
1193
# find the file id to log:
1194
1195
dir, fp = bzrdir.BzrDir.open_containing(location)
1196
b = dir.open_branch()
1197
if fp != '':
1198
try:
1199
# might be a tree:
1200
inv = dir.open_workingtree().inventory
1201
except (errors.NotBranchError, errors.NotLocalUrl):
1202
# either no tree, or is remote.
1203
inv = b.basis_tree().inventory
1204
file_id = inv.path2id(fp)
1205
else:
1206
# local dir only
1207
# FIXME ? log the current subdir only RBC 20060203
1208
dir, relpath = bzrdir.BzrDir.open_containing('.')
1209
b = dir.open_branch()
1210
1211
if revision is None:
1212
rev1 = None
1213
rev2 = None
1214
elif len(revision) == 1:
1215
rev1 = rev2 = revision[0].in_history(b).revno
1216
elif len(revision) == 2:
1217
if revision[0].spec is None:
1218
# missing begin-range means first revision
1219
rev1 = 1
1220
else:
1221
rev1 = revision[0].in_history(b).revno
1222
1223
if revision[1].spec is None:
1224
# missing end-range means last known revision
1225
rev2 = b.revno()
1226
else:
1227
rev2 = revision[1].in_history(b).revno
1228
else:
1229
raise BzrCommandError('bzr log --revision takes one or two values.')
1230
1231
# By this point, the revision numbers are converted to the +ve
1232
# form if they were supplied in the -ve form, so we can do
1233
# this comparison in relative safety
1234
if rev1 > rev2:
1235
(rev2, rev1) = (rev1, rev2)
1236
1237
mutter('encoding log as %r', bzrlib.user_encoding)
1238
1239
# use 'replace' so that we don't abort if trying to write out
1240
# in e.g. the default C locale.
1241
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
1242
1243
if (log_format == None):
1244
default = bzrlib.config.BranchConfig(b).log_format()
1245
log_format = get_log_format(long=long, short=short, line=line, default=default)
1246
1247
lf = log_formatter(log_format,
1248
show_ids=show_ids,
1249
to_file=outf,
1250
show_timezone=timezone)
1251
1252
show_log(b,
1253
lf,
1254
file_id,
1255
verbose=verbose,
1256
direction=direction,
1257
start_revision=rev1,
1258
end_revision=rev2,
1259
search=message)
1260
1261
1262
def get_log_format(long=False, short=False, line=False, default='long'):
1263
log_format = default
1264
if long:
1265
log_format = 'long'
1266
if short:
1267
log_format = 'short'
1268
if line:
1269
log_format = 'line'
1270
return log_format
1271
1272
1273
class cmd_touching_revisions(Command):
1274
"""Return revision-ids which affected a particular file.
1275
1276
A more user-friendly interface is "bzr log FILE"."""
1277
hidden = True
1278
takes_args = ["filename"]
1279
@display_command
1280
def run(self, filename):
1281
tree, relpath = WorkingTree.open_containing(filename)
1282
b = tree.branch
1283
inv = tree.read_working_inventory()
1284
file_id = inv.path2id(relpath)
1285
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1286
print "%6d %s" % (revno, what)
1287
1288
1289
class cmd_ls(Command):
1290
"""List files in a tree.
1291
"""
1292
# TODO: Take a revision or remote path and list that tree instead.
1293
hidden = True
1294
takes_options = ['verbose', 'revision',
1295
Option('non-recursive',
1296
help='don\'t recurse into sub-directories'),
1297
Option('from-root',
1298
help='Print all paths from the root of the branch.'),
1299
Option('unknown', help='Print unknown files'),
1300
Option('versioned', help='Print versioned files'),
1301
Option('ignored', help='Print ignored files'),
1302
1303
Option('null', help='Null separate the files'),
1304
]
1305
@display_command
1306
def run(self, revision=None, verbose=False,
1307
non_recursive=False, from_root=False,
1308
unknown=False, versioned=False, ignored=False,
1309
null=False):
1310
1311
if verbose and null:
1312
raise BzrCommandError('Cannot set both --verbose and --null')
1313
all = not (unknown or versioned or ignored)
1314
1315
selection = {'I':ignored, '?':unknown, 'V':versioned}
1316
1317
tree, relpath = WorkingTree.open_containing(u'.')
1318
if from_root:
1319
relpath = u''
1320
elif relpath:
1321
relpath += '/'
1322
if revision is not None:
1323
tree = tree.branch.repository.revision_tree(
1324
revision[0].in_history(tree.branch).rev_id)
1325
for fp, fc, kind, fid, entry in tree.list_files():
1326
if fp.startswith(relpath):
1327
fp = fp[len(relpath):]
1328
if non_recursive and '/' in fp:
1329
continue
1330
if not all and not selection[fc]:
1331
continue
1332
if verbose:
1333
kindch = entry.kind_character()
1334
print '%-8s %s%s' % (fc, fp, kindch)
1335
elif null:
1336
sys.stdout.write(fp)
1337
sys.stdout.write('\0')
1338
sys.stdout.flush()
1339
else:
1340
print fp
1341
1342
1343
class cmd_unknowns(Command):
1344
"""List unknown files."""
1345
@display_command
1346
def run(self):
1347
from bzrlib.osutils import quotefn
1348
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1349
print quotefn(f)
1350
1351
1352
class cmd_ignore(Command):
1353
"""Ignore a command or pattern.
1354
1355
To remove patterns from the ignore list, edit the .bzrignore file.
1356
1357
If the pattern contains a slash, it is compared to the whole path
1358
from the branch root. Otherwise, it is compared to only the last
1359
component of the path. To match a file only in the root directory,
1360
prepend './'.
1361
1362
Ignore patterns are case-insensitive on case-insensitive systems.
1363
1364
Note: wildcards must be quoted from the shell on Unix.
1365
1366
examples:
1367
bzr ignore ./Makefile
1368
bzr ignore '*.class'
1369
"""
1370
# TODO: Complain if the filename is absolute
1371
takes_args = ['name_pattern']
1372
1373
def run(self, name_pattern):
1374
from bzrlib.atomicfile import AtomicFile
1375
import os.path
1376
1377
tree, relpath = WorkingTree.open_containing(u'.')
1378
ifn = tree.abspath('.bzrignore')
1379
1380
if os.path.exists(ifn):
1381
f = open(ifn, 'rt')
1382
try:
1383
igns = f.read().decode('utf-8')
1384
finally:
1385
f.close()
1386
else:
1387
igns = ''
1388
1389
# TODO: If the file already uses crlf-style termination, maybe
1390
# we should use that for the newly added lines?
1391
1392
if igns and igns[-1] != '\n':
1393
igns += '\n'
1394
igns += name_pattern + '\n'
1395
1396
try:
1397
f = AtomicFile(ifn, 'wt')
1398
f.write(igns.encode('utf-8'))
1399
f.commit()
1400
finally:
1401
f.close()
1402
1403
inv = tree.inventory
1404
if inv.path2id('.bzrignore'):
1405
mutter('.bzrignore is already versioned')
1406
else:
1407
mutter('need to make new .bzrignore file versioned')
1408
tree.add(['.bzrignore'])
1409
1410
1411
class cmd_ignored(Command):
1412
"""List ignored files and the patterns that matched them.
1413
1414
See also: bzr ignore"""
1415
@display_command
1416
def run(self):
1417
tree = WorkingTree.open_containing(u'.')[0]
1418
for path, file_class, kind, file_id, entry in tree.list_files():
1419
if file_class != 'I':
1420
continue
1421
## XXX: Slightly inefficient since this was already calculated
1422
pat = tree.is_ignored(path)
1423
print '%-50s %s' % (path, pat)
1424
1425
1426
class cmd_lookup_revision(Command):
1427
"""Lookup the revision-id from a revision-number
1428
1429
example:
1430
bzr lookup-revision 33
1431
"""
1432
hidden = True
1433
takes_args = ['revno']
1434
1435
@display_command
1436
def run(self, revno):
1437
try:
1438
revno = int(revno)
1439
except ValueError:
1440
raise BzrCommandError("not a valid revision-number: %r" % revno)
1441
1442
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1443
1444
1445
class cmd_export(Command):
1446
"""Export past revision to destination directory.
1447
1448
If no revision is specified this exports the last committed revision.
1449
1450
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1451
given, try to find the format with the extension. If no extension
1452
is found exports to a directory (equivalent to --format=dir).
1453
1454
Root may be the top directory for tar, tgz and tbz2 formats. If none
1455
is given, the top directory will be the root name of the file.
1456
1457
Note: export of tree with non-ascii filenames to zip is not supported.
1458
1459
Supported formats Autodetected by extension
1460
----------------- -------------------------
1461
dir -
1462
tar .tar
1463
tbz2 .tar.bz2, .tbz2
1464
tgz .tar.gz, .tgz
1465
zip .zip
1466
"""
1467
takes_args = ['dest']
1468
takes_options = ['revision', 'format', 'root']
1469
def run(self, dest, revision=None, format=None, root=None):
1470
import os.path
1471
from bzrlib.export import export
1472
tree = WorkingTree.open_containing(u'.')[0]
1473
b = tree.branch
1474
if revision is None:
1475
# should be tree.last_revision FIXME
1476
rev_id = b.last_revision()
1477
else:
1478
if len(revision) != 1:
1479
raise BzrError('bzr export --revision takes exactly 1 argument')
1480
rev_id = revision[0].in_history(b).rev_id
1481
t = b.repository.revision_tree(rev_id)
1482
try:
1483
export(t, dest, format, root)
1484
except errors.NoSuchExportFormat, e:
1485
raise BzrCommandError('Unsupported export format: %s' % e.format)
1486
1487
1488
class cmd_cat(Command):
1489
"""Write a file's text from a previous revision."""
1490
1491
takes_options = ['revision']
1492
takes_args = ['filename']
1493
1494
@display_command
1495
def run(self, filename, revision=None):
1496
if revision is not None and len(revision) != 1:
1497
raise BzrCommandError("bzr cat --revision takes exactly one number")
1498
tree = None
1499
try:
1500
tree, relpath = WorkingTree.open_containing(filename)
1501
b = tree.branch
1502
except NotBranchError:
1503
pass
1504
1505
if tree is None:
1506
b, relpath = Branch.open_containing(filename)
1507
if revision is None:
1508
revision_id = b.last_revision()
1509
else:
1510
revision_id = revision[0].in_history(b).rev_id
1511
b.print_file(relpath, revision_id)
1512
1513
1514
class cmd_local_time_offset(Command):
1515
"""Show the offset in seconds from GMT to local time."""
1516
hidden = True
1517
@display_command
1518
def run(self):
1519
print bzrlib.osutils.local_time_offset()
1520
1521
1522
1523
class cmd_commit(Command):
1524
"""Commit changes into a new revision.
1525
1526
If no arguments are given, the entire tree is committed.
1527
1528
If selected files are specified, only changes to those files are
1529
committed. If a directory is specified then the directory and everything
1530
within it is committed.
1531
1532
A selected-file commit may fail in some cases where the committed
1533
tree would be invalid, such as trying to commit a file in a
1534
newly-added directory that is not itself committed.
1535
"""
1536
# TODO: Run hooks on tree to-be-committed, and after commit.
1537
1538
# TODO: Strict commit that fails if there are deleted files.
1539
# (what does "deleted files" mean ??)
1540
1541
# TODO: Give better message for -s, --summary, used by tla people
1542
1543
# XXX: verbose currently does nothing
1544
1545
takes_args = ['selected*']
1546
takes_options = ['message', 'verbose',
1547
Option('unchanged',
1548
help='commit even if nothing has changed'),
1549
Option('file', type=str,
1550
argname='msgfile',
1551
help='file containing commit message'),
1552
Option('strict',
1553
help="refuse to commit if there are unknown "
1554
"files in the working tree."),
1555
Option('local',
1556
help="perform a local only commit in a bound "
1557
"branch. Such commits are not pushed to "
1558
"the master branch until a normal commit "
1559
"is performed."
1560
),
1561
]
1562
aliases = ['ci', 'checkin']
1563
1564
def run(self, message=None, file=None, verbose=True, selected_list=None,
1565
unchanged=False, strict=False, local=False):
1566
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1567
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1568
StrictCommitFailed)
1569
from bzrlib.msgeditor import edit_commit_message, \
1570
make_commit_message_template
1571
from tempfile import TemporaryFile
1572
import codecs
1573
1574
# TODO: Need a blackbox test for invoking the external editor; may be
1575
# slightly problematic to run this cross-platform.
1576
1577
# TODO: do more checks that the commit will succeed before
1578
# spending the user's valuable time typing a commit message.
1579
#
1580
# TODO: if the commit *does* happen to fail, then save the commit
1581
# message to a temporary file where it can be recovered
1582
tree, selected_list = tree_files(selected_list)
1583
if selected_list == ['']:
1584
# workaround - commit of root of tree should be exactly the same
1585
# as just default commit in that tree, and succeed even though
1586
# selected-file merge commit is not done yet
1587
selected_list = []
1588
1589
if local and not tree.branch.get_bound_location():
1590
raise errors.LocalRequiresBoundBranch()
1591
if message is None and not file:
1592
template = make_commit_message_template(tree, selected_list)
1593
message = edit_commit_message(template)
1594
if message is None:
1595
raise BzrCommandError("please specify a commit message"
1596
" with either --message or --file")
1597
elif message and file:
1598
raise BzrCommandError("please specify either --message or --file")
1599
1600
if file:
1601
import codecs
1602
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1603
1604
if message == "":
1605
raise BzrCommandError("empty commit message specified")
1606
1607
if verbose:
1608
reporter = ReportCommitToLog()
1609
else:
1610
reporter = NullCommitReporter()
1611
1612
try:
1613
tree.commit(message, specific_files=selected_list,
1614
allow_pointless=unchanged, strict=strict, local=local,
1615
reporter=reporter)
1616
except PointlessCommit:
1617
# FIXME: This should really happen before the file is read in;
1618
# perhaps prepare the commit; get the message; then actually commit
1619
raise BzrCommandError("no changes to commit",
1620
["use --unchanged to commit anyhow"])
1621
except ConflictsInTree:
1622
raise BzrCommandError("Conflicts detected in working tree. "
1623
'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1624
except StrictCommitFailed:
1625
raise BzrCommandError("Commit refused because there are unknown "
1626
"files in the working tree.")
1627
except errors.BoundBranchOutOfDate, e:
1628
raise BzrCommandError(str(e)
1629
+ ' Either unbind, update, or'
1630
' pass --local to commit.')
1631
1632
1633
class cmd_check(Command):
1634
"""Validate consistency of branch history.
1635
1636
This command checks various invariants about the branch storage to
1637
detect data corruption or bzr bugs.
1638
"""
1639
takes_args = ['branch?']
1640
takes_options = ['verbose']
1641
1642
def run(self, branch=None, verbose=False):
1643
from bzrlib.check import check
1644
if branch is None:
1645
tree = WorkingTree.open_containing()[0]
1646
branch = tree.branch
1647
else:
1648
branch = Branch.open(branch)
1649
check(branch, verbose)
1650
1651
1652
class cmd_scan_cache(Command):
1653
hidden = True
1654
def run(self):
1655
from bzrlib.hashcache import HashCache
1656
1657
c = HashCache(u'.')
1658
c.read()
1659
c.scan()
1660
1661
print '%6d stats' % c.stat_count
1662
print '%6d in hashcache' % len(c._cache)
1663
print '%6d files removed from cache' % c.removed_count
1664
print '%6d hashes updated' % c.update_count
1665
print '%6d files changed too recently to cache' % c.danger_count
1666
1667
if c.needs_write:
1668
c.write()
1669
1670
1671
class cmd_upgrade(Command):
1672
"""Upgrade branch storage to current format.
1673
1674
The check command or bzr developers may sometimes advise you to run
1675
this command. When the default format has changed you may also be warned
1676
during other operations to upgrade.
1677
"""
1678
takes_args = ['url?']
1679
takes_options = [
1680
Option('format',
1681
help='Upgrade to a specific format. Current formats'
1682
' are: default, knit, metaweave and weave.'
1683
' Default is knit; metaweave and weave are'
1684
' deprecated',
1685
type=get_format_type),
1686
]
1687
1688
1689
def run(self, url='.', format=None):
1690
from bzrlib.upgrade import upgrade
1691
if format is None:
1692
format = get_format_type('default')
1693
upgrade(url, format)
1694
1695
1696
class cmd_whoami(Command):
1697
"""Show bzr user id."""
1698
takes_options = ['email']
1699
1700
@display_command
1701
def run(self, email=False):
1702
try:
1703
b = WorkingTree.open_containing(u'.')[0].branch
1704
config = bzrlib.config.BranchConfig(b)
1705
except NotBranchError:
1706
config = bzrlib.config.GlobalConfig()
1707
1708
if email:
1709
print config.user_email()
1710
else:
1711
print config.username()
1712
1713
1714
class cmd_nick(Command):
1715
"""Print or set the branch nickname.
1716
1717
If unset, the tree root directory name is used as the nickname
1718
To print the current nickname, execute with no argument.
1719
"""
1720
takes_args = ['nickname?']
1721
def run(self, nickname=None):
1722
branch = Branch.open_containing(u'.')[0]
1723
if nickname is None:
1724
self.printme(branch)
1725
else:
1726
branch.nick = nickname
1727
1728
@display_command
1729
def printme(self, branch):
1730
print branch.nick
1731
1732
1733
class cmd_selftest(Command):
1734
"""Run internal test suite.
1735
1736
This creates temporary test directories in the working directory,
1737
but not existing data is affected. These directories are deleted
1738
if the tests pass, or left behind to help in debugging if they
1739
fail and --keep-output is specified.
1740
1741
If arguments are given, they are regular expressions that say
1742
which tests should run.
1743
1744
If the global option '--no-plugins' is given, plugins are not loaded
1745
before running the selftests. This has two effects: features provided or
1746
modified by plugins will not be tested, and tests provided by plugins will
1747
not be run.
1748
1749
examples:
1750
bzr selftest ignore
1751
bzr --no-plugins selftest -v
1752
"""
1753
# TODO: --list should give a list of all available tests
1754
1755
# NB: this is used from the class without creating an instance, which is
1756
# why it does not have a self parameter.
1757
def get_transport_type(typestring):
1758
"""Parse and return a transport specifier."""
1759
if typestring == "sftp":
1760
from bzrlib.transport.sftp import SFTPAbsoluteServer
1761
return SFTPAbsoluteServer
1762
if typestring == "memory":
1763
from bzrlib.transport.memory import MemoryServer
1764
return MemoryServer
1765
if typestring == "fakenfs":
1766
from bzrlib.transport.fakenfs import FakeNFSServer
1767
return FakeNFSServer
1768
msg = "No known transport type %s. Supported types are: sftp\n" %\
1769
(typestring)
1770
raise BzrCommandError(msg)
1771
1772
hidden = True
1773
takes_args = ['testspecs*']
1774
takes_options = ['verbose',
1775
Option('one', help='stop when one test fails'),
1776
Option('keep-output',
1777
help='keep output directories when tests fail'),
1778
Option('transport',
1779
help='Use a different transport by default '
1780
'throughout the test suite.',
1781
type=get_transport_type),
1782
]
1783
1784
def run(self, testspecs_list=None, verbose=False, one=False,
1785
keep_output=False, transport=None):
1786
import bzrlib.ui
1787
from bzrlib.tests import selftest
1788
# we don't want progress meters from the tests to go to the
1789
# real output; and we don't want log messages cluttering up
1790
# the real logs.
1791
save_ui = bzrlib.ui.ui_factory
1792
bzrlib.trace.info('running tests...')
1793
try:
1794
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1795
if testspecs_list is not None:
1796
pattern = '|'.join(testspecs_list)
1797
else:
1798
pattern = ".*"
1799
result = selftest(verbose=verbose,
1800
pattern=pattern,
1801
stop_on_failure=one,
1802
keep_output=keep_output,
1803
transport=transport)
1804
if result:
1805
bzrlib.trace.info('tests passed')
1806
else:
1807
bzrlib.trace.info('tests failed')
1808
return int(not result)
1809
finally:
1810
bzrlib.ui.ui_factory = save_ui
1811
1812
1813
def _get_bzr_branch():
1814
"""If bzr is run from a branch, return Branch or None"""
1815
import bzrlib.errors
1816
from bzrlib.branch import Branch
1817
from bzrlib.osutils import abspath
1818
from os.path import dirname
1819
1820
try:
1821
branch = Branch.open(dirname(abspath(dirname(__file__))))
1822
return branch
1823
except bzrlib.errors.BzrError:
1824
return None
1825
1826
1827
def show_version():
1828
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1829
# is bzrlib itself in a branch?
1830
branch = _get_bzr_branch()
1831
if branch:
1832
rh = branch.revision_history()
1833
revno = len(rh)
1834
print " bzr checkout, revision %d" % (revno,)
1835
print " nick: %s" % (branch.nick,)
1836
if rh:
1837
print " revid: %s" % (rh[-1],)
1838
print bzrlib.__copyright__
1839
print "http://bazaar-vcs.org/"
1840
print
1841
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
1842
print "you may use, modify and redistribute it under the terms of the GNU"
1843
print "General Public License version 2 or later."
1844
1845
1846
class cmd_version(Command):
1847
"""Show version of bzr."""
1848
@display_command
1849
def run(self):
1850
show_version()
1851
1852
class cmd_rocks(Command):
1853
"""Statement of optimism."""
1854
hidden = True
1855
@display_command
1856
def run(self):
1857
print "it sure does!"
1858
1859
1860
class cmd_find_merge_base(Command):
1861
"""Find and print a base revision for merging two branches.
1862
"""
1863
# TODO: Options to specify revisions on either side, as if
1864
# merging only part of the history.
1865
takes_args = ['branch', 'other']
1866
hidden = True
1867
1868
@display_command
1869
def run(self, branch, other):
1870
from bzrlib.revision import common_ancestor, MultipleRevisionSources
1871
1872
branch1 = Branch.open_containing(branch)[0]
1873
branch2 = Branch.open_containing(other)[0]
1874
1875
history_1 = branch1.revision_history()
1876
history_2 = branch2.revision_history()
1877
1878
last1 = branch1.last_revision()
1879
last2 = branch2.last_revision()
1880
1881
source = MultipleRevisionSources(branch1.repository,
1882
branch2.repository)
1883
1884
base_rev_id = common_ancestor(last1, last2, source)
1885
1886
print 'merge base is revision %s' % base_rev_id
1887
1888
return
1889
1890
if base_revno is None:
1891
raise bzrlib.errors.UnrelatedBranches()
1892
1893
print ' r%-6d in %s' % (base_revno, branch)
1894
1895
other_revno = branch2.revision_id_to_revno(base_revid)
1896
1897
print ' r%-6d in %s' % (other_revno, other)
1898
1899
1900
1901
class cmd_merge(Command):
1902
"""Perform a three-way merge.
1903
1904
The branch is the branch you will merge from. By default, it will
1905
merge the latest revision. If you specify a revision, that
1906
revision will be merged. If you specify two revisions, the first
1907
will be used as a BASE, and the second one as OTHER. Revision
1908
numbers are always relative to the specified branch.
1909
1910
By default, bzr will try to merge in all new work from the other
1911
branch, automatically determining an appropriate base. If this
1912
fails, you may need to give an explicit base.
1913
1914
Merge will do its best to combine the changes in two branches, but there
1915
are some kinds of problems only a human can fix. When it encounters those,
1916
it will mark a conflict. A conflict means that you need to fix something,
1917
before you should commit.
1918
1919
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
1920
1921
If there is no default branch set, the first merge will set it. After
1922
that, you can omit the branch to use the default. To change the
1923
default, use --remember.
1924
1925
Examples:
1926
1927
To merge the latest revision from bzr.dev
1928
bzr merge ../bzr.dev
1929
1930
To merge changes up to and including revision 82 from bzr.dev
1931
bzr merge -r 82 ../bzr.dev
1932
1933
To merge the changes introduced by 82, without previous changes:
1934
bzr merge -r 81..82 ../bzr.dev
1935
1936
merge refuses to run if there are any uncommitted changes, unless
1937
--force is given.
1938
"""
1939
takes_args = ['branch?']
1940
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
1941
Option('show-base', help="Show base revision text in "
1942
"conflicts")]
1943
1944
def run(self, branch=None, revision=None, force=False, merge_type=None,
1945
show_base=False, reprocess=False, remember=False):
1946
if merge_type is None:
1947
merge_type = Merge3Merger
1948
1949
tree = WorkingTree.open_containing(u'.')[0]
1950
stored_loc = tree.branch.get_parent()
1951
if branch is None:
1952
if stored_loc is None:
1953
raise BzrCommandError("No merge branch known or specified.")
1954
else:
1955
print "Using saved branch: %s" % stored_loc
1956
branch = stored_loc
1957
1958
if tree.branch.get_parent() is None or remember:
1959
tree.branch.set_parent(branch)
1960
1961
if revision is None or len(revision) < 1:
1962
base = [None, None]
1963
other = [branch, -1]
1964
other_branch, path = Branch.open_containing(branch)
1965
else:
1966
if len(revision) == 1:
1967
base = [None, None]
1968
other_branch, path = Branch.open_containing(branch)
1969
revno = revision[0].in_history(other_branch).revno
1970
other = [branch, revno]
1971
else:
1972
assert len(revision) == 2
1973
if None in revision:
1974
raise BzrCommandError(
1975
"Merge doesn't permit that revision specifier.")
1976
b, path = Branch.open_containing(branch)
1977
1978
base = [branch, revision[0].in_history(b).revno]
1979
other = [branch, revision[1].in_history(b).revno]
1980
if path != "":
1981
interesting_files = [path]
1982
else:
1983
interesting_files = None
1984
pb = bzrlib.ui.ui_factory.nested_progress_bar()
1985
try:
1986
try:
1987
conflict_count = merge(other, base, check_clean=(not force),
1988
merge_type=merge_type,
1989
reprocess=reprocess,
1990
show_base=show_base,
1991
pb=pb, file_list=interesting_files)
1992
finally:
1993
pb.finished()
1994
if conflict_count != 0:
1995
return 1
1996
else:
1997
return 0
1998
except bzrlib.errors.AmbiguousBase, e:
1999
m = ("sorry, bzr can't determine the right merge base yet\n"
2000
"candidates are:\n "
2001
+ "\n ".join(e.bases)
2002
+ "\n"
2003
"please specify an explicit base with -r,\n"
2004
"and (if you want) report this to the bzr developers\n")
2005
log_error(m)
2006
2007
2008
class cmd_remerge(Command):
2009
"""Redo a merge.
2010
"""
2011
takes_args = ['file*']
2012
takes_options = ['merge-type', 'reprocess',
2013
Option('show-base', help="Show base revision text in "
2014
"conflicts")]
2015
2016
def run(self, file_list=None, merge_type=None, show_base=False,
2017
reprocess=False):
2018
from bzrlib.merge import merge_inner, transform_tree
2019
if merge_type is None:
2020
merge_type = Merge3Merger
2021
tree, file_list = tree_files(file_list)
2022
tree.lock_write()
2023
try:
2024
pending_merges = tree.pending_merges()
2025
if len(pending_merges) != 1:
2026
raise BzrCommandError("Sorry, remerge only works after normal"
2027
+ " merges. Not cherrypicking or"
2028
+ "multi-merges.")
2029
repository = tree.branch.repository
2030
base_revision = common_ancestor(tree.branch.last_revision(),
2031
pending_merges[0], repository)
2032
base_tree = repository.revision_tree(base_revision)
2033
other_tree = repository.revision_tree(pending_merges[0])
2034
interesting_ids = None
2035
if file_list is not None:
2036
interesting_ids = set()
2037
for filename in file_list:
2038
file_id = tree.path2id(filename)
2039
if file_id is None:
2040
raise NotVersionedError(filename)
2041
interesting_ids.add(file_id)
2042
if tree.kind(file_id) != "directory":
2043
continue
2044
2045
for name, ie in tree.inventory.iter_entries(file_id):
2046
interesting_ids.add(ie.file_id)
2047
transform_tree(tree, tree.basis_tree(), interesting_ids)
2048
if file_list is None:
2049
restore_files = list(tree.iter_conflicts())
2050
else:
2051
restore_files = file_list
2052
for filename in restore_files:
2053
try:
2054
restore(tree.abspath(filename))
2055
except NotConflicted:
2056
pass
2057
conflicts = merge_inner(tree.branch, other_tree, base_tree,
2058
this_tree=tree,
2059
interesting_ids = interesting_ids,
2060
other_rev_id=pending_merges[0],
2061
merge_type=merge_type,
2062
show_base=show_base,
2063
reprocess=reprocess)
2064
finally:
2065
tree.unlock()
2066
if conflicts > 0:
2067
return 1
2068
else:
2069
return 0
2070
2071
class cmd_revert(Command):
2072
"""Reverse all changes since the last commit.
2073
2074
Only versioned files are affected. Specify filenames to revert only
2075
those files. By default, any files that are changed will be backed up
2076
first. Backup files have a '~' appended to their name.
2077
"""
2078
takes_options = ['revision', 'no-backup']
2079
takes_args = ['file*']
2080
aliases = ['merge-revert']
2081
2082
def run(self, revision=None, no_backup=False, file_list=None):
2083
from bzrlib.commands import parse_spec
2084
if file_list is not None:
2085
if len(file_list) == 0:
2086
raise BzrCommandError("No files specified")
2087
else:
2088
file_list = []
2089
2090
tree, file_list = tree_files(file_list)
2091
if revision is None:
2092
# FIXME should be tree.last_revision
2093
rev_id = tree.last_revision()
2094
elif len(revision) != 1:
2095
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
2096
else:
2097
rev_id = revision[0].in_history(tree.branch).rev_id
2098
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2099
try:
2100
tree.revert(file_list,
2101
tree.branch.repository.revision_tree(rev_id),
2102
not no_backup, pb)
2103
finally:
2104
pb.finished()
2105
2106
2107
class cmd_assert_fail(Command):
2108
"""Test reporting of assertion failures"""
2109
hidden = True
2110
def run(self):
2111
assert False, "always fails"
2112
2113
2114
class cmd_help(Command):
2115
"""Show help on a command or other topic.
2116
2117
For a list of all available commands, say 'bzr help commands'."""
2118
takes_options = [Option('long', 'show help on all commands')]
2119
takes_args = ['topic?']
2120
aliases = ['?', '--help', '-?', '-h']
2121
2122
@display_command
2123
def run(self, topic=None, long=False):
2124
import help
2125
if topic is None and long:
2126
topic = "commands"
2127
help.help(topic)
2128
2129
2130
class cmd_shell_complete(Command):
2131
"""Show appropriate completions for context.
2132
2133
For a list of all available commands, say 'bzr shell-complete'."""
2134
takes_args = ['context?']
2135
aliases = ['s-c']
2136
hidden = True
2137
2138
@display_command
2139
def run(self, context=None):
2140
import shellcomplete
2141
shellcomplete.shellcomplete(context)
2142
2143
2144
class cmd_fetch(Command):
2145
"""Copy in history from another branch but don't merge it.
2146
2147
This is an internal method used for pull and merge."""
2148
hidden = True
2149
takes_args = ['from_branch', 'to_branch']
2150
def run(self, from_branch, to_branch):
2151
from bzrlib.fetch import Fetcher
2152
from bzrlib.branch import Branch
2153
from_b = Branch.open(from_branch)
2154
to_b = Branch.open(to_branch)
2155
Fetcher(to_b, from_b)
2156
2157
2158
class cmd_missing(Command):
2159
"""Show unmerged/unpulled revisions between two branches.
2160
2161
OTHER_BRANCH may be local or remote."""
2162
takes_args = ['other_branch?']
2163
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2164
Option('mine-only',
2165
'Display changes in the local branch only'),
2166
Option('theirs-only',
2167
'Display changes in the remote branch only'),
2168
'log-format',
2169
'line',
2170
'long',
2171
'short',
2172
'show-ids',
2173
'verbose'
2174
]
2175
2176
def run(self, other_branch=None, reverse=False, mine_only=False,
2177
theirs_only=False, log_format=None, long=False, short=False, line=False,
2178
show_ids=False, verbose=False):
2179
from bzrlib.missing import find_unmerged, iter_log_data
2180
from bzrlib.log import log_formatter
2181
local_branch = bzrlib.branch.Branch.open_containing(u".")[0]
2182
parent = local_branch.get_parent()
2183
if other_branch is None:
2184
other_branch = parent
2185
if other_branch is None:
2186
raise BzrCommandError("No missing location known or specified.")
2187
print "Using last location: " + local_branch.get_parent()
2188
remote_branch = bzrlib.branch.Branch.open(other_branch)
2189
if remote_branch.base == local_branch.base:
2190
remote_branch = local_branch
2191
local_branch.lock_read()
2192
try:
2193
remote_branch.lock_read()
2194
try:
2195
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2196
if (log_format == None):
2197
default = bzrlib.config.BranchConfig(local_branch).log_format()
2198
log_format = get_log_format(long=long, short=short, line=line, default=default)
2199
lf = log_formatter(log_format, sys.stdout,
2200
show_ids=show_ids,
2201
show_timezone='original')
2202
if reverse is False:
2203
local_extra.reverse()
2204
remote_extra.reverse()
2205
if local_extra and not theirs_only:
2206
print "You have %d extra revision(s):" % len(local_extra)
2207
for data in iter_log_data(local_extra, local_branch.repository,
2208
verbose):
2209
lf.show(*data)
2210
printed_local = True
2211
else:
2212
printed_local = False
2213
if remote_extra and not mine_only:
2214
if printed_local is True:
2215
print "\n\n"
2216
print "You are missing %d revision(s):" % len(remote_extra)
2217
for data in iter_log_data(remote_extra, remote_branch.repository,
2218
verbose):
2219
lf.show(*data)
2220
if not remote_extra and not local_extra:
2221
status_code = 0
2222
print "Branches are up to date."
2223
else:
2224
status_code = 1
2225
finally:
2226
remote_branch.unlock()
2227
finally:
2228
local_branch.unlock()
2229
if not status_code and parent is None and other_branch is not None:
2230
local_branch.lock_write()
2231
try:
2232
# handle race conditions - a parent might be set while we run.
2233
if local_branch.get_parent() is None:
2234
local_branch.set_parent(other_branch)
2235
finally:
2236
local_branch.unlock()
2237
return status_code
2238
2239
2240
class cmd_plugins(Command):
2241
"""List plugins"""
2242
hidden = True
2243
@display_command
2244
def run(self):
2245
import bzrlib.plugin
2246
from inspect import getdoc
2247
for name, plugin in bzrlib.plugin.all_plugins().items():
2248
if hasattr(plugin, '__path__'):
2249
print plugin.__path__[0]
2250
elif hasattr(plugin, '__file__'):
2251
print plugin.__file__
2252
else:
2253
print `plugin`
2254
2255
d = getdoc(plugin)
2256
if d:
2257
print '\t', d.split('\n')[0]
2258
2259
2260
class cmd_testament(Command):
2261
"""Show testament (signing-form) of a revision."""
2262
takes_options = ['revision', 'long']
2263
takes_args = ['branch?']
2264
@display_command
2265
def run(self, branch=u'.', revision=None, long=False):
2266
from bzrlib.testament import Testament
2267
b = WorkingTree.open_containing(branch)[0].branch
2268
b.lock_read()
2269
try:
2270
if revision is None:
2271
rev_id = b.last_revision()
2272
else:
2273
rev_id = revision[0].in_history(b).rev_id
2274
t = Testament.from_revision(b.repository, rev_id)
2275
if long:
2276
sys.stdout.writelines(t.as_text_lines())
2277
else:
2278
sys.stdout.write(t.as_short_text())
2279
finally:
2280
b.unlock()
2281
2282
2283
class cmd_annotate(Command):
2284
"""Show the origin of each line in a file.
2285
2286
This prints out the given file with an annotation on the left side
2287
indicating which revision, author and date introduced the change.
2288
2289
If the origin is the same for a run of consecutive lines, it is
2290
shown only at the top, unless the --all option is given.
2291
"""
2292
# TODO: annotate directories; showing when each file was last changed
2293
# TODO: if the working copy is modified, show annotations on that
2294
# with new uncommitted lines marked
2295
aliases = ['blame', 'praise']
2296
takes_args = ['filename']
2297
takes_options = [Option('all', help='show annotations on all lines'),
2298
Option('long', help='show date in annotations'),
2299
'revision'
2300
]
2301
2302
@display_command
2303
def run(self, filename, all=False, long=False, revision=None):
2304
from bzrlib.annotate import annotate_file
2305
tree, relpath = WorkingTree.open_containing(filename)
2306
branch = tree.branch
2307
branch.lock_read()
2308
try:
2309
if revision is None:
2310
revision_id = branch.last_revision()
2311
elif len(revision) != 1:
2312
raise BzrCommandError('bzr annotate --revision takes exactly 1 argument')
2313
else:
2314
revision_id = revision[0].in_history(branch).rev_id
2315
file_id = tree.inventory.path2id(relpath)
2316
tree = branch.repository.revision_tree(revision_id)
2317
file_version = tree.inventory[file_id].revision
2318
annotate_file(branch, file_version, file_id, long, all, sys.stdout)
2319
finally:
2320
branch.unlock()
2321
2322
2323
class cmd_re_sign(Command):
2324
"""Create a digital signature for an existing revision."""
2325
# TODO be able to replace existing ones.
2326
2327
hidden = True # is this right ?
2328
takes_args = ['revision_id*']
2329
takes_options = ['revision']
2330
2331
def run(self, revision_id_list=None, revision=None):
2332
import bzrlib.config as config
2333
import bzrlib.gpg as gpg
2334
if revision_id_list is not None and revision is not None:
2335
raise BzrCommandError('You can only supply one of revision_id or --revision')
2336
if revision_id_list is None and revision is None:
2337
raise BzrCommandError('You must supply either --revision or a revision_id')
2338
b = WorkingTree.open_containing(u'.')[0].branch
2339
gpg_strategy = gpg.GPGStrategy(config.BranchConfig(b))
2340
if revision_id_list is not None:
2341
for revision_id in revision_id_list:
2342
b.repository.sign_revision(revision_id, gpg_strategy)
2343
elif revision is not None:
2344
if len(revision) == 1:
2345
revno, rev_id = revision[0].in_history(b)
2346
b.repository.sign_revision(rev_id, gpg_strategy)
2347
elif len(revision) == 2:
2348
# are they both on rh- if so we can walk between them
2349
# might be nice to have a range helper for arbitrary
2350
# revision paths. hmm.
2351
from_revno, from_revid = revision[0].in_history(b)
2352
to_revno, to_revid = revision[1].in_history(b)
2353
if to_revid is None:
2354
to_revno = b.revno()
2355
if from_revno is None or to_revno is None:
2356
raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
2357
for revno in range(from_revno, to_revno + 1):
2358
b.repository.sign_revision(b.get_rev_id(revno),
2359
gpg_strategy)
2360
else:
2361
raise BzrCommandError('Please supply either one revision, or a range.')
2362
2363
2364
class cmd_bind(Command):
2365
"""Bind the current branch to a master branch.
2366
2367
After binding, commits must succeed on the master branch
2368
before they are executed on the local one.
2369
"""
2370
2371
takes_args = ['location']
2372
takes_options = []
2373
2374
def run(self, location=None):
2375
b, relpath = Branch.open_containing(u'.')
2376
b_other = Branch.open(location)
2377
try:
2378
b.bind(b_other)
2379
except DivergedBranches:
2380
raise BzrCommandError('These branches have diverged.'
2381
' Try merging, and then bind again.')
2382
2383
2384
class cmd_unbind(Command):
2385
"""Unbind the current branch from its master branch.
2386
2387
After unbinding, the local branch is considered independent.
2388
All subsequent commits will be local.
2389
"""
2390
2391
takes_args = []
2392
takes_options = []
2393
2394
def run(self):
2395
b, relpath = Branch.open_containing(u'.')
2396
if not b.unbind():
2397
raise BzrCommandError('Local branch is not bound')
2398
2399
2400
class cmd_uncommit(bzrlib.commands.Command):
2401
"""Remove the last committed revision.
2402
2403
--verbose will print out what is being removed.
2404
--dry-run will go through all the motions, but not actually
2405
remove anything.
2406
2407
In the future, uncommit will create a changeset, which can then
2408
be re-applied.
2409
"""
2410
2411
# TODO: jam 20060108 Add an option to allow uncommit to remove
2412
# unreferenced information in 'branch-as-repostory' branches.
2413
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2414
# information in shared branches as well.
2415
takes_options = ['verbose', 'revision',
2416
Option('dry-run', help='Don\'t actually make changes'),
2417
Option('force', help='Say yes to all questions.')]
2418
takes_args = ['location?']
2419
aliases = []
2420
2421
def run(self, location=None,
2422
dry_run=False, verbose=False,
2423
revision=None, force=False):
2424
from bzrlib.branch import Branch
2425
from bzrlib.log import log_formatter
2426
import sys
2427
from bzrlib.uncommit import uncommit
2428
2429
if location is None:
2430
location = u'.'
2431
control, relpath = bzrdir.BzrDir.open_containing(location)
2432
try:
2433
tree = control.open_workingtree()
2434
b = tree.branch
2435
except (errors.NoWorkingTree, errors.NotLocalUrl):
2436
tree = None
2437
b = control.open_branch()
2438
2439
if revision is None:
2440
revno = b.revno()
2441
rev_id = b.last_revision()
2442
else:
2443
revno, rev_id = revision[0].in_history(b)
2444
if rev_id is None:
2445
print 'No revisions to uncommit.'
2446
2447
for r in range(revno, b.revno()+1):
2448
rev_id = b.get_rev_id(r)
2449
lf = log_formatter('short', to_file=sys.stdout,show_timezone='original')
2450
lf.show(r, b.repository.get_revision(rev_id), None)
2451
2452
if dry_run:
2453
print 'Dry-run, pretending to remove the above revisions.'
2454
if not force:
2455
val = raw_input('Press <enter> to continue')
2456
else:
2457
print 'The above revision(s) will be removed.'
2458
if not force:
2459
val = raw_input('Are you sure [y/N]? ')
2460
if val.lower() not in ('y', 'yes'):
2461
print 'Canceled'
2462
return 0
2463
2464
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
2465
revno=revno)
2466
2467
2468
class cmd_break_lock(Command):
2469
"""Break a dead lock on a repository, branch or working directory.
2470
2471
CAUTION: Locks should only be broken when you are sure that the process
2472
holding the lock has been stopped.
2473
2474
You can get information on what locks are open via the 'bzr info' command.
2475
2476
example:
2477
bzr break-lock
2478
"""
2479
takes_args = ['location?']
2480
2481
def run(self, location=None, show=False):
2482
if location is None:
2483
location = u'.'
2484
control, relpath = bzrdir.BzrDir.open_containing(location)
2485
try:
2486
control.break_lock()
2487
except NotImplementedError:
2488
pass
2489
2490
2491
2492
# command-line interpretation helper for merge-related commands
2493
def merge(other_revision, base_revision,
2494
check_clean=True, ignore_zero=False,
2495
this_dir=None, backup_files=False, merge_type=Merge3Merger,
2496
file_list=None, show_base=False, reprocess=False,
2497
pb=DummyProgress()):
2498
"""Merge changes into a tree.
2499
2500
base_revision
2501
list(path, revno) Base for three-way merge.
2502
If [None, None] then a base will be automatically determined.
2503
other_revision
2504
list(path, revno) Other revision for three-way merge.
2505
this_dir
2506
Directory to merge changes into; '.' by default.
2507
check_clean
2508
If true, this_dir must have no uncommitted changes before the
2509
merge begins.
2510
ignore_zero - If true, suppress the "zero conflicts" message when
2511
there are no conflicts; should be set when doing something we expect
2512
to complete perfectly.
2513
file_list - If supplied, merge only changes to selected files.
2514
2515
All available ancestors of other_revision and base_revision are
2516
automatically pulled into the branch.
2517
2518
The revno may be -1 to indicate the last revision on the branch, which is
2519
the typical case.
2520
2521
This function is intended for use from the command line; programmatic
2522
clients might prefer to call merge.merge_inner(), which has less magic
2523
behavior.
2524
"""
2525
from bzrlib.merge import Merger
2526
if this_dir is None:
2527
this_dir = u'.'
2528
this_tree = WorkingTree.open_containing(this_dir)[0]
2529
if show_base and not merge_type is Merge3Merger:
2530
raise BzrCommandError("Show-base is not supported for this merge"
2531
" type. %s" % merge_type)
2532
if reprocess and not merge_type.supports_reprocess:
2533
raise BzrCommandError("Conflict reduction is not supported for merge"
2534
" type %s." % merge_type)
2535
if reprocess and show_base:
2536
raise BzrCommandError("Cannot do conflict reduction and show base.")
2537
try:
2538
merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
2539
merger.pp = ProgressPhase("Merge phase", 5, pb)
2540
merger.pp.next_phase()
2541
merger.check_basis(check_clean)
2542
merger.set_other(other_revision)
2543
merger.pp.next_phase()
2544
merger.set_base(base_revision)
2545
if merger.base_rev_id == merger.other_rev_id:
2546
note('Nothing to do.')
2547
return 0
2548
merger.backup_files = backup_files
2549
merger.merge_type = merge_type
2550
merger.set_interesting_files(file_list)
2551
merger.show_base = show_base
2552
merger.reprocess = reprocess
2553
conflicts = merger.do_merge()
2554
if file_list is None:
2555
merger.set_pending()
2556
finally:
2557
pb.clear()
2558
return conflicts
2559
2560
2561
# these get imported and then picked up by the scan for cmd_*
2562
# TODO: Some more consistent way to split command definitions across files;
2563
# we do need to load at least some information about them to know of
2564
# aliases. ideally we would avoid loading the implementation until the
2565
# details were needed.
2566
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2567
from bzrlib.sign_my_commits import cmd_sign_my_commits
2568
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
2569
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0