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