To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/commands.py
- browse files at revision 344
- compare with another revision
- download diff
- download tarball
- view history from revision 344
- Committer: Martin Pool
- Date: 2005-05-05 02:29:38 UTC
- Revision ID: mbp@sourcefrog.net-20050505022938-7e0f3e231299d920
- It's not an error to use the library without
opening the trace file
opening the trace file
- files added:
- bzrlib/tests.py
- files removed:
- bzr-man.py
- bzrlib/selftest
- contrib/emacs
- effbot
- effbot/org
- patches
- plugins
- plugins/changeset
- tools
- files renamed:
- contrib/bash/bzr.simple => contrib/bash/bzr
- files modified:
- .bzrignore
added
removed
bzrlib/commands.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
16
17
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
17
"""Bazaar-NG -- a free distributed version-control tool
18
http://bazaar-ng.org/
19
20
**WARNING: THIS IS AN UNSTABLE DEVELOPMENT VERSION**
21
22
* Metadata format is not stable yet -- you may need to
23
discard history in the future.
24
25
* Many commands unimplemented or partially implemented.
26
27
* Space-inefficient storage.
28
29
* No merge operators yet.
30
31
Interesting commands:
32
33
bzr help [COMMAND]
34
Show help screen
35
bzr version
36
Show software version/licence/non-warranty.
37
bzr init
38
Start versioning the current directory
39
bzr add FILE...
40
Make files versioned.
41
bzr log
42
Show revision history.
43
bzr rename FROM TO
44
Rename one file.
45
bzr move FROM... DESTDIR
46
Move one or more files to a different directory.
47
bzr diff [FILE...]
48
Show changes from last revision to working copy.
49
bzr commit -m 'MESSAGE'
50
Store current state as new revision.
51
bzr export [-r REVNO] DESTINATION
52
Export the branch state at a previous version.
53
bzr status
54
Show summary of pending changes.
55
bzr remove FILE...
56
Make a file not versioned.
57
bzr info
58
Show statistics about this branch.
59
bzr check
60
Verify history is stored safely.
61
(for more type 'bzr help commands')
62
"""
63
64
65
66
67
import sys, os, time, os.path
68
from sets import Set
25
69
26
70
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
145
def _get_cmd_dict(plugins_override=True):
146
d = {}
147
for k, v in globals().iteritems():
148
if k.startswith("cmd_"):
149
d[_unsquish_command_name(k)] = v
150
# If we didn't load plugins, the plugin_cmds dict will be empty
151
if plugins_override:
152
d.update(plugin_cmds)
153
else:
154
d2 = plugin_cmds.copy()
155
d2.update(d)
156
d = d2
157
return d
158
159
160
def get_all_cmds(plugins_override=True):
161
"""Return canonical name and class for all registered commands."""
162
for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems():
163
yield k,v
164
165
166
def get_cmd_class(cmd, plugins_override=True):
167
"""Return the canonical name and command class for a command.
168
"""
169
cmd = str(cmd) # not unicode
170
171
# first look up this command under the specified name
172
cmds = _get_cmd_dict(plugins_override=plugins_override)
173
try:
174
return cmd, cmds[cmd]
175
except KeyError:
176
pass
177
178
# look for any command which claims this as an alias
179
for cmdname, cmdclass in cmds.iteritems():
180
if cmd in cmdclass.aliases:
181
return cmdname, cmdclass
182
183
cmdclass = ExternalCommand.find_command(cmd)
184
if cmdclass:
185
return cmd, cmdclass
186
187
raise BzrCommandError("unknown command %r" % cmd)
188
189
190
class Command(object):
71
from bzrlib.trace import mutter, note, log_error
72
from bzrlib.errors import bailout, BzrError, BzrCheckError, BzrCommandError
73
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
74
from bzrlib.tree import RevisionTree, EmptyTree, WorkingTree, Tree
75
from bzrlib.revision import Revision
76
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
77
format_date
78
79
80
CMD_ALIASES = {
81
'?': 'help',
82
'ci': 'commit',
83
'checkin': 'commit',
84
'di': 'diff',
85
'st': 'status',
86
'stat': 'status',
87
}
88
89
90
def get_cmd_class(cmd):
91
cmd = str(cmd)
92
93
cmd = CMD_ALIASES.get(cmd, cmd)
94
95
try:
96
cmd_class = globals()['cmd_' + cmd.replace('-', '_')]
97
except KeyError:
98
raise BzrError("unknown command %r" % cmd)
99
100
return cmd, cmd_class
101
102
103
104
class Command:
191
105
"""Base class for commands.
192
106
193
107
The docstring for an actual command should give a single-line
219
133
assert isinstance(arguments, dict)
220
134
cmdargs = options.copy()
221
135
cmdargs.update(arguments)
222
if self.__doc__ == Command.__doc__:
223
from warnings import warn
224
warn("No help message set for %r" % self)
136
assert self.__doc__ != Command.__doc__, \
137
("No help message set for %r" % self)
225
138
self.status = self.run(**cmdargs)
226
if self.status is None:
227
self.status = 0
228
139
229
140
230
141
def run(self):
239
150
return 0
240
151
241
152
242
class ExternalCommand(Command):
243
"""Class to wrap external commands.
244
245
We cheat a little here, when get_cmd_class() calls us we actually
246
give it back an object we construct that has the appropriate path,
247
help, options etc for the specified command.
248
249
When run_bzr() tries to instantiate that 'class' it gets caught by
250
the __call__ method, which we override to call the Command.__init__
251
method. That then calls our run method which is pretty straight
252
forward.
253
254
The only wrinkle is that we have to map bzr's dictionary of options
255
and arguments back into command line options and arguments for the
256
script.
257
"""
258
259
def find_command(cls, cmd):
260
import os.path
261
bzrpath = os.environ.get('BZRPATH', '')
262
263
for dir in bzrpath.split(os.pathsep):
264
path = os.path.join(dir, cmd)
265
if os.path.isfile(path):
266
return ExternalCommand(path)
267
268
return None
269
270
find_command = classmethod(find_command)
271
272
def __init__(self, path):
273
self.path = path
274
275
pipe = os.popen('%s --bzr-usage' % path, 'r')
276
self.takes_options = pipe.readline().split()
277
278
for opt in self.takes_options:
279
if not opt in OPTIONS:
280
raise BzrError("Unknown option '%s' returned by external command %s"
281
% (opt, path))
282
283
# TODO: Is there any way to check takes_args is valid here?
284
self.takes_args = pipe.readline().split()
285
286
if pipe.close() is not None:
287
raise BzrError("Failed funning '%s --bzr-usage'" % path)
288
289
pipe = os.popen('%s --bzr-help' % path, 'r')
290
self.__doc__ = pipe.read()
291
if pipe.close() is not None:
292
raise BzrError("Failed funning '%s --bzr-help'" % path)
293
294
def __call__(self, options, arguments):
295
Command.__init__(self, options, arguments)
296
return self
297
298
def run(self, **kargs):
299
opts = []
300
args = []
301
302
keys = kargs.keys()
303
keys.sort()
304
for name in keys:
305
optname = name.replace('_','-')
306
value = kargs[name]
307
if OPTIONS.has_key(optname):
308
# it's an option
309
opts.append('--%s' % optname)
310
if value is not None and value is not True:
311
opts.append(str(value))
312
else:
313
# it's an arg, or arg list
314
if type(value) is not list:
315
value = [value]
316
for v in value:
317
if v is not None:
318
args.append(str(v))
319
320
self.status = os.spawnv(os.P_WAIT, self.path, [self.path] + opts + args)
321
return self.status
322
323
153
324
154
class cmd_status(Command):
325
155
"""Display status summary.
326
156
327
This reports on versioned and unknown files, reporting them
328
grouped by state. Possible states are:
329
330
added
331
Versioned in the working copy but not in the previous revision.
332
333
removed
334
Versioned in the previous revision but removed or deleted
335
in the working copy.
336
337
renamed
338
Path of this file changed from the previous revision;
339
the text may also have changed. This includes files whose
340
parent directory was renamed.
341
342
modified
343
Text has changed since the previous revision.
344
345
unchanged
346
Nothing about this file has changed since the previous revision.
347
Only shown with --all.
348
349
unknown
350
Not versioned and not matching an ignore pattern.
351
352
To see ignored files use 'bzr ignored'. For details in the
353
changes to file texts, use 'bzr diff'.
354
355
If no arguments are specified, the status of the entire working
356
directory is shown. Otherwise, only the status of the specified
357
files or directories is reported. If a directory is given, status
358
is reported for everything inside that directory.
359
360
If a revision is specified, the changes since that revision are shown.
157
For each file there is a single line giving its file state and name.
158
The name is that in the current revision unless it is deleted or
159
missing, in which case the old name is shown.
361
160
"""
362
takes_args = ['file*']
363
takes_options = ['all', 'show-ids', 'revision']
364
aliases = ['st', 'stat']
161
takes_options = ['all']
365
162
366
def run(self, all=False, show_ids=False, file_list=None):
367
if file_list:
368
b = find_branch(file_list[0])
369
file_list = [b.relpath(x) for x in file_list]
370
# special case: only one path was given and it's the root
371
# of the branch
372
if file_list == ['']:
373
file_list = None
374
else:
375
b = find_branch('.')
376
377
from bzrlib.status import show_status
378
show_status(b, show_unchanged=all, show_ids=show_ids,
379
specific_files=file_list)
163
def run(self, all=False):
164
#import bzrlib.status
165
#bzrlib.status.tree_status(Branch('.'))
166
Branch('.').show_status(show_all=all)
380
167
381
168
382
169
class cmd_cat_revision(Command):
386
173
takes_args = ['revision_id']
387
174
388
175
def run(self, revision_id):
389
from bzrlib.xml import pack_xml
390
pack_xml(find_branch('.').get_revision(revision_id), sys.stdout)
176
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
391
177
392
178
393
179
class cmd_revno(Command):
395
181
396
182
This is equal to the number of revisions on this branch."""
397
183
def run(self):
398
print find_branch('.').revno()
399
400
class cmd_revision_info(Command):
401
"""Show revision number and revision id for a given revision identifier.
402
"""
403
hidden = True
404
takes_args = ['revision_info*']
405
takes_options = ['revision']
406
def run(self, revision=None, revision_info_list=None):
407
from bzrlib.branch import find_branch
408
409
revs = []
410
if revision is not None:
411
revs.extend(revision)
412
if revision_info_list is not None:
413
revs.extend(revision_info_list)
414
if len(revs) == 0:
415
raise BzrCommandError('You must supply a revision identifier')
416
417
b = find_branch('.')
418
419
for rev in revs:
420
print '%4d %s' % b.get_revision_info(rev)
184
print Branch('.').revno()
421
185
422
186
423
187
class cmd_add(Command):
433
197
whether already versioned or not, are searched for files or
434
198
subdirectories that are neither versioned or ignored, and these
435
199
are added. This search proceeds recursively into versioned
436
directories. If no names are given '.' is assumed.
200
directories.
437
201
438
Therefore simply saying 'bzr add' will version all files that
202
Therefore simply saying 'bzr add .' will version all files that
439
203
are currently unknown.
440
204
441
205
TODO: Perhaps adding a file whose directly is not versioned should
442
206
recursively add that parent, rather than giving an error?
443
207
"""
444
takes_args = ['file*']
445
takes_options = ['verbose', 'no-recurse']
208
takes_args = ['file+']
209
takes_options = ['verbose']
446
210
447
def run(self, file_list, verbose=False, no_recurse=False):
448
from bzrlib.add import smart_add
449
smart_add(file_list, verbose, not no_recurse)
450
451
452
453
class cmd_mkdir(Command):
454
"""Create a new versioned directory.
455
456
This is equivalent to creating the directory and then adding it.
457
"""
458
takes_args = ['dir+']
459
460
def run(self, dir_list):
461
b = None
462
463
for d in dir_list:
464
os.mkdir(d)
465
if not b:
466
b = find_branch(d)
467
b.add([d], verbose=True)
468
469
470
class cmd_relpath(Command):
211
def run(self, file_list, verbose=False):
212
bzrlib.add.smart_add(file_list, verbose)
213
214
215
def Relpath(Command):
471
216
"""Show path of a file relative to root"""
472
takes_args = ['filename']
473
hidden = True
217
takes_args = ('filename')
474
218
475
def run(self, filename):
476
print find_branch(filename).relpath(filename)
219
def run(self):
220
print Branch(self.args['filename']).relpath(filename)
477
221
478
222
479
223
480
224
class cmd_inventory(Command):
481
225
"""Show inventory of the current working copy or a revision."""
482
takes_options = ['revision', 'show-ids']
226
takes_options = ['revision']
483
227
484
def run(self, revision=None, show_ids=False):
485
b = find_branch('.')
228
def run(self, revision=None):
229
b = Branch('.')
486
230
if revision == None:
487
231
inv = b.read_working_inventory()
488
232
else:
489
if len(revision) > 1:
490
raise BzrCommandError('bzr inventory --revision takes'
491
' exactly one revision identifier')
492
inv = b.get_revision_inventory(b.lookup_revision(revision[0]))
233
inv = b.get_revision_inventory(b.lookup_revision(revision))
493
234
494
for path, entry in inv.entries():
495
if show_ids:
496
print '%-50s %s' % (path, entry.file_id)
497
else:
498
print path
235
for path, entry in inv.iter_entries():
236
print '%-50s %s' % (entry.file_id, path)
499
237
500
238
501
239
class cmd_move(Command):
508
246
"""
509
247
takes_args = ['source$', 'dest']
510
248
def run(self, source_list, dest):
511
b = find_branch('.')
249
b = Branch('.')
512
250
513
# TODO: glob expansion on windows?
514
251
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
515
252
516
253
531
268
takes_args = ['from_name', 'to_name']
532
269
533
270
def run(self, from_name, to_name):
534
b = find_branch('.')
271
b = Branch('.')
535
272
b.rename_one(b.relpath(from_name), b.relpath(to_name))
536
273
537
274
538
275
539
class cmd_mv(Command):
540
"""Move or rename a file.
541
542
usage:
543
bzr mv OLDNAME NEWNAME
544
bzr mv SOURCE... DESTINATION
545
546
If the last argument is a versioned directory, all the other names
547
are moved into it. Otherwise, there must be exactly two arguments
548
and the file is changed to a new name, which must not already exist.
549
550
Files cannot be moved between branches.
551
"""
552
takes_args = ['names*']
553
def run(self, names_list):
554
if len(names_list) < 2:
555
raise BzrCommandError("missing file argument")
556
b = find_branch(names_list[0])
557
558
rel_names = [b.relpath(x) for x in names_list]
559
560
if os.path.isdir(names_list[-1]):
561
# move into existing directory
562
b.move(rel_names[:-1], rel_names[-1])
563
else:
564
if len(names_list) != 2:
565
raise BzrCommandError('to mv multiple files the destination '
566
'must be a versioned directory')
567
b.move(rel_names[0], rel_names[1])
568
569
570
571
572
class cmd_pull(Command):
573
"""Pull any changes from another branch into the current one.
574
575
If the location is omitted, the last-used location will be used.
576
Both the revision history and the working directory will be
577
updated.
578
579
This command only works on branches that have not diverged. Branches are
580
considered diverged if both branches have had commits without first
581
pulling from the other.
582
583
If branches have diverged, you can use 'bzr merge' to pull the text changes
584
from one into the other.
585
"""
586
takes_args = ['location?']
587
588
def run(self, location=None):
589
from bzrlib.merge import merge
590
import tempfile
591
from shutil import rmtree
592
import errno
593
594
br_to = find_branch('.')
595
stored_loc = None
596
try:
597
stored_loc = br_to.controlfile("x-pull", "rb").read().rstrip('\n')
598
except IOError, e:
599
if e.errno != errno.ENOENT:
600
raise
601
if location is None:
602
if stored_loc is None:
603
raise BzrCommandError("No pull location known or specified.")
604
else:
605
print "Using last location: %s" % stored_loc
606
location = stored_loc
607
cache_root = tempfile.mkdtemp()
608
from bzrlib.branch import DivergedBranches
609
br_from = find_branch(location)
610
location = pull_loc(br_from)
611
old_revno = br_to.revno()
612
try:
613
from branch import find_cached_branch, DivergedBranches
614
br_from = find_cached_branch(location, cache_root)
615
location = pull_loc(br_from)
616
old_revno = br_to.revno()
617
try:
618
br_to.update_revisions(br_from)
619
except DivergedBranches:
620
raise BzrCommandError("These branches have diverged."
621
" Try merge.")
622
623
merge(('.', -1), ('.', old_revno), check_clean=False)
624
if location != stored_loc:
625
br_to.controlfile("x-pull", "wb").write(location + "\n")
626
finally:
627
rmtree(cache_root)
628
629
630
631
class cmd_branch(Command):
632
"""Create a new copy of a branch.
633
634
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
635
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
636
637
To retrieve the branch as of a particular revision, supply the --revision
638
parameter, as in "branch foo/bar -r 5".
639
"""
640
takes_args = ['from_location', 'to_location?']
641
takes_options = ['revision']
642
aliases = ['get', 'clone']
643
644
def run(self, from_location, to_location=None, revision=None):
645
import errno
646
from bzrlib.merge import merge
647
from bzrlib.branch import DivergedBranches, \
648
find_cached_branch, Branch
649
from shutil import rmtree
650
from meta_store import CachedStore
651
import tempfile
652
cache_root = tempfile.mkdtemp()
653
654
if revision is None:
655
revision = [None]
656
elif len(revision) > 1:
657
raise BzrCommandError('bzr branch --revision takes exactly 1 revision value')
658
659
try:
660
try:
661
br_from = find_cached_branch(from_location, cache_root)
662
except OSError, e:
663
if e.errno == errno.ENOENT:
664
raise BzrCommandError('Source location "%s" does not'
665
' exist.' % to_location)
666
else:
667
raise
668
669
if to_location is None:
670
to_location = os.path.basename(from_location.rstrip("/\\"))
671
672
try:
673
os.mkdir(to_location)
674
except OSError, e:
675
if e.errno == errno.EEXIST:
676
raise BzrCommandError('Target directory "%s" already'
677
' exists.' % to_location)
678
if e.errno == errno.ENOENT:
679
raise BzrCommandError('Parent of "%s" does not exist.' %
680
to_location)
681
else:
682
raise
683
br_to = Branch(to_location, init=True)
684
685
br_to.set_root_id(br_from.get_root_id())
686
687
if revision:
688
if revision[0] is None:
689
revno = br_from.revno()
690
else:
691
revno, rev_id = br_from.get_revision_info(revision[0])
692
try:
693
br_to.update_revisions(br_from, stop_revision=revno)
694
except bzrlib.errors.NoSuchRevision:
695
rmtree(to_location)
696
msg = "The branch %s has no revision %d." % (from_location,
697
revno)
698
raise BzrCommandError(msg)
699
700
merge((to_location, -1), (to_location, 0), this_dir=to_location,
701
check_clean=False, ignore_zero=True)
702
from_location = pull_loc(br_from)
703
br_to.controlfile("x-pull", "wb").write(from_location + "\n")
704
finally:
705
rmtree(cache_root)
706
707
708
def pull_loc(branch):
709
# TODO: Should perhaps just make attribute be 'base' in
710
# RemoteBranch and Branch?
711
if hasattr(branch, "baseurl"):
712
return branch.baseurl
713
else:
714
return branch.base
715
716
717
718
276
class cmd_renames(Command):
719
277
"""Show list of renamed files.
720
278
725
283
takes_args = ['dir?']
726
284
727
285
def run(self, dir='.'):
728
b = find_branch(dir)
286
b = Branch(dir)
729
287
old_inv = b.basis_tree().inventory
730
288
new_inv = b.read_working_inventory()
731
289
736
294
737
295
738
296
class cmd_info(Command):
739
"""Show statistical information about a branch."""
740
takes_args = ['branch?']
741
742
def run(self, branch=None):
297
"""Show statistical information for this branch"""
298
def run(self):
743
299
import info
744
745
b = find_branch(branch)
746
info.show_info(b)
300
info.show_info(Branch('.'))
747
301
748
302
749
303
class cmd_remove(Command):
756
310
takes_options = ['verbose']
757
311
758
312
def run(self, file_list, verbose=False):
759
b = find_branch(file_list[0])
313
b = Branch(file_list[0])
760
314
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
761
315
762
316
770
324
hidden = True
771
325
takes_args = ['filename']
772
326
def run(self, filename):
773
b = find_branch(filename)
327
b = Branch(filename)
774
328
i = b.inventory.path2id(b.relpath(filename))
775
329
if i == None:
776
raise BzrError("%r is not a versioned file" % filename)
330
bailout("%r is not a versioned file" % filename)
777
331
else:
778
332
print i
779
333
786
340
hidden = True
787
341
takes_args = ['filename']
788
342
def run(self, filename):
789
b = find_branch(filename)
343
b = Branch(filename)
790
344
inv = b.inventory
791
345
fid = inv.path2id(b.relpath(filename))
792
346
if fid == None:
793
raise BzrError("%r is not a versioned file" % filename)
347
bailout("%r is not a versioned file" % filename)
794
348
for fip in inv.get_idpath(fid):
795
349
print fip
796
350
797
351
798
352
class cmd_revision_history(Command):
799
353
"""Display list of revision ids on this branch."""
800
hidden = True
801
354
def run(self):
802
for patchid in find_branch('.').revision_history():
355
for patchid in Branch('.').revision_history():
803
356
print patchid
804
357
805
358
806
359
class cmd_directories(Command):
807
360
"""Display list of versioned directories in this branch."""
808
361
def run(self):
809
for name, ie in find_branch('.').read_working_inventory().directories():
362
for name, ie in Branch('.').read_working_inventory().directories():
810
363
if name == '':
811
364
print '.'
812
365
else:
827
380
bzr commit -m 'imported project'
828
381
"""
829
382
def run(self):
830
from bzrlib.branch import Branch
831
383
Branch('.', init=True)
832
384
833
385
856
408
"""
857
409
858
410
takes_args = ['file*']
859
takes_options = ['revision', 'diff-options']
860
aliases = ['di', 'dif']
411
takes_options = ['revision']
861
412
862
def run(self, revision=None, file_list=None, diff_options=None):
413
def run(self, revision=None, file_list=None):
863
414
from bzrlib.diff import show_diff
864
865
if file_list:
866
b = find_branch(file_list[0])
867
file_list = [b.relpath(f) for f in file_list]
868
if file_list == ['']:
869
# just pointing to top-of-tree
870
file_list = None
871
else:
872
b = find_branch('.')
873
874
# TODO: Make show_diff support taking 2 arguments
875
base_rev = None
876
if revision is not None:
877
if len(revision) != 1:
878
raise BzrCommandError('bzr diff --revision takes exactly one revision identifier')
879
base_rev = revision[0]
880
415
881
show_diff(b, base_rev, specific_files=file_list,
882
external_diff_options=diff_options)
883
884
885
416
show_diff(Branch('.'), revision, file_list)
886
417
887
418
888
419
class cmd_deleted(Command):
891
422
TODO: Show files deleted since a previous revision, or between two revisions.
892
423
"""
893
424
def run(self, show_ids=False):
894
b = find_branch('.')
425
b = Branch('.')
895
426
old = b.basis_tree()
896
427
new = b.working_tree()
897
428
907
438
else:
908
439
print path
909
440
910
911
class cmd_modified(Command):
912
"""List files modified in working tree."""
913
hidden = True
914
def run(self):
915
from bzrlib.delta import compare_trees
916
917
b = find_branch('.')
918
td = compare_trees(b.basis_tree(), b.working_tree())
919
920
for path, id, kind in td.modified:
921
print path
922
923
924
925
class cmd_added(Command):
926
"""List files added in working tree."""
927
hidden = True
928
def run(self):
929
b = find_branch('.')
930
wt = b.working_tree()
931
basis_inv = b.basis_tree().inventory
932
inv = wt.inventory
933
for file_id in inv:
934
if file_id in basis_inv:
935
continue
936
path = inv.id2path(file_id)
937
if not os.access(b.abspath(path), os.F_OK):
938
continue
939
print path
940
941
942
943
441
class cmd_root(Command):
944
442
"""Show the tree root directory.
945
443
948
446
takes_args = ['filename?']
949
447
def run(self, filename=None):
950
448
"""Print the branch root."""
951
b = find_branch(filename)
952
print getattr(b, 'base', None) or getattr(b, 'baseurl')
449
print bzrlib.branch.find_branch_root(filename)
450
953
451
954
452
955
453
class cmd_log(Command):
956
454
"""Show log of this branch.
957
455
958
To request a range of logs, you can use the command -r begin:end
959
-r revision requests a specific revision, -r :end or -r begin: are
960
also valid.
961
962
--message allows you to give a regular expression, which will be evaluated
963
so that only matching entries will be displayed.
964
965
TODO: Make --revision support uuid: and hash: [future tag:] notation.
966
456
TODO: Options to show ids; to limit range; etc.
967
457
"""
968
969
takes_args = ['filename?']
970
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision','long', 'message']
971
972
def run(self, filename=None, timezone='original',
973
verbose=False,
974
show_ids=False,
975
forward=False,
976
revision=None,
977
message=None,
978
long=False):
979
from bzrlib.branch import find_branch
980
from bzrlib.log import log_formatter, show_log
981
import codecs
982
983
direction = (forward and 'forward') or 'reverse'
984
985
if filename:
986
b = find_branch(filename)
987
fp = b.relpath(filename)
988
if fp:
989
file_id = b.read_working_inventory().path2id(fp)
990
else:
991
file_id = None # points to branch root
992
else:
993
b = find_branch('.')
994
file_id = None
995
996
if revision is None:
997
rev1 = None
998
rev2 = None
999
elif len(revision) == 1:
1000
rev1 = rev2 = b.get_revision_info(revision[0])[0]
1001
elif len(revision) == 2:
1002
rev1 = b.get_revision_info(revision[0])[0]
1003
rev2 = b.get_revision_info(revision[1])[0]
1004
else:
1005
raise BzrCommandError('bzr log --revision takes one or two values.')
1006
1007
if rev1 == 0:
1008
rev1 = None
1009
if rev2 == 0:
1010
rev2 = None
1011
1012
mutter('encoding log as %r' % bzrlib.user_encoding)
1013
1014
# use 'replace' so that we don't abort if trying to write out
1015
# in e.g. the default C locale.
1016
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
1017
1018
if long:
1019
log_format = 'long'
1020
else:
1021
log_format = 'short'
1022
lf = log_formatter(log_format,
1023
show_ids=show_ids,
1024
to_file=outf,
1025
show_timezone=timezone)
1026
1027
show_log(b,
1028
lf,
1029
file_id,
1030
verbose=verbose,
1031
direction=direction,
1032
start_revision=rev1,
1033
end_revision=rev2,
1034
search=message)
1035
1036
1037
1038
class cmd_touching_revisions(Command):
1039
"""Return revision-ids which affected a particular file.
1040
1041
A more user-friendly interface is "bzr log FILE"."""
1042
hidden = True
1043
takes_args = ["filename"]
1044
def run(self, filename):
1045
b = find_branch(filename)
1046
inv = b.read_working_inventory()
1047
file_id = inv.path2id(b.relpath(filename))
1048
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1049
print "%6d %s" % (revno, what)
458
takes_options = ['timezone', 'verbose']
459
def run(self, timezone='original', verbose=False):
460
Branch('.').write_log(show_timezone=timezone, verbose=verbose)
1050
461
1051
462
1052
463
class cmd_ls(Command):
1056
467
"""
1057
468
hidden = True
1058
469
def run(self, revision=None, verbose=False):
1059
b = find_branch('.')
470
b = Branch('.')
1060
471
if revision == None:
1061
472
tree = b.working_tree()
1062
473
else:
1078
489
1079
490
1080
491
class cmd_unknowns(Command):
1081
"""List unknown files."""
492
"""List unknown files"""
1082
493
def run(self):
1083
from bzrlib.osutils import quotefn
1084
for f in find_branch('.').unknowns():
494
for f in Branch('.').unknowns():
1085
495
print quotefn(f)
1086
496
1087
497
1088
498
1089
499
class cmd_ignore(Command):
1090
"""Ignore a command or pattern.
1091
1092
To remove patterns from the ignore list, edit the .bzrignore file.
1093
1094
If the pattern contains a slash, it is compared to the whole path
1095
from the branch root. Otherwise, it is comapred to only the last
1096
component of the path.
1097
1098
Ignore patterns are case-insensitive on case-insensitive systems.
1099
1100
Note: wildcards must be quoted from the shell on Unix.
1101
1102
examples:
1103
bzr ignore ./Makefile
1104
bzr ignore '*.class'
1105
"""
500
"""Ignore a command or pattern"""
1106
501
takes_args = ['name_pattern']
1107
502
1108
503
def run(self, name_pattern):
1109
from bzrlib.atomicfile import AtomicFile
1110
import os.path
1111
1112
b = find_branch('.')
1113
ifn = b.abspath('.bzrignore')
1114
1115
if os.path.exists(ifn):
1116
f = open(ifn, 'rt')
1117
try:
1118
igns = f.read().decode('utf-8')
1119
finally:
1120
f.close()
1121
else:
1122
igns = ''
1123
1124
# TODO: If the file already uses crlf-style termination, maybe
1125
# we should use that for the newly added lines?
1126
1127
if igns and igns[-1] != '\n':
1128
igns += '\n'
1129
igns += name_pattern + '\n'
1130
1131
try:
1132
f = AtomicFile(ifn, 'wt')
1133
f.write(igns.encode('utf-8'))
1134
f.commit()
1135
finally:
1136
f.close()
504
b = Branch('.')
505
506
# XXX: This will fail if it's a hardlink; should use an AtomicFile class.
507
f = open(b.abspath('.bzrignore'), 'at')
508
f.write(name_pattern + '\n')
509
f.close()
1137
510
1138
511
inv = b.working_tree().inventory
1139
512
if inv.path2id('.bzrignore'):
1145
518
1146
519
1147
520
class cmd_ignored(Command):
1148
"""List ignored files and the patterns that matched them.
1149
1150
See also: bzr ignore"""
521
"""List ignored files and the patterns that matched them."""
1151
522
def run(self):
1152
tree = find_branch('.').working_tree()
523
tree = Branch('.').working_tree()
1153
524
for path, file_class, kind, file_id in tree.list_files():
1154
525
if file_class != 'I':
1155
526
continue
1163
534
1164
535
example:
1165
536
bzr lookup-revision 33
1166
"""
537
"""
1167
538
hidden = True
1168
539
takes_args = ['revno']
1169
540
1173
544
except ValueError:
1174
545
raise BzrCommandError("not a valid revision-number: %r" % revno)
1175
546
1176
print find_branch('.').lookup_revision(revno)
547
print Branch('.').lookup_revision(revno)
1177
548
1178
549
1179
550
class cmd_export(Command):
1180
551
"""Export past revision to destination directory.
1181
552
1182
If no revision is specified this exports the last committed revision.
1183
1184
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1185
given, try to find the format with the extension. If no extension
1186
is found exports to a directory (equivalent to --format=dir).
1187
1188
Root may be the top directory for tar, tgz and tbz2 formats. If none
1189
is given, the top directory will be the root name of the file."""
1190
# TODO: list known exporters
553
If no revision is specified this exports the last committed revision."""
1191
554
takes_args = ['dest']
1192
takes_options = ['revision', 'format', 'root']
1193
def run(self, dest, revision=None, format=None, root=None):
1194
import os.path
1195
b = find_branch('.')
1196
if revision is None:
1197
rev_id = b.last_patch()
555
takes_options = ['revision']
556
def run(self, dest, revno=None):
557
b = Branch('.')
558
if revno == None:
559
rh = b.revision_history[-1]
1198
560
else:
1199
if len(revision) != 1:
1200
raise BzrError('bzr export --revision takes exactly 1 argument')
1201
revno, rev_id = b.get_revision_info(revision[0])
1202
t = b.revision_tree(rev_id)
1203
root, ext = os.path.splitext(dest)
1204
if not format:
1205
if ext in (".tar",):
1206
format = "tar"
1207
elif ext in (".gz", ".tgz"):
1208
format = "tgz"
1209
elif ext in (".bz2", ".tbz2"):
1210
format = "tbz2"
1211
else:
1212
format = "dir"
1213
t.export(dest, format, root)
561
rh = b.lookup_revision(int(revno))
562
t = b.revision_tree(rh)
563
t.export(dest)
1214
564
1215
565
1216
566
class cmd_cat(Command):
1222
572
def run(self, filename, revision=None):
1223
573
if revision == None:
1224
574
raise BzrCommandError("bzr cat requires a revision number")
1225
elif len(revision) != 1:
1226
raise BzrCommandError("bzr cat --revision takes exactly one number")
1227
b = find_branch('.')
1228
b.print_file(b.relpath(filename), revision[0])
575
b = Branch('.')
576
b.print_file(b.relpath(filename), int(revision))
1229
577
1230
578
1231
579
class cmd_local_time_offset(Command):
1238
586
1239
587
class cmd_commit(Command):
1240
588
"""Commit changes into a new revision.
1241
1242
If no arguments are given, the entire tree is committed.
1243
1244
If selected files are specified, only changes to those files are
1245
committed. If a directory is specified then the directory and everything
1246
within it is committed.
1247
1248
A selected-file commit may fail in some cases where the committed
1249
tree would be invalid, such as trying to commit a file in a
1250
newly-added directory that is not itself committed.
589
590
TODO: Commit only selected files.
1251
591
1252
592
TODO: Run hooks on tree to-be-committed, and after commit.
1253
593
1254
594
TODO: Strict commit that fails if there are unknown or deleted files.
1255
595
"""
1256
takes_args = ['selected*']
1257
takes_options = ['message', 'file', 'verbose', 'unchanged']
1258
aliases = ['ci', 'checkin']
1259
1260
# TODO: Give better message for -s, --summary, used by tla people
596
takes_options = ['message', 'verbose']
1261
597
1262
def run(self, message=None, file=None, verbose=True, selected_list=None,
1263
unchanged=False):
1264
from bzrlib.errors import PointlessCommit
1265
from bzrlib.osutils import get_text_message
1266
1267
## Warning: shadows builtin file()
1268
if not message and not file:
1269
# FIXME: Ugly; change status code to send to a provided function?
1270
1271
import cStringIO
1272
stdout = sys.stdout
1273
catcher = cStringIO.StringIO()
1274
sys.stdout = catcher
1275
cmd_status({"file_list":selected_list}, {})
1276
info = catcher.getvalue()
1277
sys.stdout = stdout
1278
message = get_text_message(info)
1279
1280
if message is None:
1281
raise BzrCommandError("please specify a commit message",
1282
["use either --message or --file"])
1283
elif message and file:
1284
raise BzrCommandError("please specify either --message or --file")
1285
1286
if file:
1287
import codecs
1288
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1289
1290
b = find_branch('.')
1291
if selected_list:
1292
selected_list = [b.relpath(s) for s in selected_list]
1293
1294
try:
1295
b.commit(message, verbose=verbose,
1296
specific_files=selected_list,
1297
allow_pointless=unchanged)
1298
except PointlessCommit:
1299
# FIXME: This should really happen before the file is read in;
1300
# perhaps prepare the commit; get the message; then actually commit
1301
raise BzrCommandError("no changes to commit",
1302
["use --unchanged to commit anyhow"])
598
def run(self, message=None, verbose=False):
599
if not message:
600
raise BzrCommandError("please specify a commit message")
601
Branch('.').commit(message, verbose=verbose)
1303
602
1304
603
1305
604
class cmd_check(Command):
1307
606
1308
607
This command checks various invariants about the branch storage to
1309
608
detect data corruption or bzr bugs.
1310
1311
If given the --update flag, it will update some optional fields
1312
to help ensure data consistency.
1313
"""
1314
takes_args = ['dir?']
1315
1316
def run(self, dir='.'):
1317
from bzrlib.check import check
1318
check(find_branch(dir))
1319
1320
1321
1322
class cmd_scan_cache(Command):
1323
hidden = True
1324
def run(self):
1325
from bzrlib.hashcache import HashCache
1326
import os
1327
1328
c = HashCache('.')
1329
c.read()
1330
c.scan()
1331
1332
print '%6d stats' % c.stat_count
1333
print '%6d in hashcache' % len(c._cache)
1334
print '%6d files removed from cache' % c.removed_count
1335
print '%6d hashes updated' % c.update_count
1336
print '%6d files changed too recently to cache' % c.danger_count
1337
1338
if c.needs_write:
1339
c.write()
1340
1341
1342
1343
class cmd_upgrade(Command):
1344
"""Upgrade branch storage to current format.
1345
1346
This should normally be used only after the check command tells
1347
you to run it.
1348
"""
1349
takes_args = ['dir?']
1350
1351
def run(self, dir='.'):
1352
from bzrlib.upgrade import upgrade
1353
upgrade(find_branch(dir))
609
"""
610
takes_args = ['dir?']
611
def run(self, dir='.'):
612
import bzrlib.check
613
bzrlib.check.check(Branch(dir, find_root=False))
1354
614
1355
615
1356
616
1368
628
class cmd_selftest(Command):
1369
629
"""Run internal test suite"""
1370
630
hidden = True
1371
takes_options = ['verbose']
1372
def run(self, verbose=False):
1373
from bzrlib.selftest import selftest
1374
return int(not selftest(verbose=verbose))
631
def run(self):
632
failures, tests = 0, 0
633
634
import doctest, bzrlib.store, bzrlib.tests
635
bzrlib.trace.verbose = False
636
637
for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
638
bzrlib.tree, bzrlib.tests, bzrlib.commands, bzrlib.add:
639
mf, mt = doctest.testmod(m)
640
failures += mf
641
tests += mt
642
print '%-40s %3d tests' % (m.__name__, mt),
643
if mf:
644
print '%3d FAILED!' % mf
645
else:
646
print
647
648
print '%-40s %3d tests' % ('total', tests),
649
if failures:
650
print '%3d FAILED!' % failures
651
else:
652
print
653
1375
654
1376
655
1377
656
class cmd_version(Command):
1378
"""Show version of bzr."""
657
"""Show version of bzr"""
1379
658
def run(self):
1380
659
show_version()
1381
660
1382
661
def show_version():
1383
662
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1384
# is bzrlib itself in a branch?
1385
bzrrev = bzrlib.get_bzr_revision()
1386
if bzrrev:
1387
print " (bzr checkout, revision %d {%s})" % bzrrev
1388
663
print bzrlib.__copyright__
1389
664
print "http://bazaar-ng.org/"
1390
665
print
1399
674
def run(self):
1400
675
print "it sure does!"
1401
676
1402
def parse_spec(spec):
1403
"""
1404
>>> parse_spec(None)
1405
[None, None]
1406
>>> parse_spec("./")
1407
['./', None]
1408
>>> parse_spec("../@")
1409
['..', -1]
1410
>>> parse_spec("../f/@35")
1411
['../f', 35]
1412
>>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
1413
['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
1414
"""
1415
if spec is None:
1416
return [None, None]
1417
if '/@' in spec:
1418
parsed = spec.split('/@')
1419
assert len(parsed) == 2
1420
if parsed[1] == "":
1421
parsed[1] = -1
1422
else:
1423
try:
1424
parsed[1] = int(parsed[1])
1425
except ValueError:
1426
pass # We can allow stuff like ./@revid:blahblahblah
1427
else:
1428
assert parsed[1] >=0
1429
else:
1430
parsed = [spec, None]
1431
return parsed
1432
1433
1434
1435
class cmd_merge(Command):
1436
"""Perform a three-way merge of trees.
1437
1438
The SPEC parameters are working tree or revision specifiers. Working trees
1439
are specified using standard paths or urls. No component of a directory
1440
path may begin with '@'.
1441
1442
Working tree examples: '.', '..', 'foo@', but NOT 'foo/@bar'
1443
1444
Revisions are specified using a dirname/@revno pair, where dirname is the
1445
branch directory and revno is the revision within that branch. If no revno
1446
is specified, the latest revision is used.
1447
1448
Revision examples: './@127', 'foo/@', '../@1'
1449
1450
The OTHER_SPEC parameter is required. If the BASE_SPEC parameter is
1451
not supplied, the common ancestor of OTHER_SPEC the current branch is used
1452
as the BASE.
1453
1454
merge refuses to run if there are any uncommitted changes, unless
1455
--force is given.
1456
"""
1457
takes_args = ['other_spec', 'base_spec?']
1458
takes_options = ['force', 'merge-type']
1459
1460
def run(self, other_spec, base_spec=None, force=False, merge_type=None):
1461
from bzrlib.merge import merge
1462
from bzrlib.merge_core import ApplyMerge3
1463
if merge_type is None:
1464
merge_type = ApplyMerge3
1465
merge(parse_spec(other_spec), parse_spec(base_spec),
1466
check_clean=(not force), merge_type=merge_type)
1467
1468
1469
class cmd_revert(Command):
1470
"""Reverse all changes since the last commit.
1471
1472
Only versioned files are affected. Specify filenames to revert only
1473
those files. By default, any files that are changed will be backed up
1474
first. Backup files have a '~' appended to their name.
1475
"""
1476
takes_options = ['revision', 'no-backup']
1477
takes_args = ['file*']
1478
aliases = ['merge-revert']
1479
1480
def run(self, revision=None, no_backup=False, file_list=None):
1481
from bzrlib.merge import merge
1482
if file_list is not None:
1483
if len(file_list) == 0:
1484
raise BzrCommandError("No files specified")
1485
if revision is None:
1486
revision = [-1]
1487
elif len(revision) != 1:
1488
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1489
merge(('.', revision[0]), parse_spec('.'),
1490
check_clean=False,
1491
ignore_zero=True,
1492
backup_files=not no_backup,
1493
file_list=file_list)
1494
1495
677
1496
678
class cmd_assert_fail(Command):
1497
679
"""Test reporting of assertion failures"""
1505
687
1506
688
For a list of all available commands, say 'bzr help commands'."""
1507
689
takes_args = ['topic?']
1508
aliases = ['?']
1509
690
1510
691
def run(self, topic=None):
1511
import help
1512
help.help(topic)
1513
1514
1515
1516
1517
class cmd_plugins(Command):
1518
"""List plugins"""
1519
hidden = True
1520
def run(self):
1521
import bzrlib.plugin
1522
from inspect import getdoc
1523
from pprint import pprint
1524
for plugin in bzrlib.plugin.all_plugins:
1525
print plugin.__path__[0]
1526
d = getdoc(plugin)
1527
if d:
1528
print '\t', d.split('\n')[0]
1529
1530
#pprint(bzrlib.plugin.all_plugins)
1531
692
help(topic)
693
694
695
def help(topic=None):
696
if topic == None:
697
print __doc__
698
elif topic == 'commands':
699
help_commands()
700
else:
701
help_on_command(topic)
702
703
704
def help_on_command(cmdname):
705
cmdname = str(cmdname)
706
707
from inspect import getdoc
708
topic, cmdclass = get_cmd_class(cmdname)
709
710
doc = getdoc(cmdclass)
711
if doc == None:
712
raise NotImplementedError("sorry, no detailed help yet for %r" % cmdname)
713
714
if '\n' in doc:
715
short, rest = doc.split('\n', 1)
716
else:
717
short = doc
718
rest = ''
719
720
print 'usage: bzr ' + topic,
721
for aname in cmdclass.takes_args:
722
aname = aname.upper()
723
if aname[-1] in ['$', '+']:
724
aname = aname[:-1] + '...'
725
elif aname[-1] == '?':
726
aname = '[' + aname[:-1] + ']'
727
elif aname[-1] == '*':
728
aname = '[' + aname[:-1] + '...]'
729
print aname,
730
print
731
print short
732
if rest:
733
print rest
734
735
help_on_option(cmdclass.takes_options)
736
737
738
def help_on_option(options):
739
if not options:
740
return
741
742
print
743
print 'options:'
744
for on in options:
745
l = ' --' + on
746
for shortname, longname in SHORT_OPTIONS.items():
747
if longname == on:
748
l += ', -' + shortname
749
break
750
print l
751
752
753
def help_commands():
754
"""List all commands"""
755
import inspect
756
757
accu = []
758
for k, v in globals().items():
759
if k.startswith('cmd_'):
760
accu.append((k[4:].replace('_','-'), v))
761
accu.sort()
762
for cmdname, cmdclass in accu:
763
if cmdclass.hidden:
764
continue
765
print cmdname
766
help = inspect.getdoc(cmdclass)
767
if help:
768
print " " + help.split('\n', 1)[0]
769
770
771
######################################################################
772
# main routine
1532
773
1533
774
1534
775
# list of all available options; the rhs can be either None for an
1536
777
# the type.
1537
778
OPTIONS = {
1538
779
'all': None,
1539
'diff-options': str,
1540
780
'help': None,
1541
'file': unicode,
1542
'force': None,
1543
'format': unicode,
1544
'forward': None,
1545
781
'message': unicode,
1546
'no-recurse': None,
1547
782
'profile': None,
1548
'revision': _parse_revision_str,
783
'revision': int,
1549
784
'show-ids': None,
1550
785
'timezone': str,
1551
786
'verbose': None,
1552
787
'version': None,
1553
788
'email': None,
1554
'unchanged': None,
1555
'update': None,
1556
'long': None,
1557
'root': str,
1558
'no-backup': None,
1559
'merge-type': get_merge_type,
1560
789
}
1561
790
1562
791
SHORT_OPTIONS = {
1563
'F': 'file',
1564
'h': 'help',
1565
792
'm': 'message',
1566
793
'r': 'revision',
1567
794
'v': 'verbose',
1568
'l': 'long',
1569
795
}
1570
796
1571
797
1585
811
(['status'], {'all': True})
1586
812
>>> parse_args('commit --message=biter'.split())
1587
813
(['commit'], {'message': u'biter'})
1588
>>> parse_args('log -r 500'.split())
1589
(['log'], {'revision': [500]})
1590
>>> parse_args('log -r500..600'.split())
1591
(['log'], {'revision': [500, 600]})
1592
>>> parse_args('log -vr500..600'.split())
1593
(['log'], {'verbose': True, 'revision': [500, 600]})
1594
>>> parse_args('log -rv500..600'.split()) #the r takes an argument
1595
(['log'], {'revision': ['v500', 600]})
1596
814
"""
1597
815
args = []
1598
816
opts = {}
1612
830
else:
1613
831
optname = a[2:]
1614
832
if optname not in OPTIONS:
1615
raise BzrError('unknown long option %r' % a)
833
bailout('unknown long option %r' % a)
1616
834
else:
1617
835
shortopt = a[1:]
1618
if shortopt in SHORT_OPTIONS:
1619
# Multi-character options must have a space to delimit
1620
# their value
1621
optname = SHORT_OPTIONS[shortopt]
1622
else:
1623
# Single character short options, can be chained,
1624
# and have their value appended to their name
1625
shortopt = a[1:2]
1626
if shortopt not in SHORT_OPTIONS:
1627
# We didn't find the multi-character name, and we
1628
# didn't find the single char name
1629
raise BzrError('unknown short option %r' % a)
1630
optname = SHORT_OPTIONS[shortopt]
1631
1632
if a[2:]:
1633
# There are extra things on this option
1634
# see if it is the value, or if it is another
1635
# short option
1636
optargfn = OPTIONS[optname]
1637
if optargfn is None:
1638
# This option does not take an argument, so the
1639
# next entry is another short option, pack it back
1640
# into the list
1641
argv.insert(0, '-' + a[2:])
1642
else:
1643
# This option takes an argument, so pack it
1644
# into the array
1645
optarg = a[2:]
836
if shortopt not in SHORT_OPTIONS:
837
bailout('unknown short option %r' % a)
838
optname = SHORT_OPTIONS[shortopt]
1646
839
1647
840
if optname in opts:
1648
841
# XXX: Do we ever want to support this, e.g. for -r?
1649
raise BzrError('repeated option %r' % a)
842
bailout('repeated option %r' % a)
1650
843
1651
844
optargfn = OPTIONS[optname]
1652
845
if optargfn:
1653
846
if optarg == None:
1654
847
if not argv:
1655
raise BzrError('option %r needs an argument' % a)
848
bailout('option %r needs an argument' % a)
1656
849
else:
1657
850
optarg = argv.pop(0)
1658
851
opts[optname] = optargfn(optarg)
1659
852
else:
1660
853
if optarg != None:
1661
raise BzrError('option %r takes no argument' % optname)
854
bailout('option %r takes no argument' % optname)
1662
855
opts[optname] = True
1663
856
else:
1664
857
args.append(a)
1718
911
1719
912
This is similar to main(), but without all the trappings for
1720
913
logging and error handling.
1721
1722
argv
1723
The command-line arguments, without the program name from argv[0]
1724
1725
Returns a command status or raises an exception.
1726
1727
Special master options: these must come before the command because
1728
they control how the command is interpreted.
1729
1730
--no-plugins
1731
Do not load plugin modules at all
1732
1733
--builtin
1734
Only use builtin commands. (Plugins are still allowed to change
1735
other behaviour.)
1736
1737
--profile
1738
Run under the Python profiler.
1739
914
"""
1740
915
1741
916
argv = [a.decode(bzrlib.user_encoding) for a in argv]
1742
1743
opt_profile = opt_no_plugins = opt_builtin = False
1744
1745
# --no-plugins is handled specially at a very early stage. We need
1746
# to load plugins before doing other command parsing so that they
1747
# can override commands, but this needs to happen first.
1748
1749
for a in argv[:]:
1750
if a == '--profile':
1751
opt_profile = True
1752
elif a == '--no-plugins':
1753
opt_no_plugins = True
1754
elif a == '--builtin':
1755
opt_builtin = True
1756
else:
1757
break
1758
argv.remove(a)
1759
1760
if not opt_no_plugins:
1761
from bzrlib.plugin import load_plugins
1762
load_plugins()
1763
1764
args, opts = parse_args(argv)
1765
1766
if 'help' in opts:
1767
from bzrlib.help import help
1768
if args:
1769
help(args[0])
1770
else:
1771
help()
1772
return 0
1773
1774
if 'version' in opts:
1775
show_version()
1776
return 0
1777
917
1778
if not args:
1779
print >>sys.stderr, "please try 'bzr help' for help"
918
try:
919
args, opts = parse_args(argv[1:])
920
if 'help' in opts:
921
if args:
922
help(args[0])
923
else:
924
help()
925
return 0
926
elif 'version' in opts:
927
show_version()
928
return 0
929
cmd = str(args.pop(0))
930
except IndexError:
931
log_error('usage: bzr COMMAND')
932
log_error(' try "bzr help"')
1780
933
return 1
1781
1782
cmd = str(args.pop(0))
1783
1784
canonical_cmd, cmd_class = \
1785
get_cmd_class(cmd, plugins_override=not opt_builtin)
934
935
canonical_cmd, cmd_class = get_cmd_class(cmd)
936
937
# global option
938
if 'profile' in opts:
939
profile = True
940
del opts['profile']
941
else:
942
profile = False
1786
943
1787
944
# check options are reasonable
1788
945
allowed = cmd_class.takes_options
1789
946
for oname in opts:
1790
947
if oname not in allowed:
1791
raise BzrCommandError("option '--%s' is not allowed for command %r"
948
raise BzrCommandError("option %r is not allowed for command %r"
1792
949
% (oname, cmd))
1793
950
1794
951
# mix arguments and options into one dictionary
1797
954
for k, v in opts.items():
1798
955
cmdopts[k.replace('-', '_')] = v
1799
956
1800
if opt_profile:
957
if profile:
1801
958
import hotshot, tempfile
1802
959
pffileno, pfname = tempfile.mkstemp()
1803
960
try:
1819
976
os.close(pffileno)
1820
977
os.remove(pfname)
1821
978
else:
1822
return cmd_class(cmdopts, cmdargs).status
1823
1824
1825
def _report_exception(summary, quiet=False):
979
cmdobj = cmd_class(cmdopts, cmdargs).status
980
981
982
def _report_exception(e, summary, quiet=False):
1826
983
import traceback
1827
1828
984
log_error('bzr: ' + summary)
1829
bzrlib.trace.log_exception()
1830
1831
if os.environ.get('BZR_DEBUG'):
1832
traceback.print_exc()
985
bzrlib.trace.log_exception(e)
1833
986
1834
987
if not quiet:
1835
sys.stderr.write('\n')
1836
988
tb = sys.exc_info()[2]
1837
989
exinfo = traceback.extract_tb(tb)
1838
990
if exinfo:
1842
994
1843
995
1844
996
def main(argv):
997
import errno
1845
998
1846
bzrlib.trace.open_tracefile(argv)
999
bzrlib.open_tracefile(argv)
1847
1000
1848
1001
try:
1849
1002
try:
1850
1003
try:
1851
return run_bzr(argv[1:])
1004
return run_bzr(argv)
1852
1005
finally:
1853
1006
# do this here inside the exception wrappers to catch EPIPE
1854
1007
sys.stdout.flush()
1855
1008
except BzrError, e:
1856
1009
quiet = isinstance(e, (BzrCommandError))
1857
_report_exception('error: ' + str(e), quiet=quiet)
1010
_report_exception(e, 'error: ' + e.args[0], quiet=quiet)
1858
1011
if len(e.args) > 1:
1859
1012
for h in e.args[1]:
1860
1013
# some explanation or hints
1864
1017
msg = 'assertion failed'
1865
1018
if str(e):
1866
1019
msg += ': ' + str(e)
1867
_report_exception(msg)
1020
_report_exception(e, msg)
1868
1021
return 2
1869
1022
except KeyboardInterrupt, e:
1870
_report_exception('interrupted', quiet=True)
1023
_report_exception(e, 'interrupted', quiet=True)
1871
1024
return 2
1872
1025
except Exception, e:
1873
import errno
1874
1026
quiet = False
1875
if (isinstance(e, IOError)
1876
and hasattr(e, 'errno')
1877
and e.errno == errno.EPIPE):
1027
if isinstance(e, IOError) and e.errno == errno.EPIPE:
1878
1028
quiet = True
1879
1029
msg = 'broken pipe'
1880
1030
else:
1881
1031
msg = str(e).rstrip('\n')
1882
_report_exception(msg, quiet)
1032
_report_exception(e, msg, quiet)
1883
1033
return 2
1884
1034
finally:
1885
1035
bzrlib.trace.close_trace()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0