« back to all changes in this revision
Viewing changes to bzrlib/commands.py
- browse files at revision 391
- compare with another revision
- download diff
- download tarball
- view history from revision 391
- Committer: Martin Pool
- Date: 2005-05-06 03:20:15 UTC
- Revision ID: mbp@sourcefrog.net-20050506032014-decf4918803147d2
- split out notes on storing annotations in revfiles
- files added:
- bzrlib/cache.py
- files removed:
- HACKING
- bzrlib/plugins
- bzrlib/selftest
- bzrlib/util
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- contrib/emacs
- patches
- tools
- files renamed:
- contrib/bash/bzr.simple => contrib/bash/bzr
- bzrlib/util/elementtree/ => elementtree/
- bzrlib/util/urlgrabber/ => urlgrabber/
- files modified:
- .bzrignore
added
removed
bzrlib/commands.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
16
17
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
18
19
import sys, os, time, os.path
20
from sets import Set
25
21
26
22
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__])
23
from bzrlib.trace import mutter, note, log_error
24
from bzrlib.errors import bailout, BzrError, BzrCheckError, BzrCommandError
25
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
26
from bzrlib.tree import RevisionTree, EmptyTree, WorkingTree, Tree
27
from bzrlib.revision import Revision
28
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
29
format_date
49
30
50
31
51
32
def _squish_command_name(cmd):
56
37
assert cmd.startswith("cmd_")
57
38
return cmd[4:].replace('_','-')
58
39
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 = {}
40
def get_all_cmds():
41
"""Return canonical name and class for all registered commands."""
161
42
for k, v in globals().iteritems():
162
43
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):
44
yield _unsquish_command_name(k), v
45
46
def get_cmd_class(cmd):
181
47
"""Return the canonical name and command class for a command.
182
48
"""
183
49
cmd = str(cmd) # not unicode
184
50
185
51
# first look up this command under the specified name
186
cmds = _get_cmd_dict(plugins_override=plugins_override)
187
52
try:
188
return cmd, cmds[cmd]
53
return cmd, globals()[_squish_command_name(cmd)]
189
54
except KeyError:
190
55
pass
191
56
192
57
# look for any command which claims this as an alias
193
for cmdname, cmdclass in cmds.iteritems():
58
for cmdname, cmdclass in get_all_cmds():
194
59
if cmd in cmdclass.aliases:
195
60
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):
61
else:
62
raise BzrCommandError("unknown command %r" % cmd)
63
64
65
class Command:
205
66
"""Base class for commands.
206
67
207
68
The docstring for an actual command should give a single-line
233
94
assert isinstance(arguments, dict)
234
95
cmdargs = options.copy()
235
96
cmdargs.update(arguments)
236
if self.__doc__ == Command.__doc__:
237
from warnings import warn
238
warn("No help message set for %r" % self)
97
assert self.__doc__ != Command.__doc__, \
98
("No help message set for %r" % self)
239
99
self.status = self.run(**cmdargs)
240
if self.status is None:
241
self.status = 0
242
100
243
101
244
102
def run(self):
253
111
return 0
254
112
255
113
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
114
338
115
class cmd_status(Command):
339
116
"""Display status summary.
340
117
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.
118
For each file there is a single line giving its file state and name.
119
The name is that in the current revision unless it is deleted or
120
missing, in which case the old name is shown.
375
121
"""
376
takes_args = ['file*']
377
takes_options = ['all', 'show-ids', 'revision']
122
takes_options = ['all']
378
123
aliases = ['st', 'stat']
379
124
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)
125
def run(self, all=False):
126
#import bzrlib.status
127
#bzrlib.status.tree_status(Branch('.'))
128
Branch('.').show_status(show_all=all)
394
129
395
130
396
131
class cmd_cat_revision(Command):
400
135
takes_args = ['revision_id']
401
136
402
137
def run(self, revision_id):
403
from bzrlib.xml import pack_xml
404
pack_xml(find_branch('.').get_revision(revision_id), sys.stdout)
138
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
405
139
406
140
407
141
class cmd_revno(Command):
409
143
410
144
This is equal to the number of revisions on this branch."""
411
145
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)
146
print Branch('.').revno()
435
147
436
148
437
149
class cmd_add(Command):
447
159
whether already versioned or not, are searched for files or
448
160
subdirectories that are neither versioned or ignored, and these
449
161
are added. This search proceeds recursively into versioned
450
directories. If no names are given '.' is assumed.
162
directories.
451
163
452
Therefore simply saying 'bzr add' will version all files that
164
Therefore simply saying 'bzr add .' will version all files that
453
165
are currently unknown.
454
166
455
167
TODO: Perhaps adding a file whose directly is not versioned should
456
168
recursively add that parent, rather than giving an error?
457
169
"""
458
takes_args = ['file*']
459
takes_options = ['verbose', 'no-recurse']
170
takes_args = ['file+']
171
takes_options = ['verbose']
460
172
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
476
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)
173
def run(self, file_list, verbose=False):
174
bzrlib.add.smart_add(file_list, verbose)
482
175
483
176
484
177
class cmd_relpath(Command):
485
178
"""Show path of a file relative to root"""
486
takes_args = ['filename']
487
hidden = True
179
takes_args = ('filename')
488
180
489
def run(self, filename):
490
print find_branch(filename).relpath(filename)
181
def run(self):
182
print Branch(self.args['filename']).relpath(filename)
491
183
492
184
493
185
494
186
class cmd_inventory(Command):
495
187
"""Show inventory of the current working copy or a revision."""
496
takes_options = ['revision', 'show-ids']
188
takes_options = ['revision']
497
189
498
def run(self, revision=None, show_ids=False):
499
b = find_branch('.')
190
def run(self, revision=None):
191
b = Branch('.')
500
192
if revision == None:
501
193
inv = b.read_working_inventory()
502
194
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]))
195
inv = b.get_revision_inventory(b.lookup_revision(revision))
507
196
508
for path, entry in inv.entries():
509
if show_ids:
510
print '%-50s %s' % (path, entry.file_id)
511
else:
512
print path
197
for path, entry in inv.iter_entries():
198
print '%-50s %s' % (entry.file_id, path)
513
199
514
200
515
201
class cmd_move(Command):
522
208
"""
523
209
takes_args = ['source$', 'dest']
524
210
def run(self, source_list, dest):
525
b = find_branch('.')
211
b = Branch('.')
526
212
527
# TODO: glob expansion on windows?
528
213
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
529
214
530
215
545
230
takes_args = ['from_name', 'to_name']
546
231
547
232
def run(self, from_name, to_name):
548
b = find_branch('.')
233
b = Branch('.')
549
234
b.rename_one(b.relpath(from_name), b.relpath(to_name))
550
235
551
236
552
237
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
238
class cmd_renames(Command):
733
239
"""Show list of renamed files.
734
240
739
245
takes_args = ['dir?']
740
246
741
247
def run(self, dir='.'):
742
b = find_branch(dir)
248
b = Branch(dir)
743
249
old_inv = b.basis_tree().inventory
744
250
new_inv = b.read_working_inventory()
745
251
750
256
751
257
752
258
class cmd_info(Command):
753
"""Show statistical information about a branch."""
754
takes_args = ['branch?']
755
756
def run(self, branch=None):
259
"""Show statistical information for this branch"""
260
def run(self):
757
261
import info
758
759
b = find_branch(branch)
760
info.show_info(b)
262
info.show_info(Branch('.'))
761
263
762
264
763
265
class cmd_remove(Command):
770
272
takes_options = ['verbose']
771
273
772
274
def run(self, file_list, verbose=False):
773
b = find_branch(file_list[0])
275
b = Branch(file_list[0])
774
276
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
775
277
776
278
784
286
hidden = True
785
287
takes_args = ['filename']
786
288
def run(self, filename):
787
b = find_branch(filename)
289
b = Branch(filename)
788
290
i = b.inventory.path2id(b.relpath(filename))
789
291
if i == None:
790
raise BzrError("%r is not a versioned file" % filename)
292
bailout("%r is not a versioned file" % filename)
791
293
else:
792
294
print i
793
295
800
302
hidden = True
801
303
takes_args = ['filename']
802
304
def run(self, filename):
803
b = find_branch(filename)
305
b = Branch(filename)
804
306
inv = b.inventory
805
307
fid = inv.path2id(b.relpath(filename))
806
308
if fid == None:
807
raise BzrError("%r is not a versioned file" % filename)
309
bailout("%r is not a versioned file" % filename)
808
310
for fip in inv.get_idpath(fid):
809
311
print fip
810
312
811
313
812
314
class cmd_revision_history(Command):
813
315
"""Display list of revision ids on this branch."""
814
hidden = True
815
316
def run(self):
816
for patchid in find_branch('.').revision_history():
317
for patchid in Branch('.').revision_history():
817
318
print patchid
818
319
819
320
820
321
class cmd_directories(Command):
821
322
"""Display list of versioned directories in this branch."""
822
323
def run(self):
823
for name, ie in find_branch('.').read_working_inventory().directories():
324
for name, ie in Branch('.').read_working_inventory().directories():
824
325
if name == '':
825
326
print '.'
826
327
else:
841
342
bzr commit -m 'imported project'
842
343
"""
843
344
def run(self):
844
from bzrlib.branch import Branch
845
345
Branch('.', init=True)
846
346
847
347
851
351
If files are listed, only the changes in those files are listed.
852
352
Otherwise, all changes for the tree are listed.
853
353
354
TODO: Given two revision arguments, show the difference between them.
355
854
356
TODO: Allow diff across branches.
855
357
856
358
TODO: Option to use external diff command; could be GNU diff, wdiff,
865
367
deleted files.
866
368
867
369
TODO: This probably handles non-Unix newlines poorly.
868
869
examples:
870
bzr diff
871
bzr diff -r1
872
bzr diff -r1:2
873
370
"""
874
371
875
372
takes_args = ['file*']
876
takes_options = ['revision', 'diff-options']
877
aliases = ['di', 'dif']
373
takes_options = ['revision']
374
aliases = ['di']
878
375
879
def run(self, revision=None, file_list=None, diff_options=None):
376
def run(self, revision=None, file_list=None):
880
377
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
378
379
show_diff(Branch('.'), revision, file_list)
906
380
907
381
908
382
class cmd_deleted(Command):
911
385
TODO: Show files deleted since a previous revision, or between two revisions.
912
386
"""
913
387
def run(self, show_ids=False):
914
b = find_branch('.')
388
b = Branch('.')
915
389
old = b.basis_tree()
916
390
new = b.working_tree()
917
391
927
401
else:
928
402
print path
929
403
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
404
class cmd_root(Command):
964
405
"""Show the tree root directory.
965
406
968
409
takes_args = ['filename?']
969
410
def run(self, filename=None):
970
411
"""Print the branch root."""
971
b = find_branch(filename)
972
print getattr(b, 'base', None) or getattr(b, 'baseurl')
412
print bzrlib.branch.find_branch_root(filename)
413
973
414
974
415
975
416
class cmd_log(Command):
976
417
"""Show log of this branch.
977
418
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
419
TODO: Option to limit range.
420
421
TODO: Perhaps show most-recent first with an option for last.
987
422
"""
988
989
423
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
424
takes_options = ['timezone', 'verbose', 'show-ids']
425
def run(self, filename=None, timezone='original', verbose=False, show_ids=False):
426
b = Branch((filename or '.'), lock_mode='r')
1007
427
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)
428
filename = b.relpath(filename)
429
bzrlib.show_log(b, filename,
430
show_timezone=timezone,
431
verbose=verbose,
432
show_ids=show_ids)
1057
433
1058
434
1059
435
1060
436
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"."""
437
"""Return revision-ids which affected a particular file."""
1064
438
hidden = True
1065
439
takes_args = ["filename"]
1066
440
def run(self, filename):
1067
b = find_branch(filename)
441
b = Branch(filename, lock_mode='r')
1068
442
inv = b.read_working_inventory()
1069
443
file_id = inv.path2id(b.relpath(filename))
1070
444
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1078
452
"""
1079
453
hidden = True
1080
454
def run(self, revision=None, verbose=False):
1081
b = find_branch('.')
455
b = Branch('.')
1082
456
if revision == None:
1083
457
tree = b.working_tree()
1084
458
else:
1100
474
1101
475
1102
476
class cmd_unknowns(Command):
1103
"""List unknown files."""
477
"""List unknown files"""
1104
478
def run(self):
1105
from bzrlib.osutils import quotefn
1106
for f in find_branch('.').unknowns():
479
for f in Branch('.').unknowns():
1107
480
print quotefn(f)
1108
481
1109
482
1110
483
1111
484
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
"""
485
"""Ignore a command or pattern"""
1128
486
takes_args = ['name_pattern']
1129
487
1130
488
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()
489
b = Branch('.')
490
491
# XXX: This will fail if it's a hardlink; should use an AtomicFile class.
492
f = open(b.abspath('.bzrignore'), 'at')
493
f.write(name_pattern + '\n')
494
f.close()
1159
495
1160
496
inv = b.working_tree().inventory
1161
497
if inv.path2id('.bzrignore'):
1167
503
1168
504
1169
505
class cmd_ignored(Command):
1170
"""List ignored files and the patterns that matched them.
1171
1172
See also: bzr ignore"""
506
"""List ignored files and the patterns that matched them."""
1173
507
def run(self):
1174
tree = find_branch('.').working_tree()
508
tree = Branch('.').working_tree()
1175
509
for path, file_class, kind, file_id in tree.list_files():
1176
510
if file_class != 'I':
1177
511
continue
1185
519
1186
520
example:
1187
521
bzr lookup-revision 33
1188
"""
522
"""
1189
523
hidden = True
1190
524
takes_args = ['revno']
1191
525
1195
529
except ValueError:
1196
530
raise BzrCommandError("not a valid revision-number: %r" % revno)
1197
531
1198
print find_branch('.').lookup_revision(revno)
532
print Branch('.').lookup_revision(revno)
1199
533
1200
534
1201
535
class cmd_export(Command):
1202
536
"""Export past revision to destination directory.
1203
537
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
538
If no revision is specified this exports the last committed revision."""
1213
539
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()
540
takes_options = ['revision']
541
def run(self, dest, revno=None):
542
b = Branch('.')
543
if revno == None:
544
rh = b.revision_history[-1]
1220
545
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)
546
rh = b.lookup_revision(int(revno))
547
t = b.revision_tree(rh)
548
t.export(dest)
1236
549
1237
550
1238
551
class cmd_cat(Command):
1244
557
def run(self, filename, revision=None):
1245
558
if revision == None:
1246
559
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])
560
b = Branch('.')
561
b.print_file(b.relpath(filename), int(revision))
1251
562
1252
563
1253
564
class cmd_local_time_offset(Command):
1260
571
1261
572
class cmd_commit(Command):
1262
573
"""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.
574
575
TODO: Commit only selected files.
1273
576
1274
577
TODO: Run hooks on tree to-be-committed, and after commit.
1275
578
1276
579
TODO: Strict commit that fails if there are unknown or deleted files.
1277
580
"""
1278
takes_args = ['selected*']
1279
takes_options = ['message', 'file', 'verbose', 'unchanged']
581
takes_options = ['message', 'file', 'verbose']
1280
582
aliases = ['ci', 'checkin']
1281
583
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
584
def run(self, message=None, file=None, verbose=False):
1289
585
## Warning: shadows builtin file()
1290
586
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"])
587
raise BzrCommandError("please specify a commit message",
588
["use either --message or --file"])
1305
589
elif message and file:
1306
590
raise BzrCommandError("please specify either --message or --file")
1307
591
1309
593
import codecs
1310
594
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1311
595
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"])
596
Branch('.').commit(message, verbose=verbose)
1325
597
1326
598
1327
599
class cmd_check(Command):
1329
601
1330
602
This command checks various invariants about the branch storage to
1331
603
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))
604
"""
605
takes_args = ['dir?']
606
def run(self, dir='.'):
607
import bzrlib.check
608
bzrlib.check.check(Branch(dir, find_root=False))
1376
609
1377
610
1378
611
1381
614
takes_options = ['email']
1382
615
1383
616
def run(self, email=False):
1384
try:
1385
b = bzrlib.branch.find_branch('.')
1386
except:
1387
b = None
1388
1389
617
if email:
1390
print bzrlib.osutils.user_email(b)
618
print bzrlib.osutils.user_email()
1391
619
else:
1392
print bzrlib.osutils.username(b)
620
print bzrlib.osutils.username()
1393
621
1394
622
1395
623
class cmd_selftest(Command):
1396
624
"""Run internal test suite"""
1397
625
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))
626
def run(self):
627
failures, tests = 0, 0
628
629
import doctest, bzrlib.store, bzrlib.tests
630
bzrlib.trace.verbose = False
631
632
for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
633
bzrlib.tree, bzrlib.tests, bzrlib.commands, bzrlib.add:
634
mf, mt = doctest.testmod(m)
635
failures += mf
636
tests += mt
637
print '%-40s %3d tests' % (m.__name__, mt),
638
if mf:
639
print '%3d FAILED!' % mf
640
else:
641
print
642
643
print '%-40s %3d tests' % ('total', tests),
644
if failures:
645
print '%3d FAILED!' % failures
646
else:
647
print
648
1402
649
1403
650
1404
651
class cmd_version(Command):
1405
"""Show version of bzr."""
652
"""Show version of bzr"""
1406
653
def run(self):
1407
654
show_version()
1408
655
1409
656
def show_version():
1410
657
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
658
print bzrlib.__copyright__
1416
659
print "http://bazaar-ng.org/"
1417
660
print
1426
669
def run(self):
1427
670
print "it sure does!"
1428
671
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
672
1540
673
class cmd_assert_fail(Command):
1541
674
"""Test reporting of assertion failures"""
1556
689
help.help(topic)
1557
690
1558
691
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
692
######################################################################
693
# main routine
1621
694
1622
695
1623
696
# list of all available options; the rhs can be either None for an
1625
698
# the type.
1626
699
OPTIONS = {
1627
700
'all': None,
1628
'diff-options': str,
1629
701
'help': None,
1630
702
'file': unicode,
1631
'force': None,
1632
'format': unicode,
1633
'forward': None,
1634
703
'message': unicode,
1635
'no-recurse': None,
1636
704
'profile': None,
1637
'revision': _parse_revision_str,
1638
'short': None,
705
'revision': int,
1639
706
'show-ids': None,
1640
707
'timezone': str,
1641
708
'verbose': None,
1642
709
'version': None,
1643
710
'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
711
}
1651
712
1652
713
SHORT_OPTIONS = {
714
'm': 'message',
1653
715
'F': 'file',
1654
'h': 'help',
1655
'm': 'message',
1656
716
'r': 'revision',
1657
717
'v': 'verbose',
1658
'l': 'long',
1659
718
}
1660
719
1661
720
1675
734
(['status'], {'all': True})
1676
735
>>> parse_args('commit --message=biter'.split())
1677
736
(['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
737
"""
1687
738
args = []
1688
739
opts = {}
1702
753
else:
1703
754
optname = a[2:]
1704
755
if optname not in OPTIONS:
1705
raise BzrError('unknown long option %r' % a)
756
bailout('unknown long option %r' % a)
1706
757
else:
1707
758
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:]
759
if shortopt not in SHORT_OPTIONS:
760
bailout('unknown short option %r' % a)
761
optname = SHORT_OPTIONS[shortopt]
1736
762
1737
763
if optname in opts:
1738
764
# XXX: Do we ever want to support this, e.g. for -r?
1739
raise BzrError('repeated option %r' % a)
765
bailout('repeated option %r' % a)
1740
766
1741
767
optargfn = OPTIONS[optname]
1742
768
if optargfn:
1743
769
if optarg == None:
1744
770
if not argv:
1745
raise BzrError('option %r needs an argument' % a)
771
bailout('option %r needs an argument' % a)
1746
772
else:
1747
773
optarg = argv.pop(0)
1748
774
opts[optname] = optargfn(optarg)
1749
775
else:
1750
776
if optarg != None:
1751
raise BzrError('option %r takes no argument' % optname)
777
bailout('option %r takes no argument' % optname)
1752
778
opts[optname] = True
1753
779
else:
1754
780
args.append(a)
1808
834
1809
835
This is similar to main(), but without all the trappings for
1810
836
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.
1829
837
"""
1830
1831
838
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
839
1868
if not args:
1869
print >>sys.stderr, "please try 'bzr help' for help"
840
try:
841
args, opts = parse_args(argv[1:])
842
if 'help' in opts:
843
import help
844
if args:
845
help.help(args[0])
846
else:
847
help.help()
848
return 0
849
elif 'version' in opts:
850
show_version()
851
return 0
852
cmd = str(args.pop(0))
853
except IndexError:
854
log_error('usage: bzr COMMAND')
855
log_error(' try "bzr help"')
1870
856
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)
857
858
canonical_cmd, cmd_class = get_cmd_class(cmd)
859
860
# global option
861
if 'profile' in opts:
862
profile = True
863
del opts['profile']
864
else:
865
profile = False
1876
866
1877
867
# check options are reasonable
1878
868
allowed = cmd_class.takes_options
1887
877
for k, v in opts.items():
1888
878
cmdopts[k.replace('-', '_')] = v
1889
879
1890
if opt_profile:
880
if profile:
1891
881
import hotshot, tempfile
1892
882
pffileno, pfname = tempfile.mkstemp()
1893
883
try:
1909
899
os.close(pffileno)
1910
900
os.remove(pfname)
1911
901
else:
1912
return cmd_class(cmdopts, cmdargs).status
902
cmdobj = cmd_class(cmdopts, cmdargs).status
1913
903
1914
904
1915
905
def _report_exception(summary, quiet=False):
1916
906
import traceback
1917
1918
907
log_error('bzr: ' + summary)
1919
908
bzrlib.trace.log_exception()
1920
909
1921
if os.environ.get('BZR_DEBUG'):
1922
traceback.print_exc()
1923
1924
910
if not quiet:
1925
sys.stderr.write('\n')
1926
911
tb = sys.exc_info()[2]
1927
912
exinfo = traceback.extract_tb(tb)
1928
913
if exinfo:
1932
917
1933
918
1934
919
def main(argv):
920
import errno
1935
921
1936
bzrlib.trace.open_tracefile(argv)
922
bzrlib.open_tracefile(argv)
1937
923
1938
924
try:
1939
925
try:
1940
926
try:
1941
return run_bzr(argv[1:])
927
return run_bzr(argv)
1942
928
finally:
1943
929
# do this here inside the exception wrappers to catch EPIPE
1944
930
sys.stdout.flush()
1945
931
except BzrError, e:
1946
932
quiet = isinstance(e, (BzrCommandError))
1947
_report_exception('error: ' + str(e), quiet=quiet)
933
_report_exception('error: ' + e.args[0], quiet=quiet)
1948
934
if len(e.args) > 1:
1949
935
for h in e.args[1]:
1950
936
# some explanation or hints
1960
946
_report_exception('interrupted', quiet=True)
1961
947
return 2
1962
948
except Exception, e:
1963
import errno
1964
949
quiet = False
1965
if (isinstance(e, IOError)
1966
and hasattr(e, 'errno')
1967
and e.errno == errno.EPIPE):
950
if isinstance(e, IOError) and e.errno == errno.EPIPE:
1968
951
quiet = True
1969
952
msg = 'broken pipe'
1970
953
else:
Loggerhead is a web-based interface for Breezy
Version: 2.0.1