« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 3692.1.6
- compare with another revision
- download diff
- download tarball
- view history from revision 3692.1.6
- Committer: Andrew Bennetts
- Date: 2008-09-05 10:48:03 UTC
- mto: This revision was merged to the branch mainline in revision 3693.
- Revision ID: andrew.bennetts@canonical.com-20080905104803-6g72dz6wcldosfs2
Remove monkey-patching of branch._ensure_real from test_remote.py.
- files added:
- COPYING.txt
- bzrlib/benchmarks/tree_creator
- bzrlib/help_topics
- bzrlib/help_topics/en
- bzrlib/repofmt
- bzrlib/smart
- bzrlib/tests/commands
- bzrlib/tests/intertree_implementations
- bzrlib/tests/inventory_implementations
- bzrlib/tests/per_lock
- bzrlib/tests/per_repository_reference
- bzrlib/tests/tree_implementations
- bzrlib/transport/ftp
- bzrlib/util/tests
- bzrlib/version_info_formats
- doc/developers
- doc/en
- doc/en/admin-guide
- doc/en/developer-guide
- doc/en/mini-tutorial
- doc/en/quick-reference
- doc/en/release-notes
- doc/en/tutorials
- doc/en/user-guide
- doc/en/user-guide/images
- doc/en/user-reference
- doc/es
- doc/es/guia-desarrollador
- doc/es/guia-usuario
- doc/es/mini-tutorial
- doc/es/notas-version
- doc/es/referencia
- doc/es/referencia-rapida
- man1
- tools/packaging
- tools/win32
- files removed:
- NEWS.developers
- bzrlib/bundle/old
- bzrlib/tests/interversionedfile_implementations
- bzrlib/tests/revisionstore_implementations
- bzrlib/util/urlgrabber
- files renamed:
- bzrlib/patiencediff.py => bzrlib/_patiencediff_py.py
- bzrlib/bundle/read_bundle.py => bzrlib/bundle/bundle_data.py
- bzrlib/bundle/serializer/v07.py => bzrlib/bundle/serializer/v08.py
- bzrlib/graph.py => bzrlib/deprecated_graph.py
- doc/configuration.txt => bzrlib/help_topics/en/configuration.txt
- bzrlib/tests/HTTPTestUtil.py => bzrlib/tests/http_utils.py
- bzrlib/tests/test_revprops.py => bzrlib/tests/repository_implementations/test_revision.py
- bzrlib/tests/test_command.py => bzrlib/tests/test_commands.py
- bzrlib/tests/test_graph.py => bzrlib/tests/test_deprecated_graph.py
- bzrlib/tests/test_revisionnamespaces.py => bzrlib/tests/test_revisionspec.py
- bzrlib/transport/ftp.py => bzrlib/transport/ftp/__init__.py
- bzrlib/win32console.py => bzrlib/win32utils.py
- bzrlib/xml5.py => bzrlib/xml8.py
- HACKING => doc/developers/HACKING.txt
- doc/tutorial.txt => doc/en/tutorials/tutorial.txt
- doc/plugins.txt => doc/en/user-guide/plugins.txt
- doc/setting_up_email.txt => doc/en/user-guide/setting_up_email.txt
- doc/specifying_revisions.txt => doc/en/user-guide/specifying_revisions.txt
- doc/using_aliases.txt => doc/en/user-guide/using_aliases.txt
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2004, 2005, 2006 by Canonical Ltd
2
1
# Copyright (C) 2004, 2005, 2006, 2007, 2008 Canonical Ltd
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
16
17
17
"""builtin bzr commands"""
18
18
19
import os
20
from StringIO import StringIO
19
21
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
20
24
import codecs
21
import errno
22
import os
23
from shutil import rmtree
24
25
import sys
26
import time
25
27
26
28
import bzrlib
27
import bzrlib.branch
29
from bzrlib import (
30
bugtracker,
31
bundle,
32
bzrdir,
33
delta,
34
config,
35
errors,
36
globbing,
37
ignores,
38
log,
39
merge as _mod_merge,
40
merge_directive,
41
osutils,
42
reconfigure,
43
revision as _mod_revision,
44
symbol_versioning,
45
transport,
46
tree as _mod_tree,
47
ui,
48
urlutils,
49
)
28
50
from bzrlib.branch import Branch
29
import bzrlib.bzrdir as bzrdir
30
from bzrlib.bundle.read_bundle import BundleReader
31
from bzrlib.bundle.apply_bundle import merge_bundle
32
from bzrlib.commands import Command, display_command
33
import bzrlib.errors as errors
34
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError,
35
NotBranchError, DivergedBranches, NotConflicted,
36
NoSuchFile, NoWorkingTree, FileInWrongBranch,
37
NotVersionedError, NotABundle)
38
from bzrlib.log import show_one_log
39
from bzrlib.merge import Merge3Merger
40
from bzrlib.option import Option
41
import bzrlib.osutils
42
from bzrlib.progress import DummyProgress, ProgressPhase
43
from bzrlib.revision import common_ancestor
51
from bzrlib.conflicts import ConflictList
44
52
from bzrlib.revisionspec import RevisionSpec
45
import bzrlib.trace
46
from bzrlib.trace import mutter, note, log_error, warning, is_quiet
47
from bzrlib.transport.local import LocalTransport
48
import bzrlib.ui
49
import bzrlib.urlutils as urlutils
53
from bzrlib.smtp_connection import SMTPConnection
50
54
from bzrlib.workingtree import WorkingTree
55
""")
56
57
from bzrlib.commands import Command, display_command
58
from bzrlib.option import ListOption, Option, RegistryOption, custom_help
59
from bzrlib.trace import mutter, note, warning, is_quiet, info
51
60
52
61
53
62
def tree_files(file_list, default_branch=u'.'):
54
63
try:
55
64
return internal_tree_files(file_list, default_branch)
56
except FileInWrongBranch, e:
57
raise BzrCommandError("%s is not in the same branch as %s" %
58
(e.path, file_list[0]))
65
except errors.FileInWrongBranch, e:
66
raise errors.BzrCommandError("%s is not in the same branch as %s" %
67
(e.path, file_list[0]))
59
68
60
69
61
70
# XXX: Bad function name; should possibly also be a class method of
70
79
71
80
:param file_list: Filenames to convert.
72
81
73
:param default_branch: Fallback tree path to use if file_list is empty or None.
82
:param default_branch: Fallback tree path to use if file_list is empty or
83
None.
74
84
75
85
:return: workingtree, [relative_paths]
76
86
"""
77
87
if file_list is None or len(file_list) == 0:
78
88
return WorkingTree.open_containing(default_branch)[0], file_list
79
tree = WorkingTree.open_containing(file_list[0])[0]
89
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
90
return tree, safe_relpath_files(tree, file_list)
91
92
93
def safe_relpath_files(tree, file_list):
94
"""Convert file_list into a list of relpaths in tree.
95
96
:param tree: A tree to operate on.
97
:param file_list: A list of user provided paths or None.
98
:return: A list of relative paths.
99
:raises errors.PathNotChild: When a provided path is in a different tree
100
than tree.
101
"""
102
if file_list is None:
103
return None
80
104
new_list = []
81
105
for filename in file_list:
82
106
try:
83
new_list.append(tree.relpath(filename))
107
new_list.append(tree.relpath(osutils.dereference_path(filename)))
84
108
except errors.PathNotChild:
85
raise FileInWrongBranch(tree.branch, filename)
86
return tree, new_list
87
88
89
def get_format_type(typestring):
90
"""Parse and return a format specifier."""
91
if typestring == "weave":
92
return bzrdir.BzrDirFormat6()
93
if typestring == "default":
94
return bzrdir.BzrDirMetaFormat1()
95
if typestring == "metaweave":
96
format = bzrdir.BzrDirMetaFormat1()
97
format.repository_format = bzrlib.repository.RepositoryFormat7()
98
return format
99
if typestring == "knit":
100
format = bzrdir.BzrDirMetaFormat1()
101
format.repository_format = bzrlib.repository.RepositoryFormatKnit1()
102
return format
103
msg = "Unknown bzr format %s. Current formats are: default, knit,\n" \
104
"metaweave and weave" % typestring
105
raise BzrCommandError(msg)
109
raise errors.FileInWrongBranch(tree.branch, filename)
110
return new_list
106
111
107
112
108
113
# TODO: Make sure no commands unconditionally use the working directory as a
132
137
modified
133
138
Text has changed since the previous revision.
134
139
135
unchanged
136
Nothing about this file has changed since the previous revision.
137
Only shown with --all.
140
kind changed
141
File kind has been changed (e.g. from file to directory).
138
142
139
143
unknown
140
144
Not versioned and not matching an ignore pattern.
141
145
142
To see ignored files use 'bzr ignored'. For details in the
146
To see ignored files use 'bzr ignored'. For details on the
143
147
changes to file texts, use 'bzr diff'.
148
149
Note that --short or -S gives status flags for each item, similar
150
to Subversion's status command. To get output similar to svn -q,
151
use bzr status -SV.
144
152
145
153
If no arguments are specified, the status of the entire working
146
154
directory is shown. Otherwise, only the status of the specified
154
162
# TODO: --no-recurse, --recurse options
155
163
156
164
takes_args = ['file*']
157
takes_options = ['all', 'show-ids', 'revision']
165
takes_options = ['show-ids', 'revision', 'change',
166
Option('short', help='Use short status indicators.',
167
short_name='S'),
168
Option('versioned', help='Only show versioned files.',
169
short_name='V'),
170
Option('no-pending', help='Don\'t show pending merges.',
171
),
172
]
158
173
aliases = ['st', 'stat']
159
174
160
175
encoding_type = 'replace'
176
_see_also = ['diff', 'revert', 'status-flags']
161
177
162
178
@display_command
163
def run(self, all=False, show_ids=False, file_list=None, revision=None):
179
def run(self, show_ids=False, file_list=None, revision=None, short=False,
180
versioned=False, no_pending=False):
164
181
from bzrlib.status import show_tree_status
165
182
166
tree, file_list = tree_files(file_list)
167
168
show_tree_status(tree, show_unchanged=all, show_ids=show_ids,
169
specific_files=file_list, revision=revision,
170
to_file=self.outf)
183
if revision and len(revision) > 2:
184
raise errors.BzrCommandError('bzr status --revision takes exactly'
185
' one or two revision specifiers')
186
187
tree, relfile_list = tree_files(file_list)
188
# Avoid asking for specific files when that is not needed.
189
if relfile_list == ['']:
190
relfile_list = None
191
# Don't disable pending merges for full trees other than '.'.
192
if file_list == ['.']:
193
no_pending = True
194
# A specific path within a tree was given.
195
elif relfile_list is not None:
196
no_pending = True
197
show_tree_status(tree, show_ids=show_ids,
198
specific_files=relfile_list, revision=revision,
199
to_file=self.outf, short=short, versioned=versioned,
200
show_pending=(not no_pending))
171
201
172
202
173
203
class cmd_cat_revision(Command):
185
215
186
216
@display_command
187
217
def run(self, revision_id=None, revision=None):
188
189
218
if revision_id is not None and revision is not None:
190
raise BzrCommandError('You can only supply one of revision_id or --revision')
219
raise errors.BzrCommandError('You can only supply one of'
220
' revision_id or --revision')
191
221
if revision_id is None and revision is None:
192
raise BzrCommandError('You must supply either --revision or a revision_id')
222
raise errors.BzrCommandError('You must supply either'
223
' --revision or a revision_id')
193
224
b = WorkingTree.open_containing(u'.')[0].branch
194
225
195
226
# TODO: jam 20060112 should cat-revision always output utf-8?
196
227
if revision_id is not None:
197
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
228
revision_id = osutils.safe_revision_id(revision_id, warn=False)
229
try:
230
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
231
except errors.NoSuchRevision:
232
msg = "The repository %s contains no revision %s." % (b.repository.base,
233
revision_id)
234
raise errors.BzrCommandError(msg)
198
235
elif revision is not None:
199
236
for rev in revision:
200
237
if rev is None:
201
raise BzrCommandError('You cannot specify a NULL revision.')
202
revno, rev_id = rev.in_history(b)
238
raise errors.BzrCommandError('You cannot specify a NULL'
239
' revision.')
240
rev_id = rev.as_revision_id(b)
203
241
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
204
242
205
243
244
class cmd_remove_tree(Command):
245
"""Remove the working tree from a given branch/checkout.
246
247
Since a lightweight checkout is little more than a working tree
248
this will refuse to run against one.
249
250
To re-create the working tree, use "bzr checkout".
251
"""
252
_see_also = ['checkout', 'working-trees']
253
254
takes_args = ['location?']
255
256
def run(self, location='.'):
257
d = bzrdir.BzrDir.open(location)
258
259
try:
260
working = d.open_workingtree()
261
except errors.NoWorkingTree:
262
raise errors.BzrCommandError("No working tree to remove")
263
except errors.NotLocalUrl:
264
raise errors.BzrCommandError("You cannot remove the working tree of a "
265
"remote path")
266
267
working_path = working.bzrdir.root_transport.base
268
branch_path = working.branch.bzrdir.root_transport.base
269
if working_path != branch_path:
270
raise errors.BzrCommandError("You cannot remove the working tree from "
271
"a lightweight checkout")
272
273
d.destroy_workingtree()
274
275
206
276
class cmd_revno(Command):
207
277
"""Show current revision number.
208
278
209
279
This is equal to the number of revisions on this branch.
210
280
"""
211
281
282
_see_also = ['info']
212
283
takes_args = ['location?']
213
284
214
285
@display_command
232
303
revs.extend(revision)
233
304
if revision_info_list is not None:
234
305
for rev in revision_info_list:
235
revs.append(RevisionSpec(rev))
306
revs.append(RevisionSpec.from_string(rev))
307
308
b = Branch.open_containing(u'.')[0]
309
236
310
if len(revs) == 0:
237
raise BzrCommandError('You must supply a revision identifier')
238
239
b = WorkingTree.open_containing(u'.')[0].branch
311
revs.append(RevisionSpec.from_string('-1'))
240
312
241
313
for rev in revs:
242
revinfo = rev.in_history(b)
243
if revinfo.revno is None:
244
print ' %s' % revinfo.rev_id
245
else:
246
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
314
revision_id = rev.as_revision_id(b)
315
try:
316
revno = '%4d' % (b.revision_id_to_revno(revision_id))
317
except errors.NoSuchRevision:
318
dotted_map = b.get_revision_id_to_revno_map()
319
revno = '.'.join(str(i) for i in dotted_map[revision_id])
320
print '%s %s' % (revno, revision_id)
247
321
248
322
249
323
class cmd_add(Command):
271
345
272
346
--dry-run will show which files would be added, but not actually
273
347
add them.
348
349
--file-ids-from will try to use the file ids from the supplied path.
350
It looks up ids trying to find a matching parent directory with the
351
same filename, and then by pure path. This option is rarely needed
352
but can be useful when adding the same logical file into two
353
branches that will be merged later (without showing the two different
354
adds as a conflict). It is also useful when merging another project
355
into a subdirectory of this one.
274
356
"""
275
357
takes_args = ['file*']
276
takes_options = ['no-recurse', 'dry-run', 'verbose']
358
takes_options = [
359
Option('no-recurse',
360
help="Don't recursively add the contents of directories."),
361
Option('dry-run',
362
help="Show what would be done, but don't actually do anything."),
363
'verbose',
364
Option('file-ids-from',
365
type=unicode,
366
help='Lookup file ids from this tree.'),
367
]
277
368
encoding_type = 'replace'
369
_see_also = ['remove']
278
370
279
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False):
371
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
372
file_ids_from=None):
280
373
import bzrlib.add
281
374
282
action = bzrlib.add.AddAction(to_file=self.outf,
283
should_print=(not is_quiet()))
284
285
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
286
action=action, save=not dry_run)
375
base_tree = None
376
if file_ids_from is not None:
377
try:
378
base_tree, base_path = WorkingTree.open_containing(
379
file_ids_from)
380
except errors.NoWorkingTree:
381
base_branch, base_path = Branch.open_containing(
382
file_ids_from)
383
base_tree = base_branch.basis_tree()
384
385
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
386
to_file=self.outf, should_print=(not is_quiet()))
387
else:
388
action = bzrlib.add.AddAction(to_file=self.outf,
389
should_print=(not is_quiet()))
390
391
if base_tree:
392
base_tree.lock_read()
393
try:
394
file_list = self._maybe_expand_globs(file_list)
395
if file_list:
396
tree = WorkingTree.open_containing(file_list[0])[0]
397
else:
398
tree = WorkingTree.open_containing(u'.')[0]
399
added, ignored = tree.smart_add(file_list, not
400
no_recurse, action=action, save=not dry_run)
401
finally:
402
if base_tree is not None:
403
base_tree.unlock()
287
404
if len(ignored) > 0:
288
405
if verbose:
289
406
for glob in sorted(ignored.keys()):
335
452
"""Show inventory of the current working copy or a revision.
336
453
337
454
It is possible to limit the output to a particular entry
338
type using the --kind option. For example; --kind file.
455
type using the --kind option. For example: --kind file.
456
457
It is also possible to restrict the list of files to a specific
458
set. For example: bzr inventory --show-ids this/file
339
459
"""
340
460
341
takes_options = ['revision', 'show-ids', 'kind']
342
461
hidden = True
462
_see_also = ['ls']
463
takes_options = [
464
'revision',
465
'show-ids',
466
Option('kind',
467
help='List entries of a particular kind: file, directory, symlink.',
468
type=unicode),
469
]
470
takes_args = ['file*']
471
343
472
@display_command
344
def run(self, revision=None, show_ids=False, kind=None):
473
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
345
474
if kind and kind not in ['file', 'directory', 'symlink']:
346
raise BzrCommandError('invalid kind specified')
347
tree = WorkingTree.open_containing(u'.')[0]
348
if revision is None:
349
inv = tree.read_working_inventory()
350
else:
351
if len(revision) > 1:
352
raise BzrCommandError('bzr inventory --revision takes'
353
' exactly one revision identifier')
354
inv = tree.branch.repository.get_revision_inventory(
355
revision[0].in_history(tree.branch).rev_id)
356
357
for path, entry in inv.entries():
475
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
476
477
work_tree, file_list = tree_files(file_list)
478
work_tree.lock_read()
479
try:
480
if revision is not None:
481
if len(revision) > 1:
482
raise errors.BzrCommandError(
483
'bzr inventory --revision takes exactly one revision'
484
' identifier')
485
revision_id = revision[0].as_revision_id(work_tree.branch)
486
tree = work_tree.branch.repository.revision_tree(revision_id)
487
488
extra_trees = [work_tree]
489
tree.lock_read()
490
else:
491
tree = work_tree
492
extra_trees = []
493
494
if file_list is not None:
495
file_ids = tree.paths2ids(file_list, trees=extra_trees,
496
require_versioned=True)
497
# find_ids_across_trees may include some paths that don't
498
# exist in 'tree'.
499
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
500
for file_id in file_ids if file_id in tree)
501
else:
502
entries = tree.inventory.entries()
503
finally:
504
tree.unlock()
505
if tree is not work_tree:
506
work_tree.unlock()
507
508
for path, entry in entries:
358
509
if kind and kind != entry.kind:
359
510
continue
360
511
if show_ids:
367
518
class cmd_mv(Command):
368
519
"""Move or rename a file.
369
520
370
usage:
521
:Usage:
371
522
bzr mv OLDNAME NEWNAME
523
372
524
bzr mv SOURCE... DESTINATION
373
525
374
526
If the last argument is a versioned directory, all the other names
375
527
are moved into it. Otherwise, there must be exactly two arguments
376
and the file is changed to a new name, which must not already exist.
528
and the file is changed to a new name.
529
530
If OLDNAME does not exist on the filesystem but is versioned and
531
NEWNAME does exist on the filesystem but is not versioned, mv
532
assumes that the file has been manually moved and only updates
533
its internal inventory to reflect that change.
534
The same is valid when moving many SOURCE files to a DESTINATION.
377
535
378
536
Files cannot be moved between branches.
379
537
"""
380
538
381
539
takes_args = ['names*']
540
takes_options = [Option("after", help="Move only the bzr identifier"
541
" of the file, because the file has already been moved."),
542
]
382
543
aliases = ['move', 'rename']
383
544
encoding_type = 'replace'
384
545
385
def run(self, names_list):
546
def run(self, names_list, after=False):
547
if names_list is None:
548
names_list = []
549
386
550
if len(names_list) < 2:
387
raise BzrCommandError("missing file argument")
551
raise errors.BzrCommandError("missing file argument")
388
552
tree, rel_names = tree_files(names_list)
389
390
if os.path.isdir(names_list[-1]):
553
tree.lock_write()
554
try:
555
self._run(tree, names_list, rel_names, after)
556
finally:
557
tree.unlock()
558
559
def _run(self, tree, names_list, rel_names, after):
560
into_existing = osutils.isdir(names_list[-1])
561
if into_existing and len(names_list) == 2:
562
# special cases:
563
# a. case-insensitive filesystem and change case of dir
564
# b. move directory after the fact (if the source used to be
565
# a directory, but now doesn't exist in the working tree
566
# and the target is an existing directory, just rename it)
567
if (not tree.case_sensitive
568
and rel_names[0].lower() == rel_names[1].lower()):
569
into_existing = False
570
else:
571
inv = tree.inventory
572
from_id = tree.path2id(rel_names[0])
573
if (not osutils.lexists(names_list[0]) and
574
from_id and inv.get_file_kind(from_id) == "directory"):
575
into_existing = False
576
# move/rename
577
if into_existing:
391
578
# move into existing directory
392
for pair in tree.move(rel_names[:-1], rel_names[-1]):
579
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
393
580
self.outf.write("%s => %s\n" % pair)
394
581
else:
395
582
if len(names_list) != 2:
396
raise BzrCommandError('to mv multiple files the destination '
397
'must be a versioned directory')
398
tree.rename_one(rel_names[0], rel_names[1])
583
raise errors.BzrCommandError('to mv multiple files the'
584
' destination must be a versioned'
585
' directory')
586
tree.rename_one(rel_names[0], rel_names[1], after=after)
399
587
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
400
401
588
589
402
590
class cmd_pull(Command):
403
591
"""Turn this branch into a mirror of another branch.
404
592
410
598
from one into the other. Once one branch has merged, the other should
411
599
be able to pull it again.
412
600
413
If branches have diverged, you can use 'bzr merge' to pull the text changes
414
from one into the other. Once one branch has merged, the other should
415
be able to pull it again.
416
417
601
If you want to forget your local changes and just update your branch to
418
602
match the remote one, use pull --overwrite.
419
603
420
604
If there is no default location set, the first pull will set it. After
421
605
that, you can omit the location to use the default. To change the
422
default, use --remember.
606
default, use --remember. The value will only be saved if the remote
607
location can be accessed.
608
609
Note: The location can be specified either in the form of a branch,
610
or in the form of a path to a file containing a merge directive generated
611
with bzr send.
423
612
"""
424
613
425
takes_options = ['remember', 'overwrite', 'revision', 'verbose']
614
_see_also = ['push', 'update', 'status-flags']
615
takes_options = ['remember', 'overwrite', 'revision',
616
custom_help('verbose',
617
help='Show logs of pulled revisions.'),
618
Option('directory',
619
help='Branch to pull into, '
620
'rather than the one containing the working directory.',
621
short_name='d',
622
type=unicode,
623
),
624
]
426
625
takes_args = ['location?']
427
626
encoding_type = 'replace'
428
627
429
def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
628
def run(self, location=None, remember=False, overwrite=False,
629
revision=None, verbose=False,
630
directory=None):
430
631
# FIXME: too much stuff is in the command class
632
revision_id = None
633
mergeable = None
634
if directory is None:
635
directory = u'.'
431
636
try:
432
tree_to = WorkingTree.open_containing(u'.')[0]
637
tree_to = WorkingTree.open_containing(directory)[0]
433
638
branch_to = tree_to.branch
434
except NoWorkingTree:
639
except errors.NoWorkingTree:
435
640
tree_to = None
436
branch_to = Branch.open_containing(u'.')[0]
641
branch_to = Branch.open_containing(directory)[0]
642
643
possible_transports = []
644
if location is not None:
645
try:
646
mergeable = bundle.read_mergeable_from_url(location,
647
possible_transports=possible_transports)
648
except errors.NotABundle:
649
mergeable = None
650
437
651
stored_loc = branch_to.get_parent()
438
652
if location is None:
439
653
if stored_loc is None:
440
raise BzrCommandError("No pull location known or specified.")
654
raise errors.BzrCommandError("No pull location known or"
655
" specified.")
441
656
else:
442
657
display_url = urlutils.unescape_for_display(stored_loc,
443
658
self.outf.encoding)
444
self.outf.write("Using saved location: %s\n" % display_url)
659
if not is_quiet():
660
self.outf.write("Using saved parent location: %s\n" % display_url)
445
661
location = stored_loc
446
662
447
branch_from = Branch.open(location)
448
449
if branch_to.get_parent() is None or remember:
450
branch_to.set_parent(branch_from.base)
451
452
if revision is None:
453
rev_id = None
454
elif len(revision) == 1:
455
rev_id = revision[0].in_history(branch_from).rev_id
456
else:
457
raise BzrCommandError('bzr pull --revision takes one value.')
458
459
old_rh = branch_to.revision_history()
460
if tree_to is not None:
461
count = tree_to.pull(branch_from, overwrite, rev_id)
462
else:
463
count = branch_to.pull(branch_from, overwrite, rev_id)
464
note('%d revision(s) pulled.' % (count,))
465
466
if verbose:
467
new_rh = branch_to.revision_history()
468
if old_rh != new_rh:
469
# Something changed
470
from bzrlib.log import show_changed_revisions
471
show_changed_revisions(branch_to, old_rh, new_rh,
472
to_file=self.outf)
663
if mergeable is not None:
664
if revision is not None:
665
raise errors.BzrCommandError(
666
'Cannot use -r with merge directives or bundles')
667
mergeable.install_revisions(branch_to.repository)
668
base_revision_id, revision_id, verified = \
669
mergeable.get_merge_request(branch_to.repository)
670
branch_from = branch_to
671
else:
672
branch_from = Branch.open(location,
673
possible_transports=possible_transports)
674
675
if branch_to.get_parent() is None or remember:
676
branch_to.set_parent(branch_from.base)
677
678
if revision is not None:
679
if len(revision) == 1:
680
revision_id = revision[0].as_revision_id(branch_from)
681
else:
682
raise errors.BzrCommandError(
683
'bzr pull --revision takes one value.')
684
685
branch_to.lock_write()
686
try:
687
if tree_to is not None:
688
change_reporter = delta._ChangeReporter(
689
unversioned_filter=tree_to.is_ignored)
690
result = tree_to.pull(branch_from, overwrite, revision_id,
691
change_reporter,
692
possible_transports=possible_transports)
693
else:
694
result = branch_to.pull(branch_from, overwrite, revision_id)
695
696
result.report(self.outf)
697
if verbose and result.old_revid != result.new_revid:
698
old_rh = list(
699
branch_to.repository.iter_reverse_revision_history(
700
result.old_revid))
701
old_rh.reverse()
702
new_rh = branch_to.revision_history()
703
log.show_changed_revisions(branch_to, old_rh, new_rh,
704
to_file=self.outf)
705
finally:
706
branch_to.unlock()
473
707
474
708
475
709
class cmd_push(Command):
494
728
495
729
If there is no default push location set, the first push will set it.
496
730
After that, you can omit the location to use the default. To change the
497
default, use --remember.
731
default, use --remember. The value will only be saved if the remote
732
location can be accessed.
498
733
"""
499
734
500
takes_options = ['remember', 'overwrite', 'verbose',
501
Option('create-prefix',
502
help='Create the path leading up to the branch '
503
'if it does not already exist')]
735
_see_also = ['pull', 'update', 'working-trees']
736
takes_options = ['remember', 'overwrite', 'verbose', 'revision',
737
Option('create-prefix',
738
help='Create the path leading up to the branch '
739
'if it does not already exist.'),
740
Option('directory',
741
help='Branch to push from, '
742
'rather than the one containing the working directory.',
743
short_name='d',
744
type=unicode,
745
),
746
Option('use-existing-dir',
747
help='By default push will fail if the target'
748
' directory exists, but does not already'
749
' have a control directory. This flag will'
750
' allow push to proceed.'),
751
Option('stacked',
752
help='Create a stacked branch that references the public location '
753
'of the parent branch.'),
754
Option('stacked-on',
755
help='Create a stacked branch that refers to another branch '
756
'for the commit history. Only the work not present in the '
757
'referenced branch is included in the branch created.',
758
type=unicode),
759
]
504
760
takes_args = ['location?']
505
761
encoding_type = 'replace'
506
762
507
763
def run(self, location=None, remember=False, overwrite=False,
508
create_prefix=False, verbose=False):
509
# FIXME: Way too big! Put this into a function called from the
510
# command.
511
from bzrlib.transport import get_transport
512
513
br_from = Branch.open_containing('.')[0]
514
stored_loc = br_from.get_push_location()
764
create_prefix=False, verbose=False, revision=None,
765
use_existing_dir=False, directory=None, stacked_on=None,
766
stacked=False):
767
from bzrlib.push import _show_push_branch
768
769
# Get the source branch and revision_id
770
if directory is None:
771
directory = '.'
772
br_from = Branch.open_containing(directory)[0]
773
if revision is not None:
774
if len(revision) == 1:
775
revision_id = revision[0].in_history(br_from).rev_id
776
else:
777
raise errors.BzrCommandError(
778
'bzr push --revision takes one value.')
779
else:
780
revision_id = br_from.last_revision()
781
782
# Get the stacked_on branch, if any
783
if stacked_on is not None:
784
stacked_on = urlutils.normalize_url(stacked_on)
785
elif stacked:
786
parent_url = br_from.get_parent()
787
if parent_url:
788
parent = Branch.open(parent_url)
789
stacked_on = parent.get_public_branch()
790
if not stacked_on:
791
# I considered excluding non-http url's here, thus forcing
792
# 'public' branches only, but that only works for some
793
# users, so it's best to just depend on the user spotting an
794
# error by the feedback given to them. RBC 20080227.
795
stacked_on = parent_url
796
if not stacked_on:
797
raise errors.BzrCommandError(
798
"Could not determine branch to refer to.")
799
800
# Get the destination location
515
801
if location is None:
802
stored_loc = br_from.get_push_location()
516
803
if stored_loc is None:
517
raise BzrCommandError("No push location known or specified.")
804
raise errors.BzrCommandError(
805
"No push location known or specified.")
518
806
else:
519
807
display_url = urlutils.unescape_for_display(stored_loc,
520
808
self.outf.encoding)
521
self.outf.write("Using saved location: %s" % display_url)
809
self.outf.write("Using saved push location: %s\n" % display_url)
522
810
location = stored_loc
523
811
524
transport = get_transport(location)
525
location_url = transport.base
526
if br_from.get_push_location() is None or remember:
527
br_from.set_push_location(location_url)
528
529
old_rh = []
530
try:
531
dir_to = bzrlib.bzrdir.BzrDir.open(location_url)
532
br_to = dir_to.open_branch()
533
except NotBranchError:
534
# create a branch.
535
transport = transport.clone('..')
536
if not create_prefix:
537
try:
538
relurl = transport.relpath(location_url)
539
mutter('creating directory %s => %s', location_url, relurl)
540
transport.mkdir(relurl)
541
except NoSuchFile:
542
raise BzrCommandError("Parent directory of %s "
543
"does not exist." % location)
544
else:
545
current = transport.base
546
needed = [(transport, transport.relpath(location_url))]
547
while needed:
548
try:
549
transport, relpath = needed[-1]
550
transport.mkdir(relpath)
551
needed.pop()
552
except NoSuchFile:
553
new_transport = transport.clone('..')
554
needed.append((new_transport,
555
new_transport.relpath(transport.base)))
556
if new_transport.base == transport.base:
557
raise BzrCommandError("Could not create "
558
"path prefix.")
559
dir_to = br_from.bzrdir.clone(location_url,
560
revision_id=br_from.last_revision())
561
br_to = dir_to.open_branch()
562
count = len(br_to.revision_history())
563
else:
564
old_rh = br_to.revision_history()
565
try:
566
try:
567
tree_to = dir_to.open_workingtree()
568
except errors.NotLocalUrl:
569
warning('This transport does not update the working '
570
'tree of: %s' % (br_to.base,))
571
count = br_to.pull(br_from, overwrite)
572
except NoWorkingTree:
573
count = br_to.pull(br_from, overwrite)
574
else:
575
count = tree_to.pull(br_from, overwrite)
576
except DivergedBranches:
577
raise BzrCommandError("These branches have diverged."
578
" Try a merge then push with overwrite.")
579
note('%d revision(s) pushed.' % (count,))
580
581
if verbose:
582
new_rh = br_to.revision_history()
583
if old_rh != new_rh:
584
# Something changed
585
from bzrlib.log import show_changed_revisions
586
show_changed_revisions(br_to, old_rh, new_rh,
587
to_file=self.outf)
812
_show_push_branch(br_from, revision_id, location, self.outf,
813
verbose=verbose, overwrite=overwrite, remember=remember,
814
stacked_on=stacked_on, create_prefix=create_prefix,
815
use_existing_dir=use_existing_dir)
588
816
589
817
590
818
class cmd_branch(Command):
592
820
593
821
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
594
822
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
823
If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION
824
is derived from the FROM_LOCATION by stripping a leading scheme or drive
825
identifier, if any. For example, "branch lp:foo-bar" will attempt to
826
create ./foo-bar.
595
827
596
828
To retrieve the branch as of a particular revision, supply the --revision
597
829
parameter, as in "branch foo/bar -r 5".
830
"""
598
831
599
--basis is to speed up branching from remote branches. When specified, it
600
copies all the file-contents, inventory and revision data from the basis
601
branch before copying anything from the remote branch.
602
"""
832
_see_also = ['checkout']
603
833
takes_args = ['from_location', 'to_location?']
604
takes_options = ['revision', 'basis']
834
takes_options = ['revision', Option('hardlink',
835
help='Hard-link working tree files where possible.'),
836
Option('stacked',
837
help='Create a stacked branch referring to the source branch. '
838
'The new branch will depend on the availability of the source '
839
'branch for all operations.'),
840
]
605
841
aliases = ['get', 'clone']
606
842
607
def run(self, from_location, to_location=None, revision=None, basis=None):
608
from bzrlib.transport import get_transport
609
from bzrlib.osutils import rmtree
843
def run(self, from_location, to_location=None, revision=None,
844
hardlink=False, stacked=False):
845
from bzrlib.tag import _merge_tags_if_possible
610
846
if revision is None:
611
847
revision = [None]
612
848
elif len(revision) > 1:
613
raise BzrCommandError(
849
raise errors.BzrCommandError(
614
850
'bzr branch --revision takes exactly 1 revision value')
615
try:
616
br_from = Branch.open(from_location)
617
except OSError, e:
618
if e.errno == errno.ENOENT:
619
raise BzrCommandError('Source location "%s" does not'
620
' exist.' % to_location)
621
else:
622
raise
851
852
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
853
from_location)
623
854
br_from.lock_read()
624
855
try:
625
if basis is not None:
626
basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
627
else:
628
basis_dir = None
629
856
if len(revision) == 1 and revision[0] is not None:
630
revision_id = revision[0].in_history(br_from)[1]
857
revision_id = revision[0].as_revision_id(br_from)
631
858
else:
632
859
# FIXME - wt.last_revision, fallback to branch, fall back to
633
860
# None or perhaps NULL_REVISION to mean copy nothing
634
861
# RBC 20060209
635
862
revision_id = br_from.last_revision()
636
863
if to_location is None:
637
to_location = os.path.basename(from_location.rstrip("/\\"))
638
name = None
639
else:
640
name = os.path.basename(to_location) + '\n'
641
642
to_transport = get_transport(to_location)
864
to_location = urlutils.derive_to_location(from_location)
865
to_transport = transport.get_transport(to_location)
643
866
try:
644
867
to_transport.mkdir('.')
645
except bzrlib.errors.FileExists:
646
raise BzrCommandError('Target directory "%s" already'
647
' exists.' % to_location)
648
except bzrlib.errors.NoSuchFile:
649
raise BzrCommandError('Parent of "%s" does not exist.' %
650
to_location)
868
except errors.FileExists:
869
raise errors.BzrCommandError('Target directory "%s" already'
870
' exists.' % to_location)
871
except errors.NoSuchFile:
872
raise errors.BzrCommandError('Parent of "%s" does not exist.'
873
% to_location)
651
874
try:
652
875
# preserve whatever source format we have.
653
dir = br_from.bzrdir.sprout(to_transport.base,
654
revision_id, basis_dir)
876
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
877
possible_transports=[to_transport],
878
accelerator_tree=accelerator_tree,
879
hardlink=hardlink, stacked=stacked)
655
880
branch = dir.open_branch()
656
except bzrlib.errors.NoSuchRevision:
881
except errors.NoSuchRevision:
657
882
to_transport.delete_tree('.')
658
msg = "The branch %s has no revision %s." % (from_location, revision[0])
659
raise BzrCommandError(msg)
660
except bzrlib.errors.UnlistableBranch:
661
rmtree(to_location)
662
msg = "The branch %s cannot be used as a --basis" % (basis,)
663
raise BzrCommandError(msg)
664
if name:
665
branch.control_files.put_utf8('branch-name', name)
666
note('Branched %d revision(s).' % branch.revno())
883
msg = "The branch %s has no revision %s." % (from_location,
884
revision[0])
885
raise errors.BzrCommandError(msg)
886
_merge_tags_if_possible(br_from, branch)
887
# If the source branch is stacked, the new branch may
888
# be stacked whether we asked for that explicitly or not.
889
# We therefore need a try/except here and not just 'if stacked:'
890
try:
891
note('Created new stacked branch referring to %s.' %
892
branch.get_stacked_on_url())
893
except (errors.NotStacked, errors.UnstackableBranchFormat,
894
errors.UnstackableRepositoryFormat), e:
895
note('Branched %d revision(s).' % branch.revno())
667
896
finally:
668
897
br_from.unlock()
669
898
678
907
679
908
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
680
909
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
910
If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
911
is derived from the BRANCH_LOCATION by stripping a leading scheme or drive
912
identifier, if any. For example, "checkout lp:foo-bar" will attempt to
913
create ./foo-bar.
681
914
682
915
To retrieve the branch as of a particular revision, supply the --revision
683
916
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
684
917
out of date [so you cannot commit] but it may be useful (i.e. to examine old
685
918
code.)
919
"""
686
920
687
--basis is to speed up checking out from remote branches. When specified, it
688
uses the inventory and file contents from the basis branch in preference to the
689
branch being checked out.
690
"""
921
_see_also = ['checkouts', 'branch']
691
922
takes_args = ['branch_location?', 'to_location?']
692
takes_options = ['revision', # , 'basis']
923
takes_options = ['revision',
693
924
Option('lightweight',
694
help="perform a lightweight checkout. Lightweight "
925
help="Perform a lightweight checkout. Lightweight "
695
926
"checkouts depend on access to the branch for "
696
"every operation. Normal checkouts can perform "
927
"every operation. Normal checkouts can perform "
697
928
"common operations like diff and status without "
698
929
"such access, and also support local commits."
699
930
),
931
Option('files-from', type=str,
932
help="Get file contents from this tree."),
933
Option('hardlink',
934
help='Hard-link working tree files where possible.'
935
),
700
936
]
937
aliases = ['co']
701
938
702
def run(self, branch_location=None, to_location=None, revision=None, basis=None,
703
lightweight=False):
939
def run(self, branch_location=None, to_location=None, revision=None,
940
lightweight=False, files_from=None, hardlink=False):
704
941
if revision is None:
705
942
revision = [None]
706
943
elif len(revision) > 1:
707
raise BzrCommandError(
944
raise errors.BzrCommandError(
708
945
'bzr checkout --revision takes exactly 1 revision value')
709
946
if branch_location is None:
710
branch_location = bzrlib.osutils.getcwd()
947
branch_location = osutils.getcwd()
711
948
to_location = branch_location
712
source = Branch.open(branch_location)
949
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
950
branch_location)
951
if files_from is not None:
952
accelerator_tree = WorkingTree.open(files_from)
713
953
if len(revision) == 1 and revision[0] is not None:
714
revision_id = revision[0].in_history(source)[1]
954
revision_id = revision[0].as_revision_id(source)
715
955
else:
716
956
revision_id = None
717
957
if to_location is None:
718
to_location = os.path.basename(branch_location.rstrip("/\\"))
958
to_location = urlutils.derive_to_location(branch_location)
719
959
# if the source and to_location are the same,
720
960
# and there is no working tree,
721
961
# then reconstitute a branch
722
if (bzrlib.osutils.abspath(to_location) ==
723
bzrlib.osutils.abspath(branch_location)):
962
if (osutils.abspath(to_location) ==
963
osutils.abspath(branch_location)):
724
964
try:
725
965
source.bzrdir.open_workingtree()
726
966
except errors.NoWorkingTree:
727
source.bzrdir.create_workingtree()
967
source.bzrdir.create_workingtree(revision_id)
728
968
return
729
try:
730
os.mkdir(to_location)
731
except OSError, e:
732
if e.errno == errno.EEXIST:
733
raise BzrCommandError('Target directory "%s" already'
734
' exists.' % to_location)
735
if e.errno == errno.ENOENT:
736
raise BzrCommandError('Parent of "%s" does not exist.' %
737
to_location)
738
else:
739
raise
740
old_format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
741
bzrlib.bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
742
try:
743
if lightweight:
744
checkout = bzrdir.BzrDirMetaFormat1().initialize(to_location)
745
bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
746
else:
747
checkout_branch = bzrlib.bzrdir.BzrDir.create_branch_convenience(
748
to_location, force_new_tree=False)
749
checkout = checkout_branch.bzrdir
750
checkout_branch.bind(source)
751
if revision_id is not None:
752
rh = checkout_branch.revision_history()
753
checkout_branch.set_revision_history(rh[:rh.index(revision_id) + 1])
754
checkout.create_workingtree(revision_id)
755
finally:
756
bzrlib.bzrdir.BzrDirFormat.set_default_format(old_format)
969
source.create_checkout(to_location, revision_id, lightweight,
970
accelerator_tree, hardlink)
757
971
758
972
759
973
class cmd_renames(Command):
762
976
# TODO: Option to show renames between two historical versions.
763
977
764
978
# TODO: Only show renames under dir, rather than in the whole branch.
979
_see_also = ['status']
765
980
takes_args = ['dir?']
766
981
767
982
@display_command
768
983
def run(self, dir=u'.'):
769
984
tree = WorkingTree.open_containing(dir)[0]
770
old_inv = tree.basis_tree().inventory
771
new_inv = tree.read_working_inventory()
772
773
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
774
renames.sort()
775
for old_name, new_name in renames:
776
self.outf.write("%s => %s\n" % (old_name, new_name))
985
tree.lock_read()
986
try:
987
new_inv = tree.inventory
988
old_tree = tree.basis_tree()
989
old_tree.lock_read()
990
try:
991
old_inv = old_tree.inventory
992
renames = list(_mod_tree.find_renames(old_inv, new_inv))
993
renames.sort()
994
for old_name, new_name in renames:
995
self.outf.write("%s => %s\n" % (old_name, new_name))
996
finally:
997
old_tree.unlock()
998
finally:
999
tree.unlock()
777
1000
778
1001
779
1002
class cmd_update(Command):
786
1009
If you want to discard your local changes, you can just do a
787
1010
'bzr revert' instead of 'bzr commit' after the update.
788
1011
"""
1012
1013
_see_also = ['pull', 'working-trees', 'status-flags']
789
1014
takes_args = ['dir?']
1015
aliases = ['up']
790
1016
791
1017
def run(self, dir='.'):
792
1018
tree = WorkingTree.open_containing(dir)[0]
793
tree.lock_write()
1019
possible_transports = []
1020
master = tree.branch.get_master_branch(
1021
possible_transports=possible_transports)
1022
if master is not None:
1023
tree.lock_write()
1024
else:
1025
tree.lock_tree_write()
794
1026
try:
795
if tree.last_revision() == tree.branch.last_revision():
1027
existing_pending_merges = tree.get_parent_ids()[1:]
1028
last_rev = _mod_revision.ensure_null(tree.last_revision())
1029
if last_rev == _mod_revision.ensure_null(
1030
tree.branch.last_revision()):
796
1031
# may be up to date, check master too.
797
master = tree.branch.get_master_branch()
798
if master is None or master.last_revision == tree.last_revision():
799
note("Tree is up to date.")
800
return
801
conflicts = tree.update()
802
note('Updated to revision %d.' %
803
(tree.branch.revision_id_to_revno(tree.last_revision()),))
1032
if master is None or last_rev == _mod_revision.ensure_null(
1033
master.last_revision()):
1034
revno = tree.branch.revision_id_to_revno(last_rev)
1035
note("Tree is up to date at revision %d." % (revno,))
1036
return 0
1037
conflicts = tree.update(
1038
delta._ChangeReporter(unversioned_filter=tree.is_ignored),
1039
possible_transports=possible_transports)
1040
revno = tree.branch.revision_id_to_revno(
1041
_mod_revision.ensure_null(tree.last_revision()))
1042
note('Updated to revision %d.' % (revno,))
1043
if tree.get_parent_ids()[1:] != existing_pending_merges:
1044
note('Your local commits will now show as pending merges with '
1045
"'bzr status', and can be committed with 'bzr commit'.")
804
1046
if conflicts != 0:
805
1047
return 1
806
1048
else:
818
1060
819
1061
Branches and working trees will also report any missing revisions.
820
1062
"""
1063
_see_also = ['revno', 'working-trees', 'repositories']
821
1064
takes_args = ['location?']
822
1065
takes_options = ['verbose']
1066
encoding_type = 'replace'
823
1067
824
1068
@display_command
825
1069
def run(self, location=None, verbose=False):
1070
if verbose:
1071
noise_level = 2
1072
else:
1073
noise_level = 0
826
1074
from bzrlib.info import show_bzrdir_info
827
1075
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
828
verbose=verbose)
1076
verbose=noise_level, outfile=self.outf)
829
1077
830
1078
831
1079
class cmd_remove(Command):
832
"""Make a file unversioned.
833
834
This makes bzr stop tracking changes to a versioned file. It does
835
not delete the working copy.
836
837
You can specify one or more files, and/or --new. If you specify --new,
838
only 'added' files will be removed. If you specify both, then new files
839
in the specified directories will be removed. If the directories are
840
also new, they will also be removed.
1080
"""Remove files or directories.
1081
1082
This makes bzr stop tracking changes to the specified files. bzr will delete
1083
them if they can easily be recovered using revert. If no options or
1084
parameters are given bzr will scan for files that are being tracked by bzr
1085
but missing in your tree and stop tracking them for you.
841
1086
"""
842
1087
takes_args = ['file*']
843
takes_options = ['verbose', Option('new', help='remove newly-added files')]
844
aliases = ['rm']
1088
takes_options = ['verbose',
1089
Option('new', help='Only remove files that have never been committed.'),
1090
RegistryOption.from_kwargs('file-deletion-strategy',
1091
'The file deletion mode to be used.',
1092
title='Deletion Strategy', value_switches=True, enum_switch=False,
1093
safe='Only delete files if they can be'
1094
' safely recovered (default).',
1095
keep="Don't delete any files.",
1096
force='Delete all the specified files, even if they can not be '
1097
'recovered and even if they are non-empty directories.')]
1098
aliases = ['rm', 'del']
845
1099
encoding_type = 'replace'
846
847
def run(self, file_list, verbose=False, new=False):
1100
1101
def run(self, file_list, verbose=False, new=False,
1102
file_deletion_strategy='safe'):
848
1103
tree, file_list = tree_files(file_list)
849
if new is False:
850
if file_list is None:
851
raise BzrCommandError('Specify one or more files to remove, or'
852
' use --new.')
853
else:
854
from bzrlib.delta import compare_trees
855
added = [compare_trees(tree.basis_tree(), tree,
856
specific_files=file_list).added]
857
file_list = sorted([f[0] for f in added[0]], reverse=True)
858
if len(file_list) == 0:
859
raise BzrCommandError('No matching files.')
860
tree.remove(file_list, verbose=verbose, to_file=self.outf)
1104
1105
if file_list is not None:
1106
file_list = [f for f in file_list]
1107
1108
tree.lock_write()
1109
try:
1110
# Heuristics should probably all move into tree.remove_smart or
1111
# some such?
1112
if new:
1113
added = tree.changes_from(tree.basis_tree(),
1114
specific_files=file_list).added
1115
file_list = sorted([f[0] for f in added], reverse=True)
1116
if len(file_list) == 0:
1117
raise errors.BzrCommandError('No matching files.')
1118
elif file_list is None:
1119
# missing files show up in iter_changes(basis) as
1120
# versioned-with-no-kind.
1121
missing = []
1122
for change in tree.iter_changes(tree.basis_tree()):
1123
# Find paths in the working tree that have no kind:
1124
if change[1][1] is not None and change[6][1] is None:
1125
missing.append(change[1][1])
1126
file_list = sorted(missing, reverse=True)
1127
file_deletion_strategy = 'keep'
1128
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1129
keep_files=file_deletion_strategy=='keep',
1130
force=file_deletion_strategy=='force')
1131
finally:
1132
tree.unlock()
861
1133
862
1134
863
1135
class cmd_file_id(Command):
869
1141
"""
870
1142
871
1143
hidden = True
1144
_see_also = ['inventory', 'ls']
872
1145
takes_args = ['filename']
873
1146
874
1147
@display_command
875
1148
def run(self, filename):
876
1149
tree, relpath = WorkingTree.open_containing(filename)
877
i = tree.inventory.path2id(relpath)
878
if i == None:
879
raise BzrError("%r is not a versioned file" % filename)
1150
i = tree.path2id(relpath)
1151
if i is None:
1152
raise errors.NotVersionedError(filename)
880
1153
else:
881
1154
self.outf.write(i + '\n')
882
1155
894
1167
@display_command
895
1168
def run(self, filename):
896
1169
tree, relpath = WorkingTree.open_containing(filename)
897
inv = tree.inventory
898
fid = inv.path2id(relpath)
899
if fid == None:
900
raise BzrError("%r is not a versioned file" % filename)
901
for fip in inv.get_idpath(fid):
902
self.outf.write(fip + '\n')
1170
fid = tree.path2id(relpath)
1171
if fid is None:
1172
raise errors.NotVersionedError(filename)
1173
segments = osutils.splitpath(relpath)
1174
for pos in range(1, len(segments) + 1):
1175
path = osutils.joinpath(segments[:pos])
1176
self.outf.write("%s\n" % tree.path2id(path))
903
1177
904
1178
905
1179
class cmd_reconcile(Command):
920
1194
921
1195
The branch *MUST* be on a listable system such as local disk or sftp.
922
1196
"""
1197
1198
_see_also = ['check']
923
1199
takes_args = ['branch?']
924
1200
925
1201
def run(self, branch="."):
926
1202
from bzrlib.reconcile import reconcile
927
dir = bzrlib.bzrdir.BzrDir.open(branch)
1203
dir = bzrdir.BzrDir.open(branch)
928
1204
reconcile(dir)
929
1205
930
1206
931
1207
class cmd_revision_history(Command):
932
"""Display list of revision ids on this branch."""
1208
"""Display the list of revision ids on a branch."""
1209
1210
_see_also = ['log']
1211
takes_args = ['location?']
1212
933
1213
hidden = True
934
1214
935
1215
@display_command
936
def run(self):
937
branch = WorkingTree.open_containing(u'.')[0].branch
938
for patchid in branch.revision_history():
939
self.outf.write(patchid)
1216
def run(self, location="."):
1217
branch = Branch.open_containing(location)[0]
1218
for revid in branch.revision_history():
1219
self.outf.write(revid)
940
1220
self.outf.write('\n')
941
1221
942
1222
943
1223
class cmd_ancestry(Command):
944
1224
"""List all revisions merged into this branch."""
1225
1226
_see_also = ['log', 'revision-history']
1227
takes_args = ['location?']
1228
945
1229
hidden = True
946
1230
947
1231
@display_command
948
def run(self):
949
tree = WorkingTree.open_containing(u'.')[0]
950
b = tree.branch
951
# FIXME. should be tree.last_revision
952
revision_ids = b.repository.get_ancestry(b.last_revision())
953
assert revision_ids[0] == None
1232
def run(self, location="."):
1233
try:
1234
wt = WorkingTree.open_containing(location)[0]
1235
except errors.NoWorkingTree:
1236
b = Branch.open(location)
1237
last_revision = b.last_revision()
1238
else:
1239
b = wt.branch
1240
last_revision = wt.last_revision()
1241
1242
revision_ids = b.repository.get_ancestry(last_revision)
954
1243
revision_ids.pop(0)
955
1244
for revision_id in revision_ids:
956
1245
self.outf.write(revision_id + '\n')
964
1253
965
1254
If there is a repository in a parent directory of the location, then
966
1255
the history of the branch will be stored in the repository. Otherwise
967
init creates a standalone branch which carries its own history in
968
.bzr.
1256
init creates a standalone branch which carries its own history
1257
in the .bzr directory.
969
1258
970
1259
If there is already a branch at the location but it has no working tree,
971
1260
the tree can be populated with 'bzr checkout'.
972
1261
973
Recipe for importing a tree of files:
1262
Recipe for importing a tree of files::
1263
974
1264
cd ~/project
975
1265
bzr init
976
1266
bzr add .
977
1267
bzr status
978
bzr commit -m 'imported project'
1268
bzr commit -m "imported project"
979
1269
"""
1270
1271
_see_also = ['init-repository', 'branch', 'checkout']
980
1272
takes_args = ['location?']
981
1273
takes_options = [
982
Option('format',
983
help='Specify a format for this branch. Current'
984
' formats are: default, knit, metaweave and'
985
' weave. Default is knit; metaweave and'
986
' weave are deprecated',
987
type=get_format_type),
988
]
989
def run(self, location=None, format=None):
990
from bzrlib.branch import Branch
1274
Option('create-prefix',
1275
help='Create the path leading up to the branch '
1276
'if it does not already exist.'),
1277
RegistryOption('format',
1278
help='Specify a format for this branch. '
1279
'See "help formats".',
1280
registry=bzrdir.format_registry,
1281
converter=bzrdir.format_registry.make_bzrdir,
1282
value_switches=True,
1283
title="Branch Format",
1284
),
1285
Option('append-revisions-only',
1286
help='Never change revnos or the existing log.'
1287
' Append revisions to it only.')
1288
]
1289
def run(self, location=None, format=None, append_revisions_only=False,
1290
create_prefix=False):
991
1291
if format is None:
992
format = get_format_type('default')
1292
format = bzrdir.format_registry.make_bzrdir('default')
993
1293
if location is None:
994
1294
location = u'.'
995
else:
996
# The path has to exist to initialize a
997
# branch inside of it.
998
# Just using os.mkdir, since I don't
999
# believe that we want to create a bunch of
1000
# locations if the user supplies an extended path
1001
if not os.path.exists(location):
1002
os.mkdir(location)
1003
try:
1004
existing_bzrdir = bzrdir.BzrDir.open(location)
1005
except NotBranchError:
1295
1296
to_transport = transport.get_transport(location)
1297
1298
# The path has to exist to initialize a
1299
# branch inside of it.
1300
# Just using os.mkdir, since I don't
1301
# believe that we want to create a bunch of
1302
# locations if the user supplies an extended path
1303
try:
1304
to_transport.ensure_base()
1305
except errors.NoSuchFile:
1306
if not create_prefix:
1307
raise errors.BzrCommandError("Parent directory of %s"
1308
" does not exist."
1309
"\nYou may supply --create-prefix to create all"
1310
" leading parent directories."
1311
% location)
1312
_create_prefix(to_transport)
1313
1314
try:
1315
existing_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1316
except errors.NotBranchError:
1006
1317
# really a NotBzrDir error...
1007
bzrdir.BzrDir.create_branch_convenience(location, format=format)
1318
create_branch = bzrdir.BzrDir.create_branch_convenience
1319
branch = create_branch(to_transport.base, format=format,
1320
possible_transports=[to_transport])
1008
1321
else:
1322
from bzrlib.transport.local import LocalTransport
1009
1323
if existing_bzrdir.has_branch():
1010
if existing_bzrdir.has_workingtree():
1011
raise errors.AlreadyBranchError(location)
1012
else:
1013
raise errors.BranchExistsWithoutWorkingTree(location)
1324
if (isinstance(to_transport, LocalTransport)
1325
and not existing_bzrdir.has_workingtree()):
1326
raise errors.BranchExistsWithoutWorkingTree(location)
1327
raise errors.AlreadyBranchError(location)
1014
1328
else:
1015
existing_bzrdir.create_branch()
1329
branch = existing_bzrdir.create_branch()
1016
1330
existing_bzrdir.create_workingtree()
1331
if append_revisions_only:
1332
try:
1333
branch.set_append_revisions_only(True)
1334
except errors.UpgradeRequired:
1335
raise errors.BzrCommandError('This branch format cannot be set'
1336
' to append-revisions-only. Try --experimental-branch6')
1337
if not is_quiet():
1338
from bzrlib.info import show_bzrdir_info
1339
show_bzrdir_info(bzrdir.BzrDir.open_containing_from_transport(
1340
to_transport)[0], verbose=0, outfile=self.outf)
1017
1341
1018
1342
1019
1343
class cmd_init_repository(Command):
1020
1344
"""Create a shared repository to hold branches.
1021
1345
1022
New branches created under the repository directory will store their revisions
1023
in the repository, not in the branch directory, if the branch format supports
1024
shared storage.
1025
1026
example:
1027
bzr init-repo repo
1028
bzr init repo/trunk
1029
bzr checkout --lightweight repo/trunk trunk-checkout
1030
cd trunk-checkout
1031
(add files here)
1346
New branches created under the repository directory will store their
1347
revisions in the repository, not in the branch directory.
1348
1349
If the --no-trees option is used then the branches in the repository
1350
will not have working trees by default.
1351
1352
:Examples:
1353
Create a shared repositories holding just branches::
1354
1355
bzr init-repo --no-trees repo
1356
bzr init repo/trunk
1357
1358
Make a lightweight checkout elsewhere::
1359
1360
bzr checkout --lightweight repo/trunk trunk-checkout
1361
cd trunk-checkout
1362
(add files here)
1032
1363
"""
1033
takes_args = ["location"]
1034
takes_options = [Option('format',
1035
help='Specify a format for this repository.'
1036
' Current formats are: default, knit,'
1037
' metaweave and weave. Default is knit;'
1038
' metaweave and weave are deprecated',
1039
type=get_format_type),
1040
Option('trees',
1041
help='Allows branches in repository to have'
1042
' a working tree')]
1364
1365
_see_also = ['init', 'branch', 'checkout', 'repositories']
1366
takes_args = ["location"]
1367
takes_options = [RegistryOption('format',
1368
help='Specify a format for this repository. See'
1369
' "bzr help formats" for details.',
1370
registry=bzrdir.format_registry,
1371
converter=bzrdir.format_registry.make_bzrdir,
1372
value_switches=True, title='Repository format'),
1373
Option('no-trees',
1374
help='Branches in the repository will default to'
1375
' not having a working tree.'),
1376
]
1043
1377
aliases = ["init-repo"]
1044
def run(self, location, format=None, trees=False):
1045
from bzrlib.transport import get_transport
1378
1379
def run(self, location, format=None, no_trees=False):
1046
1380
if format is None:
1047
format = get_format_type('default')
1048
transport = get_transport(location)
1049
if not transport.has('.'):
1050
transport.mkdir('')
1051
newdir = format.initialize_on_transport(transport)
1381
format = bzrdir.format_registry.make_bzrdir('default')
1382
1383
if location is None:
1384
location = '.'
1385
1386
to_transport = transport.get_transport(location)
1387
to_transport.ensure_base()
1388
1389
newdir = format.initialize_on_transport(to_transport)
1052
1390
repo = newdir.create_repository(shared=True)
1053
repo.set_make_working_trees(trees)
1391
repo.set_make_working_trees(not no_trees)
1392
if not is_quiet():
1393
from bzrlib.info import show_bzrdir_info
1394
show_bzrdir_info(bzrdir.BzrDir.open_containing_from_transport(
1395
to_transport)[0], verbose=0, outfile=self.outf)
1054
1396
1055
1397
1056
1398
class cmd_diff(Command):
1057
"""Show differences in working tree.
1399
"""Show differences in the working tree, between revisions or branches.
1058
1400
1059
If files are listed, only the changes in those files are listed.
1060
Otherwise, all changes for the tree are listed.
1401
If no arguments are given, all changes for the current tree are listed.
1402
If files are given, only the changes in those files are listed.
1403
Remote and multiple branches can be compared by using the --old and
1404
--new options. If not provided, the default for both is derived from
1405
the first argument, if any, or the current tree if no arguments are
1406
given.
1061
1407
1062
1408
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1063
1409
produces patches suitable for "patch -p1".
1064
1410
1065
examples:
1066
bzr diff
1067
bzr diff -r1
1068
bzr diff -r1..2
1069
bzr diff --diff-prefix old/:new/
1070
bzr diff bzr.mine bzr.dev
1071
bzr diff foo.c
1411
:Exit values:
1412
1 - changed
1413
2 - unrepresentable changes
1414
3 - error
1415
0 - no change
1416
1417
:Examples:
1418
Shows the difference in the working tree versus the last commit::
1419
1420
bzr diff
1421
1422
Difference between the working tree and revision 1::
1423
1424
bzr diff -r1
1425
1426
Difference between revision 2 and revision 1::
1427
1428
bzr diff -r1..2
1429
1430
Difference between revision 2 and revision 1 for branch xxx::
1431
1432
bzr diff -r1..2 xxx
1433
1434
Show just the differences for file NEWS::
1435
1436
bzr diff NEWS
1437
1438
Show the differences in working tree xxx for file NEWS::
1439
1440
bzr diff xxx/NEWS
1441
1442
Show the differences from branch xxx to this working tree:
1443
1444
bzr diff --old xxx
1445
1446
Show the differences between two branches for file NEWS::
1447
1448
bzr diff --old xxx --new yyy NEWS
1449
1450
Same as 'bzr diff' but prefix paths with old/ and new/::
1451
1452
bzr diff --prefix old/:new/
1072
1453
"""
1073
# TODO: Option to use external diff command; could be GNU diff, wdiff,
1074
# or a graphical diff.
1075
1076
# TODO: Python difflib is not exactly the same as unidiff; should
1077
# either fix it up or prefer to use an external diff.
1078
1079
# TODO: Selected-file diff is inefficient and doesn't show you
1080
# deleted files.
1081
1082
# TODO: This probably handles non-Unix newlines poorly.
1083
1454
_see_also = ['status']
1084
1455
takes_args = ['file*']
1085
takes_options = ['revision', 'diff-options', 'prefix']
1456
takes_options = [
1457
Option('diff-options', type=str,
1458
help='Pass these options to the external diff program.'),
1459
Option('prefix', type=str,
1460
short_name='p',
1461
help='Set prefixes added to old and new filenames, as '
1462
'two values separated by a colon. (eg "old/:new/").'),
1463
Option('old',
1464
help='Branch/tree to compare from.',
1465
type=unicode,
1466
),
1467
Option('new',
1468
help='Branch/tree to compare to.',
1469
type=unicode,
1470
),
1471
'revision',
1472
'change',
1473
Option('using',
1474
help='Use this command to compare files.',
1475
type=unicode,
1476
),
1477
]
1086
1478
aliases = ['di', 'dif']
1087
1479
encoding_type = 'exact'
1088
1480
1089
1481
@display_command
1090
1482
def run(self, revision=None, file_list=None, diff_options=None,
1091
prefix=None):
1092
from bzrlib.diff import diff_cmd_helper, show_diff_trees
1483
prefix=None, old=None, new=None, using=None):
1484
from bzrlib.diff import _get_trees_to_diff, show_diff_trees
1093
1485
1094
1486
if (prefix is None) or (prefix == '0'):
1095
1487
# diff -p0 format
1098
1490
elif prefix == '1':
1099
1491
old_label = 'old/'
1100
1492
new_label = 'new/'
1101
else:
1102
if not ':' in prefix:
1103
raise BzrError("--diff-prefix expects two values separated by a colon")
1493
elif ':' in prefix:
1104
1494
old_label, new_label = prefix.split(":")
1105
1106
try:
1107
tree1, file_list = internal_tree_files(file_list)
1108
tree2 = None
1109
b = None
1110
b2 = None
1111
except FileInWrongBranch:
1112
if len(file_list) != 2:
1113
raise BzrCommandError("Files are in different branches")
1114
1115
tree1, file1 = WorkingTree.open_containing(file_list[0])
1116
tree2, file2 = WorkingTree.open_containing(file_list[1])
1117
if file1 != "" or file2 != "":
1118
# FIXME diff those two files. rbc 20051123
1119
raise BzrCommandError("Files are in different branches")
1120
file_list = None
1121
if revision is not None:
1122
if tree2 is not None:
1123
raise BzrCommandError("Can't specify -r with two branches")
1124
if (len(revision) == 1) or (revision[1].spec is None):
1125
return diff_cmd_helper(tree1, file_list, diff_options,
1126
revision[0],
1127
old_label=old_label, new_label=new_label)
1128
elif len(revision) == 2:
1129
return diff_cmd_helper(tree1, file_list, diff_options,
1130
revision[0], revision[1],
1131
old_label=old_label, new_label=new_label)
1132
else:
1133
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
1134
1495
else:
1135
if tree2 is not None:
1136
return show_diff_trees(tree1, tree2, sys.stdout,
1137
specific_files=file_list,
1138
external_diff_options=diff_options,
1139
old_label=old_label, new_label=new_label)
1140
else:
1141
return diff_cmd_helper(tree1, file_list, diff_options,
1142
old_label=old_label, new_label=new_label)
1496
raise errors.BzrCommandError(
1497
'--prefix expects two values separated by a colon'
1498
' (eg "old/:new/")')
1499
1500
if revision and len(revision) > 2:
1501
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1502
' one or two revision specifiers')
1503
1504
old_tree, new_tree, specific_files, extra_trees = \
1505
_get_trees_to_diff(file_list, revision, old, new)
1506
return show_diff_trees(old_tree, new_tree, sys.stdout,
1507
specific_files=specific_files,
1508
external_diff_options=diff_options,
1509
old_label=old_label, new_label=new_label,
1510
extra_trees=extra_trees, using=using)
1143
1511
1144
1512
1145
1513
class cmd_deleted(Command):
1151
1519
# directories with readdir, rather than stating each one. Same
1152
1520
# level of effort but possibly much less IO. (Or possibly not,
1153
1521
# if the directories are very large...)
1522
_see_also = ['status', 'ls']
1154
1523
takes_options = ['show-ids']
1155
1524
1156
1525
@display_command
1157
1526
def run(self, show_ids=False):
1158
1527
tree = WorkingTree.open_containing(u'.')[0]
1159
old = tree.basis_tree()
1160
for path, ie in old.inventory.iter_entries():
1161
if not tree.has_id(ie.file_id):
1162
self.outf.write(path)
1163
if show_ids:
1164
self.outf.write(' ')
1165
self.outf.write(ie.file_id)
1166
self.outf.write('\n')
1528
tree.lock_read()
1529
try:
1530
old = tree.basis_tree()
1531
old.lock_read()
1532
try:
1533
for path, ie in old.inventory.iter_entries():
1534
if not tree.has_id(ie.file_id):
1535
self.outf.write(path)
1536
if show_ids:
1537
self.outf.write(' ')
1538
self.outf.write(ie.file_id)
1539
self.outf.write('\n')
1540
finally:
1541
old.unlock()
1542
finally:
1543
tree.unlock()
1167
1544
1168
1545
1169
1546
class cmd_modified(Command):
1170
"""List files modified in working tree."""
1547
"""List files modified in working tree.
1548
"""
1549
1171
1550
hidden = True
1551
_see_also = ['status', 'ls']
1552
takes_options = [
1553
Option('null',
1554
help='Write an ascii NUL (\\0) separator '
1555
'between files rather than a newline.')
1556
]
1557
1172
1558
@display_command
1173
def run(self):
1174
from bzrlib.delta import compare_trees
1175
1559
def run(self, null=False):
1176
1560
tree = WorkingTree.open_containing(u'.')[0]
1177
td = compare_trees(tree.basis_tree(), tree)
1178
1561
td = tree.changes_from(tree.basis_tree())
1179
1562
for path, id, kind, text_modified, meta_modified in td.modified:
1180
self.outf.write(path + '\n')
1563
if null:
1564
self.outf.write(path + '\0')
1565
else:
1566
self.outf.write(osutils.quotefn(path) + '\n')
1181
1567
1182
1568
1183
1569
class cmd_added(Command):
1184
"""List files added in working tree."""
1570
"""List files added in working tree.
1571
"""
1572
1185
1573
hidden = True
1574
_see_also = ['status', 'ls']
1575
takes_options = [
1576
Option('null',
1577
help='Write an ascii NUL (\\0) separator '
1578
'between files rather than a newline.')
1579
]
1580
1186
1581
@display_command
1187
def run(self):
1582
def run(self, null=False):
1188
1583
wt = WorkingTree.open_containing(u'.')[0]
1189
basis_inv = wt.basis_tree().inventory
1190
inv = wt.inventory
1191
for file_id in inv:
1192
if file_id in basis_inv:
1193
continue
1194
path = inv.id2path(file_id)
1195
if not os.access(bzrlib.osutils.abspath(path), os.F_OK):
1196
continue
1197
self.outf.write(path + '\n')
1584
wt.lock_read()
1585
try:
1586
basis = wt.basis_tree()
1587
basis.lock_read()
1588
try:
1589
basis_inv = basis.inventory
1590
inv = wt.inventory
1591
for file_id in inv:
1592
if file_id in basis_inv:
1593
continue
1594
if inv.is_root(file_id) and len(basis_inv) == 0:
1595
continue
1596
path = inv.id2path(file_id)
1597
if not os.access(osutils.abspath(path), os.F_OK):
1598
continue
1599
if null:
1600
self.outf.write(path + '\0')
1601
else:
1602
self.outf.write(osutils.quotefn(path) + '\n')
1603
finally:
1604
basis.unlock()
1605
finally:
1606
wt.unlock()
1198
1607
1199
1608
1200
1609
class cmd_root(Command):
1202
1611
1203
1612
The root is the nearest enclosing directory with a .bzr control
1204
1613
directory."""
1614
1205
1615
takes_args = ['filename?']
1206
1616
@display_command
1207
1617
def run(self, filename=None):
1210
1620
self.outf.write(tree.basedir + '\n')
1211
1621
1212
1622
1623
def _parse_limit(limitstring):
1624
try:
1625
return int(limitstring)
1626
except ValueError:
1627
msg = "The limit argument must be an integer."
1628
raise errors.BzrCommandError(msg)
1629
1630
1213
1631
class cmd_log(Command):
1214
1632
"""Show log of a branch, file, or directory.
1215
1633
1219
1637
-r revision requests a specific revision, -r ..end or -r begin.. are
1220
1638
also valid.
1221
1639
1222
examples:
1223
bzr log
1224
bzr log foo.c
1225
bzr log -r -10.. http://server/branch
1640
:Examples:
1641
Log the current branch::
1642
1643
bzr log
1644
1645
Log a file::
1646
1647
bzr log foo.c
1648
1649
Log the last 10 revisions of a branch::
1650
1651
bzr log -r -10.. http://server/branch
1226
1652
"""
1227
1653
1228
1654
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1229
1655
1230
1656
takes_args = ['location?']
1231
takes_options = [Option('forward',
1232
help='show from oldest to newest'),
1233
'timezone',
1234
Option('verbose',
1235
help='show files changed in each revision'),
1236
'show-ids', 'revision',
1237
'log-format',
1238
'line', 'long',
1239
Option('message',
1240
help='show revisions whose message matches this regexp',
1241
type=str),
1242
'short',
1243
]
1657
takes_options = [
1658
Option('forward',
1659
help='Show from oldest to newest.'),
1660
Option('timezone',
1661
type=str,
1662
help='Display timezone as local, original, or utc.'),
1663
custom_help('verbose',
1664
help='Show files changed in each revision.'),
1665
'show-ids',
1666
'revision',
1667
'log-format',
1668
Option('message',
1669
short_name='m',
1670
help='Show revisions whose message matches this '
1671
'regular expression.',
1672
type=str),
1673
Option('limit',
1674
short_name='l',
1675
help='Limit the output to the first N revisions.',
1676
argname='N',
1677
type=_parse_limit),
1678
]
1244
1679
encoding_type = 'replace'
1245
1680
1246
1681
@display_command
1251
1686
revision=None,
1252
1687
log_format=None,
1253
1688
message=None,
1254
long=False,
1255
short=False,
1256
line=False):
1257
from bzrlib.log import log_formatter, show_log
1258
assert message is None or isinstance(message, basestring), \
1259
"invalid message argument %r" % message
1689
limit=None):
1690
from bzrlib.log import show_log
1260
1691
direction = (forward and 'forward') or 'reverse'
1261
1692
1262
1693
# log everything
1264
1695
if location:
1265
1696
# find the file id to log:
1266
1697
1267
dir, fp = bzrdir.BzrDir.open_containing(location)
1268
b = dir.open_branch()
1698
tree, b, fp = bzrdir.BzrDir.open_containing_tree_or_branch(
1699
location)
1269
1700
if fp != '':
1270
try:
1271
# might be a tree:
1272
inv = dir.open_workingtree().inventory
1273
except (errors.NotBranchError, errors.NotLocalUrl):
1274
# either no tree, or is remote.
1275
inv = b.basis_tree().inventory
1276
file_id = inv.path2id(fp)
1701
if tree is None:
1702
tree = b.basis_tree()
1703
file_id = tree.path2id(fp)
1704
if file_id is None:
1705
raise errors.BzrCommandError(
1706
"Path does not have any revision history: %s" %
1707
location)
1277
1708
else:
1278
1709
# local dir only
1279
1710
# FIXME ? log the current subdir only RBC 20060203
1280
dir, relpath = bzrdir.BzrDir.open_containing('.')
1711
if revision is not None \
1712
and len(revision) > 0 and revision[0].get_branch():
1713
location = revision[0].get_branch()
1714
else:
1715
location = '.'
1716
dir, relpath = bzrdir.BzrDir.open_containing(location)
1281
1717
b = dir.open_branch()
1282
1718
1283
if revision is None:
1284
rev1 = None
1285
rev2 = None
1286
elif len(revision) == 1:
1287
rev1 = rev2 = revision[0].in_history(b).revno
1288
elif len(revision) == 2:
1289
if revision[0].spec is None:
1290
# missing begin-range means first revision
1291
rev1 = 1
1292
else:
1293
rev1 = revision[0].in_history(b).revno
1294
1295
if revision[1].spec is None:
1296
# missing end-range means last known revision
1297
rev2 = b.revno()
1298
else:
1299
rev2 = revision[1].in_history(b).revno
1300
else:
1301
raise BzrCommandError('bzr log --revision takes one or two values.')
1302
1303
# By this point, the revision numbers are converted to the +ve
1304
# form if they were supplied in the -ve form, so we can do
1305
# this comparison in relative safety
1306
if rev1 > rev2:
1307
(rev2, rev1) = (rev1, rev2)
1308
1309
if (log_format == None):
1310
default = bzrlib.config.BranchConfig(b).log_format()
1311
log_format = get_log_format(long=long, short=short, line=line, default=default)
1312
lf = log_formatter(log_format,
1313
show_ids=show_ids,
1314
to_file=self.outf,
1315
show_timezone=timezone)
1316
1317
show_log(b,
1318
lf,
1319
file_id,
1320
verbose=verbose,
1321
direction=direction,
1322
start_revision=rev1,
1323
end_revision=rev2,
1324
search=message)
1719
b.lock_read()
1720
try:
1721
if revision is None:
1722
rev1 = None
1723
rev2 = None
1724
elif len(revision) == 1:
1725
rev1 = rev2 = revision[0].in_history(b)
1726
elif len(revision) == 2:
1727
if revision[1].get_branch() != revision[0].get_branch():
1728
# b is taken from revision[0].get_branch(), and
1729
# show_log will use its revision_history. Having
1730
# different branches will lead to weird behaviors.
1731
raise errors.BzrCommandError(
1732
"Log doesn't accept two revisions in different"
1733
" branches.")
1734
rev1 = revision[0].in_history(b)
1735
rev2 = revision[1].in_history(b)
1736
else:
1737
raise errors.BzrCommandError(
1738
'bzr log --revision takes one or two values.')
1739
1740
if log_format is None:
1741
log_format = log.log_formatter_registry.get_default(b)
1742
1743
lf = log_format(show_ids=show_ids, to_file=self.outf,
1744
show_timezone=timezone)
1745
1746
show_log(b,
1747
lf,
1748
file_id,
1749
verbose=verbose,
1750
direction=direction,
1751
start_revision=rev1,
1752
end_revision=rev2,
1753
search=message,
1754
limit=limit)
1755
finally:
1756
b.unlock()
1325
1757
1326
1758
1327
1759
def get_log_format(long=False, short=False, line=False, default='long'):
1348
1780
def run(self, filename):
1349
1781
tree, relpath = WorkingTree.open_containing(filename)
1350
1782
b = tree.branch
1351
inv = tree.read_working_inventory()
1352
file_id = inv.path2id(relpath)
1353
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1783
file_id = tree.path2id(relpath)
1784
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1354
1785
self.outf.write("%6d %s\n" % (revno, what))
1355
1786
1356
1787
1357
1788
class cmd_ls(Command):
1358
1789
"""List files in a tree.
1359
1790
"""
1791
1792
_see_also = ['status', 'cat']
1793
takes_args = ['path?']
1360
1794
# TODO: Take a revision or remote path and list that tree instead.
1361
hidden = True
1362
takes_options = ['verbose', 'revision',
1363
Option('non-recursive',
1364
help='don\'t recurse into sub-directories'),
1365
Option('from-root',
1366
help='Print all paths from the root of the branch.'),
1367
Option('unknown', help='Print unknown files'),
1368
Option('versioned', help='Print versioned files'),
1369
Option('ignored', help='Print ignored files'),
1370
1371
Option('null', help='Null separate the files'),
1372
]
1795
takes_options = [
1796
'verbose',
1797
'revision',
1798
Option('non-recursive',
1799
help='Don\'t recurse into subdirectories.'),
1800
Option('from-root',
1801
help='Print paths relative to the root of the branch.'),
1802
Option('unknown', help='Print unknown files.'),
1803
Option('versioned', help='Print versioned files.',
1804
short_name='V'),
1805
Option('ignored', help='Print ignored files.'),
1806
Option('null',
1807
help='Write an ascii NUL (\\0) separator '
1808
'between files rather than a newline.'),
1809
Option('kind',
1810
help='List entries of a particular kind: file, directory, symlink.',
1811
type=unicode),
1812
'show-ids',
1813
]
1373
1814
@display_command
1374
def run(self, revision=None, verbose=False,
1815
def run(self, revision=None, verbose=False,
1375
1816
non_recursive=False, from_root=False,
1376
1817
unknown=False, versioned=False, ignored=False,
1377
null=False):
1818
null=False, kind=None, show_ids=False, path=None):
1819
1820
if kind and kind not in ('file', 'directory', 'symlink'):
1821
raise errors.BzrCommandError('invalid kind specified')
1378
1822
1379
1823
if verbose and null:
1380
raise BzrCommandError('Cannot set both --verbose and --null')
1824
raise errors.BzrCommandError('Cannot set both --verbose and --null')
1381
1825
all = not (unknown or versioned or ignored)
1382
1826
1383
1827
selection = {'I':ignored, '?':unknown, 'V':versioned}
1384
1828
1385
tree, relpath = WorkingTree.open_containing(u'.')
1829
if path is None:
1830
fs_path = '.'
1831
prefix = ''
1832
else:
1833
if from_root:
1834
raise errors.BzrCommandError('cannot specify both --from-root'
1835
' and PATH')
1836
fs_path = path
1837
prefix = path
1838
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
1839
fs_path)
1386
1840
if from_root:
1387
1841
relpath = u''
1388
1842
elif relpath:
1389
1843
relpath += '/'
1390
1844
if revision is not None:
1391
tree = tree.branch.repository.revision_tree(
1392
revision[0].in_history(tree.branch).rev_id)
1845
tree = branch.repository.revision_tree(
1846
revision[0].as_revision_id(branch))
1847
elif tree is None:
1848
tree = branch.basis_tree()
1393
1849
1394
for fp, fc, kind, fid, entry in tree.list_files():
1395
if fp.startswith(relpath):
1396
fp = fp[len(relpath):]
1397
if non_recursive and '/' in fp:
1398
continue
1399
if not all and not selection[fc]:
1400
continue
1401
if verbose:
1402
kindch = entry.kind_character()
1403
self.outf.write('%-8s %s%s\n' % (fc, fp, kindch))
1404
elif null:
1405
self.outf.write(fp + '\0')
1406
self.outf.flush()
1407
else:
1408
self.outf.write(fp + '\n')
1850
tree.lock_read()
1851
try:
1852
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1853
if fp.startswith(relpath):
1854
fp = osutils.pathjoin(prefix, fp[len(relpath):])
1855
if non_recursive and '/' in fp:
1856
continue
1857
if not all and not selection[fc]:
1858
continue
1859
if kind is not None and fkind != kind:
1860
continue
1861
if verbose:
1862
kindch = entry.kind_character()
1863
outstring = '%-8s %s%s' % (fc, fp, kindch)
1864
if show_ids and fid is not None:
1865
outstring = "%-50s %s" % (outstring, fid)
1866
self.outf.write(outstring + '\n')
1867
elif null:
1868
self.outf.write(fp + '\0')
1869
if show_ids:
1870
if fid is not None:
1871
self.outf.write(fid)
1872
self.outf.write('\0')
1873
self.outf.flush()
1874
else:
1875
if fid is not None:
1876
my_id = fid
1877
else:
1878
my_id = ''
1879
if show_ids:
1880
self.outf.write('%-50s %s\n' % (fp, my_id))
1881
else:
1882
self.outf.write(fp + '\n')
1883
finally:
1884
tree.unlock()
1409
1885
1410
1886
1411
1887
class cmd_unknowns(Command):
1412
"""List unknown files."""
1888
"""List unknown files.
1889
"""
1890
1891
hidden = True
1892
_see_also = ['ls']
1893
1413
1894
@display_command
1414
1895
def run(self):
1415
from bzrlib.osutils import quotefn
1416
1896
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1417
self.outf.write(quotefn(f) + '\n')
1897
self.outf.write(osutils.quotefn(f) + '\n')
1418
1898
1419
1899
1420
1900
class cmd_ignore(Command):
1421
"""Ignore a command or pattern.
1901
"""Ignore specified files or patterns.
1902
1903
See ``bzr help patterns`` for details on the syntax of patterns.
1422
1904
1423
1905
To remove patterns from the ignore list, edit the .bzrignore file.
1424
1425
If the pattern contains a slash, it is compared to the whole path
1426
from the branch root. Otherwise, it is compared to only the last
1427
component of the path. To match a file only in the root directory,
1428
prepend './'.
1429
1430
Ignore patterns are case-insensitive on case-insensitive systems.
1431
1432
Note: wildcards must be quoted from the shell on Unix.
1433
1434
examples:
1435
bzr ignore ./Makefile
1436
bzr ignore '*.class'
1906
After adding, editing or deleting that file either indirectly by
1907
using this command or directly by using an editor, be sure to commit
1908
it.
1909
1910
Note: ignore patterns containing shell wildcards must be quoted from
1911
the shell on Unix.
1912
1913
:Examples:
1914
Ignore the top level Makefile::
1915
1916
bzr ignore ./Makefile
1917
1918
Ignore class files in all directories::
1919
1920
bzr ignore "*.class"
1921
1922
Ignore .o files under the lib directory::
1923
1924
bzr ignore "lib/**/*.o"
1925
1926
Ignore .o files under the lib directory::
1927
1928
bzr ignore "RE:lib/.*\.o"
1929
1930
Ignore everything but the "debian" toplevel directory::
1931
1932
bzr ignore "RE:(?!debian/).*"
1437
1933
"""
1438
# TODO: Complain if the filename is absolute
1439
takes_args = ['name_pattern']
1934
1935
_see_also = ['status', 'ignored', 'patterns']
1936
takes_args = ['name_pattern*']
1937
takes_options = [
1938
Option('old-default-rules',
1939
help='Write out the ignore rules bzr < 0.9 always used.')
1940
]
1440
1941
1441
def run(self, name_pattern):
1442
from bzrlib.atomicfile import AtomicFile
1443
import os.path
1444
1942
def run(self, name_pattern_list=None, old_default_rules=None):
1943
from bzrlib import ignores
1944
if old_default_rules is not None:
1945
# dump the rules and exit
1946
for pattern in ignores.OLD_DEFAULTS:
1947
print pattern
1948
return
1949
if not name_pattern_list:
1950
raise errors.BzrCommandError("ignore requires at least one "
1951
"NAME_PATTERN or --old-default-rules")
1952
name_pattern_list = [globbing.normalize_pattern(p)
1953
for p in name_pattern_list]
1954
for name_pattern in name_pattern_list:
1955
if (name_pattern[0] == '/' or
1956
(len(name_pattern) > 1 and name_pattern[1] == ':')):
1957
raise errors.BzrCommandError(
1958
"NAME_PATTERN should not be an absolute path")
1445
1959
tree, relpath = WorkingTree.open_containing(u'.')
1446
ifn = tree.abspath('.bzrignore')
1447
1448
if os.path.exists(ifn):
1449
f = open(ifn, 'rt')
1450
try:
1451
igns = f.read().decode('utf-8')
1452
finally:
1453
f.close()
1454
else:
1455
igns = ''
1456
1457
# TODO: If the file already uses crlf-style termination, maybe
1458
# we should use that for the newly added lines?
1459
1460
if igns and igns[-1] != '\n':
1461
igns += '\n'
1462
igns += name_pattern + '\n'
1463
1464
f = AtomicFile(ifn, 'wt')
1465
try:
1466
f.write(igns.encode('utf-8'))
1467
f.commit()
1468
finally:
1469
f.close()
1470
1471
inv = tree.inventory
1472
if inv.path2id('.bzrignore'):
1473
mutter('.bzrignore is already versioned')
1474
else:
1475
mutter('need to make new .bzrignore file versioned')
1476
tree.add(['.bzrignore'])
1960
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
1961
ignored = globbing.Globster(name_pattern_list)
1962
matches = []
1963
tree.lock_read()
1964
for entry in tree.list_files():
1965
id = entry[3]
1966
if id is not None:
1967
filename = entry[0]
1968
if ignored.match(filename):
1969
matches.append(filename.encode('utf-8'))
1970
tree.unlock()
1971
if len(matches) > 0:
1972
print "Warning: the following files are version controlled and" \
1973
" match your ignore pattern:\n%s" % ("\n".join(matches),)
1477
1974
1478
1975
1479
1976
class cmd_ignored(Command):
1480
1977
"""List ignored files and the patterns that matched them.
1481
1978
1482
See also: bzr ignore"""
1979
List all the ignored files and the ignore pattern that caused the file to
1980
be ignored.
1981
1982
Alternatively, to list just the files::
1983
1984
bzr ls --ignored
1985
"""
1986
1987
encoding_type = 'replace'
1988
_see_also = ['ignore', 'ls']
1989
1483
1990
@display_command
1484
1991
def run(self):
1485
1992
tree = WorkingTree.open_containing(u'.')[0]
1486
for path, file_class, kind, file_id, entry in tree.list_files():
1487
if file_class != 'I':
1488
continue
1489
## XXX: Slightly inefficient since this was already calculated
1490
pat = tree.is_ignored(path)
1491
print '%-50s %s' % (path, pat)
1993
tree.lock_read()
1994
try:
1995
for path, file_class, kind, file_id, entry in tree.list_files():
1996
if file_class != 'I':
1997
continue
1998
## XXX: Slightly inefficient since this was already calculated
1999
pat = tree.is_ignored(path)
2000
self.outf.write('%-50s %s\n' % (path, pat))
2001
finally:
2002
tree.unlock()
1492
2003
1493
2004
1494
2005
class cmd_lookup_revision(Command):
1495
2006
"""Lookup the revision-id from a revision-number
1496
2007
1497
example:
2008
:Examples:
1498
2009
bzr lookup-revision 33
1499
2010
"""
1500
2011
hidden = True
1505
2016
try:
1506
2017
revno = int(revno)
1507
2018
except ValueError:
1508
raise BzrCommandError("not a valid revision-number: %r" % revno)
2019
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
1509
2020
1510
2021
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1511
2022
1512
2023
1513
2024
class cmd_export(Command):
1514
"""Export past revision to destination directory.
2025
"""Export current or past revision to a destination directory or archive.
1515
2026
1516
2027
If no revision is specified this exports the last committed revision.
1517
2028
1519
2030
given, try to find the format with the extension. If no extension
1520
2031
is found exports to a directory (equivalent to --format=dir).
1521
2032
1522
Root may be the top directory for tar, tgz and tbz2 formats. If none
1523
is given, the top directory will be the root name of the file.
1524
1525
Note: export of tree with non-ascii filenames to zip is not supported.
1526
1527
Supported formats Autodetected by extension
1528
----------------- -------------------------
1529
dir -
2033
If root is supplied, it will be used as the root directory inside
2034
container formats (tar, zip, etc). If it is not supplied it will default
2035
to the exported filename. The root option has no effect for 'dir' format.
2036
2037
If branch is omitted then the branch containing the current working
2038
directory will be used.
2039
2040
Note: Export of tree with non-ASCII filenames to zip is not supported.
2041
2042
================= =========================
2043
Supported formats Autodetected by extension
2044
================= =========================
2045
dir (none)
1530
2046
tar .tar
1531
2047
tbz2 .tar.bz2, .tbz2
1532
2048
tgz .tar.gz, .tgz
1533
2049
zip .zip
2050
================= =========================
1534
2051
"""
1535
takes_args = ['dest']
1536
takes_options = ['revision', 'format', 'root']
1537
def run(self, dest, revision=None, format=None, root=None):
1538
import os.path
2052
takes_args = ['dest', 'branch_or_subdir?']
2053
takes_options = [
2054
Option('format',
2055
help="Type of file to export to.",
2056
type=unicode),
2057
'revision',
2058
Option('root',
2059
type=str,
2060
help="Name of the root directory inside the exported file."),
2061
]
2062
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2063
root=None):
1539
2064
from bzrlib.export import export
1540
tree = WorkingTree.open_containing(u'.')[0]
1541
b = tree.branch
2065
2066
if branch_or_subdir is None:
2067
tree = WorkingTree.open_containing(u'.')[0]
2068
b = tree.branch
2069
subdir = None
2070
else:
2071
b, subdir = Branch.open_containing(branch_or_subdir)
2072
1542
2073
if revision is None:
1543
2074
# should be tree.last_revision FIXME
1544
2075
rev_id = b.last_revision()
1545
2076
else:
1546
2077
if len(revision) != 1:
1547
raise BzrError('bzr export --revision takes exactly 1 argument')
1548
rev_id = revision[0].in_history(b).rev_id
2078
raise errors.BzrCommandError('bzr export --revision takes exactly 1 argument')
2079
rev_id = revision[0].as_revision_id(b)
1549
2080
t = b.repository.revision_tree(rev_id)
1550
2081
try:
1551
export(t, dest, format, root)
2082
export(t, dest, format, root, subdir)
1552
2083
except errors.NoSuchExportFormat, e:
1553
raise BzrCommandError('Unsupported export format: %s' % e.format)
2084
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
1554
2085
1555
2086
1556
2087
class cmd_cat(Command):
1557
"""Write a file's text from a previous revision."""
1558
1559
takes_options = ['revision']
2088
"""Write the contents of a file as of a given revision to standard output.
2089
2090
If no revision is nominated, the last revision is used.
2091
2092
Note: Take care to redirect standard output when using this command on a
2093
binary file.
2094
"""
2095
2096
_see_also = ['ls']
2097
takes_options = [
2098
Option('name-from-revision', help='The path name in the old tree.'),
2099
'revision',
2100
]
1560
2101
takes_args = ['filename']
2102
encoding_type = 'exact'
1561
2103
1562
2104
@display_command
1563
def run(self, filename, revision=None):
2105
def run(self, filename, revision=None, name_from_revision=False):
1564
2106
if revision is not None and len(revision) != 1:
1565
raise BzrCommandError("bzr cat --revision takes exactly one number")
1566
tree = None
2107
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2108
" one revision specifier")
2109
tree, branch, relpath = \
2110
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2111
branch.lock_read()
1567
2112
try:
1568
tree, relpath = WorkingTree.open_containing(filename)
1569
b = tree.branch
1570
except NotBranchError:
1571
pass
2113
return self._run(tree, branch, relpath, filename, revision,
2114
name_from_revision)
2115
finally:
2116
branch.unlock()
1572
2117
2118
def _run(self, tree, b, relpath, filename, revision, name_from_revision):
1573
2119
if tree is None:
1574
b, relpath = Branch.open_containing(filename)
2120
tree = b.basis_tree()
1575
2121
if revision is None:
1576
2122
revision_id = b.last_revision()
1577
2123
else:
1578
revision_id = revision[0].in_history(b).rev_id
1579
b.print_file(relpath, revision_id)
2124
revision_id = revision[0].as_revision_id(b)
2125
2126
cur_file_id = tree.path2id(relpath)
2127
rev_tree = b.repository.revision_tree(revision_id)
2128
old_file_id = rev_tree.path2id(relpath)
2129
2130
if name_from_revision:
2131
if old_file_id is None:
2132
raise errors.BzrCommandError("%r is not present in revision %s"
2133
% (filename, revision_id))
2134
else:
2135
content = rev_tree.get_file_text(old_file_id)
2136
elif cur_file_id is not None:
2137
content = rev_tree.get_file_text(cur_file_id)
2138
elif old_file_id is not None:
2139
content = rev_tree.get_file_text(old_file_id)
2140
else:
2141
raise errors.BzrCommandError("%r is not present in revision %s" %
2142
(filename, revision_id))
2143
self.outf.write(content)
1580
2144
1581
2145
1582
2146
class cmd_local_time_offset(Command):
1584
2148
hidden = True
1585
2149
@display_command
1586
2150
def run(self):
1587
print bzrlib.osutils.local_time_offset()
2151
print osutils.local_time_offset()
1588
2152
1589
2153
1590
2154
1597
2161
committed. If a directory is specified then the directory and everything
1598
2162
within it is committed.
1599
2163
2164
When excludes are given, they take precedence over selected files.
2165
For example, too commit only changes within foo, but not changes within
2166
foo/bar::
2167
2168
bzr commit foo -x foo/bar
2169
2170
If author of the change is not the same person as the committer, you can
2171
specify the author's name using the --author option. The name should be
2172
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2173
1600
2174
A selected-file commit may fail in some cases where the committed
1601
tree would be invalid, such as trying to commit a file in a
1602
newly-added directory that is not itself committed.
2175
tree would be invalid. Consider::
2176
2177
bzr init foo
2178
mkdir foo/bar
2179
bzr add foo/bar
2180
bzr commit foo -m "committing foo"
2181
bzr mv foo/bar foo/baz
2182
mkdir foo/bar
2183
bzr add foo/bar
2184
bzr commit foo/bar -m "committing bar but not baz"
2185
2186
In the example above, the last commit will fail by design. This gives
2187
the user the opportunity to decide whether they want to commit the
2188
rename at the same time, separately first, or not at all. (As a general
2189
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2190
2191
Note: A selected-file commit after a merge is not yet supported.
1603
2192
"""
1604
2193
# TODO: Run hooks on tree to-be-committed, and after commit.
1605
2194
1610
2199
1611
2200
# XXX: verbose currently does nothing
1612
2201
2202
_see_also = ['bugs', 'uncommit']
1613
2203
takes_args = ['selected*']
1614
takes_options = ['message', 'verbose',
1615
Option('unchanged',
1616
help='commit even if nothing has changed'),
1617
Option('file', type=str,
1618
argname='msgfile',
1619
help='file containing commit message'),
1620
Option('strict',
1621
help="refuse to commit if there are unknown "
1622
"files in the working tree."),
1623
Option('local',
1624
help="perform a local only commit in a bound "
1625
"branch. Such commits are not pushed to "
1626
"the master branch until a normal commit "
1627
"is performed."
1628
),
1629
]
2204
takes_options = [
2205
ListOption('exclude', type=str, short_name='x',
2206
help="Do not consider changes made to a given path."),
2207
Option('message', type=unicode,
2208
short_name='m',
2209
help="Description of the new revision."),
2210
'verbose',
2211
Option('unchanged',
2212
help='Commit even if nothing has changed.'),
2213
Option('file', type=str,
2214
short_name='F',
2215
argname='msgfile',
2216
help='Take commit message from this file.'),
2217
Option('strict',
2218
help="Refuse to commit if there are unknown "
2219
"files in the working tree."),
2220
ListOption('fixes', type=str,
2221
help="Mark a bug as being fixed by this revision."),
2222
Option('author', type=unicode,
2223
help="Set the author's name, if it's different "
2224
"from the committer."),
2225
Option('local',
2226
help="Perform a local commit in a bound "
2227
"branch. Local commits are not pushed to "
2228
"the master branch until a normal commit "
2229
"is performed."
2230
),
2231
Option('show-diff',
2232
help='When no message is supplied, show the diff along'
2233
' with the status summary in the message editor.'),
2234
]
1630
2235
aliases = ['ci', 'checkin']
1631
2236
1632
def run(self, message=None, file=None, verbose=True, selected_list=None,
1633
unchanged=False, strict=False, local=False):
1634
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1635
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1636
StrictCommitFailed)
1637
from bzrlib.msgeditor import edit_commit_message, \
1638
make_commit_message_template
1639
from tempfile import TemporaryFile
2237
def _get_bug_fix_properties(self, fixes, branch):
2238
properties = []
2239
# Configure the properties for bug fixing attributes.
2240
for fixed_bug in fixes:
2241
tokens = fixed_bug.split(':')
2242
if len(tokens) != 2:
2243
raise errors.BzrCommandError(
2244
"Invalid bug %s. Must be in the form of 'tag:id'. "
2245
"Commit refused." % fixed_bug)
2246
tag, bug_id = tokens
2247
try:
2248
bug_url = bugtracker.get_bug_url(tag, branch, bug_id)
2249
except errors.UnknownBugTrackerAbbreviation:
2250
raise errors.BzrCommandError(
2251
'Unrecognized bug %s. Commit refused.' % fixed_bug)
2252
except errors.MalformedBugIdentifier:
2253
raise errors.BzrCommandError(
2254
"Invalid bug identifier for %s. Commit refused."
2255
% fixed_bug)
2256
properties.append('%s fixed' % bug_url)
2257
return '\n'.join(properties)
2258
2259
def run(self, message=None, file=None, verbose=False, selected_list=None,
2260
unchanged=False, strict=False, local=False, fixes=None,
2261
author=None, show_diff=False, exclude=None):
2262
from bzrlib.errors import (
2263
PointlessCommit,
2264
ConflictsInTree,
2265
StrictCommitFailed
2266
)
2267
from bzrlib.msgeditor import (
2268
edit_commit_message_encoded,
2269
make_commit_message_template_encoded
2270
)
1640
2271
1641
2272
# TODO: Need a blackbox test for invoking the external editor; may be
1642
2273
# slightly problematic to run this cross-platform.
1643
2274
1644
2275
# TODO: do more checks that the commit will succeed before
1645
2276
# spending the user's valuable time typing a commit message.
1646
#
1647
# TODO: if the commit *does* happen to fail, then save the commit
1648
# message to a temporary file where it can be recovered
2277
2278
properties = {}
2279
1649
2280
tree, selected_list = tree_files(selected_list)
1650
2281
if selected_list == ['']:
1651
2282
# workaround - commit of root of tree should be exactly the same
1653
2284
# selected-file merge commit is not done yet
1654
2285
selected_list = []
1655
2286
2287
if fixes is None:
2288
fixes = []
2289
bug_property = self._get_bug_fix_properties(fixes, tree.branch)
2290
if bug_property:
2291
properties['bugs'] = bug_property
2292
1656
2293
if local and not tree.branch.get_bound_location():
1657
2294
raise errors.LocalRequiresBoundBranch()
1658
if message is None and not file:
1659
template = make_commit_message_template(tree, selected_list)
1660
message = edit_commit_message(template)
1661
if message is None:
1662
raise BzrCommandError("please specify a commit message"
1663
" with either --message or --file")
1664
elif message and file:
1665
raise BzrCommandError("please specify either --message or --file")
1666
1667
if file:
1668
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1669
1670
if message == "":
1671
raise BzrCommandError("empty commit message specified")
1672
1673
if verbose:
1674
reporter = ReportCommitToLog()
1675
else:
1676
reporter = NullCommitReporter()
1677
2295
2296
def get_message(commit_obj):
2297
"""Callback to get commit message"""
2298
my_message = message
2299
if my_message is None and not file:
2300
t = make_commit_message_template_encoded(tree,
2301
selected_list, diff=show_diff,
2302
output_encoding=bzrlib.user_encoding)
2303
my_message = edit_commit_message_encoded(t)
2304
if my_message is None:
2305
raise errors.BzrCommandError("please specify a commit"
2306
" message with either --message or --file")
2307
elif my_message and file:
2308
raise errors.BzrCommandError(
2309
"please specify either --message or --file")
2310
if file:
2311
my_message = codecs.open(file, 'rt',
2312
bzrlib.user_encoding).read()
2313
if my_message == "":
2314
raise errors.BzrCommandError("empty commit message specified")
2315
return my_message
2316
1678
2317
try:
1679
tree.commit(message, specific_files=selected_list,
2318
tree.commit(message_callback=get_message,
2319
specific_files=selected_list,
1680
2320
allow_pointless=unchanged, strict=strict, local=local,
1681
reporter=reporter)
2321
reporter=None, verbose=verbose, revprops=properties,
2322
author=author,
2323
exclude=safe_relpath_files(tree, exclude))
1682
2324
except PointlessCommit:
1683
2325
# FIXME: This should really happen before the file is read in;
1684
2326
# perhaps prepare the commit; get the message; then actually commit
1685
raise BzrCommandError("no changes to commit",
1686
["use --unchanged to commit anyhow"])
2327
raise errors.BzrCommandError("no changes to commit."
2328
" use --unchanged to commit anyhow")
1687
2329
except ConflictsInTree:
1688
raise BzrCommandError("Conflicts detected in working tree. "
1689
'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
2330
raise errors.BzrCommandError('Conflicts detected in working '
2331
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
2332
' resolve.')
1690
2333
except StrictCommitFailed:
1691
raise BzrCommandError("Commit refused because there are unknown "
1692
"files in the working tree.")
2334
raise errors.BzrCommandError("Commit refused because there are"
2335
" unknown files in the working tree.")
1693
2336
except errors.BoundBranchOutOfDate, e:
1694
raise BzrCommandError(str(e)
1695
+ ' Either unbind, update, or'
1696
' pass --local to commit.')
2337
raise errors.BzrCommandError(str(e) + "\n"
2338
'To commit to master branch, run update and then commit.\n'
2339
'You can also pass --local to commit to continue working '
2340
'disconnected.')
1697
2341
1698
2342
1699
2343
class cmd_check(Command):
1700
"""Validate consistency of branch history.
1701
1702
This command checks various invariants about the branch storage to
1703
detect data corruption or bzr bugs.
2344
"""Validate working tree structure, branch consistency and repository history.
2345
2346
This command checks various invariants about branch and repository storage
2347
to detect data corruption or bzr bugs.
2348
2349
The working tree and branch checks will only give output if a problem is
2350
detected. The output fields of the repository check are:
2351
2352
revisions: This is just the number of revisions checked. It doesn't
2353
indicate a problem.
2354
versionedfiles: This is just the number of versionedfiles checked. It
2355
doesn't indicate a problem.
2356
unreferenced ancestors: Texts that are ancestors of other texts, but
2357
are not properly referenced by the revision ancestry. This is a
2358
subtle problem that Bazaar can work around.
2359
unique file texts: This is the total number of unique file contents
2360
seen in the checked revisions. It does not indicate a problem.
2361
repeated file texts: This is the total number of repeated texts seen
2362
in the checked revisions. Texts can be repeated when their file
2363
entries are modified, but the file contents are not. It does not
2364
indicate a problem.
2365
2366
If no restrictions are specified, all Bazaar data that is found at the given
2367
location will be checked.
2368
2369
:Examples:
2370
2371
Check the tree and branch at 'foo'::
2372
2373
bzr check --tree --branch foo
2374
2375
Check only the repository at 'bar'::
2376
2377
bzr check --repo bar
2378
2379
Check everything at 'baz'::
2380
2381
bzr check baz
1704
2382
"""
1705
takes_args = ['branch?']
1706
takes_options = ['verbose']
1707
1708
def run(self, branch=None, verbose=False):
1709
from bzrlib.check import check
1710
if branch is None:
1711
tree = WorkingTree.open_containing()[0]
1712
branch = tree.branch
1713
else:
1714
branch = Branch.open(branch)
1715
check(branch, verbose)
1716
1717
1718
class cmd_scan_cache(Command):
1719
hidden = True
1720
def run(self):
1721
from bzrlib.hashcache import HashCache
1722
1723
c = HashCache(u'.')
1724
c.read()
1725
c.scan()
1726
1727
print '%6d stats' % c.stat_count
1728
print '%6d in hashcache' % len(c._cache)
1729
print '%6d files removed from cache' % c.removed_count
1730
print '%6d hashes updated' % c.update_count
1731
print '%6d files changed too recently to cache' % c.danger_count
1732
1733
if c.needs_write:
1734
c.write()
2383
2384
_see_also = ['reconcile']
2385
takes_args = ['path?']
2386
takes_options = ['verbose',
2387
Option('branch', help="Check the branch related to the"
2388
" current directory."),
2389
Option('repo', help="Check the repository related to the"
2390
" current directory."),
2391
Option('tree', help="Check the working tree related to"
2392
" the current directory.")]
2393
2394
def run(self, path=None, verbose=False, branch=False, repo=False,
2395
tree=False):
2396
from bzrlib.check import check_dwim
2397
if path is None:
2398
path = '.'
2399
if not branch and not repo and not tree:
2400
branch = repo = tree = True
2401
check_dwim(path, verbose, do_branch=branch, do_repo=repo, do_tree=tree)
1735
2402
1736
2403
1737
2404
class cmd_upgrade(Command):
1741
2408
this command. When the default format has changed you may also be warned
1742
2409
during other operations to upgrade.
1743
2410
"""
2411
2412
_see_also = ['check']
1744
2413
takes_args = ['url?']
1745
2414
takes_options = [
1746
Option('format',
1747
help='Upgrade to a specific format. Current formats'
1748
' are: default, knit, metaweave and weave.'
1749
' Default is knit; metaweave and weave are'
1750
' deprecated',
1751
type=get_format_type),
2415
RegistryOption('format',
2416
help='Upgrade to a specific format. See "bzr help'
2417
' formats" for details.',
2418
registry=bzrdir.format_registry,
2419
converter=bzrdir.format_registry.make_bzrdir,
2420
value_switches=True, title='Branch format'),
1752
2421
]
1753
2422
1754
1755
2423
def run(self, url='.', format=None):
1756
2424
from bzrlib.upgrade import upgrade
1757
2425
if format is None:
1758
format = get_format_type('default')
2426
format = bzrdir.format_registry.make_bzrdir('default')
1759
2427
upgrade(url, format)
1760
2428
1761
2429
1762
2430
class cmd_whoami(Command):
1763
"""Show bzr user id."""
1764
takes_options = ['email']
2431
"""Show or set bzr user id.
2432
2433
:Examples:
2434
Show the email of the current user::
2435
2436
bzr whoami --email
2437
2438
Set the current user::
2439
2440
bzr whoami "Frank Chu <fchu@example.com>"
2441
"""
2442
takes_options = [ Option('email',
2443
help='Display email address only.'),
2444
Option('branch',
2445
help='Set identity for the current branch instead of '
2446
'globally.'),
2447
]
2448
takes_args = ['name?']
2449
encoding_type = 'replace'
1765
2450
1766
2451
@display_command
1767
def run(self, email=False):
2452
def run(self, email=False, branch=False, name=None):
2453
if name is None:
2454
# use branch if we're inside one; otherwise global config
2455
try:
2456
c = Branch.open_containing('.')[0].get_config()
2457
except errors.NotBranchError:
2458
c = config.GlobalConfig()
2459
if email:
2460
self.outf.write(c.user_email() + '\n')
2461
else:
2462
self.outf.write(c.username() + '\n')
2463
return
2464
2465
# display a warning if an email address isn't included in the given name.
1768
2466
try:
1769
b = WorkingTree.open_containing(u'.')[0].branch
1770
config = bzrlib.config.BranchConfig(b)
1771
except NotBranchError:
1772
config = bzrlib.config.GlobalConfig()
2467
config.extract_email_address(name)
2468
except errors.NoEmailInUsername, e:
2469
warning('"%s" does not seem to contain an email address. '
2470
'This is allowed, but not recommended.', name)
1773
2471
1774
if email:
1775
print config.user_email()
2472
# use global config unless --branch given
2473
if branch:
2474
c = Branch.open_containing('.')[0].get_config()
1776
2475
else:
1777
print config.username()
2476
c = config.GlobalConfig()
2477
c.set_user_option('email', name)
1778
2478
1779
2479
1780
2480
class cmd_nick(Command):
1783
2483
If unset, the tree root directory name is used as the nickname
1784
2484
To print the current nickname, execute with no argument.
1785
2485
"""
2486
2487
_see_also = ['info']
1786
2488
takes_args = ['nickname?']
1787
2489
def run(self, nickname=None):
1788
2490
branch = Branch.open_containing(u'.')[0]
1793
2495
1794
2496
@display_command
1795
2497
def printme(self, branch):
1796
print branch.nick
2498
print branch.nick
2499
2500
2501
class cmd_alias(Command):
2502
"""Set/unset and display aliases.
2503
2504
:Examples:
2505
Show the current aliases::
2506
2507
bzr alias
2508
2509
Show the alias specified for 'll'::
2510
2511
bzr alias ll
2512
2513
Set an alias for 'll'::
2514
2515
bzr alias ll="log --line -r-10..-1"
2516
2517
To remove an alias for 'll'::
2518
2519
bzr alias --remove ll
2520
2521
"""
2522
takes_args = ['name?']
2523
takes_options = [
2524
Option('remove', help='Remove the alias.'),
2525
]
2526
2527
def run(self, name=None, remove=False):
2528
if remove:
2529
self.remove_alias(name)
2530
elif name is None:
2531
self.print_aliases()
2532
else:
2533
equal_pos = name.find('=')
2534
if equal_pos == -1:
2535
self.print_alias(name)
2536
else:
2537
self.set_alias(name[:equal_pos], name[equal_pos+1:])
2538
2539
def remove_alias(self, alias_name):
2540
if alias_name is None:
2541
raise errors.BzrCommandError(
2542
'bzr alias --remove expects an alias to remove.')
2543
# If alias is not found, print something like:
2544
# unalias: foo: not found
2545
c = config.GlobalConfig()
2546
c.unset_alias(alias_name)
2547
2548
@display_command
2549
def print_aliases(self):
2550
"""Print out the defined aliases in a similar format to bash."""
2551
aliases = config.GlobalConfig().get_aliases()
2552
for key, value in sorted(aliases.iteritems()):
2553
self.outf.write('bzr alias %s="%s"\n' % (key, value))
2554
2555
@display_command
2556
def print_alias(self, alias_name):
2557
from bzrlib.commands import get_alias
2558
alias = get_alias(alias_name)
2559
if alias is None:
2560
self.outf.write("bzr alias: %s: not found\n" % alias_name)
2561
else:
2562
self.outf.write(
2563
'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
2564
2565
def set_alias(self, alias_name, alias_command):
2566
"""Save the alias in the global config."""
2567
c = config.GlobalConfig()
2568
c.set_alias(alias_name, alias_command)
1797
2569
1798
2570
1799
2571
class cmd_selftest(Command):
1800
2572
"""Run internal test suite.
1801
2573
1802
This creates temporary test directories in the working directory,
1803
but not existing data is affected. These directories are deleted
1804
if the tests pass, or left behind to help in debugging if they
1805
fail and --keep-output is specified.
1806
1807
If arguments are given, they are regular expressions that say
1808
which tests should run.
2574
If arguments are given, they are regular expressions that say which tests
2575
should run. Tests matching any expression are run, and other tests are
2576
not run.
2577
2578
Alternatively if --first is given, matching tests are run first and then
2579
all other tests are run. This is useful if you have been working in a
2580
particular area, but want to make sure nothing else was broken.
2581
2582
If --exclude is given, tests that match that regular expression are
2583
excluded, regardless of whether they match --first or not.
2584
2585
To help catch accidential dependencies between tests, the --randomize
2586
option is useful. In most cases, the argument used is the word 'now'.
2587
Note that the seed used for the random number generator is displayed
2588
when this option is used. The seed can be explicitly passed as the
2589
argument to this option if required. This enables reproduction of the
2590
actual ordering used if and when an order sensitive problem is encountered.
2591
2592
If --list-only is given, the tests that would be run are listed. This is
2593
useful when combined with --first, --exclude and/or --randomize to
2594
understand their impact. The test harness reports "Listed nn tests in ..."
2595
instead of "Ran nn tests in ..." when list mode is enabled.
1809
2596
1810
2597
If the global option '--no-plugins' is given, plugins are not loaded
1811
2598
before running the selftests. This has two effects: features provided or
1812
2599
modified by plugins will not be tested, and tests provided by plugins will
1813
2600
not be run.
1814
2601
1815
examples:
1816
bzr selftest ignore
1817
bzr --no-plugins selftest -v
2602
Tests that need working space on disk use a common temporary directory,
2603
typically inside $TMPDIR or /tmp.
2604
2605
:Examples:
2606
Run only tests relating to 'ignore'::
2607
2608
bzr selftest ignore
2609
2610
Disable plugins and list tests as they're run::
2611
2612
bzr --no-plugins selftest -v
1818
2613
"""
1819
# TODO: --list should give a list of all available tests
1820
1821
2614
# NB: this is used from the class without creating an instance, which is
1822
2615
# why it does not have a self parameter.
1823
2616
def get_transport_type(typestring):
1833
2626
return FakeNFSServer
1834
2627
msg = "No known transport type %s. Supported types are: sftp\n" %\
1835
2628
(typestring)
1836
raise BzrCommandError(msg)
2629
raise errors.BzrCommandError(msg)
1837
2630
1838
2631
hidden = True
1839
2632
takes_args = ['testspecs*']
1840
2633
takes_options = ['verbose',
1841
Option('one', help='stop when one test fails'),
1842
Option('keep-output',
1843
help='keep output directories when tests fail'),
1844
Option('transport',
2634
Option('one',
2635
help='Stop when one test fails.',
2636
short_name='1',
2637
),
2638
Option('transport',
1845
2639
help='Use a different transport by default '
1846
2640
'throughout the test suite.',
1847
2641
type=get_transport_type),
1848
Option('benchmark', help='run the bzr bencharks.'),
2642
Option('benchmark',
2643
help='Run the benchmarks rather than selftests.'),
1849
2644
Option('lsprof-timed',
1850
help='generate lsprof output for benchmarked'
2645
help='Generate lsprof output for benchmarked'
1851
2646
' sections of code.'),
2647
Option('cache-dir', type=str,
2648
help='Cache intermediate benchmark output in this '
2649
'directory.'),
2650
Option('first',
2651
help='Run all tests, but run specified tests first.',
2652
short_name='f',
2653
),
2654
Option('list-only',
2655
help='List the tests instead of running them.'),
2656
Option('randomize', type=str, argname="SEED",
2657
help='Randomize the order of tests using the given'
2658
' seed or "now" for the current time.'),
2659
Option('exclude', type=str, argname="PATTERN",
2660
short_name='x',
2661
help='Exclude tests that match this regular'
2662
' expression.'),
2663
Option('strict', help='Fail on missing dependencies or '
2664
'known failures.'),
2665
Option('load-list', type=str, argname='TESTLISTFILE',
2666
help='Load a test id list from a text file.'),
2667
ListOption('debugflag', type=str, short_name='E',
2668
help='Turn on a selftest debug flag.'),
2669
ListOption('starting-with', type=str, argname='TESTID',
2670
param_name='starting_with', short_name='s',
2671
help=
2672
'Load only the tests starting with TESTID.'),
1852
2673
]
2674
encoding_type = 'replace'
1853
2675
1854
def run(self, testspecs_list=None, verbose=None, one=False,
1855
keep_output=False, transport=None, benchmark=None,
1856
lsprof_timed=None):
2676
def run(self, testspecs_list=None, verbose=False, one=False,
2677
transport=None, benchmark=None,
2678
lsprof_timed=None, cache_dir=None,
2679
first=False, list_only=False,
2680
randomize=None, exclude=None, strict=False,
2681
load_list=None, debugflag=None, starting_with=None):
1857
2682
import bzrlib.ui
1858
2683
from bzrlib.tests import selftest
1859
2684
import bzrlib.benchmarks as benchmarks
1860
# we don't want progress meters from the tests to go to the
1861
# real output; and we don't want log messages cluttering up
1862
# the real logs.
1863
save_ui = bzrlib.ui.ui_factory
1864
print '%10s: %s' % ('bzr', bzrlib.osutils.realpath(sys.argv[0]))
1865
print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
2685
from bzrlib.benchmarks import tree_creator
2686
2687
# Make deprecation warnings visible, unless -Werror is set
2688
symbol_versioning.activate_deprecation_warnings(override=False)
2689
2690
if cache_dir is not None:
2691
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2692
if not list_only:
2693
print 'testing: %s' % (osutils.realpath(sys.argv[0]),)
2694
print ' %s (%s python%s)' % (
2695
bzrlib.__path__[0],
2696
bzrlib.version_string,
2697
bzrlib._format_version_tuple(sys.version_info),
2698
)
1866
2699
print
1867
bzrlib.trace.info('running tests...')
2700
if testspecs_list is not None:
2701
pattern = '|'.join(testspecs_list)
2702
else:
2703
pattern = ".*"
2704
if benchmark:
2705
test_suite_factory = benchmarks.test_suite
2706
# Unless user explicitly asks for quiet, be verbose in benchmarks
2707
verbose = not is_quiet()
2708
# TODO: should possibly lock the history file...
2709
benchfile = open(".perf_history", "at", buffering=1)
2710
else:
2711
test_suite_factory = None
2712
benchfile = None
1868
2713
try:
1869
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1870
if testspecs_list is not None:
1871
pattern = '|'.join(testspecs_list)
1872
else:
1873
pattern = ".*"
1874
if benchmark:
1875
test_suite_factory = benchmarks.test_suite
1876
if verbose is None:
1877
verbose = True
1878
else:
1879
test_suite_factory = None
1880
if verbose is None:
1881
verbose = False
1882
result = selftest(verbose=verbose,
2714
result = selftest(verbose=verbose,
1883
2715
pattern=pattern,
1884
stop_on_failure=one,
1885
keep_output=keep_output,
2716
stop_on_failure=one,
1886
2717
transport=transport,
1887
2718
test_suite_factory=test_suite_factory,
1888
lsprof_timed=lsprof_timed)
1889
if result:
1890
bzrlib.trace.info('tests passed')
1891
else:
1892
bzrlib.trace.info('tests failed')
1893
return int(not result)
2719
lsprof_timed=lsprof_timed,
2720
bench_history=benchfile,
2721
matching_tests_first=first,
2722
list_only=list_only,
2723
random_seed=randomize,
2724
exclude_pattern=exclude,
2725
strict=strict,
2726
load_list=load_list,
2727
debug_flags=debugflag,
2728
starting_with=starting_with,
2729
)
1894
2730
finally:
1895
bzrlib.ui.ui_factory = save_ui
1896
1897
1898
def _get_bzr_branch():
1899
"""If bzr is run from a branch, return Branch or None"""
1900
import bzrlib.errors
1901
from bzrlib.branch import Branch
1902
from bzrlib.osutils import abspath
1903
from os.path import dirname
1904
1905
try:
1906
branch = Branch.open(dirname(abspath(dirname(__file__))))
1907
return branch
1908
except bzrlib.errors.BzrError:
1909
return None
1910
1911
1912
def show_version():
1913
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1914
# is bzrlib itself in a branch?
1915
branch = _get_bzr_branch()
1916
if branch:
1917
rh = branch.revision_history()
1918
revno = len(rh)
1919
print " bzr checkout, revision %d" % (revno,)
1920
print " nick: %s" % (branch.nick,)
1921
if rh:
1922
print " revid: %s" % (rh[-1],)
1923
print "Using python interpreter:", sys.executable
1924
import site
1925
print "Using python standard library:", os.path.dirname(site.__file__)
1926
print "Using bzrlib:",
1927
if len(bzrlib.__path__) > 1:
1928
# print repr, which is a good enough way of making it clear it's
1929
# more than one element (eg ['/foo/bar', '/foo/bzr'])
1930
print repr(bzrlib.__path__)
1931
else:
1932
print bzrlib.__path__[0]
1933
1934
print
1935
print bzrlib.__copyright__
1936
print "http://bazaar-vcs.org/"
1937
print
1938
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
1939
print "you may use, modify and redistribute it under the terms of the GNU"
1940
print "General Public License version 2 or later."
2731
if benchfile is not None:
2732
benchfile.close()
2733
if result:
2734
note('tests passed')
2735
else:
2736
note('tests failed')
2737
return int(not result)
1941
2738
1942
2739
1943
2740
class cmd_version(Command):
1944
2741
"""Show version of bzr."""
2742
2743
encoding_type = 'replace'
2744
takes_options = [
2745
Option("short", help="Print just the version number."),
2746
]
2747
1945
2748
@display_command
1946
def run(self):
1947
show_version()
2749
def run(self, short=False):
2750
from bzrlib.version import show_version
2751
if short:
2752
self.outf.write(bzrlib.version_string + '\n')
2753
else:
2754
show_version(to_file=self.outf)
2755
1948
2756
1949
2757
class cmd_rocks(Command):
1950
2758
"""Statement of optimism."""
2759
1951
2760
hidden = True
2761
1952
2762
@display_command
1953
2763
def run(self):
1954
print "it sure does!"
2764
print "It sure does!"
1955
2765
1956
2766
1957
2767
class cmd_find_merge_base(Command):
1958
"""Find and print a base revision for merging two branches.
1959
"""
2768
"""Find and print a base revision for merging two branches."""
1960
2769
# TODO: Options to specify revisions on either side, as if
1961
2770
# merging only part of the history.
1962
2771
takes_args = ['branch', 'other']
1964
2773
1965
2774
@display_command
1966
2775
def run(self, branch, other):
1967
from bzrlib.revision import common_ancestor, MultipleRevisionSources
2776
from bzrlib.revision import ensure_null
1968
2777
1969
2778
branch1 = Branch.open_containing(branch)[0]
1970
2779
branch2 = Branch.open_containing(other)[0]
1971
1972
history_1 = branch1.revision_history()
1973
history_2 = branch2.revision_history()
1974
1975
last1 = branch1.last_revision()
1976
last2 = branch2.last_revision()
1977
1978
source = MultipleRevisionSources(branch1.repository,
1979
branch2.repository)
1980
1981
base_rev_id = common_ancestor(last1, last2, source)
1982
1983
print 'merge base is revision %s' % base_rev_id
1984
1985
return
1986
1987
if base_revno is None:
1988
raise bzrlib.errors.UnrelatedBranches()
1989
1990
print ' r%-6d in %s' % (base_revno, branch)
1991
1992
other_revno = branch2.revision_id_to_revno(base_revid)
1993
1994
print ' r%-6d in %s' % (other_revno, other)
1995
2780
branch1.lock_read()
2781
try:
2782
branch2.lock_read()
2783
try:
2784
last1 = ensure_null(branch1.last_revision())
2785
last2 = ensure_null(branch2.last_revision())
2786
2787
graph = branch1.repository.get_graph(branch2.repository)
2788
base_rev_id = graph.find_unique_lca(last1, last2)
2789
2790
print 'merge base is revision %s' % base_rev_id
2791
finally:
2792
branch2.unlock()
2793
finally:
2794
branch1.unlock()
1996
2795
1997
2796
1998
2797
class cmd_merge(Command):
1999
2798
"""Perform a three-way merge.
2000
2799
2001
The branch is the branch you will merge from. By default, it will
2002
merge the latest revision. If you specify a revision, that
2003
revision will be merged. If you specify two revisions, the first
2004
will be used as a BASE, and the second one as OTHER. Revision
2005
numbers are always relative to the specified branch.
2800
The source of the merge can be specified either in the form of a branch,
2801
or in the form of a path to a file containing a merge directive generated
2802
with bzr send. If neither is specified, the default is the upstream branch
2803
or the branch most recently merged using --remember.
2804
2805
When merging a branch, by default the tip will be merged. To pick a different
2806
revision, pass --revision. If you specify two values, the first will be used as
2807
BASE and the second one as OTHER. Merging individual revisions, or a subset of
2808
available revisions, like this is commonly referred to as "cherrypicking".
2809
2810
Revision numbers are always relative to the branch being merged.
2006
2811
2007
2812
By default, bzr will try to merge in all new work from the other
2008
2813
branch, automatically determining an appropriate base. If this
2017
2822
2018
2823
If there is no default branch set, the first merge will set it. After
2019
2824
that, you can omit the branch to use the default. To change the
2020
default, use --remember.
2021
2022
Examples:
2023
2024
To merge the latest revision from bzr.dev
2025
bzr merge ../bzr.dev
2026
2027
To merge changes up to and including revision 82 from bzr.dev
2028
bzr merge -r 82 ../bzr.dev
2029
2030
To merge the changes introduced by 82, without previous changes:
2031
bzr merge -r 81..82 ../bzr.dev
2825
default, use --remember. The value will only be saved if the remote
2826
location can be accessed.
2827
2828
The results of the merge are placed into the destination working
2829
directory, where they can be reviewed (with bzr diff), tested, and then
2830
committed to record the result of the merge.
2032
2831
2033
2832
merge refuses to run if there are any uncommitted changes, unless
2034
2833
--force is given.
2035
2834
2036
The following merge types are available:
2835
:Examples:
2836
To merge the latest revision from bzr.dev::
2837
2838
bzr merge ../bzr.dev
2839
2840
To merge changes up to and including revision 82 from bzr.dev::
2841
2842
bzr merge -r 82 ../bzr.dev
2843
2844
To merge the changes introduced by 82, without previous changes::
2845
2846
bzr merge -r 81..82 ../bzr.dev
2847
2848
To apply a merge directive contained in in /tmp/merge:
2849
2850
bzr merge /tmp/merge
2037
2851
"""
2038
takes_args = ['branch?']
2039
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
2040
Option('show-base', help="Show base revision text in "
2041
"conflicts")]
2042
2043
def help(self):
2044
from merge import merge_type_help
2045
from inspect import getdoc
2046
return getdoc(self) + '\n' + merge_type_help()
2047
2048
def run(self, branch=None, revision=None, force=False, merge_type=None,
2049
show_base=False, reprocess=False, remember=False):
2852
2853
encoding_type = 'exact'
2854
_see_also = ['update', 'remerge', 'status-flags']
2855
takes_args = ['location?']
2856
takes_options = [
2857
'change',
2858
'revision',
2859
Option('force',
2860
help='Merge even if the destination tree has uncommitted changes.'),
2861
'merge-type',
2862
'reprocess',
2863
'remember',
2864
Option('show-base', help="Show base revision text in "
2865
"conflicts."),
2866
Option('uncommitted', help='Apply uncommitted changes'
2867
' from a working copy, instead of branch changes.'),
2868
Option('pull', help='If the destination is already'
2869
' completely merged into the source, pull from the'
2870
' source rather than merging. When this happens,'
2871
' you do not need to commit the result.'),
2872
Option('directory',
2873
help='Branch to merge into, '
2874
'rather than the one containing the working directory.',
2875
short_name='d',
2876
type=unicode,
2877
),
2878
Option('preview', help='Instead of merging, show a diff of the merge.')
2879
]
2880
2881
def run(self, location=None, revision=None, force=False,
2882
merge_type=None, show_base=False, reprocess=False, remember=False,
2883
uncommitted=False, pull=False,
2884
directory=None,
2885
preview=False,
2886
):
2050
2887
if merge_type is None:
2051
merge_type = Merge3Merger
2052
2053
tree = WorkingTree.open_containing(u'.')[0]
2054
2055
try:
2888
merge_type = _mod_merge.Merge3Merger
2889
2890
if directory is None: directory = u'.'
2891
possible_transports = []
2892
merger = None
2893
allow_pending = True
2894
verified = 'inapplicable'
2895
tree = WorkingTree.open_containing(directory)[0]
2896
change_reporter = delta._ChangeReporter(
2897
unversioned_filter=tree.is_ignored)
2898
cleanups = []
2899
try:
2900
pb = ui.ui_factory.nested_progress_bar()
2901
cleanups.append(pb.finished)
2902
tree.lock_write()
2903
cleanups.append(tree.unlock)
2904
if location is not None:
2905
try:
2906
mergeable = bundle.read_mergeable_from_url(location,
2907
possible_transports=possible_transports)
2908
except errors.NotABundle:
2909
mergeable = None
2910
else:
2911
if uncommitted:
2912
raise errors.BzrCommandError('Cannot use --uncommitted'
2913
' with bundles or merge directives.')
2914
2915
if revision is not None:
2916
raise errors.BzrCommandError(
2917
'Cannot use -r with merge directives or bundles')
2918
merger, verified = _mod_merge.Merger.from_mergeable(tree,
2919
mergeable, pb)
2920
2921
if merger is None and uncommitted:
2922
if revision is not None and len(revision) > 0:
2923
raise errors.BzrCommandError('Cannot use --uncommitted and'
2924
' --revision at the same time.')
2925
location = self._select_branch_location(tree, location)[0]
2926
other_tree, other_path = WorkingTree.open_containing(location)
2927
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
2928
pb)
2929
allow_pending = False
2930
if other_path != '':
2931
merger.interesting_files = [other_path]
2932
2933
if merger is None:
2934
merger, allow_pending = self._get_merger_from_branch(tree,
2935
location, revision, remember, possible_transports, pb)
2936
2937
merger.merge_type = merge_type
2938
merger.reprocess = reprocess
2939
merger.show_base = show_base
2940
self.sanity_check_merger(merger)
2941
if (merger.base_rev_id == merger.other_rev_id and
2942
merger.other_rev_id is not None):
2943
note('Nothing to do.')
2944
return 0
2945
if pull:
2946
if merger.interesting_files is not None:
2947
raise errors.BzrCommandError('Cannot pull individual files')
2948
if (merger.base_rev_id == tree.last_revision()):
2949
result = tree.pull(merger.other_branch, False,
2950
merger.other_rev_id)
2951
result.report(self.outf)
2952
return 0
2953
merger.check_basis(not force)
2954
if preview:
2955
return self._do_preview(merger)
2956
else:
2957
return self._do_merge(merger, change_reporter, allow_pending,
2958
verified)
2959
finally:
2960
for cleanup in reversed(cleanups):
2961
cleanup()
2962
2963
def _do_preview(self, merger):
2964
from bzrlib.diff import show_diff_trees
2965
tree_merger = merger.make_merger()
2966
tt = tree_merger.make_preview_transform()
2967
try:
2968
result_tree = tt.get_preview_tree()
2969
show_diff_trees(merger.this_tree, result_tree, self.outf,
2970
old_label='', new_label='')
2971
finally:
2972
tt.finalize()
2973
2974
def _do_merge(self, merger, change_reporter, allow_pending, verified):
2975
merger.change_reporter = change_reporter
2976
conflict_count = merger.do_merge()
2977
if allow_pending:
2978
merger.set_pending()
2979
if verified == 'failed':
2980
warning('Preview patch does not match changes')
2981
if conflict_count != 0:
2982
return 1
2983
else:
2984
return 0
2985
2986
def sanity_check_merger(self, merger):
2987
if (merger.show_base and
2988
not merger.merge_type is _mod_merge.Merge3Merger):
2989
raise errors.BzrCommandError("Show-base is not supported for this"
2990
" merge type. %s" % merger.merge_type)
2991
if merger.reprocess and not merger.merge_type.supports_reprocess:
2992
raise errors.BzrCommandError("Conflict reduction is not supported"
2993
" for merge type %s." %
2994
merger.merge_type)
2995
if merger.reprocess and merger.show_base:
2996
raise errors.BzrCommandError("Cannot do conflict reduction and"
2997
" show base.")
2998
2999
def _get_merger_from_branch(self, tree, location, revision, remember,
3000
possible_transports, pb):
3001
"""Produce a merger from a location, assuming it refers to a branch."""
3002
from bzrlib.tag import _merge_tags_if_possible
3003
# find the branch locations
3004
other_loc, user_location = self._select_branch_location(tree, location,
3005
revision, -1)
3006
if revision is not None and len(revision) == 2:
3007
base_loc, _unused = self._select_branch_location(tree,
3008
location, revision, 0)
3009
else:
3010
base_loc = other_loc
3011
# Open the branches
3012
other_branch, other_path = Branch.open_containing(other_loc,
3013
possible_transports)
3014
if base_loc == other_loc:
3015
base_branch = other_branch
3016
else:
3017
base_branch, base_path = Branch.open_containing(base_loc,
3018
possible_transports)
3019
# Find the revision ids
3020
if revision is None or len(revision) < 1 or revision[-1] is None:
3021
other_revision_id = _mod_revision.ensure_null(
3022
other_branch.last_revision())
3023
else:
3024
other_revision_id = revision[-1].as_revision_id(other_branch)
3025
if (revision is not None and len(revision) == 2
3026
and revision[0] is not None):
3027
base_revision_id = revision[0].as_revision_id(base_branch)
3028
else:
3029
base_revision_id = None
3030
# Remember where we merge from
3031
if ((remember or tree.branch.get_submit_branch() is None) and
3032
user_location is not None):
3033
tree.branch.set_submit_branch(other_branch.base)
3034
_merge_tags_if_possible(other_branch, tree.branch)
3035
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3036
other_revision_id, base_revision_id, other_branch, base_branch)
3037
if other_path != '':
3038
allow_pending = False
3039
merger.interesting_files = [other_path]
3040
else:
3041
allow_pending = True
3042
return merger, allow_pending
3043
3044
def _select_branch_location(self, tree, user_location, revision=None,
3045
index=None):
3046
"""Select a branch location, according to possible inputs.
3047
3048
If provided, branches from ``revision`` are preferred. (Both
3049
``revision`` and ``index`` must be supplied.)
3050
3051
Otherwise, the ``location`` parameter is used. If it is None, then the
3052
``submit`` or ``parent`` location is used, and a note is printed.
3053
3054
:param tree: The working tree to select a branch for merging into
3055
:param location: The location entered by the user
3056
:param revision: The revision parameter to the command
3057
:param index: The index to use for the revision parameter. Negative
3058
indices are permitted.
3059
:return: (selected_location, user_location). The default location
3060
will be the user-entered location.
3061
"""
3062
if (revision is not None and index is not None
3063
and revision[index] is not None):
3064
branch = revision[index].get_branch()
2056
3065
if branch is not None:
2057
reader = BundleReader(file(branch, 'rb'))
2058
else:
2059
reader = None
2060
except IOError, e:
2061
if e.errno not in (errno.ENOENT, errno.EISDIR):
2062
raise
2063
reader = None
2064
except NotABundle:
2065
reader = None
2066
if reader is not None:
2067
conflicts = merge_bundle(reader, tree, not force, merge_type,
2068
reprocess, show_base)
2069
if conflicts == 0:
2070
return 0
2071
else:
2072
return 1
2073
2074
branch = self._get_remembered_parent(tree, branch, 'Merging from')
2075
2076
if revision is None or len(revision) < 1:
2077
base = [None, None]
2078
other = [branch, -1]
2079
other_branch, path = Branch.open_containing(branch)
2080
else:
2081
if len(revision) == 1:
2082
base = [None, None]
2083
other_branch, path = Branch.open_containing(branch)
2084
revno = revision[0].in_history(other_branch).revno
2085
other = [branch, revno]
2086
else:
2087
assert len(revision) == 2
2088
if None in revision:
2089
raise BzrCommandError(
2090
"Merge doesn't permit that revision specifier.")
2091
other_branch, path = Branch.open_containing(branch)
2092
2093
base = [branch, revision[0].in_history(other_branch).revno]
2094
other = [branch, revision[1].in_history(other_branch).revno]
2095
2096
if tree.branch.get_parent() is None or remember:
2097
tree.branch.set_parent(other_branch.base)
2098
2099
if path != "":
2100
interesting_files = [path]
2101
else:
2102
interesting_files = None
2103
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2104
try:
2105
try:
2106
conflict_count = merge(other, base, check_clean=(not force),
2107
merge_type=merge_type,
2108
reprocess=reprocess,
2109
show_base=show_base,
2110
pb=pb, file_list=interesting_files)
2111
finally:
2112
pb.finished()
2113
if conflict_count != 0:
2114
return 1
2115
else:
2116
return 0
2117
except bzrlib.errors.AmbiguousBase, e:
2118
m = ("sorry, bzr can't determine the right merge base yet\n"
2119
"candidates are:\n "
2120
+ "\n ".join(e.bases)
2121
+ "\n"
2122
"please specify an explicit base with -r,\n"
2123
"and (if you want) report this to the bzr developers\n")
2124
log_error(m)
2125
2126
# TODO: move up to common parent; this isn't merge-specific anymore.
2127
def _get_remembered_parent(self, tree, supplied_location, verb_string):
3066
return branch, branch
3067
if user_location is None:
3068
location = self._get_remembered(tree, 'Merging from')
3069
else:
3070
location = user_location
3071
return location, user_location
3072
3073
def _get_remembered(self, tree, verb_string):
2128
3074
"""Use tree.branch's parent if none was supplied.
2129
3075
2130
3076
Report if the remembered location was used.
2131
3077
"""
2132
if supplied_location is not None:
2133
return supplied_location
2134
stored_location = tree.branch.get_parent()
3078
stored_location = tree.branch.get_submit_branch()
3079
stored_location_type = "submit"
3080
if stored_location is None:
3081
stored_location = tree.branch.get_parent()
3082
stored_location_type = "parent"
2135
3083
mutter("%s", stored_location)
2136
3084
if stored_location is None:
2137
raise BzrCommandError("No location specified or remembered")
2138
display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2139
self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
3085
raise errors.BzrCommandError("No location specified or remembered")
3086
display_url = urlutils.unescape_for_display(stored_location, 'utf-8')
3087
note(u"%s remembered %s location %s", verb_string,
3088
stored_location_type, display_url)
2140
3089
return stored_location
2141
3090
2142
3091
2151
3100
merge. The difference is that remerge can (only) be run when there is a
2152
3101
pending merge, and it lets you specify particular files.
2153
3102
2154
Examples:
2155
$ bzr remerge --show-base
3103
:Examples:
2156
3104
Re-do the merge of all conflicted files, and show the base text in
2157
conflict regions, in addition to the usual THIS and OTHER texts.
3105
conflict regions, in addition to the usual THIS and OTHER texts::
3106
3107
bzr remerge --show-base
2158
3108
2159
$ bzr remerge --merge-type weave --reprocess foobar
2160
3109
Re-do the merge of "foobar", using the weave merge algorithm, with
2161
additional processing to reduce the size of conflict regions.
2162
2163
The following merge types are available:"""
3110
additional processing to reduce the size of conflict regions::
3111
3112
bzr remerge --merge-type weave --reprocess foobar
3113
"""
2164
3114
takes_args = ['file*']
2165
takes_options = ['merge-type', 'reprocess',
2166
Option('show-base', help="Show base revision text in "
2167
"conflicts")]
2168
2169
def help(self):
2170
from merge import merge_type_help
2171
from inspect import getdoc
2172
return getdoc(self) + '\n' + merge_type_help()
3115
takes_options = [
3116
'merge-type',
3117
'reprocess',
3118
Option('show-base',
3119
help="Show base revision text in conflicts."),
3120
]
2173
3121
2174
3122
def run(self, file_list=None, merge_type=None, show_base=False,
2175
3123
reprocess=False):
2176
from bzrlib.merge import merge_inner, transform_tree
2177
3124
if merge_type is None:
2178
merge_type = Merge3Merger
3125
merge_type = _mod_merge.Merge3Merger
2179
3126
tree, file_list = tree_files(file_list)
2180
3127
tree.lock_write()
2181
3128
try:
2182
pending_merges = tree.pending_merges()
2183
if len(pending_merges) != 1:
2184
raise BzrCommandError("Sorry, remerge only works after normal"
2185
+ " merges. Not cherrypicking or"
2186
+ "multi-merges.")
3129
parents = tree.get_parent_ids()
3130
if len(parents) != 2:
3131
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3132
" merges. Not cherrypicking or"
3133
" multi-merges.")
2187
3134
repository = tree.branch.repository
2188
base_revision = common_ancestor(tree.branch.last_revision(),
2189
pending_merges[0], repository)
2190
base_tree = repository.revision_tree(base_revision)
2191
other_tree = repository.revision_tree(pending_merges[0])
2192
3135
interesting_ids = None
3136
new_conflicts = []
3137
conflicts = tree.conflicts()
2193
3138
if file_list is not None:
2194
3139
interesting_ids = set()
2195
3140
for filename in file_list:
2196
3141
file_id = tree.path2id(filename)
2197
3142
if file_id is None:
2198
raise NotVersionedError(filename)
3143
raise errors.NotVersionedError(filename)
2199
3144
interesting_ids.add(file_id)
2200
3145
if tree.kind(file_id) != "directory":
2201
3146
continue
2202
3147
2203
3148
for name, ie in tree.inventory.iter_entries(file_id):
2204
3149
interesting_ids.add(ie.file_id)
2205
transform_tree(tree, tree.basis_tree(), interesting_ids)
2206
if file_list is None:
2207
restore_files = list(tree.iter_conflicts())
3150
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
2208
3151
else:
3152
# Remerge only supports resolving contents conflicts
3153
allowed_conflicts = ('text conflict', 'contents conflict')
3154
restore_files = [c.path for c in conflicts
3155
if c.typestring in allowed_conflicts]
3156
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3157
tree.set_conflicts(ConflictList(new_conflicts))
3158
if file_list is not None:
2209
3159
restore_files = file_list
2210
3160
for filename in restore_files:
2211
3161
try:
2212
3162
restore(tree.abspath(filename))
2213
except NotConflicted:
3163
except errors.NotConflicted:
2214
3164
pass
2215
conflicts = merge_inner(tree.branch, other_tree, base_tree,
2216
this_tree=tree,
2217
interesting_ids = interesting_ids,
2218
other_rev_id=pending_merges[0],
2219
merge_type=merge_type,
2220
show_base=show_base,
2221
reprocess=reprocess)
3165
# Disable pending merges, because the file texts we are remerging
3166
# have not had those merges performed. If we use the wrong parents
3167
# list, we imply that the working tree text has seen and rejected
3168
# all the changes from the other tree, when in fact those changes
3169
# have not yet been seen.
3170
pb = ui.ui_factory.nested_progress_bar()
3171
tree.set_parent_ids(parents[:1])
3172
try:
3173
merger = _mod_merge.Merger.from_revision_ids(pb,
3174
tree, parents[1])
3175
merger.interesting_ids = interesting_ids
3176
merger.merge_type = merge_type
3177
merger.show_base = show_base
3178
merger.reprocess = reprocess
3179
conflicts = merger.do_merge()
3180
finally:
3181
tree.set_parent_ids(parents)
3182
pb.finished()
2222
3183
finally:
2223
3184
tree.unlock()
2224
3185
if conflicts > 0:
2226
3187
else:
2227
3188
return 0
2228
3189
3190
2229
3191
class cmd_revert(Command):
2230
"""Reverse all changes since the last commit.
2231
2232
Only versioned files are affected. Specify filenames to revert only
2233
those files. By default, any files that are changed will be backed up
2234
first. Backup files have a '~' appended to their name.
3192
"""Revert files to a previous revision.
3193
3194
Giving a list of files will revert only those files. Otherwise, all files
3195
will be reverted. If the revision is not specified with '--revision', the
3196
last committed revision is used.
3197
3198
To remove only some changes, without reverting to a prior version, use
3199
merge instead. For example, "merge . --revision -2..-3" will remove the
3200
changes introduced by -2, without affecting the changes introduced by -1.
3201
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
3202
3203
By default, any files that have been manually changed will be backed up
3204
first. (Files changed only by merge are not backed up.) Backup files have
3205
'.~#~' appended to their name, where # is a number.
3206
3207
When you provide files, you can use their current pathname or the pathname
3208
from the target revision. So you can use revert to "undelete" a file by
3209
name. If you name a directory, all the contents of that directory will be
3210
reverted.
3211
3212
Any files that have been newly added since that revision will be deleted,
3213
with a backup kept if appropriate. Directories containing unknown files
3214
will not be deleted.
3215
3216
The working tree contains a list of pending merged revisions, which will
3217
be included as parents in the next commit. Normally, revert clears that
3218
list as well as reverting the files. If any files are specified, revert
3219
leaves the pending merge list alone and reverts only the files. Use "bzr
3220
revert ." in the tree root to revert all files but keep the merge record,
3221
and "bzr revert --forget-merges" to clear the pending merge list without
3222
reverting any files.
2235
3223
"""
2236
takes_options = ['revision', 'no-backup']
3224
3225
_see_also = ['cat', 'export']
3226
takes_options = [
3227
'revision',
3228
Option('no-backup', "Do not save backups of reverted files."),
3229
Option('forget-merges',
3230
'Remove pending merge marker, without changing any files.'),
3231
]
2237
3232
takes_args = ['file*']
2238
aliases = ['merge-revert']
2239
3233
2240
def run(self, revision=None, no_backup=False, file_list=None):
2241
from bzrlib.commands import parse_spec
2242
if file_list is not None:
2243
if len(file_list) == 0:
2244
raise BzrCommandError("No files specified")
3234
def run(self, revision=None, no_backup=False, file_list=None,
3235
forget_merges=None):
3236
tree, file_list = tree_files(file_list)
3237
if forget_merges:
3238
tree.set_parent_ids(tree.get_parent_ids()[:1])
2245
3239
else:
2246
file_list = []
2247
2248
tree, file_list = tree_files(file_list)
3240
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3241
3242
@staticmethod
3243
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
2249
3244
if revision is None:
2250
# FIXME should be tree.last_revision
2251
3245
rev_id = tree.last_revision()
2252
3246
elif len(revision) != 1:
2253
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
3247
raise errors.BzrCommandError('bzr revert --revision takes exactly 1 argument')
2254
3248
else:
2255
rev_id = revision[0].in_history(tree.branch).rev_id
2256
pb = bzrlib.ui.ui_factory.nested_progress_bar()
3249
rev_id = revision[0].as_revision_id(tree.branch)
3250
pb = ui.ui_factory.nested_progress_bar()
2257
3251
try:
2258
tree.revert(file_list,
3252
tree.revert(file_list,
2259
3253
tree.branch.repository.revision_tree(rev_id),
2260
not no_backup, pb)
3254
not no_backup, pb, report_changes=True)
2261
3255
finally:
2262
3256
pb.finished()
2263
3257
2264
3258
2265
3259
class cmd_assert_fail(Command):
2266
3260
"""Test reporting of assertion failures"""
3261
# intended just for use in testing
3262
2267
3263
hidden = True
3264
2268
3265
def run(self):
2269
assert False, "always fails"
3266
raise AssertionError("always fails")
2270
3267
2271
3268
2272
3269
class cmd_help(Command):
2273
3270
"""Show help on a command or other topic.
3271
"""
2274
3272
2275
For a list of all available commands, say 'bzr help commands'."""
2276
takes_options = [Option('long', 'show help on all commands')]
3273
_see_also = ['topics']
3274
takes_options = [
3275
Option('long', 'Show help on all commands.'),
3276
]
2277
3277
takes_args = ['topic?']
2278
3278
aliases = ['?', '--help', '-?', '-h']
2279
3279
2280
3280
@display_command
2281
3281
def run(self, topic=None, long=False):
2282
import help
3282
import bzrlib.help
2283
3283
if topic is None and long:
2284
3284
topic = "commands"
2285
help.help(topic)
3285
bzrlib.help.help(topic)
2286
3286
2287
3287
2288
3288
class cmd_shell_complete(Command):
2289
3289
"""Show appropriate completions for context.
2290
3290
2291
For a list of all available commands, say 'bzr shell-complete'."""
3291
For a list of all available commands, say 'bzr shell-complete'.
3292
"""
2292
3293
takes_args = ['context?']
2293
3294
aliases = ['s-c']
2294
3295
hidden = True
2299
3300
shellcomplete.shellcomplete(context)
2300
3301
2301
3302
2302
class cmd_fetch(Command):
2303
"""Copy in history from another branch but don't merge it.
2304
2305
This is an internal method used for pull and merge."""
2306
hidden = True
2307
takes_args = ['from_branch', 'to_branch']
2308
def run(self, from_branch, to_branch):
2309
from bzrlib.fetch import Fetcher
2310
from bzrlib.branch import Branch
2311
from_b = Branch.open(from_branch)
2312
to_b = Branch.open(to_branch)
2313
Fetcher(to_b, from_b)
2314
2315
2316
3303
class cmd_missing(Command):
2317
3304
"""Show unmerged/unpulled revisions between two branches.
3305
3306
OTHER_BRANCH may be local or remote.
3307
"""
2318
3308
2319
OTHER_BRANCH may be local or remote."""
3309
_see_also = ['merge', 'pull']
2320
3310
takes_args = ['other_branch?']
2321
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2322
Option('mine-only',
2323
'Display changes in the local branch only'),
2324
Option('theirs-only',
2325
'Display changes in the remote branch only'),
2326
'log-format',
2327
'line',
2328
'long',
2329
'short',
2330
'show-ids',
2331
'verbose'
2332
]
3311
takes_options = [
3312
Option('reverse', 'Reverse the order of revisions.'),
3313
Option('mine-only',
3314
'Display changes in the local branch only.'),
3315
Option('this' , 'Same as --mine-only.'),
3316
Option('theirs-only',
3317
'Display changes in the remote branch only.'),
3318
Option('other', 'Same as --theirs-only.'),
3319
'log-format',
3320
'show-ids',
3321
'verbose'
3322
]
3323
encoding_type = 'replace'
2333
3324
3325
@display_command
2334
3326
def run(self, other_branch=None, reverse=False, mine_only=False,
2335
3327
theirs_only=False, log_format=None, long=False, short=False, line=False,
2336
show_ids=False, verbose=False):
2337
from bzrlib.missing import find_unmerged, iter_log_data
2338
from bzrlib.log import log_formatter
2339
local_branch = bzrlib.branch.Branch.open_containing(u".")[0]
3328
show_ids=False, verbose=False, this=False, other=False):
3329
from bzrlib.missing import find_unmerged, iter_log_revisions
3330
3331
if this:
3332
mine_only = this
3333
if other:
3334
theirs_only = other
3335
# TODO: We should probably check that we don't have mine-only and
3336
# theirs-only set, but it gets complicated because we also have
3337
# this and other which could be used.
3338
restrict = 'all'
3339
if mine_only:
3340
restrict = 'local'
3341
elif theirs_only:
3342
restrict = 'remote'
3343
3344
local_branch = Branch.open_containing(u".")[0]
2340
3345
parent = local_branch.get_parent()
2341
3346
if other_branch is None:
2342
3347
other_branch = parent
2343
3348
if other_branch is None:
2344
raise BzrCommandError("No missing location known or specified.")
2345
print "Using last location: " + local_branch.get_parent()
2346
remote_branch = bzrlib.branch.Branch.open(other_branch)
3349
raise errors.BzrCommandError("No peer location known"
3350
" or specified.")
3351
display_url = urlutils.unescape_for_display(parent,
3352
self.outf.encoding)
3353
self.outf.write("Using saved parent location: "
3354
+ display_url + "\n")
3355
3356
remote_branch = Branch.open(other_branch)
2347
3357
if remote_branch.base == local_branch.base:
2348
3358
remote_branch = local_branch
2349
3359
local_branch.lock_read()
2350
3360
try:
2351
3361
remote_branch.lock_read()
2352
3362
try:
2353
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2354
if (log_format == None):
2355
default = bzrlib.config.BranchConfig(local_branch).log_format()
2356
log_format = get_log_format(long=long, short=short, line=line, default=default)
2357
lf = log_formatter(log_format, sys.stdout,
2358
show_ids=show_ids,
2359
show_timezone='original')
3363
local_extra, remote_extra = find_unmerged(
3364
local_branch, remote_branch, restrict)
3365
3366
if log_format is None:
3367
registry = log.log_formatter_registry
3368
log_format = registry.get_default(local_branch)
3369
lf = log_format(to_file=self.outf,
3370
show_ids=show_ids,
3371
show_timezone='original')
2360
3372
if reverse is False:
2361
local_extra.reverse()
2362
remote_extra.reverse()
3373
if local_extra is not None:
3374
local_extra.reverse()
3375
if remote_extra is not None:
3376
remote_extra.reverse()
3377
3378
status_code = 0
2363
3379
if local_extra and not theirs_only:
2364
print "You have %d extra revision(s):" % len(local_extra)
2365
for data in iter_log_data(local_extra, local_branch.repository,
2366
verbose):
2367
lf.show(*data)
3380
self.outf.write("You have %d extra revision(s):\n" %
3381
len(local_extra))
3382
for revision in iter_log_revisions(local_extra,
3383
local_branch.repository,
3384
verbose):
3385
lf.log_revision(revision)
2368
3386
printed_local = True
3387
status_code = 1
2369
3388
else:
2370
3389
printed_local = False
3390
2371
3391
if remote_extra and not mine_only:
2372
3392
if printed_local is True:
2373
print "\n\n"
2374
print "You are missing %d revision(s):" % len(remote_extra)
2375
for data in iter_log_data(remote_extra, remote_branch.repository,
2376
verbose):
2377
lf.show(*data)
2378
if not remote_extra and not local_extra:
2379
status_code = 0
2380
print "Branches are up to date."
2381
else:
3393
self.outf.write("\n\n\n")
3394
self.outf.write("You are missing %d revision(s):\n" %
3395
len(remote_extra))
3396
for revision in iter_log_revisions(remote_extra,
3397
remote_branch.repository,
3398
verbose):
3399
lf.log_revision(revision)
2382
3400
status_code = 1
3401
3402
if mine_only and not local_extra:
3403
# We checked local, and found nothing extra
3404
self.outf.write('This branch is up to date.\n')
3405
elif theirs_only and not remote_extra:
3406
# We checked remote, and found nothing extra
3407
self.outf.write('Other branch is up to date.\n')
3408
elif not (mine_only or theirs_only or local_extra or
3409
remote_extra):
3410
# We checked both branches, and neither one had extra
3411
# revisions
3412
self.outf.write("Branches are up to date.\n")
2383
3413
finally:
2384
3414
remote_branch.unlock()
2385
3415
finally:
2395
3425
return status_code
2396
3426
2397
3427
3428
class cmd_pack(Command):
3429
"""Compress the data within a repository."""
3430
3431
_see_also = ['repositories']
3432
takes_args = ['branch_or_repo?']
3433
3434
def run(self, branch_or_repo='.'):
3435
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
3436
try:
3437
branch = dir.open_branch()
3438
repository = branch.repository
3439
except errors.NotBranchError:
3440
repository = dir.open_repository()
3441
repository.pack()
3442
3443
2398
3444
class cmd_plugins(Command):
2399
"""List plugins"""
2400
hidden = True
3445
"""List the installed plugins.
3446
3447
This command displays the list of installed plugins including
3448
version of plugin and a short description of each.
3449
3450
--verbose shows the path where each plugin is located.
3451
3452
A plugin is an external component for Bazaar that extends the
3453
revision control system, by adding or replacing code in Bazaar.
3454
Plugins can do a variety of things, including overriding commands,
3455
adding new commands, providing additional network transports and
3456
customizing log output.
3457
3458
See the Bazaar web site, http://bazaar-vcs.org, for further
3459
information on plugins including where to find them and how to
3460
install them. Instructions are also provided there on how to
3461
write new plugins using the Python programming language.
3462
"""
3463
takes_options = ['verbose']
3464
2401
3465
@display_command
2402
def run(self):
3466
def run(self, verbose=False):
2403
3467
import bzrlib.plugin
2404
3468
from inspect import getdoc
2405
for name, plugin in bzrlib.plugin.all_plugins().items():
2406
if hasattr(plugin, '__path__'):
2407
print plugin.__path__[0]
2408
elif hasattr(plugin, '__file__'):
2409
print plugin.__file__
2410
else:
2411
print `plugin`
2412
2413
d = getdoc(plugin)
3469
result = []
3470
for name, plugin in bzrlib.plugin.plugins().items():
3471
version = plugin.__version__
3472
if version == 'unknown':
3473
version = ''
3474
name_ver = '%s %s' % (name, version)
3475
d = getdoc(plugin.module)
2414
3476
if d:
2415
print '\t', d.split('\n')[0]
3477
doc = d.split('\n')[0]
3478
else:
3479
doc = '(no description)'
3480
result.append((name_ver, doc, plugin.path()))
3481
for name_ver, doc, path in sorted(result):
3482
print name_ver
3483
print ' ', doc
3484
if verbose:
3485
print ' ', path
3486
print
2416
3487
2417
3488
2418
3489
class cmd_testament(Command):
2419
3490
"""Show testament (signing-form) of a revision."""
2420
takes_options = ['revision', 'long']
3491
takes_options = [
3492
'revision',
3493
Option('long', help='Produce long-format testament.'),
3494
Option('strict',
3495
help='Produce a strict-format testament.')]
2421
3496
takes_args = ['branch?']
2422
3497
@display_command
2423
def run(self, branch=u'.', revision=None, long=False):
2424
from bzrlib.testament import Testament
2425
b = WorkingTree.open_containing(branch)[0].branch
3498
def run(self, branch=u'.', revision=None, long=False, strict=False):
3499
from bzrlib.testament import Testament, StrictTestament
3500
if strict is True:
3501
testament_class = StrictTestament
3502
else:
3503
testament_class = Testament
3504
if branch == '.':
3505
b = Branch.open_containing(branch)[0]
3506
else:
3507
b = Branch.open(branch)
2426
3508
b.lock_read()
2427
3509
try:
2428
3510
if revision is None:
2429
3511
rev_id = b.last_revision()
2430
3512
else:
2431
rev_id = revision[0].in_history(b).rev_id
2432
t = Testament.from_revision(b.repository, rev_id)
3513
rev_id = revision[0].as_revision_id(b)
3514
t = testament_class.from_revision(b.repository, rev_id)
2433
3515
if long:
2434
3516
sys.stdout.writelines(t.as_text_lines())
2435
3517
else:
2450
3532
# TODO: annotate directories; showing when each file was last changed
2451
3533
# TODO: if the working copy is modified, show annotations on that
2452
3534
# with new uncommitted lines marked
2453
aliases = ['blame', 'praise']
3535
aliases = ['ann', 'blame', 'praise']
2454
3536
takes_args = ['filename']
2455
takes_options = [Option('all', help='show annotations on all lines'),
2456
Option('long', help='show date in annotations'),
2457
'revision'
3537
takes_options = [Option('all', help='Show annotations on all lines.'),
3538
Option('long', help='Show commit date in annotations.'),
3539
'revision',
3540
'show-ids',
2458
3541
]
3542
encoding_type = 'exact'
2459
3543
2460
3544
@display_command
2461
def run(self, filename, all=False, long=False, revision=None):
3545
def run(self, filename, all=False, long=False, revision=None,
3546
show_ids=False):
2462
3547
from bzrlib.annotate import annotate_file
2463
tree, relpath = WorkingTree.open_containing(filename)
2464
branch = tree.branch
2465
branch.lock_read()
3548
wt, branch, relpath = \
3549
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
3550
if wt is not None:
3551
wt.lock_read()
3552
else:
3553
branch.lock_read()
2466
3554
try:
2467
3555
if revision is None:
2468
3556
revision_id = branch.last_revision()
2469
3557
elif len(revision) != 1:
2470
raise BzrCommandError('bzr annotate --revision takes exactly 1 argument')
3558
raise errors.BzrCommandError('bzr annotate --revision takes exactly 1 argument')
2471
3559
else:
2472
revision_id = revision[0].in_history(branch).rev_id
2473
file_id = tree.inventory.path2id(relpath)
3560
revision_id = revision[0].as_revision_id(branch)
2474
3561
tree = branch.repository.revision_tree(revision_id)
3562
if wt is not None:
3563
file_id = wt.path2id(relpath)
3564
else:
3565
file_id = tree.path2id(relpath)
3566
if file_id is None:
3567
raise errors.NotVersionedError(filename)
2475
3568
file_version = tree.inventory[file_id].revision
2476
annotate_file(branch, file_version, file_id, long, all, sys.stdout)
3569
annotate_file(branch, file_version, file_id, long, all, self.outf,
3570
show_ids=show_ids)
2477
3571
finally:
2478
branch.unlock()
3572
if wt is not None:
3573
wt.unlock()
3574
else:
3575
branch.unlock()
2479
3576
2480
3577
2481
3578
class cmd_re_sign(Command):
2487
3584
takes_options = ['revision']
2488
3585
2489
3586
def run(self, revision_id_list=None, revision=None):
2490
import bzrlib.config as config
2491
import bzrlib.gpg as gpg
2492
3587
if revision_id_list is not None and revision is not None:
2493
raise BzrCommandError('You can only supply one of revision_id or --revision')
3588
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
2494
3589
if revision_id_list is None and revision is None:
2495
raise BzrCommandError('You must supply either --revision or a revision_id')
3590
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
2496
3591
b = WorkingTree.open_containing(u'.')[0].branch
2497
gpg_strategy = gpg.GPGStrategy(config.BranchConfig(b))
3592
b.lock_write()
3593
try:
3594
return self._run(b, revision_id_list, revision)
3595
finally:
3596
b.unlock()
3597
3598
def _run(self, b, revision_id_list, revision):
3599
import bzrlib.gpg as gpg
3600
gpg_strategy = gpg.GPGStrategy(b.get_config())
2498
3601
if revision_id_list is not None:
2499
for revision_id in revision_id_list:
2500
b.repository.sign_revision(revision_id, gpg_strategy)
3602
b.repository.start_write_group()
3603
try:
3604
for revision_id in revision_id_list:
3605
b.repository.sign_revision(revision_id, gpg_strategy)
3606
except:
3607
b.repository.abort_write_group()
3608
raise
3609
else:
3610
b.repository.commit_write_group()
2501
3611
elif revision is not None:
2502
3612
if len(revision) == 1:
2503
3613
revno, rev_id = revision[0].in_history(b)
2504
b.repository.sign_revision(rev_id, gpg_strategy)
3614
b.repository.start_write_group()
3615
try:
3616
b.repository.sign_revision(rev_id, gpg_strategy)
3617
except:
3618
b.repository.abort_write_group()
3619
raise
3620
else:
3621
b.repository.commit_write_group()
2505
3622
elif len(revision) == 2:
2506
3623
# are they both on rh- if so we can walk between them
2507
3624
# might be nice to have a range helper for arbitrary
2511
3628
if to_revid is None:
2512
3629
to_revno = b.revno()
2513
3630
if from_revno is None or to_revno is None:
2514
raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
2515
for revno in range(from_revno, to_revno + 1):
2516
b.repository.sign_revision(b.get_rev_id(revno),
2517
gpg_strategy)
3631
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
3632
b.repository.start_write_group()
3633
try:
3634
for revno in range(from_revno, to_revno + 1):
3635
b.repository.sign_revision(b.get_rev_id(revno),
3636
gpg_strategy)
3637
except:
3638
b.repository.abort_write_group()
3639
raise
3640
else:
3641
b.repository.commit_write_group()
2518
3642
else:
2519
raise BzrCommandError('Please supply either one revision, or a range.')
3643
raise errors.BzrCommandError('Please supply either one revision, or a range.')
2520
3644
2521
3645
2522
3646
class cmd_bind(Command):
2523
"""Bind the current branch to a master branch.
3647
"""Convert the current branch into a checkout of the supplied branch.
2524
3648
2525
After binding, commits must succeed on the master branch
2526
before they are executed on the local one.
3649
Once converted into a checkout, commits must succeed on the master branch
3650
before they will be applied to the local branch.
2527
3651
"""
2528
3652
2529
takes_args = ['location']
3653
_see_also = ['checkouts', 'unbind']
3654
takes_args = ['location?']
2530
3655
takes_options = []
2531
3656
2532
3657
def run(self, location=None):
2533
3658
b, relpath = Branch.open_containing(u'.')
3659
if location is None:
3660
try:
3661
location = b.get_old_bound_location()
3662
except errors.UpgradeRequired:
3663
raise errors.BzrCommandError('No location supplied. '
3664
'This format does not remember old locations.')
3665
else:
3666
if location is None:
3667
raise errors.BzrCommandError('No location supplied and no '
3668
'previous location known')
2534
3669
b_other = Branch.open(location)
2535
3670
try:
2536
3671
b.bind(b_other)
2537
except DivergedBranches:
2538
raise BzrCommandError('These branches have diverged.'
2539
' Try merging, and then bind again.')
3672
except errors.DivergedBranches:
3673
raise errors.BzrCommandError('These branches have diverged.'
3674
' Try merging, and then bind again.')
2540
3675
2541
3676
2542
3677
class cmd_unbind(Command):
2543
"""Unbind the current branch from its master branch.
3678
"""Convert the current checkout into a regular branch.
2544
3679
2545
After unbinding, the local branch is considered independent.
2546
All subsequent commits will be local.
3680
After unbinding, the local branch is considered independent and subsequent
3681
commits will be local only.
2547
3682
"""
2548
3683
3684
_see_also = ['checkouts', 'bind']
2549
3685
takes_args = []
2550
3686
takes_options = []
2551
3687
2552
3688
def run(self):
2553
3689
b, relpath = Branch.open_containing(u'.')
2554
3690
if not b.unbind():
2555
raise BzrCommandError('Local branch is not bound')
2556
2557
2558
class cmd_uncommit(bzrlib.commands.Command):
3691
raise errors.BzrCommandError('Local branch is not bound')
3692
3693
3694
class cmd_uncommit(Command):
2559
3695
"""Remove the last committed revision.
2560
3696
2561
3697
--verbose will print out what is being removed.
2562
3698
--dry-run will go through all the motions, but not actually
2563
3699
remove anything.
2564
2565
In the future, uncommit will create a revision bundle, which can then
2566
be re-applied.
3700
3701
If --revision is specified, uncommit revisions to leave the branch at the
3702
specified revision. For example, "bzr uncommit -r 15" will leave the
3703
branch at revision 15.
3704
3705
Uncommit leaves the working tree ready for a new commit. The only change
3706
it may make is to restore any pending merges that were present before
3707
the commit.
2567
3708
"""
2568
3709
2569
3710
# TODO: jam 20060108 Add an option to allow uncommit to remove
2570
3711
# unreferenced information in 'branch-as-repository' branches.
2571
3712
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2572
3713
# information in shared branches as well.
3714
_see_also = ['commit']
2573
3715
takes_options = ['verbose', 'revision',
2574
Option('dry-run', help='Don\'t actually make changes'),
2575
Option('force', help='Say yes to all questions.')]
3716
Option('dry-run', help='Don\'t actually make changes.'),
3717
Option('force', help='Say yes to all questions.'),
3718
Option('local',
3719
help="Only remove the commits from the local branch"
3720
" when in a checkout."
3721
),
3722
]
2576
3723
takes_args = ['location?']
2577
3724
aliases = []
3725
encoding_type = 'replace'
2578
3726
2579
def run(self, location=None,
3727
def run(self, location=None,
2580
3728
dry_run=False, verbose=False,
2581
revision=None, force=False):
2582
from bzrlib.branch import Branch
2583
from bzrlib.log import log_formatter
2584
import sys
2585
from bzrlib.uncommit import uncommit
2586
3729
revision=None, force=False, local=False):
2587
3730
if location is None:
2588
3731
location = u'.'
2589
3732
control, relpath = bzrdir.BzrDir.open_containing(location)
2594
3737
tree = None
2595
3738
b = control.open_branch()
2596
3739
3740
if tree is not None:
3741
tree.lock_write()
3742
else:
3743
b.lock_write()
3744
try:
3745
return self._run(b, tree, dry_run, verbose, revision, force,
3746
local=local)
3747
finally:
3748
if tree is not None:
3749
tree.unlock()
3750
else:
3751
b.unlock()
3752
3753
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
3754
from bzrlib.log import log_formatter, show_log
3755
from bzrlib.uncommit import uncommit
3756
3757
last_revno, last_rev_id = b.last_revision_info()
3758
3759
rev_id = None
2597
3760
if revision is None:
2598
revno = b.revno()
2599
rev_id = b.last_revision()
3761
revno = last_revno
3762
rev_id = last_rev_id
2600
3763
else:
2601
revno, rev_id = revision[0].in_history(b)
2602
if rev_id is None:
2603
print 'No revisions to uncommit.'
2604
2605
for r in range(revno, b.revno()+1):
2606
rev_id = b.get_rev_id(r)
2607
lf = log_formatter('short', to_file=sys.stdout,show_timezone='original')
2608
lf.show(r, b.repository.get_revision(rev_id), None)
3764
# 'bzr uncommit -r 10' actually means uncommit
3765
# so that the final tree is at revno 10.
3766
# but bzrlib.uncommit.uncommit() actually uncommits
3767
# the revisions that are supplied.
3768
# So we need to offset it by one
3769
revno = revision[0].in_history(b).revno + 1
3770
if revno <= last_revno:
3771
rev_id = b.get_rev_id(revno)
3772
3773
if rev_id is None or _mod_revision.is_null(rev_id):
3774
self.outf.write('No revisions to uncommit.\n')
3775
return 1
3776
3777
lf = log_formatter('short',
3778
to_file=self.outf,
3779
show_timezone='original')
3780
3781
show_log(b,
3782
lf,
3783
verbose=False,
3784
direction='forward',
3785
start_revision=revno,
3786
end_revision=last_revno)
2609
3787
2610
3788
if dry_run:
2611
3789
print 'Dry-run, pretending to remove the above revisions.'
2619
3797
print 'Canceled'
2620
3798
return 0
2621
3799
3800
mutter('Uncommitting from {%s} to {%s}',
3801
last_rev_id, rev_id)
2622
3802
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
2623
revno=revno)
3803
revno=revno, local=local)
3804
note('You can restore the old tip by running:\n'
3805
' bzr pull . -r revid:%s', last_rev_id)
2624
3806
2625
3807
2626
3808
class cmd_break_lock(Command):
2631
3813
2632
3814
You can get information on what locks are open via the 'bzr info' command.
2633
3815
2634
example:
3816
:Examples:
2635
3817
bzr break-lock
2636
3818
"""
2637
3819
takes_args = ['location?']
2646
3828
pass
2647
3829
2648
3830
2649
2650
# command-line interpretation helper for merge-related commands
2651
def merge(other_revision, base_revision,
2652
check_clean=True, ignore_zero=False,
2653
this_dir=None, backup_files=False, merge_type=Merge3Merger,
2654
file_list=None, show_base=False, reprocess=False,
2655
pb=DummyProgress()):
2656
"""Merge changes into a tree.
2657
2658
base_revision
2659
list(path, revno) Base for three-way merge.
2660
If [None, None] then a base will be automatically determined.
2661
other_revision
2662
list(path, revno) Other revision for three-way merge.
2663
this_dir
2664
Directory to merge changes into; '.' by default.
2665
check_clean
2666
If true, this_dir must have no uncommitted changes before the
2667
merge begins.
2668
ignore_zero - If true, suppress the "zero conflicts" message when
2669
there are no conflicts; should be set when doing something we expect
2670
to complete perfectly.
2671
file_list - If supplied, merge only changes to selected files.
2672
2673
All available ancestors of other_revision and base_revision are
2674
automatically pulled into the branch.
2675
2676
The revno may be -1 to indicate the last revision on the branch, which is
2677
the typical case.
2678
2679
This function is intended for use from the command line; programmatic
2680
clients might prefer to call merge.merge_inner(), which has less magic
2681
behavior.
2682
"""
2683
from bzrlib.merge import Merger
2684
if this_dir is None:
2685
this_dir = u'.'
2686
this_tree = WorkingTree.open_containing(this_dir)[0]
2687
if show_base and not merge_type is Merge3Merger:
2688
raise BzrCommandError("Show-base is not supported for this merge"
2689
" type. %s" % merge_type)
2690
if reprocess and not merge_type.supports_reprocess:
2691
raise BzrCommandError("Conflict reduction is not supported for merge"
2692
" type %s." % merge_type)
2693
if reprocess and show_base:
2694
raise BzrCommandError("Cannot do conflict reduction and show base.")
2695
try:
2696
merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
2697
merger.pp = ProgressPhase("Merge phase", 5, pb)
2698
merger.pp.next_phase()
2699
merger.check_basis(check_clean)
2700
merger.set_other(other_revision)
2701
merger.pp.next_phase()
2702
merger.set_base(base_revision)
2703
if merger.base_rev_id == merger.other_rev_id:
2704
note('Nothing to do.')
2705
return 0
2706
merger.backup_files = backup_files
2707
merger.merge_type = merge_type
2708
merger.set_interesting_files(file_list)
2709
merger.show_base = show_base
2710
merger.reprocess = reprocess
2711
conflicts = merger.do_merge()
2712
if file_list is None:
2713
merger.set_pending()
2714
finally:
2715
pb.clear()
2716
return conflicts
3831
class cmd_wait_until_signalled(Command):
3832
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
3833
3834
This just prints a line to signal when it is ready, then blocks on stdin.
3835
"""
3836
3837
hidden = True
3838
3839
def run(self):
3840
sys.stdout.write("running\n")
3841
sys.stdout.flush()
3842
sys.stdin.readline()
3843
3844
3845
class cmd_serve(Command):
3846
"""Run the bzr server."""
3847
3848
aliases = ['server']
3849
3850
takes_options = [
3851
Option('inet',
3852
help='Serve on stdin/out for use from inetd or sshd.'),
3853
Option('port',
3854
help='Listen for connections on nominated port of the form '
3855
'[hostname:]portnumber. Passing 0 as the port number will '
3856
'result in a dynamically allocated port. The default port is '
3857
'4155.',
3858
type=str),
3859
Option('directory',
3860
help='Serve contents of this directory.',
3861
type=unicode),
3862
Option('allow-writes',
3863
help='By default the server is a readonly server. Supplying '
3864
'--allow-writes enables write access to the contents of '
3865
'the served directory and below.'
3866
),
3867
]
3868
3869
def run(self, port=None, inet=False, directory=None, allow_writes=False):
3870
from bzrlib import lockdir
3871
from bzrlib.smart import medium, server
3872
from bzrlib.transport import get_transport
3873
from bzrlib.transport.chroot import ChrootServer
3874
if directory is None:
3875
directory = os.getcwd()
3876
url = urlutils.local_path_to_url(directory)
3877
if not allow_writes:
3878
url = 'readonly+' + url
3879
chroot_server = ChrootServer(get_transport(url))
3880
chroot_server.setUp()
3881
t = get_transport(chroot_server.get_url())
3882
if inet:
3883
smart_server = medium.SmartServerPipeStreamMedium(
3884
sys.stdin, sys.stdout, t)
3885
else:
3886
host = medium.BZR_DEFAULT_INTERFACE
3887
if port is None:
3888
port = medium.BZR_DEFAULT_PORT
3889
else:
3890
if ':' in port:
3891
host, port = port.split(':')
3892
port = int(port)
3893
smart_server = server.SmartTCPServer(t, host=host, port=port)
3894
print 'listening on port: ', smart_server.port
3895
sys.stdout.flush()
3896
# for the duration of this server, no UI output is permitted.
3897
# note that this may cause problems with blackbox tests. This should
3898
# be changed with care though, as we dont want to use bandwidth sending
3899
# progress over stderr to smart server clients!
3900
old_factory = ui.ui_factory
3901
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
3902
try:
3903
ui.ui_factory = ui.SilentUIFactory()
3904
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
3905
smart_server.serve()
3906
finally:
3907
ui.ui_factory = old_factory
3908
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
3909
3910
3911
class cmd_join(Command):
3912
"""Combine a subtree into its containing tree.
3913
3914
This command is for experimental use only. It requires the target tree
3915
to be in dirstate-with-subtree format, which cannot be converted into
3916
earlier formats.
3917
3918
The TREE argument should be an independent tree, inside another tree, but
3919
not part of it. (Such trees can be produced by "bzr split", but also by
3920
running "bzr branch" with the target inside a tree.)
3921
3922
The result is a combined tree, with the subtree no longer an independant
3923
part. This is marked as a merge of the subtree into the containing tree,
3924
and all history is preserved.
3925
3926
If --reference is specified, the subtree retains its independence. It can
3927
be branched by itself, and can be part of multiple projects at the same
3928
time. But operations performed in the containing tree, such as commit
3929
and merge, will recurse into the subtree.
3930
"""
3931
3932
_see_also = ['split']
3933
takes_args = ['tree']
3934
takes_options = [
3935
Option('reference', help='Join by reference.'),
3936
]
3937
hidden = True
3938
3939
def run(self, tree, reference=False):
3940
sub_tree = WorkingTree.open(tree)
3941
parent_dir = osutils.dirname(sub_tree.basedir)
3942
containing_tree = WorkingTree.open_containing(parent_dir)[0]
3943
repo = containing_tree.branch.repository
3944
if not repo.supports_rich_root():
3945
raise errors.BzrCommandError(
3946
"Can't join trees because %s doesn't support rich root data.\n"
3947
"You can use bzr upgrade on the repository."
3948
% (repo,))
3949
if reference:
3950
try:
3951
containing_tree.add_reference(sub_tree)
3952
except errors.BadReferenceTarget, e:
3953
# XXX: Would be better to just raise a nicely printable
3954
# exception from the real origin. Also below. mbp 20070306
3955
raise errors.BzrCommandError("Cannot join %s. %s" %
3956
(tree, e.reason))
3957
else:
3958
try:
3959
containing_tree.subsume(sub_tree)
3960
except errors.BadSubsumeSource, e:
3961
raise errors.BzrCommandError("Cannot join %s. %s" %
3962
(tree, e.reason))
3963
3964
3965
class cmd_split(Command):
3966
"""Split a subdirectory of a tree into a separate tree.
3967
3968
This command will produce a target tree in a format that supports
3969
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
3970
converted into earlier formats like 'dirstate-tags'.
3971
3972
The TREE argument should be a subdirectory of a working tree. That
3973
subdirectory will be converted into an independent tree, with its own
3974
branch. Commits in the top-level tree will not apply to the new subtree.
3975
"""
3976
3977
# join is not un-hidden yet
3978
#_see_also = ['join']
3979
takes_args = ['tree']
3980
3981
def run(self, tree):
3982
containing_tree, subdir = WorkingTree.open_containing(tree)
3983
sub_id = containing_tree.path2id(subdir)
3984
if sub_id is None:
3985
raise errors.NotVersionedError(subdir)
3986
try:
3987
containing_tree.extract(sub_id)
3988
except errors.RootNotRich:
3989
raise errors.UpgradeRequired(containing_tree.branch.base)
3990
3991
3992
class cmd_merge_directive(Command):
3993
"""Generate a merge directive for auto-merge tools.
3994
3995
A directive requests a merge to be performed, and also provides all the
3996
information necessary to do so. This means it must either include a
3997
revision bundle, or the location of a branch containing the desired
3998
revision.
3999
4000
A submit branch (the location to merge into) must be supplied the first
4001
time the command is issued. After it has been supplied once, it will
4002
be remembered as the default.
4003
4004
A public branch is optional if a revision bundle is supplied, but required
4005
if --diff or --plain is specified. It will be remembered as the default
4006
after the first use.
4007
"""
4008
4009
takes_args = ['submit_branch?', 'public_branch?']
4010
4011
hidden = True
4012
4013
_see_also = ['send']
4014
4015
takes_options = [
4016
RegistryOption.from_kwargs('patch-type',
4017
'The type of patch to include in the directive.',
4018
title='Patch type',
4019
value_switches=True,
4020
enum_switch=False,
4021
bundle='Bazaar revision bundle (default).',
4022
diff='Normal unified diff.',
4023
plain='No patch, just directive.'),
4024
Option('sign', help='GPG-sign the directive.'), 'revision',
4025
Option('mail-to', type=str,
4026
help='Instead of printing the directive, email to this address.'),
4027
Option('message', type=str, short_name='m',
4028
help='Message to use when committing this merge.')
4029
]
4030
4031
encoding_type = 'exact'
4032
4033
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
4034
sign=False, revision=None, mail_to=None, message=None):
4035
from bzrlib.revision import ensure_null, NULL_REVISION
4036
include_patch, include_bundle = {
4037
'plain': (False, False),
4038
'diff': (True, False),
4039
'bundle': (True, True),
4040
}[patch_type]
4041
branch = Branch.open('.')
4042
stored_submit_branch = branch.get_submit_branch()
4043
if submit_branch is None:
4044
submit_branch = stored_submit_branch
4045
else:
4046
if stored_submit_branch is None:
4047
branch.set_submit_branch(submit_branch)
4048
if submit_branch is None:
4049
submit_branch = branch.get_parent()
4050
if submit_branch is None:
4051
raise errors.BzrCommandError('No submit branch specified or known')
4052
4053
stored_public_branch = branch.get_public_branch()
4054
if public_branch is None:
4055
public_branch = stored_public_branch
4056
elif stored_public_branch is None:
4057
branch.set_public_branch(public_branch)
4058
if not include_bundle and public_branch is None:
4059
raise errors.BzrCommandError('No public branch specified or'
4060
' known')
4061
base_revision_id = None
4062
if revision is not None:
4063
if len(revision) > 2:
4064
raise errors.BzrCommandError('bzr merge-directive takes '
4065
'at most two one revision identifiers')
4066
revision_id = revision[-1].as_revision_id(branch)
4067
if len(revision) == 2:
4068
base_revision_id = revision[0].as_revision_id(branch)
4069
else:
4070
revision_id = branch.last_revision()
4071
revision_id = ensure_null(revision_id)
4072
if revision_id == NULL_REVISION:
4073
raise errors.BzrCommandError('No revisions to bundle.')
4074
directive = merge_directive.MergeDirective2.from_objects(
4075
branch.repository, revision_id, time.time(),
4076
osutils.local_time_offset(), submit_branch,
4077
public_branch=public_branch, include_patch=include_patch,
4078
include_bundle=include_bundle, message=message,
4079
base_revision_id=base_revision_id)
4080
if mail_to is None:
4081
if sign:
4082
self.outf.write(directive.to_signed(branch))
4083
else:
4084
self.outf.writelines(directive.to_lines())
4085
else:
4086
message = directive.to_email(mail_to, branch, sign)
4087
s = SMTPConnection(branch.get_config())
4088
s.send_email(message)
4089
4090
4091
class cmd_send(Command):
4092
"""Mail or create a merge-directive for submiting changes.
4093
4094
A merge directive provides many things needed for requesting merges:
4095
4096
* A machine-readable description of the merge to perform
4097
4098
* An optional patch that is a preview of the changes requested
4099
4100
* An optional bundle of revision data, so that the changes can be applied
4101
directly from the merge directive, without retrieving data from a
4102
branch.
4103
4104
If --no-bundle is specified, then public_branch is needed (and must be
4105
up-to-date), so that the receiver can perform the merge using the
4106
public_branch. The public_branch is always included if known, so that
4107
people can check it later.
4108
4109
The submit branch defaults to the parent, but can be overridden. Both
4110
submit branch and public branch will be remembered if supplied.
4111
4112
If a public_branch is known for the submit_branch, that public submit
4113
branch is used in the merge instructions. This means that a local mirror
4114
can be used as your actual submit branch, once you have set public_branch
4115
for that mirror.
4116
4117
Mail is sent using your preferred mail program. This should be transparent
4118
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
4119
If the preferred client can't be found (or used), your editor will be used.
4120
4121
To use a specific mail program, set the mail_client configuration option.
4122
(For Thunderbird 1.5, this works around some bugs.) Supported values for
4123
specific clients are "evolution", "kmail", "mutt", and "thunderbird";
4124
generic options are "default", "editor", "emacsclient", "mapi", and
4125
"xdg-email". Plugins may also add supported clients.
4126
4127
If mail is being sent, a to address is required. This can be supplied
4128
either on the commandline, by setting the submit_to configuration
4129
option in the branch itself or the child_submit_to configuration option
4130
in the submit branch.
4131
4132
Two formats are currently supported: "4" uses revision bundle format 4 and
4133
merge directive format 2. It is significantly faster and smaller than
4134
older formats. It is compatible with Bazaar 0.19 and later. It is the
4135
default. "0.9" uses revision bundle format 0.9 and merge directive
4136
format 1. It is compatible with Bazaar 0.12 - 0.18.
4137
4138
Merge directives are applied using the merge command or the pull command.
4139
"""
4140
4141
encoding_type = 'exact'
4142
4143
_see_also = ['merge', 'pull']
4144
4145
takes_args = ['submit_branch?', 'public_branch?']
4146
4147
takes_options = [
4148
Option('no-bundle',
4149
help='Do not include a bundle in the merge directive.'),
4150
Option('no-patch', help='Do not include a preview patch in the merge'
4151
' directive.'),
4152
Option('remember',
4153
help='Remember submit and public branch.'),
4154
Option('from',
4155
help='Branch to generate the submission from, '
4156
'rather than the one containing the working directory.',
4157
short_name='f',
4158
type=unicode),
4159
Option('output', short_name='o',
4160
help='Write merge directive to this file; '
4161
'use - for stdout.',
4162
type=unicode),
4163
Option('mail-to', help='Mail the request to this address.',
4164
type=unicode),
4165
'revision',
4166
'message',
4167
RegistryOption.from_kwargs('format',
4168
'Use the specified output format.',
4169
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4170
'0.9': 'Bundle format 0.9, Merge Directive 1',})
4171
]
4172
4173
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
4174
no_patch=False, revision=None, remember=False, output=None,
4175
format='4', mail_to=None, message=None, **kwargs):
4176
return self._run(submit_branch, revision, public_branch, remember,
4177
format, no_bundle, no_patch, output,
4178
kwargs.get('from', '.'), mail_to, message)
4179
4180
def _run(self, submit_branch, revision, public_branch, remember, format,
4181
no_bundle, no_patch, output, from_, mail_to, message):
4182
from bzrlib.revision import NULL_REVISION
4183
branch = Branch.open_containing(from_)[0]
4184
if output is None:
4185
outfile = StringIO()
4186
elif output == '-':
4187
outfile = self.outf
4188
else:
4189
outfile = open(output, 'wb')
4190
# we may need to write data into branch's repository to calculate
4191
# the data to send.
4192
branch.lock_write()
4193
try:
4194
if output is None:
4195
config = branch.get_config()
4196
if mail_to is None:
4197
mail_to = config.get_user_option('submit_to')
4198
mail_client = config.get_mail_client()
4199
if remember and submit_branch is None:
4200
raise errors.BzrCommandError(
4201
'--remember requires a branch to be specified.')
4202
stored_submit_branch = branch.get_submit_branch()
4203
remembered_submit_branch = None
4204
if submit_branch is None:
4205
submit_branch = stored_submit_branch
4206
remembered_submit_branch = "submit"
4207
else:
4208
if stored_submit_branch is None or remember:
4209
branch.set_submit_branch(submit_branch)
4210
if submit_branch is None:
4211
submit_branch = branch.get_parent()
4212
remembered_submit_branch = "parent"
4213
if submit_branch is None:
4214
raise errors.BzrCommandError('No submit branch known or'
4215
' specified')
4216
if remembered_submit_branch is not None:
4217
note('Using saved %s location "%s" to determine what '
4218
'changes to submit.', remembered_submit_branch,
4219
submit_branch)
4220
4221
if mail_to is None:
4222
submit_config = Branch.open(submit_branch).get_config()
4223
mail_to = submit_config.get_user_option("child_submit_to")
4224
4225
stored_public_branch = branch.get_public_branch()
4226
if public_branch is None:
4227
public_branch = stored_public_branch
4228
elif stored_public_branch is None or remember:
4229
branch.set_public_branch(public_branch)
4230
if no_bundle and public_branch is None:
4231
raise errors.BzrCommandError('No public branch specified or'
4232
' known')
4233
base_revision_id = None
4234
revision_id = None
4235
if revision is not None:
4236
if len(revision) > 2:
4237
raise errors.BzrCommandError('bzr send takes '
4238
'at most two one revision identifiers')
4239
revision_id = revision[-1].as_revision_id(branch)
4240
if len(revision) == 2:
4241
base_revision_id = revision[0].as_revision_id(branch)
4242
if revision_id is None:
4243
revision_id = branch.last_revision()
4244
if revision_id == NULL_REVISION:
4245
raise errors.BzrCommandError('No revisions to submit.')
4246
if format == '4':
4247
directive = merge_directive.MergeDirective2.from_objects(
4248
branch.repository, revision_id, time.time(),
4249
osutils.local_time_offset(), submit_branch,
4250
public_branch=public_branch, include_patch=not no_patch,
4251
include_bundle=not no_bundle, message=message,
4252
base_revision_id=base_revision_id)
4253
elif format == '0.9':
4254
if not no_bundle:
4255
if not no_patch:
4256
patch_type = 'bundle'
4257
else:
4258
raise errors.BzrCommandError('Format 0.9 does not'
4259
' permit bundle with no patch')
4260
else:
4261
if not no_patch:
4262
patch_type = 'diff'
4263
else:
4264
patch_type = None
4265
directive = merge_directive.MergeDirective.from_objects(
4266
branch.repository, revision_id, time.time(),
4267
osutils.local_time_offset(), submit_branch,
4268
public_branch=public_branch, patch_type=patch_type,
4269
message=message)
4270
4271
outfile.writelines(directive.to_lines())
4272
if output is None:
4273
subject = '[MERGE] '
4274
if message is not None:
4275
subject += message
4276
else:
4277
revision = branch.repository.get_revision(revision_id)
4278
subject += revision.get_summary()
4279
basename = directive.get_disk_name(branch)
4280
mail_client.compose_merge_request(mail_to, subject,
4281
outfile.getvalue(), basename)
4282
finally:
4283
if output != '-':
4284
outfile.close()
4285
branch.unlock()
4286
4287
4288
class cmd_bundle_revisions(cmd_send):
4289
4290
"""Create a merge-directive for submiting changes.
4291
4292
A merge directive provides many things needed for requesting merges:
4293
4294
* A machine-readable description of the merge to perform
4295
4296
* An optional patch that is a preview of the changes requested
4297
4298
* An optional bundle of revision data, so that the changes can be applied
4299
directly from the merge directive, without retrieving data from a
4300
branch.
4301
4302
If --no-bundle is specified, then public_branch is needed (and must be
4303
up-to-date), so that the receiver can perform the merge using the
4304
public_branch. The public_branch is always included if known, so that
4305
people can check it later.
4306
4307
The submit branch defaults to the parent, but can be overridden. Both
4308
submit branch and public branch will be remembered if supplied.
4309
4310
If a public_branch is known for the submit_branch, that public submit
4311
branch is used in the merge instructions. This means that a local mirror
4312
can be used as your actual submit branch, once you have set public_branch
4313
for that mirror.
4314
4315
Two formats are currently supported: "4" uses revision bundle format 4 and
4316
merge directive format 2. It is significantly faster and smaller than
4317
older formats. It is compatible with Bazaar 0.19 and later. It is the
4318
default. "0.9" uses revision bundle format 0.9 and merge directive
4319
format 1. It is compatible with Bazaar 0.12 - 0.18.
4320
"""
4321
4322
takes_options = [
4323
Option('no-bundle',
4324
help='Do not include a bundle in the merge directive.'),
4325
Option('no-patch', help='Do not include a preview patch in the merge'
4326
' directive.'),
4327
Option('remember',
4328
help='Remember submit and public branch.'),
4329
Option('from',
4330
help='Branch to generate the submission from, '
4331
'rather than the one containing the working directory.',
4332
short_name='f',
4333
type=unicode),
4334
Option('output', short_name='o', help='Write directive to this file.',
4335
type=unicode),
4336
'revision',
4337
RegistryOption.from_kwargs('format',
4338
'Use the specified output format.',
4339
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4340
'0.9': 'Bundle format 0.9, Merge Directive 1',})
4341
]
4342
aliases = ['bundle']
4343
4344
_see_also = ['send', 'merge']
4345
4346
hidden = True
4347
4348
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
4349
no_patch=False, revision=None, remember=False, output=None,
4350
format='4', **kwargs):
4351
if output is None:
4352
output = '-'
4353
return self._run(submit_branch, revision, public_branch, remember,
4354
format, no_bundle, no_patch, output,
4355
kwargs.get('from', '.'), None, None)
4356
4357
4358
class cmd_tag(Command):
4359
"""Create, remove or modify a tag naming a revision.
4360
4361
Tags give human-meaningful names to revisions. Commands that take a -r
4362
(--revision) option can be given -rtag:X, where X is any previously
4363
created tag.
4364
4365
Tags are stored in the branch. Tags are copied from one branch to another
4366
along when you branch, push, pull or merge.
4367
4368
It is an error to give a tag name that already exists unless you pass
4369
--force, in which case the tag is moved to point to the new revision.
4370
4371
To rename a tag (change the name but keep it on the same revsion), run ``bzr
4372
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
4373
"""
4374
4375
_see_also = ['commit', 'tags']
4376
takes_args = ['tag_name']
4377
takes_options = [
4378
Option('delete',
4379
help='Delete this tag rather than placing it.',
4380
),
4381
Option('directory',
4382
help='Branch in which to place the tag.',
4383
short_name='d',
4384
type=unicode,
4385
),
4386
Option('force',
4387
help='Replace existing tags.',
4388
),
4389
'revision',
4390
]
4391
4392
def run(self, tag_name,
4393
delete=None,
4394
directory='.',
4395
force=None,
4396
revision=None,
4397
):
4398
branch, relpath = Branch.open_containing(directory)
4399
branch.lock_write()
4400
try:
4401
if delete:
4402
branch.tags.delete_tag(tag_name)
4403
self.outf.write('Deleted tag %s.\n' % tag_name)
4404
else:
4405
if revision:
4406
if len(revision) != 1:
4407
raise errors.BzrCommandError(
4408
"Tags can only be placed on a single revision, "
4409
"not on a range")
4410
revision_id = revision[0].as_revision_id(branch)
4411
else:
4412
revision_id = branch.last_revision()
4413
if (not force) and branch.tags.has_tag(tag_name):
4414
raise errors.TagAlreadyExists(tag_name)
4415
branch.tags.set_tag(tag_name, revision_id)
4416
self.outf.write('Created tag %s.\n' % tag_name)
4417
finally:
4418
branch.unlock()
4419
4420
4421
class cmd_tags(Command):
4422
"""List tags.
4423
4424
This command shows a table of tag names and the revisions they reference.
4425
"""
4426
4427
_see_also = ['tag']
4428
takes_options = [
4429
Option('directory',
4430
help='Branch whose tags should be displayed.',
4431
short_name='d',
4432
type=unicode,
4433
),
4434
RegistryOption.from_kwargs('sort',
4435
'Sort tags by different criteria.', title='Sorting',
4436
alpha='Sort tags lexicographically (default).',
4437
time='Sort tags chronologically.',
4438
),
4439
'show-ids',
4440
]
4441
4442
@display_command
4443
def run(self,
4444
directory='.',
4445
sort='alpha',
4446
show_ids=False,
4447
):
4448
branch, relpath = Branch.open_containing(directory)
4449
tags = branch.tags.get_tag_dict().items()
4450
if not tags:
4451
return
4452
if sort == 'alpha':
4453
tags.sort()
4454
elif sort == 'time':
4455
timestamps = {}
4456
for tag, revid in tags:
4457
try:
4458
revobj = branch.repository.get_revision(revid)
4459
except errors.NoSuchRevision:
4460
timestamp = sys.maxint # place them at the end
4461
else:
4462
timestamp = revobj.timestamp
4463
timestamps[revid] = timestamp
4464
tags.sort(key=lambda x: timestamps[x[1]])
4465
if not show_ids:
4466
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
4467
revno_map = branch.get_revision_id_to_revno_map()
4468
tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
4469
for tag, revid in tags ]
4470
for tag, revspec in tags:
4471
self.outf.write('%-20s %s\n' % (tag, revspec))
4472
4473
4474
class cmd_reconfigure(Command):
4475
"""Reconfigure the type of a bzr directory.
4476
4477
A target configuration must be specified.
4478
4479
For checkouts, the bind-to location will be auto-detected if not specified.
4480
The order of preference is
4481
1. For a lightweight checkout, the current bound location.
4482
2. For branches that used to be checkouts, the previously-bound location.
4483
3. The push location.
4484
4. The parent location.
4485
If none of these is available, --bind-to must be specified.
4486
"""
4487
4488
_see_also = ['branches', 'checkouts', 'standalone-trees', 'working-trees']
4489
takes_args = ['location?']
4490
takes_options = [RegistryOption.from_kwargs('target_type',
4491
title='Target type',
4492
help='The type to reconfigure the directory to.',
4493
value_switches=True, enum_switch=False,
4494
branch='Reconfigure to be an unbound branch '
4495
'with no working tree.',
4496
tree='Reconfigure to be an unbound branch '
4497
'with a working tree.',
4498
checkout='Reconfigure to be a bound branch '
4499
'with a working tree.',
4500
lightweight_checkout='Reconfigure to be a lightweight'
4501
' checkout (with no local history).',
4502
standalone='Reconfigure to be a standalone branch '
4503
'(i.e. stop using shared repository).',
4504
use_shared='Reconfigure to use a shared repository.'),
4505
Option('bind-to', help='Branch to bind checkout to.',
4506
type=str),
4507
Option('force',
4508
help='Perform reconfiguration even if local changes'
4509
' will be lost.')
4510
]
4511
4512
def run(self, location=None, target_type=None, bind_to=None, force=False):
4513
directory = bzrdir.BzrDir.open(location)
4514
if target_type is None:
4515
raise errors.BzrCommandError('No target configuration specified')
4516
elif target_type == 'branch':
4517
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
4518
elif target_type == 'tree':
4519
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
4520
elif target_type == 'checkout':
4521
reconfiguration = reconfigure.Reconfigure.to_checkout(directory,
4522
bind_to)
4523
elif target_type == 'lightweight-checkout':
4524
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
4525
directory, bind_to)
4526
elif target_type == 'use-shared':
4527
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
4528
elif target_type == 'standalone':
4529
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
4530
reconfiguration.apply(force)
4531
4532
4533
class cmd_switch(Command):
4534
"""Set the branch of a checkout and update.
4535
4536
For lightweight checkouts, this changes the branch being referenced.
4537
For heavyweight checkouts, this checks that there are no local commits
4538
versus the current bound branch, then it makes the local branch a mirror
4539
of the new location and binds to it.
4540
4541
In both cases, the working tree is updated and uncommitted changes
4542
are merged. The user can commit or revert these as they desire.
4543
4544
Pending merges need to be committed or reverted before using switch.
4545
4546
The path to the branch to switch to can be specified relative to the parent
4547
directory of the current branch. For example, if you are currently in a
4548
checkout of /path/to/branch, specifying 'newbranch' will find a branch at
4549
/path/to/newbranch.
4550
"""
4551
4552
takes_args = ['to_location']
4553
takes_options = [Option('force',
4554
help='Switch even if local commits will be lost.')
4555
]
4556
4557
def run(self, to_location, force=False):
4558
from bzrlib import switch
4559
tree_location = '.'
4560
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
4561
try:
4562
to_branch = Branch.open(to_location)
4563
except errors.NotBranchError:
4564
to_branch = Branch.open(
4565
control_dir.open_branch().base + '../' + to_location)
4566
switch.switch(control_dir, to_branch, force)
4567
note('Switched to branch: %s',
4568
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
4569
4570
4571
class cmd_hooks(Command):
4572
"""Show a branch's currently registered hooks.
4573
"""
4574
4575
hidden = True
4576
takes_args = ['path?']
4577
4578
def run(self, path=None):
4579
if path is None:
4580
path = '.'
4581
branch_hooks = Branch.open(path).hooks
4582
for hook_type in branch_hooks:
4583
hooks = branch_hooks[hook_type]
4584
self.outf.write("%s:\n" % (hook_type,))
4585
if hooks:
4586
for hook in hooks:
4587
self.outf.write(" %s\n" %
4588
(branch_hooks.get_hook_name(hook),))
4589
else:
4590
self.outf.write(" <no hooks installed>\n")
4591
4592
4593
def _create_prefix(cur_transport):
4594
needed = [cur_transport]
4595
# Recurse upwards until we can create a directory successfully
4596
while True:
4597
new_transport = cur_transport.clone('..')
4598
if new_transport.base == cur_transport.base:
4599
raise errors.BzrCommandError(
4600
"Failed to create path prefix for %s."
4601
% cur_transport.base)
4602
try:
4603
new_transport.mkdir('.')
4604
except errors.NoSuchFile:
4605
needed.append(new_transport)
4606
cur_transport = new_transport
4607
else:
4608
break
4609
# Now we only need to create child directories
4610
while needed:
4611
cur_transport = needed.pop()
4612
cur_transport.ensure_base()
2717
4613
2718
4614
2719
4615
# these get imported and then picked up by the scan for cmd_*
2721
4617
# we do need to load at least some information about them to know of
2722
4618
# aliases. ideally we would avoid loading the implementation until the
2723
4619
# details were needed.
4620
from bzrlib.cmd_version_info import cmd_version_info
2724
4621
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2725
from bzrlib.bundle.commands import cmd_bundle_revisions
4622
from bzrlib.bundle.commands import (
4623
cmd_bundle_info,
4624
)
2726
4625
from bzrlib.sign_my_commits import cmd_sign_my_commits
2727
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
4626
from bzrlib.weave_commands import cmd_versionedfile_list, \
2728
4627
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.1