« back to all changes in this revision
Viewing changes to bzrlib/commands.py
- browse files at revision 1110
- compare with another revision
- download diff
- download tarball
- view history from revision 1110
- Committer: Martin Pool
- Date: 2005-08-25 05:58:05 UTC
- mfrom: (974.1.36)
- Revision ID: mbp@sourcefrog.net-20050825055805-8c892bc3c2d75131
- merge aaron's merge improvements:
* When merging, pull in all missing revisions from the source
branch.
* Detect common ancestors by looking at the whole ancestry graph,
rather than just mainline history.
Some changes to reconcile this with parallel updates to the test and
trace code.
aaron.bentley@utoronto.ca-20050823052551-f3401a8b57d9126f
* When merging, pull in all missing revisions from the source
branch.
* Detect common ancestors by looking at the whole ancestry graph,
rather than just mainline history.
Some changes to reconcile this with parallel updates to the test and
trace code.
aaron.bentley@utoronto.ca-20050823052551-f3401a8b57d9126f
- files added:
- .bzrignore
- bzrlib/plugins
- bzrlib/selftest
- bzrlib/util
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- bzrlib/util/urlgrabber
- contrib
- contrib/bash
- contrib/emacs
- contrib/zsh
- doc
- notes
- patches
- tools
- files removed:
- bzrlib/tests.py
- files renamed:
- bzr.py => bzrlib/commands.py
- files modified:
- README
added
removed
bzrlib/commands.py
1
#! /usr/bin/python
2
3
4
# Copyright (C) 2004, 2005 by Martin Pool
5
# Copyright (C) 2005 by Canonical Ltd
6
1
# Copyright (C) 2004, 2005 by Canonical Ltd
7
2
8
3
# This program is free software; you can redistribute it and/or modify
9
4
# it under the terms of the GNU General Public License as published by
19
14
# along with this program; if not, write to the Free Software
20
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21
16
22
"""Bazaar-NG -- a free distributed version-control tool
23
24
**WARNING: THIS IS AN UNSTABLE DEVELOPMENT VERSION**
25
26
Current limitation include:
27
28
* Metadata format is not stable yet -- you may need to
29
discard history in the future.
30
31
* No handling of subdirectories, symlinks or any non-text files.
32
33
* Insufficient error handling.
34
35
* Many commands unimplemented or partially implemented.
36
37
* Space-inefficient storage.
38
39
* No merge operators yet.
40
41
Interesting commands::
42
43
bzr help
44
Show summary help screen
45
bzr version
46
Show software version/licence/non-warranty.
47
bzr init
48
Start versioning the current directory
49
bzr add FILE...
50
Make files versioned.
51
bzr log
52
Show revision history.
53
bzr diff
54
Show changes from last revision to working copy.
55
bzr commit -m 'MESSAGE'
56
Store current state as new revision.
57
bzr export REVNO DESTINATION
58
Export the branch state at a previous version.
59
bzr status
60
Show summary of pending changes.
61
bzr remove FILE...
62
Make a file not versioned.
63
"""
64
65
# not currently working:
66
# bzr check
67
# Run internal consistency checks.
68
# bzr info
69
# Show some information about this branch.
70
71
72
73
__copyright__ = "Copyright 2005 Canonical Development Ltd."
74
__author__ = "Martin Pool <mbp@canonical.com>"
75
__docformat__ = "restructuredtext en"
76
__version__ = '0.0.0'
77
78
79
import sys, os, random, time, sha, sets, types, re, shutil, tempfile
80
import traceback, socket, fnmatch, difflib
81
from os import path
82
from sets import Set
83
from pprint import pprint
84
from stat import *
85
from glob import glob
86
from ElementTree import Element, ElementTree, SubElement
17
18
# TODO: Split the command framework away from the actual commands.
19
20
# TODO: probably should say which arguments are candidates for glob
21
# expansion on windows and do that at the command level.
22
23
# TODO: Help messages for options.
24
25
# TODO: Define arguments by objects, rather than just using names.
26
# Those objects can specify the expected type of the argument, which
27
# would help with validation and shell completion.
28
29
30
import sys
31
import os
87
32
88
33
import bzrlib
89
from bzrlib.store import ImmutableStore
90
from bzrlib.trace import mutter, note, log_error
91
from bzrlib.errors import bailout, BzrError
92
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
93
from bzrlib.tree import RevisionTree, EmptyTree, WorkingTree, Tree
94
from bzrlib.revision import Revision
95
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
96
format_date
97
98
BZR_DIFF_FORMAT = "## Bazaar-NG diff, format 0 ##\n"
99
BZR_PATCHNAME_FORMAT = 'cset:sha1:%s'
100
101
## standard representation
102
NONE_STRING = '(none)'
103
EMPTY = 'empty'
104
105
106
## TODO: Perhaps a different version of inventory commands that
107
## returns iterators...
108
109
## TODO: Perhaps an AtomicFile class that writes to a temporary file and then renames.
110
111
## TODO: Some kind of locking on branches. Perhaps there should be a
112
## parameter to the branch object saying whether we want a read or
113
## write lock; release it from destructor. Perhaps don't even need a
114
## read lock to look at immutable objects?
115
116
## TODO: Perhaps make UUIDs predictable in test mode to make it easier
117
## to compare output?
118
119
## TODO: Is ElementTree really all that much better for our purposes?
120
## Perhaps using the standard MiniDOM would be enough?
121
122
123
124
125
126
127
######################################################################
128
# check status
129
130
131
def cmd_status(all=False):
34
from bzrlib.trace import mutter, note, log_error, warning
35
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError
36
from bzrlib.branch import find_branch
37
from bzrlib import BZRDIR
38
39
40
plugin_cmds = {}
41
42
43
def register_command(cmd):
44
"Utility function to help register a command"
45
global plugin_cmds
46
k = cmd.__name__
47
if k.startswith("cmd_"):
48
k_unsquished = _unsquish_command_name(k)
49
else:
50
k_unsquished = k
51
if not plugin_cmds.has_key(k_unsquished):
52
plugin_cmds[k_unsquished] = cmd
53
else:
54
log_error('Two plugins defined the same command: %r' % k)
55
log_error('Not loading the one in %r' % sys.modules[cmd.__module__])
56
57
58
def _squish_command_name(cmd):
59
return 'cmd_' + cmd.replace('-', '_')
60
61
62
def _unsquish_command_name(cmd):
63
assert cmd.startswith("cmd_")
64
return cmd[4:].replace('_','-')
65
66
67
def _parse_revision_str(revstr):
68
"""This handles a revision string -> revno.
69
70
This always returns a list. The list will have one element for
71
72
It supports integers directly, but everything else it
73
defers for passing to Branch.get_revision_info()
74
75
>>> _parse_revision_str('234')
76
[234]
77
>>> _parse_revision_str('234..567')
78
[234, 567]
79
>>> _parse_revision_str('..')
80
[None, None]
81
>>> _parse_revision_str('..234')
82
[None, 234]
83
>>> _parse_revision_str('234..')
84
[234, None]
85
>>> _parse_revision_str('234..456..789') # Maybe this should be an error
86
[234, 456, 789]
87
>>> _parse_revision_str('234....789') # Error?
88
[234, None, 789]
89
>>> _parse_revision_str('revid:test@other.com-234234')
90
['revid:test@other.com-234234']
91
>>> _parse_revision_str('revid:test@other.com-234234..revid:test@other.com-234235')
92
['revid:test@other.com-234234', 'revid:test@other.com-234235']
93
>>> _parse_revision_str('revid:test@other.com-234234..23')
94
['revid:test@other.com-234234', 23]
95
>>> _parse_revision_str('date:2005-04-12')
96
['date:2005-04-12']
97
>>> _parse_revision_str('date:2005-04-12 12:24:33')
98
['date:2005-04-12 12:24:33']
99
>>> _parse_revision_str('date:2005-04-12T12:24:33')
100
['date:2005-04-12T12:24:33']
101
>>> _parse_revision_str('date:2005-04-12,12:24:33')
102
['date:2005-04-12,12:24:33']
103
>>> _parse_revision_str('-5..23')
104
[-5, 23]
105
>>> _parse_revision_str('-5')
106
[-5]
107
>>> _parse_revision_str('123a')
108
['123a']
109
>>> _parse_revision_str('abc')
110
['abc']
111
"""
112
import re
113
old_format_re = re.compile('\d*:\d*')
114
m = old_format_re.match(revstr)
115
if m:
116
warning('Colon separator for revision numbers is deprecated.'
117
' Use .. instead')
118
revs = []
119
for rev in revstr.split(':'):
120
if rev:
121
revs.append(int(rev))
122
else:
123
revs.append(None)
124
return revs
125
revs = []
126
for x in revstr.split('..'):
127
if not x:
128
revs.append(None)
129
else:
130
try:
131
revs.append(int(x))
132
except ValueError:
133
revs.append(x)
134
return revs
135
136
137
def get_merge_type(typestring):
138
"""Attempt to find the merge class/factory associated with a string."""
139
from merge import merge_types
140
try:
141
return merge_types[typestring][0]
142
except KeyError:
143
templ = '%s%%7s: %%s' % (' '*12)
144
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
145
type_list = '\n'.join(lines)
146
msg = "No known merge type %s. Supported types are:\n%s" %\
147
(typestring, type_list)
148
raise BzrCommandError(msg)
149
150
151
def get_merge_type(typestring):
152
"""Attempt to find the merge class/factory associated with a string."""
153
from merge import merge_types
154
try:
155
return merge_types[typestring][0]
156
except KeyError:
157
templ = '%s%%7s: %%s' % (' '*12)
158
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
159
type_list = '\n'.join(lines)
160
msg = "No known merge type %s. Supported types are:\n%s" %\
161
(typestring, type_list)
162
raise BzrCommandError(msg)
163
164
165
166
def _get_cmd_dict(plugins_override=True):
167
d = {}
168
for k, v in globals().iteritems():
169
if k.startswith("cmd_"):
170
d[_unsquish_command_name(k)] = v
171
# If we didn't load plugins, the plugin_cmds dict will be empty
172
if plugins_override:
173
d.update(plugin_cmds)
174
else:
175
d2 = plugin_cmds.copy()
176
d2.update(d)
177
d = d2
178
return d
179
180
181
def get_all_cmds(plugins_override=True):
182
"""Return canonical name and class for all registered commands."""
183
for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems():
184
yield k,v
185
186
187
def get_cmd_class(cmd, plugins_override=True):
188
"""Return the canonical name and command class for a command.
189
"""
190
cmd = str(cmd) # not unicode
191
192
# first look up this command under the specified name
193
cmds = _get_cmd_dict(plugins_override=plugins_override)
194
try:
195
return cmd, cmds[cmd]
196
except KeyError:
197
pass
198
199
# look for any command which claims this as an alias
200
for cmdname, cmdclass in cmds.iteritems():
201
if cmd in cmdclass.aliases:
202
return cmdname, cmdclass
203
204
cmdclass = ExternalCommand.find_command(cmd)
205
if cmdclass:
206
return cmd, cmdclass
207
208
raise BzrCommandError("unknown command %r" % cmd)
209
210
211
class Command(object):
212
"""Base class for commands.
213
214
The docstring for an actual command should give a single-line
215
summary, then a complete description of the command. A grammar
216
description will be inserted.
217
218
takes_args
219
List of argument forms, marked with whether they are optional,
220
repeated, etc.
221
222
takes_options
223
List of options that may be given for this command.
224
225
hidden
226
If true, this command isn't advertised.
227
"""
228
aliases = []
229
230
takes_args = []
231
takes_options = []
232
233
hidden = False
234
235
def __init__(self, options, arguments):
236
"""Construct and run the command.
237
238
Sets self.status to the return value of run()."""
239
assert isinstance(options, dict)
240
assert isinstance(arguments, dict)
241
cmdargs = options.copy()
242
cmdargs.update(arguments)
243
if self.__doc__ == Command.__doc__:
244
from warnings import warn
245
warn("No help message set for %r" % self)
246
self.status = self.run(**cmdargs)
247
if self.status is None:
248
self.status = 0
249
250
251
def run(self):
252
"""Override this in sub-classes.
253
254
This is invoked with the options and arguments bound to
255
keyword parameters.
256
257
Return 0 or None if the command was successful, or a shell
258
error code if not.
259
"""
260
return 0
261
262
263
class ExternalCommand(Command):
264
"""Class to wrap external commands.
265
266
We cheat a little here, when get_cmd_class() calls us we actually
267
give it back an object we construct that has the appropriate path,
268
help, options etc for the specified command.
269
270
When run_bzr() tries to instantiate that 'class' it gets caught by
271
the __call__ method, which we override to call the Command.__init__
272
method. That then calls our run method which is pretty straight
273
forward.
274
275
The only wrinkle is that we have to map bzr's dictionary of options
276
and arguments back into command line options and arguments for the
277
script.
278
"""
279
280
def find_command(cls, cmd):
281
import os.path
282
bzrpath = os.environ.get('BZRPATH', '')
283
284
for dir in bzrpath.split(os.pathsep):
285
path = os.path.join(dir, cmd)
286
if os.path.isfile(path):
287
return ExternalCommand(path)
288
289
return None
290
291
find_command = classmethod(find_command)
292
293
def __init__(self, path):
294
self.path = path
295
296
pipe = os.popen('%s --bzr-usage' % path, 'r')
297
self.takes_options = pipe.readline().split()
298
299
for opt in self.takes_options:
300
if not opt in OPTIONS:
301
raise BzrError("Unknown option '%s' returned by external command %s"
302
% (opt, path))
303
304
# TODO: Is there any way to check takes_args is valid here?
305
self.takes_args = pipe.readline().split()
306
307
if pipe.close() is not None:
308
raise BzrError("Failed funning '%s --bzr-usage'" % path)
309
310
pipe = os.popen('%s --bzr-help' % path, 'r')
311
self.__doc__ = pipe.read()
312
if pipe.close() is not None:
313
raise BzrError("Failed funning '%s --bzr-help'" % path)
314
315
def __call__(self, options, arguments):
316
Command.__init__(self, options, arguments)
317
return self
318
319
def run(self, **kargs):
320
opts = []
321
args = []
322
323
keys = kargs.keys()
324
keys.sort()
325
for name in keys:
326
optname = name.replace('_','-')
327
value = kargs[name]
328
if OPTIONS.has_key(optname):
329
# it's an option
330
opts.append('--%s' % optname)
331
if value is not None and value is not True:
332
opts.append(str(value))
333
else:
334
# it's an arg, or arg list
335
if type(value) is not list:
336
value = [value]
337
for v in value:
338
if v is not None:
339
args.append(str(v))
340
341
self.status = os.spawnv(os.P_WAIT, self.path, [self.path] + opts + args)
342
return self.status
343
344
345
class cmd_status(Command):
132
346
"""Display status summary.
133
347
134
For each file there is a single line giving its file state and name.
135
The name is that in the current revision unless it is deleted or
136
missing, in which case the old name is shown.
137
138
:todo: Don't show unchanged files unless ``--all`` is given?
139
"""
140
Branch('.').show_status(show_all=all)
141
142
143
144
######################################################################
145
# examining history
146
def cmd_get_revision(revision_id):
147
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
148
149
150
def cmd_get_inventory(inventory_id):
151
"""Return inventory in XML by hash"""
152
Branch('.').get_inventory(inventory_hash).write_xml(sys.stdout)
153
154
155
def cmd_get_revision_inventory(revision_id):
156
"""Output inventory for a revision."""
157
b = Branch('.')
158
b.get_revision_inventory(revision_id).write_xml(sys.stdout)
159
160
161
def cmd_get_file_text(text_id):
162
"""Get contents of a file by hash."""
163
sf = Branch('.').text_store[text_id]
164
pumpfile(sf, sys.stdout)
165
166
167
168
######################################################################
169
# commands
170
171
172
def cmd_revno():
173
"""Show number of revisions on this branch"""
174
print Branch('.').revno()
175
176
177
def cmd_add(file_list, verbose=False):
178
"""Add specified files.
179
180
Fails if the files are already added.
181
"""
182
Branch('.').add(file_list, verbose=verbose)
183
184
185
def cmd_inventory(revision=None):
186
"""Show inventory of the current working copy."""
187
## TODO: Also optionally show a previous inventory
188
## TODO: Format options
189
b = Branch('.')
190
if revision == None:
348
This reports on versioned and unknown files, reporting them
349
grouped by state. Possible states are:
350
351
added
352
Versioned in the working copy but not in the previous revision.
353
354
removed
355
Versioned in the previous revision but removed or deleted
356
in the working copy.
357
358
renamed
359
Path of this file changed from the previous revision;
360
the text may also have changed. This includes files whose
361
parent directory was renamed.
362
363
modified
364
Text has changed since the previous revision.
365
366
unchanged
367
Nothing about this file has changed since the previous revision.
368
Only shown with --all.
369
370
unknown
371
Not versioned and not matching an ignore pattern.
372
373
To see ignored files use 'bzr ignored'. For details in the
374
changes to file texts, use 'bzr diff'.
375
376
If no arguments are specified, the status of the entire working
377
directory is shown. Otherwise, only the status of the specified
378
files or directories is reported. If a directory is given, status
379
is reported for everything inside that directory.
380
381
If a revision is specified, the changes since that revision are shown.
382
"""
383
takes_args = ['file*']
384
takes_options = ['all', 'show-ids', 'revision']
385
aliases = ['st', 'stat']
386
387
def run(self, all=False, show_ids=False, file_list=None):
388
if file_list:
389
b = find_branch(file_list[0])
390
file_list = [b.relpath(x) for x in file_list]
391
# special case: only one path was given and it's the root
392
# of the branch
393
if file_list == ['']:
394
file_list = None
395
else:
396
b = find_branch('.')
397
398
from bzrlib.status import show_status
399
show_status(b, show_unchanged=all, show_ids=show_ids,
400
specific_files=file_list)
401
402
403
class cmd_cat_revision(Command):
404
"""Write out metadata for a revision."""
405
406
hidden = True
407
takes_args = ['revision_id']
408
409
def run(self, revision_id):
410
from bzrlib.xml import pack_xml
411
pack_xml(find_branch('.').get_revision(revision_id), sys.stdout)
412
413
414
class cmd_revno(Command):
415
"""Show current revision number.
416
417
This is equal to the number of revisions on this branch."""
418
def run(self):
419
print find_branch('.').revno()
420
421
class cmd_revision_info(Command):
422
"""Show revision number and revision id for a given revision identifier.
423
"""
424
hidden = True
425
takes_args = ['revision_info*']
426
takes_options = ['revision']
427
def run(self, revision=None, revision_info_list=None):
428
from bzrlib.branch import find_branch
429
430
revs = []
431
if revision is not None:
432
revs.extend(revision)
433
if revision_info_list is not None:
434
revs.extend(revision_info_list)
435
if len(revs) == 0:
436
raise BzrCommandError('You must supply a revision identifier')
437
438
b = find_branch('.')
439
440
for rev in revs:
441
print '%4d %s' % b.get_revision_info(rev)
442
443
444
class cmd_add(Command):
445
"""Add specified files or directories.
446
447
In non-recursive mode, all the named items are added, regardless
448
of whether they were previously ignored. A warning is given if
449
any of the named files are already versioned.
450
451
In recursive mode (the default), files are treated the same way
452
but the behaviour for directories is different. Directories that
453
are already versioned do not give a warning. All directories,
454
whether already versioned or not, are searched for files or
455
subdirectories that are neither versioned or ignored, and these
456
are added. This search proceeds recursively into versioned
457
directories. If no names are given '.' is assumed.
458
459
Therefore simply saying 'bzr add' will version all files that
460
are currently unknown.
461
462
TODO: Perhaps adding a file whose directly is not versioned should
463
recursively add that parent, rather than giving an error?
464
"""
465
takes_args = ['file*']
466
takes_options = ['verbose', 'no-recurse']
467
468
def run(self, file_list, verbose=False, no_recurse=False):
469
from bzrlib.add import smart_add
470
smart_add(file_list, verbose, not no_recurse)
471
472
473
474
class cmd_mkdir(Command):
475
"""Create a new versioned directory.
476
477
This is equivalent to creating the directory and then adding it.
478
"""
479
takes_args = ['dir+']
480
481
def run(self, dir_list):
482
b = None
483
484
for d in dir_list:
485
os.mkdir(d)
486
if not b:
487
b = find_branch(d)
488
b.add([d], verbose=True)
489
490
491
class cmd_relpath(Command):
492
"""Show path of a file relative to root"""
493
takes_args = ['filename']
494
hidden = True
495
496
def run(self, filename):
497
print find_branch(filename).relpath(filename)
498
499
500
501
class cmd_inventory(Command):
502
"""Show inventory of the current working copy or a revision."""
503
takes_options = ['revision', 'show-ids']
504
505
def run(self, revision=None, show_ids=False):
506
b = find_branch('.')
507
if revision == None:
508
inv = b.read_working_inventory()
509
else:
510
if len(revision) > 1:
511
raise BzrCommandError('bzr inventory --revision takes'
512
' exactly one revision identifier')
513
inv = b.get_revision_inventory(b.lookup_revision(revision[0]))
514
515
for path, entry in inv.entries():
516
if show_ids:
517
print '%-50s %s' % (path, entry.file_id)
518
else:
519
print path
520
521
522
class cmd_move(Command):
523
"""Move files to a different directory.
524
525
examples:
526
bzr move *.txt doc
527
528
The destination must be a versioned directory in the same branch.
529
"""
530
takes_args = ['source$', 'dest']
531
def run(self, source_list, dest):
532
b = find_branch('.')
533
534
# TODO: glob expansion on windows?
535
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
536
537
538
class cmd_rename(Command):
539
"""Change the name of an entry.
540
541
examples:
542
bzr rename frob.c frobber.c
543
bzr rename src/frob.c lib/frob.c
544
545
It is an error if the destination name exists.
546
547
See also the 'move' command, which moves files into a different
548
directory without changing their name.
549
550
TODO: Some way to rename multiple files without invoking bzr for each
551
one?"""
552
takes_args = ['from_name', 'to_name']
553
554
def run(self, from_name, to_name):
555
b = find_branch('.')
556
b.rename_one(b.relpath(from_name), b.relpath(to_name))
557
558
559
560
class cmd_mv(Command):
561
"""Move or rename a file.
562
563
usage:
564
bzr mv OLDNAME NEWNAME
565
bzr mv SOURCE... DESTINATION
566
567
If the last argument is a versioned directory, all the other names
568
are moved into it. Otherwise, there must be exactly two arguments
569
and the file is changed to a new name, which must not already exist.
570
571
Files cannot be moved between branches.
572
"""
573
takes_args = ['names*']
574
def run(self, names_list):
575
if len(names_list) < 2:
576
raise BzrCommandError("missing file argument")
577
b = find_branch(names_list[0])
578
579
rel_names = [b.relpath(x) for x in names_list]
580
581
if os.path.isdir(names_list[-1]):
582
# move into existing directory
583
b.move(rel_names[:-1], rel_names[-1])
584
else:
585
if len(names_list) != 2:
586
raise BzrCommandError('to mv multiple files the destination '
587
'must be a versioned directory')
588
b.move(rel_names[0], rel_names[1])
589
590
591
592
593
class cmd_pull(Command):
594
"""Pull any changes from another branch into the current one.
595
596
If the location is omitted, the last-used location will be used.
597
Both the revision history and the working directory will be
598
updated.
599
600
This command only works on branches that have not diverged. Branches are
601
considered diverged if both branches have had commits without first
602
pulling from the other.
603
604
If branches have diverged, you can use 'bzr merge' to pull the text changes
605
from one into the other.
606
"""
607
takes_args = ['location?']
608
609
def run(self, location=None):
610
from bzrlib.merge import merge
611
import tempfile
612
from shutil import rmtree
613
import errno
614
615
br_to = find_branch('.')
616
stored_loc = None
617
try:
618
stored_loc = br_to.controlfile("x-pull", "rb").read().rstrip('\n')
619
except IOError, e:
620
if e.errno != errno.ENOENT:
621
raise
622
if location is None:
623
if stored_loc is None:
624
raise BzrCommandError("No pull location known or specified.")
625
else:
626
print "Using last location: %s" % stored_loc
627
location = stored_loc
628
cache_root = tempfile.mkdtemp()
629
from bzrlib.branch import DivergedBranches
630
br_from = find_branch(location)
631
location = pull_loc(br_from)
632
old_revno = br_to.revno()
633
try:
634
from branch import find_cached_branch, DivergedBranches
635
br_from = find_cached_branch(location, cache_root)
636
location = pull_loc(br_from)
637
old_revno = br_to.revno()
638
try:
639
br_to.update_revisions(br_from)
640
except DivergedBranches:
641
raise BzrCommandError("These branches have diverged."
642
" Try merge.")
643
644
merge(('.', -1), ('.', old_revno), check_clean=False)
645
if location != stored_loc:
646
br_to.controlfile("x-pull", "wb").write(location + "\n")
647
finally:
648
rmtree(cache_root)
649
650
651
652
class cmd_branch(Command):
653
"""Create a new copy of a branch.
654
655
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
656
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
657
658
To retrieve the branch as of a particular revision, supply the --revision
659
parameter, as in "branch foo/bar -r 5".
660
"""
661
takes_args = ['from_location', 'to_location?']
662
takes_options = ['revision']
663
aliases = ['get', 'clone']
664
665
def run(self, from_location, to_location=None, revision=None):
666
import errno
667
from bzrlib.merge import merge
668
from bzrlib.branch import DivergedBranches, \
669
find_cached_branch, Branch
670
from shutil import rmtree
671
from meta_store import CachedStore
672
import tempfile
673
cache_root = tempfile.mkdtemp()
674
675
if revision is None:
676
revision = [None]
677
elif len(revision) > 1:
678
raise BzrCommandError('bzr branch --revision takes exactly 1 revision value')
679
680
try:
681
try:
682
br_from = find_cached_branch(from_location, cache_root)
683
except OSError, e:
684
if e.errno == errno.ENOENT:
685
raise BzrCommandError('Source location "%s" does not'
686
' exist.' % to_location)
687
else:
688
raise
689
690
if to_location is None:
691
to_location = os.path.basename(from_location.rstrip("/\\"))
692
693
try:
694
os.mkdir(to_location)
695
except OSError, e:
696
if e.errno == errno.EEXIST:
697
raise BzrCommandError('Target directory "%s" already'
698
' exists.' % to_location)
699
if e.errno == errno.ENOENT:
700
raise BzrCommandError('Parent of "%s" does not exist.' %
701
to_location)
702
else:
703
raise
704
br_to = Branch(to_location, init=True)
705
706
br_to.set_root_id(br_from.get_root_id())
707
708
if revision:
709
if revision[0] is None:
710
revno = br_from.revno()
711
else:
712
revno, rev_id = br_from.get_revision_info(revision[0])
713
try:
714
br_to.update_revisions(br_from, stop_revision=revno)
715
except bzrlib.errors.NoSuchRevision:
716
rmtree(to_location)
717
msg = "The branch %s has no revision %d." % (from_location,
718
revno)
719
raise BzrCommandError(msg)
720
721
merge((to_location, -1), (to_location, 0), this_dir=to_location,
722
check_clean=False, ignore_zero=True)
723
from_location = pull_loc(br_from)
724
br_to.controlfile("x-pull", "wb").write(from_location + "\n")
725
finally:
726
rmtree(cache_root)
727
728
729
def pull_loc(branch):
730
# TODO: Should perhaps just make attribute be 'base' in
731
# RemoteBranch and Branch?
732
if hasattr(branch, "baseurl"):
733
return branch.baseurl
734
else:
735
return branch.base
736
737
738
739
class cmd_renames(Command):
740
"""Show list of renamed files.
741
742
TODO: Option to show renames between two historical versions.
743
744
TODO: Only show renames under dir, rather than in the whole branch.
745
"""
746
takes_args = ['dir?']
747
748
def run(self, dir='.'):
749
b = find_branch(dir)
750
old_inv = b.basis_tree().inventory
751
new_inv = b.read_working_inventory()
752
753
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
754
renames.sort()
755
for old_name, new_name in renames:
756
print "%s => %s" % (old_name, new_name)
757
758
759
class cmd_info(Command):
760
"""Show statistical information about a branch."""
761
takes_args = ['branch?']
762
763
def run(self, branch=None):
764
import info
765
766
b = find_branch(branch)
767
info.show_info(b)
768
769
770
class cmd_remove(Command):
771
"""Make a file unversioned.
772
773
This makes bzr stop tracking changes to a versioned file. It does
774
not delete the working copy.
775
"""
776
takes_args = ['file+']
777
takes_options = ['verbose']
778
779
def run(self, file_list, verbose=False):
780
b = find_branch(file_list[0])
781
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
782
783
784
class cmd_file_id(Command):
785
"""Print file_id of a particular file or directory.
786
787
The file_id is assigned when the file is first added and remains the
788
same through all revisions where the file exists, even when it is
789
moved or renamed.
790
"""
791
hidden = True
792
takes_args = ['filename']
793
def run(self, filename):
794
b = find_branch(filename)
795
i = b.inventory.path2id(b.relpath(filename))
796
if i == None:
797
raise BzrError("%r is not a versioned file" % filename)
798
else:
799
print i
800
801
802
class cmd_file_path(Command):
803
"""Print path of file_ids to a file or directory.
804
805
This prints one line for each directory down to the target,
806
starting at the branch root."""
807
hidden = True
808
takes_args = ['filename']
809
def run(self, filename):
810
b = find_branch(filename)
811
inv = b.inventory
812
fid = inv.path2id(b.relpath(filename))
813
if fid == None:
814
raise BzrError("%r is not a versioned file" % filename)
815
for fip in inv.get_idpath(fid):
816
print fip
817
818
819
class cmd_revision_history(Command):
820
"""Display list of revision ids on this branch."""
821
hidden = True
822
def run(self):
823
for patchid in find_branch('.').revision_history():
824
print patchid
825
826
827
class cmd_directories(Command):
828
"""Display list of versioned directories in this branch."""
829
def run(self):
830
for name, ie in find_branch('.').read_working_inventory().directories():
831
if name == '':
832
print '.'
833
else:
834
print name
835
836
837
class cmd_init(Command):
838
"""Make a directory into a versioned branch.
839
840
Use this to create an empty branch, or before importing an
841
existing project.
842
843
Recipe for importing a tree of files:
844
cd ~/project
845
bzr init
846
bzr add -v .
847
bzr status
848
bzr commit -m 'imported project'
849
"""
850
def run(self):
851
from bzrlib.branch import Branch
852
Branch('.', init=True)
853
854
855
class cmd_diff(Command):
856
"""Show differences in working tree.
857
858
If files are listed, only the changes in those files are listed.
859
Otherwise, all changes for the tree are listed.
860
861
TODO: Allow diff across branches.
862
863
TODO: Option to use external diff command; could be GNU diff, wdiff,
864
or a graphical diff.
865
866
TODO: Python difflib is not exactly the same as unidiff; should
867
either fix it up or prefer to use an external diff.
868
869
TODO: If a directory is given, diff everything under that.
870
871
TODO: Selected-file diff is inefficient and doesn't show you
872
deleted files.
873
874
TODO: This probably handles non-Unix newlines poorly.
875
876
examples:
877
bzr diff
878
bzr diff -r1
879
bzr diff -r1:2
880
"""
881
882
takes_args = ['file*']
883
takes_options = ['revision', 'diff-options']
884
aliases = ['di', 'dif']
885
886
def run(self, revision=None, file_list=None, diff_options=None):
887
from bzrlib.diff import show_diff
888
889
if file_list:
890
b = find_branch(file_list[0])
891
file_list = [b.relpath(f) for f in file_list]
892
if file_list == ['']:
893
# just pointing to top-of-tree
894
file_list = None
895
else:
896
b = find_branch('.')
897
898
if revision is not None:
899
if len(revision) == 1:
900
show_diff(b, revision[0], specific_files=file_list,
901
external_diff_options=diff_options)
902
elif len(revision) == 2:
903
show_diff(b, revision[0], specific_files=file_list,
904
external_diff_options=diff_options,
905
revision2=revision[1])
906
else:
907
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
908
else:
909
show_diff(b, None, specific_files=file_list,
910
external_diff_options=diff_options)
911
912
913
914
915
class cmd_deleted(Command):
916
"""List files deleted in the working tree.
917
918
TODO: Show files deleted since a previous revision, or between two revisions.
919
"""
920
def run(self, show_ids=False):
921
b = find_branch('.')
922
old = b.basis_tree()
923
new = b.working_tree()
924
925
## TODO: Much more efficient way to do this: read in new
926
## directories with readdir, rather than stating each one. Same
927
## level of effort but possibly much less IO. (Or possibly not,
928
## if the directories are very large...)
929
930
for path, ie in old.inventory.iter_entries():
931
if not new.has_id(ie.file_id):
932
if show_ids:
933
print '%-50s %s' % (path, ie.file_id)
934
else:
935
print path
936
937
938
class cmd_modified(Command):
939
"""List files modified in working tree."""
940
hidden = True
941
def run(self):
942
from bzrlib.delta import compare_trees
943
944
b = find_branch('.')
945
td = compare_trees(b.basis_tree(), b.working_tree())
946
947
for path, id, kind in td.modified:
948
print path
949
950
951
952
class cmd_added(Command):
953
"""List files added in working tree."""
954
hidden = True
955
def run(self):
956
b = find_branch('.')
957
wt = b.working_tree()
958
basis_inv = b.basis_tree().inventory
959
inv = wt.inventory
960
for file_id in inv:
961
if file_id in basis_inv:
962
continue
963
path = inv.id2path(file_id)
964
if not os.access(b.abspath(path), os.F_OK):
965
continue
966
print path
967
968
969
970
class cmd_root(Command):
971
"""Show the tree root directory.
972
973
The root is the nearest enclosing directory with a .bzr control
974
directory."""
975
takes_args = ['filename?']
976
def run(self, filename=None):
977
"""Print the branch root."""
978
b = find_branch(filename)
979
print getattr(b, 'base', None) or getattr(b, 'baseurl')
980
981
982
class cmd_log(Command):
983
"""Show log of this branch.
984
985
To request a range of logs, you can use the command -r begin:end
986
-r revision requests a specific revision, -r :end or -r begin: are
987
also valid.
988
989
--message allows you to give a regular expression, which will be evaluated
990
so that only matching entries will be displayed.
991
992
TODO: Make --revision support uuid: and hash: [future tag:] notation.
993
994
"""
995
996
takes_args = ['filename?']
997
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision',
998
'long', 'message', 'short',]
999
1000
def run(self, filename=None, timezone='original',
1001
verbose=False,
1002
show_ids=False,
1003
forward=False,
1004
revision=None,
1005
message=None,
1006
long=False,
1007
short=False):
1008
from bzrlib.branch import find_branch
1009
from bzrlib.log import log_formatter, show_log
1010
import codecs
1011
1012
direction = (forward and 'forward') or 'reverse'
1013
1014
if filename:
1015
b = find_branch(filename)
1016
fp = b.relpath(filename)
1017
if fp:
1018
file_id = b.read_working_inventory().path2id(fp)
1019
else:
1020
file_id = None # points to branch root
1021
else:
1022
b = find_branch('.')
1023
file_id = None
1024
1025
if revision is None:
1026
rev1 = None
1027
rev2 = None
1028
elif len(revision) == 1:
1029
rev1 = rev2 = b.get_revision_info(revision[0])[0]
1030
elif len(revision) == 2:
1031
rev1 = b.get_revision_info(revision[0])[0]
1032
rev2 = b.get_revision_info(revision[1])[0]
1033
else:
1034
raise BzrCommandError('bzr log --revision takes one or two values.')
1035
1036
if rev1 == 0:
1037
rev1 = None
1038
if rev2 == 0:
1039
rev2 = None
1040
1041
mutter('encoding log as %r' % bzrlib.user_encoding)
1042
1043
# use 'replace' so that we don't abort if trying to write out
1044
# in e.g. the default C locale.
1045
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
1046
1047
if not short:
1048
log_format = 'long'
1049
else:
1050
log_format = 'short'
1051
lf = log_formatter(log_format,
1052
show_ids=show_ids,
1053
to_file=outf,
1054
show_timezone=timezone)
1055
1056
show_log(b,
1057
lf,
1058
file_id,
1059
verbose=verbose,
1060
direction=direction,
1061
start_revision=rev1,
1062
end_revision=rev2,
1063
search=message)
1064
1065
1066
1067
class cmd_touching_revisions(Command):
1068
"""Return revision-ids which affected a particular file.
1069
1070
A more user-friendly interface is "bzr log FILE"."""
1071
hidden = True
1072
takes_args = ["filename"]
1073
def run(self, filename):
1074
b = find_branch(filename)
191
1075
inv = b.read_working_inventory()
192
else:
193
inv = b.get_revision_inventory(b.lookup_revision(revision))
194
195
for path, entry in inv.iter_entries():
196
print '%-50s %s' % (entry.file_id, path)
197
198
199
200
def cmd_info():
201
b = Branch('.')
202
print 'branch format:', b.controlfile('branch-format', 'r').readline().rstrip('\n')
203
print 'revision number:', b.revno()
204
print 'number of versioned files:', len(b.read_working_inventory())
205
206
207
def cmd_remove(file_list, verbose=False):
208
Branch('.').remove(file_list, verbose=verbose)
209
210
211
212
def cmd_file_id(filename):
213
i = Branch('.').read_working_inventory().path2id(filename)
214
if i is None:
215
bailout("%s is not a versioned file" % filename)
216
else:
217
print i
218
219
220
def cmd_find_filename(fileid):
221
n = find_filename(fileid)
222
if n is None:
223
bailout("%s is not a live file id" % fileid)
224
else:
225
print n
226
227
228
def cmd_revision_history():
229
for patchid in Branch('.').revision_history():
230
print patchid
231
232
233
234
def cmd_init():
235
# TODO: Check we're not already in a working directory? At the
236
# moment you'll get an ugly error.
237
238
# TODO: What if we're in a subdirectory of a branch? Would like
239
# to allow that, but then the parent may need to understand that
240
# the children have disappeared, or should they be versioned in
241
# both?
242
243
# TODO: Take an argument/option for branch name.
244
Branch('.', init=True)
245
246
247
def cmd_diff(revision=None):
248
"""Show diff from basis to working copy.
249
250
:todo: Take one or two revision arguments, look up those trees,
251
and diff them.
252
253
:todo: Allow diff across branches.
254
255
:todo: Mangle filenames in diff to be more relevant.
256
257
:todo: Shouldn't be in the cmd function.
258
"""
259
260
b = Branch('.')
261
262
if revision == None:
263
old_tree = b.basis_tree()
264
else:
265
old_tree = b.revision_tree(b.lookup_revision(revision))
266
267
new_tree = b.working_tree()
268
old_inv = old_tree.inventory
269
new_inv = new_tree.inventory
270
271
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
272
old_label = ''
273
new_label = ''
274
275
DEVNULL = '/dev/null'
276
# Windows users, don't panic about this filename -- it is a
277
# special signal to GNU patch that the file should be created or
278
# deleted respectively.
279
280
# TODO: Generation of pseudo-diffs for added/deleted files could
281
# be usefully made into a much faster special case.
282
283
# TODO: Better to return them in sorted order I think.
284
285
for file_state, fid, old_name, new_name, kind in bzrlib.diff_trees(old_tree, new_tree):
286
d = None
287
288
# Don't show this by default; maybe do it if an option is passed
289
# idlabel = ' {%s}' % fid
290
idlabel = ''
291
292
# FIXME: Something about the diff format makes patch unhappy
293
# with newly-added files.
294
295
def diffit(*a, **kw):
296
sys.stdout.writelines(difflib.unified_diff(*a, **kw))
297
print
298
299
if file_state in ['.', '?', 'I']:
300
continue
301
elif file_state == 'A':
302
print '*** added %s %r' % (kind, new_name)
303
if kind == 'file':
304
diffit([],
305
new_tree.get_file(fid).readlines(),
306
fromfile=DEVNULL,
307
tofile=new_label + new_name + idlabel)
308
elif file_state == 'D':
309
assert isinstance(old_name, types.StringTypes)
310
print '*** deleted %s %r' % (kind, old_name)
311
if kind == 'file':
312
diffit(old_tree.get_file(fid).readlines(), [],
313
fromfile=old_label + old_name + idlabel,
314
tofile=DEVNULL)
315
elif file_state in ['M', 'R']:
316
if file_state == 'M':
317
assert kind == 'file'
318
assert old_name == new_name
319
print '*** modified %s %r' % (kind, new_name)
320
elif file_state == 'R':
321
print '*** renamed %s %r => %r' % (kind, old_name, new_name)
322
323
if kind == 'file':
324
diffit(old_tree.get_file(fid).readlines(),
325
new_tree.get_file(fid).readlines(),
326
fromfile=old_label + old_name + idlabel,
327
tofile=new_label + new_name)
328
else:
329
bailout("can't represent state %s {%s}" % (file_state, fid))
330
331
332
333
def cmd_log():
334
"""Show log of this branch.
335
336
:todo: Options for utc; to show ids; to limit range; etc.
337
"""
338
Branch('.').write_log()
339
340
341
def cmd_ls(revision=None, verbose=False):
1076
file_id = inv.path2id(b.relpath(filename))
1077
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1078
print "%6d %s" % (revno, what)
1079
1080
1081
class cmd_ls(Command):
342
1082
"""List files in a tree.
343
1083
344
:todo: Take a revision or remote path and list that tree instead.
345
"""
346
b = Branch('.')
347
if revision == None:
348
tree = b.working_tree()
349
else:
350
tree = b.revision_tree(b.lookup_revision(revision))
351
352
for fp, fc, kind, fid in tree.list_files():
353
if verbose:
354
if kind == 'directory':
355
kindch = '/'
356
elif kind == 'file':
357
kindch = ''
358
else:
359
kindch = '???'
360
361
print '%-8s %s%s' % (fc, fp, kindch)
362
else:
363
print fp
364
365
366
367
def cmd_unknowns():
368
"""List unknown files"""
369
for f in Branch('.').unknowns():
370
print quotefn(f)
371
372
373
def cmd_lookup_revision(revno):
374
try:
375
revno = int(revno)
376
except ValueError:
377
bailout("usage: lookup-revision REVNO",
378
["REVNO is a non-negative revision number for this branch"])
379
380
print Branch('.').lookup_revision(revno) or NONE_STRING
381
382
383
384
def cmd_export(revno, dest):
385
"""Export past revision to destination directory."""
386
b = Branch('.')
387
rh = b.lookup_revision(int(revno))
388
t = b.revision_tree(rh)
389
t.export(dest)
390
391
392
393
######################################################################
394
# internal/test commands
395
396
397
def cmd_uuid():
398
"""Print a newly-generated UUID."""
399
print uuid()
400
401
402
403
def cmd_commit(message, verbose=False):
404
Branch('.').commit(message, verbose=verbose)
405
406
407
def cmd_check():
408
"""Check consistency of the branch."""
409
check()
410
411
412
def cmd_is(pred, *rest):
413
"""Test whether PREDICATE is true."""
414
try:
415
cmd_handler = globals()['assert_' + pred.replace('-', '_')]
416
except KeyError:
417
bailout("unknown predicate: %s" % quotefn(pred))
418
419
try:
420
cmd_handler(*rest)
421
except BzrCheckError:
422
# by default we don't print the message so that this can
423
# be used from shell scripts without producing noise
424
sys.exit(1)
425
426
427
def cmd_username():
428
print bzrlib.osutils.username()
429
430
431
def cmd_user_email():
432
print bzrlib.osutils.user_email()
433
434
435
def cmd_gen_revision_id():
436
import time
437
print bzrlib.branch._gen_revision_id(time.time())
438
439
440
def cmd_doctest():
441
"""Run internal doctest suite"""
442
## -v, if present, is seen by doctest; the argument is just here
443
## so our parser doesn't complain
444
445
## TODO: --verbose option
446
447
import bzr, doctest, bzrlib.store
448
bzrlib.trace.verbose = False
449
doctest.testmod(bzr)
450
doctest.testmod(bzrlib.store)
451
doctest.testmod(bzrlib.inventory)
452
doctest.testmod(bzrlib.branch)
453
doctest.testmod(bzrlib.osutils)
454
doctest.testmod(bzrlib.tree)
455
456
# more strenuous tests;
457
import bzrlib.tests
458
doctest.testmod(bzrlib.tests)
459
460
461
######################################################################
462
# help
463
464
465
def cmd_help():
466
# TODO: Specific help for particular commands
467
print __doc__
468
469
470
def cmd_version():
471
print "bzr (bazaar-ng) %s" % __version__
472
print __copyright__
1084
TODO: Take a revision or remote path and list that tree instead.
1085
"""
1086
hidden = True
1087
def run(self, revision=None, verbose=False):
1088
b = find_branch('.')
1089
if revision == None:
1090
tree = b.working_tree()
1091
else:
1092
tree = b.revision_tree(b.lookup_revision(revision))
1093
1094
for fp, fc, kind, fid in tree.list_files():
1095
if verbose:
1096
if kind == 'directory':
1097
kindch = '/'
1098
elif kind == 'file':
1099
kindch = ''
1100
else:
1101
kindch = '???'
1102
1103
print '%-8s %s%s' % (fc, fp, kindch)
1104
else:
1105
print fp
1106
1107
1108
1109
class cmd_unknowns(Command):
1110
"""List unknown files."""
1111
def run(self):
1112
from bzrlib.osutils import quotefn
1113
for f in find_branch('.').unknowns():
1114
print quotefn(f)
1115
1116
1117
1118
class cmd_ignore(Command):
1119
"""Ignore a command or pattern.
1120
1121
To remove patterns from the ignore list, edit the .bzrignore file.
1122
1123
If the pattern contains a slash, it is compared to the whole path
1124
from the branch root. Otherwise, it is comapred to only the last
1125
component of the path.
1126
1127
Ignore patterns are case-insensitive on case-insensitive systems.
1128
1129
Note: wildcards must be quoted from the shell on Unix.
1130
1131
examples:
1132
bzr ignore ./Makefile
1133
bzr ignore '*.class'
1134
"""
1135
takes_args = ['name_pattern']
1136
1137
def run(self, name_pattern):
1138
from bzrlib.atomicfile import AtomicFile
1139
import os.path
1140
1141
b = find_branch('.')
1142
ifn = b.abspath('.bzrignore')
1143
1144
if os.path.exists(ifn):
1145
f = open(ifn, 'rt')
1146
try:
1147
igns = f.read().decode('utf-8')
1148
finally:
1149
f.close()
1150
else:
1151
igns = ''
1152
1153
# TODO: If the file already uses crlf-style termination, maybe
1154
# we should use that for the newly added lines?
1155
1156
if igns and igns[-1] != '\n':
1157
igns += '\n'
1158
igns += name_pattern + '\n'
1159
1160
try:
1161
f = AtomicFile(ifn, 'wt')
1162
f.write(igns.encode('utf-8'))
1163
f.commit()
1164
finally:
1165
f.close()
1166
1167
inv = b.working_tree().inventory
1168
if inv.path2id('.bzrignore'):
1169
mutter('.bzrignore is already versioned')
1170
else:
1171
mutter('need to make new .bzrignore file versioned')
1172
b.add(['.bzrignore'])
1173
1174
1175
1176
class cmd_ignored(Command):
1177
"""List ignored files and the patterns that matched them.
1178
1179
See also: bzr ignore"""
1180
def run(self):
1181
tree = find_branch('.').working_tree()
1182
for path, file_class, kind, file_id in tree.list_files():
1183
if file_class != 'I':
1184
continue
1185
## XXX: Slightly inefficient since this was already calculated
1186
pat = tree.is_ignored(path)
1187
print '%-50s %s' % (path, pat)
1188
1189
1190
class cmd_lookup_revision(Command):
1191
"""Lookup the revision-id from a revision-number
1192
1193
example:
1194
bzr lookup-revision 33
1195
"""
1196
hidden = True
1197
takes_args = ['revno']
1198
1199
def run(self, revno):
1200
try:
1201
revno = int(revno)
1202
except ValueError:
1203
raise BzrCommandError("not a valid revision-number: %r" % revno)
1204
1205
print find_branch('.').lookup_revision(revno)
1206
1207
1208
class cmd_export(Command):
1209
"""Export past revision to destination directory.
1210
1211
If no revision is specified this exports the last committed revision.
1212
1213
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1214
given, try to find the format with the extension. If no extension
1215
is found exports to a directory (equivalent to --format=dir).
1216
1217
Root may be the top directory for tar, tgz and tbz2 formats. If none
1218
is given, the top directory will be the root name of the file."""
1219
# TODO: list known exporters
1220
takes_args = ['dest']
1221
takes_options = ['revision', 'format', 'root']
1222
def run(self, dest, revision=None, format=None, root=None):
1223
import os.path
1224
b = find_branch('.')
1225
if revision is None:
1226
rev_id = b.last_patch()
1227
else:
1228
if len(revision) != 1:
1229
raise BzrError('bzr export --revision takes exactly 1 argument')
1230
revno, rev_id = b.get_revision_info(revision[0])
1231
t = b.revision_tree(rev_id)
1232
root, ext = os.path.splitext(dest)
1233
if not format:
1234
if ext in (".tar",):
1235
format = "tar"
1236
elif ext in (".gz", ".tgz"):
1237
format = "tgz"
1238
elif ext in (".bz2", ".tbz2"):
1239
format = "tbz2"
1240
else:
1241
format = "dir"
1242
t.export(dest, format, root)
1243
1244
1245
class cmd_cat(Command):
1246
"""Write a file's text from a previous revision."""
1247
1248
takes_options = ['revision']
1249
takes_args = ['filename']
1250
1251
def run(self, filename, revision=None):
1252
if revision == None:
1253
raise BzrCommandError("bzr cat requires a revision number")
1254
elif len(revision) != 1:
1255
raise BzrCommandError("bzr cat --revision takes exactly one number")
1256
b = find_branch('.')
1257
b.print_file(b.relpath(filename), revision[0])
1258
1259
1260
class cmd_local_time_offset(Command):
1261
"""Show the offset in seconds from GMT to local time."""
1262
hidden = True
1263
def run(self):
1264
print bzrlib.osutils.local_time_offset()
1265
1266
1267
1268
class cmd_commit(Command):
1269
"""Commit changes into a new revision.
1270
1271
If no arguments are given, the entire tree is committed.
1272
1273
If selected files are specified, only changes to those files are
1274
committed. If a directory is specified then the directory and everything
1275
within it is committed.
1276
1277
A selected-file commit may fail in some cases where the committed
1278
tree would be invalid, such as trying to commit a file in a
1279
newly-added directory that is not itself committed.
1280
1281
TODO: Run hooks on tree to-be-committed, and after commit.
1282
1283
TODO: Strict commit that fails if there are unknown or deleted files.
1284
"""
1285
takes_args = ['selected*']
1286
takes_options = ['message', 'file', 'verbose', 'unchanged']
1287
aliases = ['ci', 'checkin']
1288
1289
# TODO: Give better message for -s, --summary, used by tla people
1290
1291
def run(self, message=None, file=None, verbose=True, selected_list=None,
1292
unchanged=False):
1293
from bzrlib.errors import PointlessCommit
1294
from bzrlib.osutils import get_text_message
1295
1296
## Warning: shadows builtin file()
1297
if not message and not file:
1298
# FIXME: Ugly; change status code to send to a provided function?
1299
1300
import cStringIO
1301
stdout = sys.stdout
1302
catcher = cStringIO.StringIO()
1303
sys.stdout = catcher
1304
cmd_status({"file_list":selected_list}, {})
1305
info = catcher.getvalue()
1306
sys.stdout = stdout
1307
message = get_text_message(info)
1308
1309
if message is None:
1310
raise BzrCommandError("please specify a commit message",
1311
["use either --message or --file"])
1312
elif message and file:
1313
raise BzrCommandError("please specify either --message or --file")
1314
1315
if file:
1316
import codecs
1317
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1318
1319
b = find_branch('.')
1320
if selected_list:
1321
selected_list = [b.relpath(s) for s in selected_list]
1322
1323
try:
1324
b.commit(message, verbose=verbose,
1325
specific_files=selected_list,
1326
allow_pointless=unchanged)
1327
except PointlessCommit:
1328
# FIXME: This should really happen before the file is read in;
1329
# perhaps prepare the commit; get the message; then actually commit
1330
raise BzrCommandError("no changes to commit",
1331
["use --unchanged to commit anyhow"])
1332
1333
1334
class cmd_check(Command):
1335
"""Validate consistency of branch history.
1336
1337
This command checks various invariants about the branch storage to
1338
detect data corruption or bzr bugs.
1339
1340
If given the --update flag, it will update some optional fields
1341
to help ensure data consistency.
1342
"""
1343
takes_args = ['dir?']
1344
1345
def run(self, dir='.'):
1346
from bzrlib.check import check
1347
1348
check(find_branch(dir))
1349
1350
1351
class cmd_scan_cache(Command):
1352
hidden = True
1353
def run(self):
1354
from bzrlib.hashcache import HashCache
1355
import os
1356
1357
c = HashCache('.')
1358
c.read()
1359
c.scan()
1360
1361
print '%6d stats' % c.stat_count
1362
print '%6d in hashcache' % len(c._cache)
1363
print '%6d files removed from cache' % c.removed_count
1364
print '%6d hashes updated' % c.update_count
1365
print '%6d files changed too recently to cache' % c.danger_count
1366
1367
if c.needs_write:
1368
c.write()
1369
1370
1371
1372
class cmd_upgrade(Command):
1373
"""Upgrade branch storage to current format.
1374
1375
This should normally be used only after the check command tells
1376
you to run it.
1377
"""
1378
takes_args = ['dir?']
1379
1380
def run(self, dir='.'):
1381
from bzrlib.upgrade import upgrade
1382
upgrade(find_branch(dir))
1383
1384
1385
1386
class cmd_whoami(Command):
1387
"""Show bzr user id."""
1388
takes_options = ['email']
1389
1390
def run(self, email=False):
1391
try:
1392
b = bzrlib.branch.find_branch('.')
1393
except:
1394
b = None
1395
1396
if email:
1397
print bzrlib.osutils.user_email(b)
1398
else:
1399
print bzrlib.osutils.username(b)
1400
1401
1402
class cmd_selftest(Command):
1403
"""Run internal test suite"""
1404
hidden = True
1405
takes_options = ['verbose']
1406
def run(self, verbose=False):
1407
import bzrlib.ui
1408
from bzrlib.selftest import selftest
1409
1410
# we don't want progress meters from the tests to go to the
1411
# real output.
1412
1413
save_ui = bzrlib.ui.ui_factory
1414
try:
1415
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1416
return int(not selftest(verbose=verbose))
1417
finally:
1418
bzrlib.ui.ui_factory = save_ui
1419
1420
1421
class cmd_version(Command):
1422
"""Show version of bzr."""
1423
def run(self):
1424
show_version()
1425
1426
def show_version():
1427
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1428
# is bzrlib itself in a branch?
1429
bzrrev = bzrlib.get_bzr_revision()
1430
if bzrrev:
1431
print " (bzr checkout, revision %d {%s})" % bzrrev
1432
print bzrlib.__copyright__
473
1433
print "http://bazaar-ng.org/"
474
1434
print
475
print \
476
"""bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and
477
you may use, modify and redistribute it under the terms of the GNU
478
General Public License version 2 or later."""
479
480
481
def cmd_rocks():
1435
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
1436
print "you may use, modify and redistribute it under the terms of the GNU"
1437
print "General Public License version 2 or later."
1438
1439
1440
class cmd_rocks(Command):
482
1441
"""Statement of optimism."""
483
print "it sure does!"
484
485
486
487
######################################################################
488
# main routine
1442
hidden = True
1443
def run(self):
1444
print "it sure does!"
1445
1446
def parse_spec(spec):
1447
"""
1448
>>> parse_spec(None)
1449
[None, None]
1450
>>> parse_spec("./")
1451
['./', None]
1452
>>> parse_spec("../@")
1453
['..', -1]
1454
>>> parse_spec("../f/@35")
1455
['../f', 35]
1456
>>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
1457
['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
1458
"""
1459
if spec is None:
1460
return [None, None]
1461
if '/@' in spec:
1462
parsed = spec.split('/@')
1463
assert len(parsed) == 2
1464
if parsed[1] == "":
1465
parsed[1] = -1
1466
else:
1467
try:
1468
parsed[1] = int(parsed[1])
1469
except ValueError:
1470
pass # We can allow stuff like ./@revid:blahblahblah
1471
else:
1472
assert parsed[1] >=0
1473
else:
1474
parsed = [spec, None]
1475
return parsed
1476
1477
1478
1479
class cmd_find_merge_base(Command):
1480
"""Find and print a base revision for merging two branches.
1481
1482
TODO: Options to specify revisions on either side, as if
1483
merging only part of the history.
1484
"""
1485
takes_args = ['branch', 'other']
1486
hidden = True
1487
1488
def run(self, branch, other):
1489
branch1 = find_branch(branch)
1490
branch2 = find_branch(other)
1491
1492
base_revno, base_revid = branch1.common_ancestor(branch2)
1493
1494
if base_revno is None:
1495
raise bzrlib.errors.UnrelatedBranches()
1496
1497
print 'merge base is revision %s' % base_revid
1498
print ' r%-6d in %s' % (base_revno, branch)
1499
1500
other_revno = branch2.revision_id_to_revno(base_revid)
1501
1502
print ' r%-6d in %s' % (other_revno, other)
1503
1504
1505
1506
class cmd_merge(Command):
1507
"""Perform a three-way merge.
1508
1509
The branch is the branch you will merge from. By default, it will merge
1510
the latest revision. If you specify a revision, that revision will be
1511
merged. If you specify two revisions, the first will be used as a BASE,
1512
and the second one as OTHER. Revision numbers are always relative to the
1513
specified branch.
1514
1515
Examples:
1516
1517
To merge the latest revision from bzr.dev
1518
bzr merge ../bzr.dev
1519
1520
To merge changes up to and including revision 82 from bzr.dev
1521
bzr merge -r 82 ../bzr.dev
1522
1523
To merge the changes introduced by 82, without previous changes:
1524
bzr merge -r 81..82 ../bzr.dev
1525
1526
merge refuses to run if there are any uncommitted changes, unless
1527
--force is given.
1528
"""
1529
takes_args = ['branch?']
1530
takes_options = ['revision', 'force', 'merge-type']
1531
1532
def run(self, branch='.', revision=None, force=False,
1533
merge_type=None):
1534
from bzrlib.merge import merge
1535
from bzrlib.merge_core import ApplyMerge3
1536
if merge_type is None:
1537
merge_type = ApplyMerge3
1538
1539
if revision is None or len(revision) < 1:
1540
base = (None, None)
1541
other = (branch, -1)
1542
else:
1543
if len(revision) == 1:
1544
other = (branch, revision[0])
1545
base = (None, None)
1546
else:
1547
assert len(revision) == 2
1548
if None in revision:
1549
raise BzrCommandError(
1550
"Merge doesn't permit that revision specifier.")
1551
base = (branch, revision[0])
1552
other = (branch, revision[1])
1553
1554
merge(other, base, check_clean=(not force), merge_type=merge_type)
1555
1556
1557
class cmd_revert(Command):
1558
"""Reverse all changes since the last commit.
1559
1560
Only versioned files are affected. Specify filenames to revert only
1561
those files. By default, any files that are changed will be backed up
1562
first. Backup files have a '~' appended to their name.
1563
"""
1564
takes_options = ['revision', 'no-backup']
1565
takes_args = ['file*']
1566
aliases = ['merge-revert']
1567
1568
def run(self, revision=None, no_backup=False, file_list=None):
1569
from bzrlib.merge import merge
1570
if file_list is not None:
1571
if len(file_list) == 0:
1572
raise BzrCommandError("No files specified")
1573
if revision is None:
1574
revision = [-1]
1575
elif len(revision) != 1:
1576
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1577
merge(('.', revision[0]), parse_spec('.'),
1578
check_clean=False,
1579
ignore_zero=True,
1580
backup_files=not no_backup,
1581
file_list=file_list)
1582
1583
1584
class cmd_assert_fail(Command):
1585
"""Test reporting of assertion failures"""
1586
hidden = True
1587
def run(self):
1588
assert False, "always fails"
1589
1590
1591
class cmd_help(Command):
1592
"""Show help on a command or other topic.
1593
1594
For a list of all available commands, say 'bzr help commands'."""
1595
takes_options = ['long']
1596
takes_args = ['topic?']
1597
aliases = ['?']
1598
1599
def run(self, topic=None, long=False):
1600
import help
1601
if topic is None and long:
1602
topic = "commands"
1603
help.help(topic)
1604
1605
1606
class cmd_shell_complete(Command):
1607
"""Show appropriate completions for context.
1608
1609
For a list of all available commands, say 'bzr shell-complete'."""
1610
takes_args = ['context?']
1611
aliases = ['s-c']
1612
hidden = True
1613
1614
def run(self, context=None):
1615
import shellcomplete
1616
shellcomplete.shellcomplete(context)
1617
1618
1619
class cmd_missing(Command):
1620
"""What is missing in this branch relative to other branch.
1621
"""
1622
takes_args = ['remote?']
1623
aliases = ['mis', 'miss']
1624
# We don't have to add quiet to the list, because
1625
# unknown options are parsed as booleans
1626
takes_options = ['verbose', 'quiet']
1627
1628
def run(self, remote=None, verbose=False, quiet=False):
1629
from bzrlib.branch import find_branch, DivergedBranches
1630
from bzrlib.errors import BzrCommandError
1631
from bzrlib.missing import get_parent, show_missing
1632
1633
if verbose and quiet:
1634
raise BzrCommandError('Cannot pass both quiet and verbose')
1635
1636
b = find_branch('.')
1637
parent = get_parent(b)
1638
if remote is None:
1639
if parent is None:
1640
raise BzrCommandError("No missing location known or specified.")
1641
else:
1642
if not quiet:
1643
print "Using last location: %s" % parent
1644
remote = parent
1645
elif parent is None:
1646
# We only update x-pull if it did not exist, missing should not change the parent
1647
b.controlfile('x-pull', 'wb').write(remote + '\n')
1648
br_remote = find_branch(remote)
1649
1650
return show_missing(b, br_remote, verbose=verbose, quiet=quiet)
1651
1652
1653
1654
class cmd_plugins(Command):
1655
"""List plugins"""
1656
hidden = True
1657
def run(self):
1658
import bzrlib.plugin
1659
from inspect import getdoc
1660
from pprint import pprint
1661
for plugin in bzrlib.plugin.all_plugins:
1662
print plugin.__path__[0]
1663
d = getdoc(plugin)
1664
if d:
1665
print '\t', d.split('\n')[0]
1666
1667
#pprint(bzrlib.plugin.all_plugins)
1668
489
1669
490
1670
491
1671
# list of all available options; the rhs can be either None for an
493
1673
# the type.
494
1674
OPTIONS = {
495
1675
'all': None,
1676
'diff-options': str,
496
1677
'help': None,
1678
'file': unicode,
1679
'force': None,
1680
'format': unicode,
1681
'forward': None,
497
1682
'message': unicode,
498
'revision': int,
1683
'no-recurse': None,
1684
'profile': None,
1685
'revision': _parse_revision_str,
1686
'short': None,
499
1687
'show-ids': None,
1688
'timezone': str,
500
1689
'verbose': None,
501
1690
'version': None,
1691
'email': None,
1692
'unchanged': None,
1693
'update': None,
1694
'long': None,
1695
'root': str,
1696
'no-backup': None,
1697
'merge-type': get_merge_type,
502
1698
}
503
1699
504
1700
SHORT_OPTIONS = {
1701
'F': 'file',
1702
'h': 'help',
505
1703
'm': 'message',
506
1704
'r': 'revision',
507
1705
'v': 'verbose',
1706
'l': 'long',
508
1707
}
509
1708
510
# List of options that apply to particular commands; commands not
511
# listed take none.
512
cmd_options = {
513
'add': ['verbose'],
514
'commit': ['message', 'verbose'],
515
'diff': ['revision'],
516
'inventory': ['revision'],
517
'ls': ['revision', 'verbose'],
518
'status': ['all'],
519
'log': ['show-ids'],
520
'remove': ['verbose'],
521
}
522
523
524
cmd_args = {
525
'init': [],
526
'add': ['file+'],
527
'commit': [],
528
'diff': [],
529
'file-id': ['filename'],
530
'get-file-text': ['text_id'],
531
'get-inventory': ['inventory_id'],
532
'get-revision': ['revision_id'],
533
'get-revision-inventory': ['revision_id'],
534
'log': [],
535
'lookup-revision': ['revno'],
536
'export': ['revno', 'dest'],
537
'remove': ['file+'],
538
'status': [],
539
}
540
541
1709
542
1710
def parse_args(argv):
543
1711
"""Parse command line.
547
1715
lookup table, something about the available options, what optargs
548
1716
they take, and which commands will accept them.
549
1717
550
>>> parse_args('bzr --help'.split())
1718
>>> parse_args('--help'.split())
551
1719
([], {'help': True})
552
>>> parse_args('bzr --version'.split())
1720
>>> parse_args('--version'.split())
553
1721
([], {'version': True})
554
>>> parse_args('bzr status --all'.split())
1722
>>> parse_args('status --all'.split())
555
1723
(['status'], {'all': True})
1724
>>> parse_args('commit --message=biter'.split())
1725
(['commit'], {'message': u'biter'})
1726
>>> parse_args('log -r 500'.split())
1727
(['log'], {'revision': [500]})
1728
>>> parse_args('log -r500..600'.split())
1729
(['log'], {'revision': [500, 600]})
1730
>>> parse_args('log -vr500..600'.split())
1731
(['log'], {'verbose': True, 'revision': [500, 600]})
1732
>>> parse_args('log -rv500..600'.split()) #the r takes an argument
1733
(['log'], {'revision': ['v500', 600]})
556
1734
"""
557
1735
args = []
558
1736
opts = {}
559
1737
560
1738
# TODO: Maybe handle '--' to end options?
561
1739
562
it = iter(argv[1:])
563
while it:
564
a = it.next()
1740
while argv:
1741
a = argv.pop(0)
565
1742
if a[0] == '-':
1743
# option names must not be unicode
1744
a = str(a)
1745
optarg = None
566
1746
if a[1] == '-':
567
1747
mutter(" got option %r" % a)
568
optname = a[2:]
1748
if '=' in a:
1749
optname, optarg = a[2:].split('=', 1)
1750
else:
1751
optname = a[2:]
569
1752
if optname not in OPTIONS:
570
bailout('unknown long option %r' % a)
1753
raise BzrError('unknown long option %r' % a)
571
1754
else:
572
1755
shortopt = a[1:]
573
if shortopt not in SHORT_OPTIONS:
574
bailout('unknown short option %r' % a)
575
optname = SHORT_OPTIONS[shortopt]
1756
if shortopt in SHORT_OPTIONS:
1757
# Multi-character options must have a space to delimit
1758
# their value
1759
optname = SHORT_OPTIONS[shortopt]
1760
else:
1761
# Single character short options, can be chained,
1762
# and have their value appended to their name
1763
shortopt = a[1:2]
1764
if shortopt not in SHORT_OPTIONS:
1765
# We didn't find the multi-character name, and we
1766
# didn't find the single char name
1767
raise BzrError('unknown short option %r' % a)
1768
optname = SHORT_OPTIONS[shortopt]
1769
1770
if a[2:]:
1771
# There are extra things on this option
1772
# see if it is the value, or if it is another
1773
# short option
1774
optargfn = OPTIONS[optname]
1775
if optargfn is None:
1776
# This option does not take an argument, so the
1777
# next entry is another short option, pack it back
1778
# into the list
1779
argv.insert(0, '-' + a[2:])
1780
else:
1781
# This option takes an argument, so pack it
1782
# into the array
1783
optarg = a[2:]
576
1784
577
1785
if optname in opts:
578
1786
# XXX: Do we ever want to support this, e.g. for -r?
579
bailout('repeated option %r' % a)
1787
raise BzrError('repeated option %r' % a)
1788
580
1789
optargfn = OPTIONS[optname]
581
1790
if optargfn:
582
if not it:
583
bailout('option %r needs an argument' % a)
584
opts[optname] = optargfn(it.next())
585
mutter(" option argument %r" % opts[optname])
1791
if optarg == None:
1792
if not argv:
1793
raise BzrError('option %r needs an argument' % a)
1794
else:
1795
optarg = argv.pop(0)
1796
opts[optname] = optargfn(optarg)
586
1797
else:
587
# takes no option argument
1798
if optarg != None:
1799
raise BzrError('option %r takes no argument' % optname)
588
1800
opts[optname] = True
589
elif a[:1] == '-':
590
bailout('unknown short option %r' % a)
591
1801
else:
592
1802
args.append(a)
593
1803
595
1805
596
1806
597
1807
598
def _match_args(cmd, args):
599
"""Check non-option arguments match required pattern.
600
1808
601
>>> _match_args('status', ['asdasdsadasd'])
602
Traceback (most recent call last):
603
...
604
BzrError: ("extra arguments to command status: ['asdasdsadasd']", [])
605
>>> _match_args('add', ['asdasdsadasd'])
606
{'file_list': ['asdasdsadasd']}
607
>>> _match_args('add', 'abc def gj'.split())
608
{'file_list': ['abc', 'def', 'gj']}
609
"""
610
# match argument pattern
611
argform = cmd_args.get(cmd, [])
1809
def _match_argform(cmd, takes_args, args):
612
1810
argdict = {}
613
# TODO: Need a way to express 'cp SRC... DEST', where it matches
614
# all but one.
615
for ap in argform:
1811
1812
# step through args and takes_args, allowing appropriate 0-many matches
1813
for ap in takes_args:
616
1814
argname = ap[:-1]
617
1815
if ap[-1] == '?':
618
assert 0
619
elif ap[-1] == '*':
620
assert 0
1816
if args:
1817
argdict[argname] = args.pop(0)
1818
elif ap[-1] == '*': # all remaining arguments
1819
if args:
1820
argdict[argname + '_list'] = args[:]
1821
args = []
1822
else:
1823
argdict[argname + '_list'] = None
621
1824
elif ap[-1] == '+':
622
1825
if not args:
623
bailout("command %r needs one or more %s"
1826
raise BzrCommandError("command %r needs one or more %s"
624
1827
% (cmd, argname.upper()))
625
1828
else:
626
1829
argdict[argname + '_list'] = args[:]
627
1830
args = []
1831
elif ap[-1] == '$': # all but one
1832
if len(args) < 2:
1833
raise BzrCommandError("command %r needs one or more %s"
1834
% (cmd, argname.upper()))
1835
argdict[argname + '_list'] = args[:-1]
1836
args[:-1] = []
628
1837
else:
629
1838
# just a plain arg
630
1839
argname = ap
631
1840
if not args:
632
bailout("command %r requires argument %s"
1841
raise BzrCommandError("command %r requires argument %s"
633
1842
% (cmd, argname.upper()))
634
1843
else:
635
1844
argdict[argname] = args.pop(0)
636
1845
637
1846
if args:
638
bailout("extra arguments to command %s: %r"
639
% (cmd, args))
1847
raise BzrCommandError("extra argument to command %s: %s"
1848
% (cmd, args[0]))
640
1849
641
1850
return argdict
642
1851
646
1855
"""Execute a command.
647
1856
648
1857
This is similar to main(), but without all the trappings for
649
logging and error handling.
1858
logging and error handling.
1859
1860
argv
1861
The command-line arguments, without the program name from argv[0]
1862
1863
Returns a command status or raises an exception.
1864
1865
Special master options: these must come before the command because
1866
they control how the command is interpreted.
1867
1868
--no-plugins
1869
Do not load plugin modules at all
1870
1871
--builtin
1872
Only use builtin commands. (Plugins are still allowed to change
1873
other behaviour.)
1874
1875
--profile
1876
Run under the Python profiler.
650
1877
"""
651
try:
652
args, opts = parse_args(argv)
653
if 'help' in opts:
654
# TODO: pass down other arguments in case they asked for
655
# help on a command name?
656
cmd_help()
657
return 0
658
elif 'version' in opts:
659
cmd_version()
660
return 0
661
cmd = args.pop(0)
662
except IndexError:
663
log_error('usage: bzr COMMAND\n')
664
log_error(' try "bzr help"\n')
665
return 1
666
667
try:
668
cmd_handler = globals()['cmd_' + cmd.replace('-', '_')]
669
except KeyError:
670
bailout("unknown command " + `cmd`)
671
672
# TODO: special --profile option to turn on the Python profiler
1878
1879
argv = [a.decode(bzrlib.user_encoding) for a in argv]
1880
1881
opt_profile = opt_no_plugins = opt_builtin = False
1882
1883
# --no-plugins is handled specially at a very early stage. We need
1884
# to load plugins before doing other command parsing so that they
1885
# can override commands, but this needs to happen first.
1886
1887
for a in argv[:]:
1888
if a == '--profile':
1889
opt_profile = True
1890
elif a == '--no-plugins':
1891
opt_no_plugins = True
1892
elif a == '--builtin':
1893
opt_builtin = True
1894
else:
1895
break
1896
argv.remove(a)
1897
1898
if not opt_no_plugins:
1899
from bzrlib.plugin import load_plugins
1900
load_plugins()
1901
1902
args, opts = parse_args(argv)
1903
1904
if 'help' in opts:
1905
from bzrlib.help import help
1906
if args:
1907
help(args[0])
1908
else:
1909
help()
1910
return 0
1911
1912
if 'version' in opts:
1913
show_version()
1914
return 0
1915
1916
if not args:
1917
from bzrlib.help import help
1918
help(None)
1919
return 0
1920
1921
cmd = str(args.pop(0))
1922
1923
canonical_cmd, cmd_class = \
1924
get_cmd_class(cmd, plugins_override=not opt_builtin)
673
1925
674
1926
# check options are reasonable
675
allowed = cmd_options.get(cmd, [])
1927
allowed = cmd_class.takes_options
676
1928
for oname in opts:
677
1929
if oname not in allowed:
678
bailout("option %r is not allowed for command %r"
679
% (oname, cmd))
680
681
cmdargs = _match_args(cmd, args)
682
cmdargs.update(opts)
683
684
ret = cmd_handler(**cmdargs) or 0
685
1930
raise BzrCommandError("option '--%s' is not allowed for command %r"
1931
% (oname, cmd))
1932
1933
# mix arguments and options into one dictionary
1934
cmdargs = _match_argform(cmd, cmd_class.takes_args, args)
1935
cmdopts = {}
1936
for k, v in opts.items():
1937
cmdopts[k.replace('-', '_')] = v
1938
1939
if opt_profile:
1940
import hotshot, tempfile
1941
pffileno, pfname = tempfile.mkstemp()
1942
try:
1943
prof = hotshot.Profile(pfname)
1944
ret = prof.runcall(cmd_class, cmdopts, cmdargs) or 0
1945
prof.close()
1946
1947
import hotshot.stats
1948
stats = hotshot.stats.load(pfname)
1949
#stats.strip_dirs()
1950
stats.sort_stats('time')
1951
## XXX: Might like to write to stderr or the trace file instead but
1952
## print_stats seems hardcoded to stdout
1953
stats.print_stats(20)
1954
1955
return ret.status
1956
1957
finally:
1958
os.close(pffileno)
1959
os.remove(pfname)
1960
else:
1961
return cmd_class(cmdopts, cmdargs).status
686
1962
687
1963
688
1964
def main(argv):
689
## TODO: Handle command-line options; probably know what options are valid for
690
## each command
1965
import bzrlib.ui
1966
1967
bzrlib.trace.open_tracefile(argv)
691
1968
692
## TODO: If the arguments are wrong, give a usage message rather
693
## than just a backtrace.
1969
bzrlib.ui.ui_factory = bzrlib.ui.TextUIFactory()
694
1970
695
1971
try:
696
t = bzrlib.trace._tracefile
697
t.write('-' * 60 + '\n')
698
t.write('bzr invoked at %s\n' % format_date(time.time()))
699
t.write(' by %s on %s\n' % (bzrlib.osutils.username(), socket.gethostname()))
700
t.write(' arguments: %r\n' % argv)
701
702
starttime = os.times()[4]
703
704
import platform
705
t.write(' platform: %s\n' % platform.platform())
706
t.write(' python: %s\n' % platform.python_version())
707
708
ret = run_bzr(argv)
709
710
times = os.times()
711
mutter("finished, %.3fu/%.3fs cpu, %.3fu/%.3fs cum"
712
% times[:4])
713
mutter(" %.3f elapsed" % (times[4] - starttime))
714
715
return ret
1972
try:
1973
return run_bzr(argv[1:])
1974
finally:
1975
# do this here inside the exception wrappers to catch EPIPE
1976
sys.stdout.flush()
1977
except BzrCommandError, e:
1978
# command line syntax error, etc
1979
log_error(str(e))
1980
return 1
716
1981
except BzrError, e:
717
log_error('bzr: error: ' + e.args[0] + '\n')
718
if len(e.args) > 1:
719
for h in e.args[1]:
720
log_error(' ' + h + '\n')
1982
bzrlib.trace.log_exception()
721
1983
return 1
1984
except AssertionError, e:
1985
bzrlib.trace.log_exception('assertion failed: ' + str(e))
1986
return 3
1987
except KeyboardInterrupt, e:
1988
bzrlib.trace.note('interrupted')
1989
return 2
722
1990
except Exception, e:
723
log_error('bzr: exception: %s\n' % e)
724
log_error(' see .bzr.log for details\n')
725
traceback.print_exc(None, bzrlib.trace._tracefile)
726
traceback.print_exc(None, sys.stderr)
727
return 1
728
729
# TODO: Maybe nicer handling of IOError?
730
1991
import errno
1992
if (isinstance(e, IOError)
1993
and hasattr(e, 'errno')
1994
and e.errno == errno.EPIPE):
1995
bzrlib.trace.note('broken pipe')
1996
return 2
1997
else:
1998
bzrlib.trace.log_exception()
1999
return 2
731
2000
732
2001
733
2002
if __name__ == '__main__':
734
2003
sys.exit(main(sys.argv))
735
##import profile
736
##profile.run('main(sys.argv)')
737
Loggerhead is a web-based interface for Breezy
Version: 2.0.1