« back to all changes in this revision
Viewing changes to bzrlib/commands.py
- browse files at revision 559
- compare with another revision
- download diff
- download tarball
- view history from revision 559
- Committer: Martin Pool
- Date: 2005-05-26 02:22:15 UTC
- Revision ID: mbp@sourcefrog.net-20050526022214-3c33416ed1fbb212
- AtomicFile must cope without destination file existing on
win32
(patch from John A Meinel)
win32
(patch from John A Meinel)
- files added:
- bzrlib/statcache.py
- files removed:
- HACKING
- bzrlib/plugins
- bzrlib/selftest
- bzrlib/util
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- contrib/emacs
- 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
# TODO: Help messages for options.
24
25
# TODO: Define arguments by objects, rather than just using names.
26
# Those objects can specify the expected type of the argument, which
27
# would help with validation and shell completion.
28
29
30
import sys
31
import os
18
19
import sys, os, time, os.path
32
20
33
21
import bzrlib
34
import bzrlib.trace
35
from bzrlib.trace import mutter, note, log_error, warning
36
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError
37
from bzrlib.branch import find_branch
38
from bzrlib import BZRDIR
39
40
41
plugin_cmds = {}
42
43
44
def register_command(cmd):
45
"Utility function to help register a command"
46
global plugin_cmds
47
k = cmd.__name__
48
if k.startswith("cmd_"):
49
k_unsquished = _unsquish_command_name(k)
50
else:
51
k_unsquished = k
52
if not plugin_cmds.has_key(k_unsquished):
53
plugin_cmds[k_unsquished] = cmd
54
else:
55
log_error('Two plugins defined the same command: %r' % k)
56
log_error('Not loading the one in %r' % sys.modules[cmd.__module__])
22
from bzrlib.trace import mutter, note, log_error
23
from bzrlib.errors import bailout, BzrError, BzrCheckError, BzrCommandError
24
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
25
from bzrlib.tree import RevisionTree, EmptyTree, Tree
26
from bzrlib.revision import Revision
27
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
28
format_date
29
from bzrlib import merge
57
30
58
31
59
32
def _squish_command_name(cmd):
64
37
assert cmd.startswith("cmd_")
65
38
return cmd[4:].replace('_','-')
66
39
67
68
def _parse_revision_str(revstr):
69
"""This handles a revision string -> revno.
70
71
This always returns a list. The list will have one element for
72
73
It supports integers directly, but everything else it
74
defers for passing to Branch.get_revision_info()
75
76
>>> _parse_revision_str('234')
77
[234]
78
>>> _parse_revision_str('234..567')
79
[234, 567]
80
>>> _parse_revision_str('..')
81
[None, None]
82
>>> _parse_revision_str('..234')
83
[None, 234]
84
>>> _parse_revision_str('234..')
85
[234, None]
86
>>> _parse_revision_str('234..456..789') # Maybe this should be an error
87
[234, 456, 789]
88
>>> _parse_revision_str('234....789') # Error?
89
[234, None, 789]
90
>>> _parse_revision_str('revid:test@other.com-234234')
91
['revid:test@other.com-234234']
92
>>> _parse_revision_str('revid:test@other.com-234234..revid:test@other.com-234235')
93
['revid:test@other.com-234234', 'revid:test@other.com-234235']
94
>>> _parse_revision_str('revid:test@other.com-234234..23')
95
['revid:test@other.com-234234', 23]
96
>>> _parse_revision_str('date:2005-04-12')
97
['date:2005-04-12']
98
>>> _parse_revision_str('date:2005-04-12 12:24:33')
99
['date:2005-04-12 12:24:33']
100
>>> _parse_revision_str('date:2005-04-12T12:24:33')
101
['date:2005-04-12T12:24:33']
102
>>> _parse_revision_str('date:2005-04-12,12:24:33')
103
['date:2005-04-12,12:24:33']
104
>>> _parse_revision_str('-5..23')
105
[-5, 23]
106
>>> _parse_revision_str('-5')
107
[-5]
108
>>> _parse_revision_str('123a')
109
['123a']
110
>>> _parse_revision_str('abc')
111
['abc']
112
"""
113
import re
114
old_format_re = re.compile('\d*:\d*')
115
m = old_format_re.match(revstr)
116
if m:
117
warning('Colon separator for revision numbers is deprecated.'
118
' Use .. instead')
119
revs = []
120
for rev in revstr.split(':'):
121
if rev:
122
revs.append(int(rev))
123
else:
124
revs.append(None)
125
return revs
126
revs = []
127
for x in revstr.split('..'):
128
if not x:
129
revs.append(None)
130
else:
131
try:
132
revs.append(int(x))
133
except ValueError:
134
revs.append(x)
135
return revs
136
137
138
def get_merge_type(typestring):
139
"""Attempt to find the merge class/factory associated with a string."""
140
from merge import merge_types
141
try:
142
return merge_types[typestring][0]
143
except KeyError:
144
templ = '%s%%7s: %%s' % (' '*12)
145
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
146
type_list = '\n'.join(lines)
147
msg = "No known merge type %s. Supported types are:\n%s" %\
148
(typestring, type_list)
149
raise BzrCommandError(msg)
150
151
152
def get_merge_type(typestring):
153
"""Attempt to find the merge class/factory associated with a string."""
154
from merge import merge_types
155
try:
156
return merge_types[typestring][0]
157
except KeyError:
158
templ = '%s%%7s: %%s' % (' '*12)
159
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
160
type_list = '\n'.join(lines)
161
msg = "No known merge type %s. Supported types are:\n%s" %\
162
(typestring, type_list)
163
raise BzrCommandError(msg)
164
165
166
167
def _get_cmd_dict(plugins_override=True):
168
d = {}
40
def get_all_cmds():
41
"""Return canonical name and class for all registered commands."""
169
42
for k, v in globals().iteritems():
170
43
if k.startswith("cmd_"):
171
d[_unsquish_command_name(k)] = v
172
# If we didn't load plugins, the plugin_cmds dict will be empty
173
if plugins_override:
174
d.update(plugin_cmds)
175
else:
176
d2 = plugin_cmds.copy()
177
d2.update(d)
178
d = d2
179
return d
180
181
182
def get_all_cmds(plugins_override=True):
183
"""Return canonical name and class for all registered commands."""
184
for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems():
185
yield k,v
186
187
188
def get_cmd_class(cmd, plugins_override=True):
44
yield _unsquish_command_name(k), v
45
46
def get_cmd_class(cmd):
189
47
"""Return the canonical name and command class for a command.
190
48
"""
191
49
cmd = str(cmd) # not unicode
192
50
193
51
# first look up this command under the specified name
194
cmds = _get_cmd_dict(plugins_override=plugins_override)
195
52
try:
196
return cmd, cmds[cmd]
53
return cmd, globals()[_squish_command_name(cmd)]
197
54
except KeyError:
198
55
pass
199
56
200
57
# look for any command which claims this as an alias
201
for cmdname, cmdclass in cmds.iteritems():
58
for cmdname, cmdclass in get_all_cmds():
202
59
if cmd in cmdclass.aliases:
203
60
return cmdname, cmdclass
204
61
241
98
assert isinstance(arguments, dict)
242
99
cmdargs = options.copy()
243
100
cmdargs.update(arguments)
244
if self.__doc__ == Command.__doc__:
245
from warnings import warn
246
warn("No help message set for %r" % self)
101
assert self.__doc__ != Command.__doc__, \
102
("No help message set for %r" % self)
247
103
self.status = self.run(**cmdargs)
248
if self.status is None:
249
self.status = 0
250
104
251
105
252
106
def run(self):
264
118
class ExternalCommand(Command):
265
119
"""Class to wrap external commands.
266
120
267
We cheat a little here, when get_cmd_class() calls us we actually
268
give it back an object we construct that has the appropriate path,
269
help, options etc for the specified command.
270
271
When run_bzr() tries to instantiate that 'class' it gets caught by
272
the __call__ method, which we override to call the Command.__init__
273
method. That then calls our run method which is pretty straight
274
forward.
275
276
The only wrinkle is that we have to map bzr's dictionary of options
277
and arguments back into command line options and arguments for the
278
script.
121
We cheat a little here, when get_cmd_class() calls us we actually give it back
122
an object we construct that has the appropriate path, help, options etc for the
123
specified command.
124
125
When run_bzr() tries to instantiate that 'class' it gets caught by the __call__
126
method, which we override to call the Command.__init__ method. That then calls
127
our run method which is pretty straight forward.
128
129
The only wrinkle is that we have to map bzr's dictionary of options and arguments
130
back into command line options and arguments for the script.
279
131
"""
280
132
281
133
def find_command(cls, cmd):
282
import os.path
283
134
bzrpath = os.environ.get('BZRPATH', '')
284
135
285
for dir in bzrpath.split(os.pathsep):
136
for dir in bzrpath.split(':'):
286
137
path = os.path.join(dir, cmd)
287
138
if os.path.isfile(path):
288
139
return ExternalCommand(path)
294
145
def __init__(self, path):
295
146
self.path = path
296
147
148
# TODO: If either of these fail, we should detect that and
149
# assume that path is not really a bzr plugin after all.
150
297
151
pipe = os.popen('%s --bzr-usage' % path, 'r')
298
152
self.takes_options = pipe.readline().split()
299
300
for opt in self.takes_options:
301
if not opt in OPTIONS:
302
raise BzrError("Unknown option '%s' returned by external command %s"
303
% (opt, path))
304
305
# TODO: Is there any way to check takes_args is valid here?
306
153
self.takes_args = pipe.readline().split()
307
308
if pipe.close() is not None:
309
raise BzrError("Failed funning '%s --bzr-usage'" % path)
154
pipe.close()
310
155
311
156
pipe = os.popen('%s --bzr-help' % path, 'r')
312
157
self.__doc__ = pipe.read()
313
if pipe.close() is not None:
314
raise BzrError("Failed funning '%s --bzr-help'" % path)
158
pipe.close()
315
159
316
160
def __call__(self, options, arguments):
317
161
Command.__init__(self, options, arguments)
324
168
keys = kargs.keys()
325
169
keys.sort()
326
170
for name in keys:
327
optname = name.replace('_','-')
328
171
value = kargs[name]
329
if OPTIONS.has_key(optname):
172
if OPTIONS.has_key(name):
330
173
# it's an option
331
opts.append('--%s' % optname)
174
opts.append('--%s' % name)
332
175
if value is not None and value is not True:
333
176
opts.append(str(value))
334
177
else:
378
221
directory is shown. Otherwise, only the status of the specified
379
222
files or directories is reported. If a directory is given, status
380
223
is reported for everything inside that directory.
381
382
If a revision is specified, the changes since that revision are shown.
383
224
"""
384
225
takes_args = ['file*']
385
takes_options = ['all', 'show-ids', 'revision']
226
takes_options = ['all', 'show-ids']
386
227
aliases = ['st', 'stat']
387
228
388
229
def run(self, all=False, show_ids=False, file_list=None):
389
230
if file_list:
390
b = find_branch(file_list[0])
231
b = Branch(file_list[0], lock_mode='r')
391
232
file_list = [b.relpath(x) for x in file_list]
392
233
# special case: only one path was given and it's the root
393
234
# of the branch
394
235
if file_list == ['']:
395
236
file_list = None
396
237
else:
397
b = find_branch('.')
398
399
from bzrlib.status import show_status
400
show_status(b, show_unchanged=all, show_ids=show_ids,
401
specific_files=file_list)
238
b = Branch('.', lock_mode='r')
239
import status
240
status.show_status(b, show_unchanged=all, show_ids=show_ids,
241
specific_files=file_list)
402
242
403
243
404
244
class cmd_cat_revision(Command):
408
248
takes_args = ['revision_id']
409
249
410
250
def run(self, revision_id):
411
from bzrlib.xml import pack_xml
412
pack_xml(find_branch('.').get_revision(revision_id), sys.stdout)
251
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
413
252
414
253
415
254
class cmd_revno(Command):
417
256
418
257
This is equal to the number of revisions on this branch."""
419
258
def run(self):
420
print find_branch('.').revno()
421
422
class cmd_revision_info(Command):
423
"""Show revision number and revision id for a given revision identifier.
424
"""
425
hidden = True
426
takes_args = ['revision_info*']
427
takes_options = ['revision']
428
def run(self, revision=None, revision_info_list=None):
429
from bzrlib.branch import find_branch
430
431
revs = []
432
if revision is not None:
433
revs.extend(revision)
434
if revision_info_list is not None:
435
revs.extend(revision_info_list)
436
if len(revs) == 0:
437
raise BzrCommandError('You must supply a revision identifier')
438
439
b = find_branch('.')
440
441
for rev in revs:
442
print '%4d %s' % b.get_revision_info(rev)
259
print Branch('.').revno()
443
260
444
261
445
262
class cmd_add(Command):
455
272
whether already versioned or not, are searched for files or
456
273
subdirectories that are neither versioned or ignored, and these
457
274
are added. This search proceeds recursively into versioned
458
directories. If no names are given '.' is assumed.
275
directories.
459
276
460
Therefore simply saying 'bzr add' will version all files that
277
Therefore simply saying 'bzr add .' will version all files that
461
278
are currently unknown.
462
279
463
280
TODO: Perhaps adding a file whose directly is not versioned should
464
281
recursively add that parent, rather than giving an error?
465
282
"""
466
takes_args = ['file*']
467
takes_options = ['verbose', 'no-recurse']
283
takes_args = ['file+']
284
takes_options = ['verbose']
468
285
469
def run(self, file_list, verbose=False, no_recurse=False):
470
from bzrlib.add import smart_add
471
smart_add(file_list, verbose, not no_recurse)
472
473
474
475
class cmd_mkdir(Command):
476
"""Create a new versioned directory.
477
478
This is equivalent to creating the directory and then adding it.
479
"""
480
takes_args = ['dir+']
481
482
def run(self, dir_list):
483
b = None
484
485
for d in dir_list:
486
os.mkdir(d)
487
if not b:
488
b = find_branch(d)
489
b.add([d], verbose=True)
286
def run(self, file_list, verbose=False):
287
bzrlib.add.smart_add(file_list, verbose)
490
288
491
289
492
290
class cmd_relpath(Command):
493
291
"""Show path of a file relative to root"""
494
292
takes_args = ['filename']
495
hidden = True
496
293
497
294
def run(self, filename):
498
print find_branch(filename).relpath(filename)
295
print Branch(filename).relpath(filename)
499
296
500
297
501
298
502
299
class cmd_inventory(Command):
503
300
"""Show inventory of the current working copy or a revision."""
504
takes_options = ['revision', 'show-ids']
301
takes_options = ['revision']
505
302
506
def run(self, revision=None, show_ids=False):
507
b = find_branch('.')
303
def run(self, revision=None):
304
b = Branch('.')
508
305
if revision == None:
509
306
inv = b.read_working_inventory()
510
307
else:
511
if len(revision) > 1:
512
raise BzrCommandError('bzr inventory --revision takes'
513
' exactly one revision identifier')
514
inv = b.get_revision_inventory(b.lookup_revision(revision[0]))
308
inv = b.get_revision_inventory(b.lookup_revision(revision))
515
309
516
310
for path, entry in inv.entries():
517
if show_ids:
518
print '%-50s %s' % (path, entry.file_id)
519
else:
520
print path
311
print '%-50s %s' % (entry.file_id, path)
521
312
522
313
523
314
class cmd_move(Command):
530
321
"""
531
322
takes_args = ['source$', 'dest']
532
323
def run(self, source_list, dest):
533
b = find_branch('.')
324
b = Branch('.')
534
325
535
# TODO: glob expansion on windows?
536
326
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
537
327
538
328
553
343
takes_args = ['from_name', 'to_name']
554
344
555
345
def run(self, from_name, to_name):
556
b = find_branch('.')
346
b = Branch('.')
557
347
b.rename_one(b.relpath(from_name), b.relpath(to_name))
558
348
559
349
560
350
561
class cmd_mv(Command):
562
"""Move or rename a file.
563
564
usage:
565
bzr mv OLDNAME NEWNAME
566
bzr mv SOURCE... DESTINATION
567
568
If the last argument is a versioned directory, all the other names
569
are moved into it. Otherwise, there must be exactly two arguments
570
and the file is changed to a new name, which must not already exist.
571
572
Files cannot be moved between branches.
573
"""
574
takes_args = ['names*']
575
def run(self, names_list):
576
if len(names_list) < 2:
577
raise BzrCommandError("missing file argument")
578
b = find_branch(names_list[0])
579
580
rel_names = [b.relpath(x) for x in names_list]
581
582
if os.path.isdir(names_list[-1]):
583
# move into existing directory
584
b.move(rel_names[:-1], rel_names[-1])
585
else:
586
if len(names_list) != 2:
587
raise BzrCommandError('to mv multiple files the destination '
588
'must be a versioned directory')
589
b.move(rel_names[0], rel_names[1])
590
591
592
593
594
class cmd_pull(Command):
595
"""Pull any changes from another branch into the current one.
596
597
If the location is omitted, the last-used location will be used.
598
Both the revision history and the working directory will be
599
updated.
600
601
This command only works on branches that have not diverged. Branches are
602
considered diverged if both branches have had commits without first
603
pulling from the other.
604
605
If branches have diverged, you can use 'bzr merge' to pull the text changes
606
from one into the other.
607
"""
608
takes_args = ['location?']
609
610
def run(self, location=None):
611
from bzrlib.merge import merge
612
import tempfile
613
from shutil import rmtree
614
import errno
615
616
br_to = find_branch('.')
617
stored_loc = None
618
try:
619
stored_loc = br_to.controlfile("x-pull", "rb").read().rstrip('\n')
620
except IOError, e:
621
if e.errno != errno.ENOENT:
622
raise
623
if location is None:
624
if stored_loc is None:
625
raise BzrCommandError("No pull location known or specified.")
626
else:
627
print "Using last location: %s" % stored_loc
628
location = stored_loc
629
cache_root = tempfile.mkdtemp()
630
from bzrlib.branch import DivergedBranches
631
br_from = find_branch(location)
632
location = pull_loc(br_from)
633
old_revno = br_to.revno()
634
try:
635
from branch import find_cached_branch, DivergedBranches
636
br_from = find_cached_branch(location, cache_root)
637
location = pull_loc(br_from)
638
old_revno = br_to.revno()
639
try:
640
br_to.update_revisions(br_from)
641
except DivergedBranches:
642
raise BzrCommandError("These branches have diverged."
643
" Try merge.")
644
645
merge(('.', -1), ('.', old_revno), check_clean=False)
646
if location != stored_loc:
647
br_to.controlfile("x-pull", "wb").write(location + "\n")
648
finally:
649
rmtree(cache_root)
650
651
652
653
class cmd_branch(Command):
654
"""Create a new copy of a branch.
655
656
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
657
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
658
659
To retrieve the branch as of a particular revision, supply the --revision
660
parameter, as in "branch foo/bar -r 5".
661
"""
662
takes_args = ['from_location', 'to_location?']
663
takes_options = ['revision']
664
aliases = ['get', 'clone']
665
666
def run(self, from_location, to_location=None, revision=None):
667
import errno
668
from bzrlib.merge import merge
669
from bzrlib.branch import DivergedBranches, \
670
find_cached_branch, Branch
671
from shutil import rmtree
672
from meta_store import CachedStore
673
import tempfile
674
cache_root = tempfile.mkdtemp()
675
676
if revision is None:
677
revision = [None]
678
elif len(revision) > 1:
679
raise BzrCommandError('bzr branch --revision takes exactly 1 revision value')
680
681
try:
682
try:
683
br_from = find_cached_branch(from_location, cache_root)
684
except OSError, e:
685
if e.errno == errno.ENOENT:
686
raise BzrCommandError('Source location "%s" does not'
687
' exist.' % to_location)
688
else:
689
raise
690
691
if to_location is None:
692
to_location = os.path.basename(from_location.rstrip("/\\"))
693
694
try:
695
os.mkdir(to_location)
696
except OSError, e:
697
if e.errno == errno.EEXIST:
698
raise BzrCommandError('Target directory "%s" already'
699
' exists.' % to_location)
700
if e.errno == errno.ENOENT:
701
raise BzrCommandError('Parent of "%s" does not exist.' %
702
to_location)
703
else:
704
raise
705
br_to = Branch(to_location, init=True)
706
707
br_to.set_root_id(br_from.get_root_id())
708
709
if revision:
710
if revision[0] is None:
711
revno = br_from.revno()
712
else:
713
revno, rev_id = br_from.get_revision_info(revision[0])
714
try:
715
br_to.update_revisions(br_from, stop_revision=revno)
716
except bzrlib.errors.NoSuchRevision:
717
rmtree(to_location)
718
msg = "The branch %s has no revision %d." % (from_location,
719
revno)
720
raise BzrCommandError(msg)
721
722
merge((to_location, -1), (to_location, 0), this_dir=to_location,
723
check_clean=False, ignore_zero=True)
724
from_location = pull_loc(br_from)
725
br_to.controlfile("x-pull", "wb").write(from_location + "\n")
726
finally:
727
rmtree(cache_root)
728
729
730
def pull_loc(branch):
731
# TODO: Should perhaps just make attribute be 'base' in
732
# RemoteBranch and Branch?
733
if hasattr(branch, "baseurl"):
734
return branch.baseurl
735
else:
736
return branch.base
737
738
739
740
351
class cmd_renames(Command):
741
352
"""Show list of renamed files.
742
353
747
358
takes_args = ['dir?']
748
359
749
360
def run(self, dir='.'):
750
b = find_branch(dir)
361
b = Branch(dir)
751
362
old_inv = b.basis_tree().inventory
752
363
new_inv = b.read_working_inventory()
753
364
764
375
def run(self, branch=None):
765
376
import info
766
377
378
from branch import find_branch
767
379
b = find_branch(branch)
768
380
info.show_info(b)
769
381
778
390
takes_options = ['verbose']
779
391
780
392
def run(self, file_list, verbose=False):
781
b = find_branch(file_list[0])
393
b = Branch(file_list[0])
782
394
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
783
395
784
396
792
404
hidden = True
793
405
takes_args = ['filename']
794
406
def run(self, filename):
795
b = find_branch(filename)
407
b = Branch(filename)
796
408
i = b.inventory.path2id(b.relpath(filename))
797
409
if i == None:
798
raise BzrError("%r is not a versioned file" % filename)
410
bailout("%r is not a versioned file" % filename)
799
411
else:
800
412
print i
801
413
808
420
hidden = True
809
421
takes_args = ['filename']
810
422
def run(self, filename):
811
b = find_branch(filename)
423
b = Branch(filename)
812
424
inv = b.inventory
813
425
fid = inv.path2id(b.relpath(filename))
814
426
if fid == None:
815
raise BzrError("%r is not a versioned file" % filename)
427
bailout("%r is not a versioned file" % filename)
816
428
for fip in inv.get_idpath(fid):
817
429
print fip
818
430
819
431
820
432
class cmd_revision_history(Command):
821
433
"""Display list of revision ids on this branch."""
822
hidden = True
823
434
def run(self):
824
for patchid in find_branch('.').revision_history():
435
for patchid in Branch('.').revision_history():
825
436
print patchid
826
437
827
438
828
439
class cmd_directories(Command):
829
440
"""Display list of versioned directories in this branch."""
830
441
def run(self):
831
for name, ie in find_branch('.').read_working_inventory().directories():
442
for name, ie in Branch('.').read_working_inventory().directories():
832
443
if name == '':
833
444
print '.'
834
445
else:
849
460
bzr commit -m 'imported project'
850
461
"""
851
462
def run(self):
852
from bzrlib.branch import Branch
853
463
Branch('.', init=True)
854
464
855
465
859
469
If files are listed, only the changes in those files are listed.
860
470
Otherwise, all changes for the tree are listed.
861
471
472
TODO: Given two revision arguments, show the difference between them.
473
862
474
TODO: Allow diff across branches.
863
475
864
476
TODO: Option to use external diff command; could be GNU diff, wdiff,
873
485
deleted files.
874
486
875
487
TODO: This probably handles non-Unix newlines poorly.
876
877
examples:
878
bzr diff
879
bzr diff -r1
880
bzr diff -r1:2
881
488
"""
882
489
883
490
takes_args = ['file*']
884
takes_options = ['revision', 'diff-options']
885
aliases = ['di', 'dif']
491
takes_options = ['revision']
492
aliases = ['di']
886
493
887
def run(self, revision=None, file_list=None, diff_options=None):
494
def run(self, revision=None, file_list=None):
888
495
from bzrlib.diff import show_diff
496
from bzrlib import find_branch
889
497
890
498
if file_list:
891
b = find_branch(file_list[0])
499
b = find_branch(file_list[0], lock_mode='r')
892
500
file_list = [b.relpath(f) for f in file_list]
893
501
if file_list == ['']:
894
502
# just pointing to top-of-tree
895
503
file_list = None
896
504
else:
897
b = find_branch('.')
505
b = Branch('.', lock_mode='r')
506
507
show_diff(b, revision, specific_files=file_list)
898
508
899
if revision is not None:
900
if len(revision) == 1:
901
show_diff(b, revision[0], specific_files=file_list,
902
external_diff_options=diff_options)
903
elif len(revision) == 2:
904
show_diff(b, revision[0], specific_files=file_list,
905
external_diff_options=diff_options,
906
revision2=revision[1])
907
else:
908
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
909
else:
910
show_diff(b, None, specific_files=file_list,
911
external_diff_options=diff_options)
912
509
913
510
914
511
919
516
TODO: Show files deleted since a previous revision, or between two revisions.
920
517
"""
921
518
def run(self, show_ids=False):
922
b = find_branch('.')
519
b = Branch('.')
923
520
old = b.basis_tree()
924
521
new = b.working_tree()
925
522
940
537
"""List files modified in working tree."""
941
538
hidden = True
942
539
def run(self):
943
from bzrlib.delta import compare_trees
944
945
b = find_branch('.')
946
td = compare_trees(b.basis_tree(), b.working_tree())
947
948
for path, id, kind in td.modified:
949
print path
540
import statcache
541
b = Branch('.')
542
inv = b.read_working_inventory()
543
sc = statcache.update_cache(b, inv)
544
basis = b.basis_tree()
545
basis_inv = basis.inventory
546
547
# We used to do this through iter_entries(), but that's slow
548
# when most of the files are unmodified, as is usually the
549
# case. So instead we iterate by inventory entry, and only
550
# calculate paths as necessary.
551
552
for file_id in basis_inv:
553
cacheentry = sc.get(file_id)
554
if not cacheentry: # deleted
555
continue
556
ie = basis_inv[file_id]
557
if cacheentry[statcache.SC_SHA1] != ie.text_sha1:
558
path = inv.id2path(file_id)
559
print path
950
560
951
561
952
562
954
564
"""List files added in working tree."""
955
565
hidden = True
956
566
def run(self):
957
b = find_branch('.')
567
b = Branch('.')
958
568
wt = b.working_tree()
959
569
basis_inv = b.basis_tree().inventory
960
570
inv = wt.inventory
976
586
takes_args = ['filename?']
977
587
def run(self, filename=None):
978
588
"""Print the branch root."""
589
from branch import find_branch
979
590
b = find_branch(filename)
980
591
print getattr(b, 'base', None) or getattr(b, 'baseurl')
981
592
983
594
class cmd_log(Command):
984
595
"""Show log of this branch.
985
596
986
To request a range of logs, you can use the command -r begin:end
987
-r revision requests a specific revision, -r :end or -r begin: are
988
also valid.
989
990
--message allows you to give a regular expression, which will be evaluated
991
so that only matching entries will be displayed.
992
993
TODO: Make --revision support uuid: and hash: [future tag:] notation.
994
597
TODO: Option to limit range.
995
598
"""
996
599
997
600
takes_args = ['filename?']
998
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision',
999
'long', 'message', 'short',]
601
takes_options = ['forward', 'timezone', 'verbose', 'show-ids']
1000
602
1001
603
def run(self, filename=None, timezone='original',
1002
604
verbose=False,
1003
605
show_ids=False,
1004
forward=False,
1005
revision=None,
1006
message=None,
1007
long=False,
1008
short=False):
1009
from bzrlib.branch import find_branch
1010
from bzrlib.log import log_formatter, show_log
1011
import codecs
606
forward=False):
607
from bzrlib import show_log, find_branch
1012
608
1013
609
direction = (forward and 'forward') or 'reverse'
1014
610
1015
611
if filename:
1016
b = find_branch(filename)
612
b = find_branch(filename, lock_mode='r')
1017
613
fp = b.relpath(filename)
1018
614
if fp:
1019
615
file_id = b.read_working_inventory().path2id(fp)
1020
616
else:
1021
617
file_id = None # points to branch root
1022
618
else:
1023
b = find_branch('.')
619
b = find_branch('.', lock_mode='r')
1024
620
file_id = None
1025
621
1026
if revision is None:
1027
rev1 = None
1028
rev2 = None
1029
elif len(revision) == 1:
1030
rev1 = rev2 = b.get_revision_info(revision[0])[0]
1031
elif len(revision) == 2:
1032
rev1 = b.get_revision_info(revision[0])[0]
1033
rev2 = b.get_revision_info(revision[1])[0]
1034
else:
1035
raise BzrCommandError('bzr log --revision takes one or two values.')
1036
1037
if rev1 == 0:
1038
rev1 = None
1039
if rev2 == 0:
1040
rev2 = None
1041
1042
mutter('encoding log as %r' % bzrlib.user_encoding)
1043
1044
# use 'replace' so that we don't abort if trying to write out
1045
# in e.g. the default C locale.
1046
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
1047
1048
if not short:
1049
log_format = 'long'
1050
else:
1051
log_format = 'short'
1052
lf = log_formatter(log_format,
1053
show_ids=show_ids,
1054
to_file=outf,
1055
show_timezone=timezone)
1056
1057
show_log(b,
1058
lf,
1059
file_id,
622
show_log(b, file_id,
623
show_timezone=timezone,
1060
624
verbose=verbose,
1061
direction=direction,
1062
start_revision=rev1,
1063
end_revision=rev2,
1064
search=message)
625
show_ids=show_ids,
626
to_file=sys.stdout,
627
direction=direction)
1065
628
1066
629
1067
630
1072
635
hidden = True
1073
636
takes_args = ["filename"]
1074
637
def run(self, filename):
1075
b = find_branch(filename)
638
b = Branch(filename, lock_mode='r')
1076
639
inv = b.read_working_inventory()
1077
640
file_id = inv.path2id(b.relpath(filename))
1078
641
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1086
649
"""
1087
650
hidden = True
1088
651
def run(self, revision=None, verbose=False):
1089
b = find_branch('.')
652
b = Branch('.')
1090
653
if revision == None:
1091
654
tree = b.working_tree()
1092
655
else:
1108
671
1109
672
1110
673
class cmd_unknowns(Command):
1111
"""List unknown files."""
674
"""List unknown files"""
1112
675
def run(self):
1113
from bzrlib.osutils import quotefn
1114
for f in find_branch('.').unknowns():
676
for f in Branch('.').unknowns():
1115
677
print quotefn(f)
1116
678
1117
679
1118
680
1119
681
class cmd_ignore(Command):
1120
"""Ignore a command or pattern.
682
"""Ignore a command or pattern
1121
683
1122
684
To remove patterns from the ignore list, edit the .bzrignore file.
1123
685
1137
699
1138
700
def run(self, name_pattern):
1139
701
from bzrlib.atomicfile import AtomicFile
1140
import os.path
702
import codecs
1141
703
1142
b = find_branch('.')
704
b = Branch('.')
1143
705
ifn = b.abspath('.bzrignore')
1144
706
1145
707
if os.path.exists(ifn):
1151
713
else:
1152
714
igns = ''
1153
715
1154
# TODO: If the file already uses crlf-style termination, maybe
1155
# we should use that for the newly added lines?
1156
1157
716
if igns and igns[-1] != '\n':
1158
717
igns += '\n'
1159
718
igns += name_pattern + '\n'
1179
738
1180
739
See also: bzr ignore"""
1181
740
def run(self):
1182
tree = find_branch('.').working_tree()
741
tree = Branch('.').working_tree()
1183
742
for path, file_class, kind, file_id in tree.list_files():
1184
743
if file_class != 'I':
1185
744
continue
1203
762
except ValueError:
1204
763
raise BzrCommandError("not a valid revision-number: %r" % revno)
1205
764
1206
print find_branch('.').lookup_revision(revno)
765
print Branch('.').lookup_revision(revno)
1207
766
1208
767
1209
768
class cmd_export(Command):
1210
769
"""Export past revision to destination directory.
1211
770
1212
If no revision is specified this exports the last committed revision.
1213
1214
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1215
given, try to find the format with the extension. If no extension
1216
is found exports to a directory (equivalent to --format=dir).
1217
1218
Root may be the top directory for tar, tgz and tbz2 formats. If none
1219
is given, the top directory will be the root name of the file."""
1220
# TODO: list known exporters
771
If no revision is specified this exports the last committed revision."""
1221
772
takes_args = ['dest']
1222
takes_options = ['revision', 'format', 'root']
1223
def run(self, dest, revision=None, format=None, root=None):
1224
import os.path
1225
b = find_branch('.')
1226
if revision is None:
1227
rev_id = b.last_patch()
773
takes_options = ['revision']
774
def run(self, dest, revision=None):
775
b = Branch('.')
776
if revision == None:
777
rh = b.revision_history()[-1]
1228
778
else:
1229
if len(revision) != 1:
1230
raise BzrError('bzr export --revision takes exactly 1 argument')
1231
revno, rev_id = b.get_revision_info(revision[0])
1232
t = b.revision_tree(rev_id)
1233
root, ext = os.path.splitext(dest)
1234
if not format:
1235
if ext in (".tar",):
1236
format = "tar"
1237
elif ext in (".gz", ".tgz"):
1238
format = "tgz"
1239
elif ext in (".bz2", ".tbz2"):
1240
format = "tbz2"
1241
else:
1242
format = "dir"
1243
t.export(dest, format, root)
779
rh = b.lookup_revision(int(revision))
780
t = b.revision_tree(rh)
781
t.export(dest)
1244
782
1245
783
1246
784
class cmd_cat(Command):
1252
790
def run(self, filename, revision=None):
1253
791
if revision == None:
1254
792
raise BzrCommandError("bzr cat requires a revision number")
1255
elif len(revision) != 1:
1256
raise BzrCommandError("bzr cat --revision takes exactly one number")
1257
b = find_branch('.')
1258
b.print_file(b.relpath(filename), revision[0])
793
b = Branch('.')
794
b.print_file(b.relpath(filename), int(revision))
1259
795
1260
796
1261
797
class cmd_local_time_offset(Command):
1268
804
1269
805
class cmd_commit(Command):
1270
806
"""Commit changes into a new revision.
1271
1272
If no arguments are given, the entire tree is committed.
1273
807
1274
808
If selected files are specified, only changes to those files are
1275
committed. If a directory is specified then the directory and everything
1276
within it is committed.
809
committed. If a directory is specified then its contents are also
810
committed.
1277
811
1278
812
A selected-file commit may fail in some cases where the committed
1279
813
tree would be invalid, such as trying to commit a file in a
1284
818
TODO: Strict commit that fails if there are unknown or deleted files.
1285
819
"""
1286
820
takes_args = ['selected*']
1287
takes_options = ['message', 'file', 'verbose', 'unchanged']
821
takes_options = ['message', 'file', 'verbose']
1288
822
aliases = ['ci', 'checkin']
1289
823
1290
# TODO: Give better message for -s, --summary, used by tla people
1291
1292
def run(self, message=None, file=None, verbose=True, selected_list=None,
1293
unchanged=False):
1294
from bzrlib.errors import PointlessCommit
1295
from bzrlib.osutils import get_text_message
824
def run(self, message=None, file=None, verbose=True, selected_list=None):
825
from bzrlib.commit import commit
1296
826
1297
827
## Warning: shadows builtin file()
1298
828
if not message and not file:
1299
# FIXME: Ugly; change status code to send to a provided function?
1300
1301
import cStringIO
1302
stdout = sys.stdout
1303
catcher = cStringIO.StringIO()
1304
sys.stdout = catcher
1305
cmd_status({"file_list":selected_list}, {})
1306
info = catcher.getvalue()
1307
sys.stdout = stdout
1308
message = get_text_message(info)
1309
1310
if message is None:
1311
raise BzrCommandError("please specify a commit message",
1312
["use either --message or --file"])
829
raise BzrCommandError("please specify a commit message",
830
["use either --message or --file"])
1313
831
elif message and file:
1314
832
raise BzrCommandError("please specify either --message or --file")
1315
833
1317
835
import codecs
1318
836
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1319
837
1320
b = find_branch('.')
1321
if selected_list:
1322
selected_list = [b.relpath(s) for s in selected_list]
1323
1324
try:
1325
b.commit(message, verbose=verbose,
1326
specific_files=selected_list,
1327
allow_pointless=unchanged)
1328
except PointlessCommit:
1329
# FIXME: This should really happen before the file is read in;
1330
# perhaps prepare the commit; get the message; then actually commit
1331
raise BzrCommandError("no changes to commit",
1332
["use --unchanged to commit anyhow"])
838
b = Branch('.')
839
commit(b, message, verbose=verbose, specific_files=selected_list)
1333
840
1334
841
1335
842
class cmd_check(Command):
1337
844
1338
845
This command checks various invariants about the branch storage to
1339
846
detect data corruption or bzr bugs.
1340
1341
If given the --update flag, it will update some optional fields
1342
to help ensure data consistency.
1343
"""
1344
takes_args = ['dir?']
1345
1346
def run(self, dir='.'):
1347
from bzrlib.check import check
1348
1349
check(find_branch(dir))
1350
1351
1352
class cmd_scan_cache(Command):
1353
hidden = True
1354
def run(self):
1355
from bzrlib.hashcache import HashCache
1356
import os
1357
1358
c = HashCache('.')
1359
c.read()
1360
c.scan()
1361
1362
print '%6d stats' % c.stat_count
1363
print '%6d in hashcache' % len(c._cache)
1364
print '%6d files removed from cache' % c.removed_count
1365
print '%6d hashes updated' % c.update_count
1366
print '%6d files changed too recently to cache' % c.danger_count
1367
1368
if c.needs_write:
1369
c.write()
1370
1371
1372
1373
class cmd_upgrade(Command):
1374
"""Upgrade branch storage to current format.
1375
1376
This should normally be used only after the check command tells
1377
you to run it.
1378
"""
1379
takes_args = ['dir?']
1380
1381
def run(self, dir='.'):
1382
from bzrlib.upgrade import upgrade
1383
upgrade(find_branch(dir))
847
"""
848
takes_args = ['dir?']
849
def run(self, dir='.'):
850
import bzrlib.check
851
bzrlib.check.check(Branch(dir))
1384
852
1385
853
1386
854
1389
857
takes_options = ['email']
1390
858
1391
859
def run(self, email=False):
1392
try:
1393
b = bzrlib.branch.find_branch('.')
1394
except:
1395
b = None
1396
1397
860
if email:
1398
print bzrlib.osutils.user_email(b)
861
print bzrlib.osutils.user_email()
1399
862
else:
1400
print bzrlib.osutils.username(b)
863
print bzrlib.osutils.username()
1401
864
1402
865
1403
866
class cmd_selftest(Command):
1404
867
"""Run internal test suite"""
1405
868
hidden = True
1406
takes_options = ['verbose']
1407
def run(self, verbose=False):
1408
import bzrlib.ui
1409
from bzrlib.selftest import selftest
1410
1411
# we don't want progress meters from the tests to go to the
1412
# real output; and we don't want log messages cluttering up
1413
# the real logs.
1414
1415
save_ui = bzrlib.ui.ui_factory
1416
bzrlib.trace.info('running tests...')
1417
bzrlib.trace.disable_default_logging()
1418
try:
1419
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1420
result = selftest(verbose=verbose)
1421
if result:
1422
bzrlib.trace.info('tests passed')
869
def run(self):
870
failures, tests = 0, 0
871
872
import doctest, bzrlib.store
873
bzrlib.trace.verbose = False
874
875
for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
876
bzrlib.tree, bzrlib.commands, bzrlib.add:
877
mf, mt = doctest.testmod(m)
878
failures += mf
879
tests += mt
880
print '%-40s %3d tests' % (m.__name__, mt),
881
if mf:
882
print '%3d FAILED!' % mf
1423
883
else:
1424
bzrlib.trace.info('tests failed')
1425
return int(not result)
1426
finally:
1427
bzrlib.trace.enable_default_logging()
1428
bzrlib.ui.ui_factory = save_ui
884
print
885
886
print '%-40s %3d tests' % ('total', tests),
887
if failures:
888
print '%3d FAILED!' % failures
889
return 1
890
else:
891
print
892
return 0
893
1429
894
1430
895
1431
896
class cmd_version(Command):
1432
"""Show version of bzr."""
897
"""Show version of bzr"""
1433
898
def run(self):
1434
899
show_version()
1435
900
1436
901
def show_version():
1437
902
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1438
# is bzrlib itself in a branch?
1439
bzrrev = bzrlib.get_bzr_revision()
1440
if bzrrev:
1441
print " (bzr checkout, revision %d {%s})" % bzrrev
1442
903
print bzrlib.__copyright__
1443
904
print "http://bazaar-ng.org/"
1444
905
print
1454
915
print "it sure does!"
1455
916
1456
917
def parse_spec(spec):
1457
"""
1458
>>> parse_spec(None)
1459
[None, None]
1460
>>> parse_spec("./")
1461
['./', None]
1462
>>> parse_spec("../@")
1463
['..', -1]
1464
>>> parse_spec("../f/@35")
1465
['../f', 35]
1466
>>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
1467
['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
1468
"""
1469
if spec is None:
1470
return [None, None]
1471
918
if '/@' in spec:
1472
919
parsed = spec.split('/@')
1473
920
assert len(parsed) == 2
1474
921
if parsed[1] == "":
1475
922
parsed[1] = -1
1476
923
else:
1477
try:
1478
parsed[1] = int(parsed[1])
1479
except ValueError:
1480
pass # We can allow stuff like ./@revid:blahblahblah
1481
else:
1482
assert parsed[1] >=0
924
parsed[1] = int(parsed[1])
925
assert parsed[1] >=0
1483
926
else:
1484
927
parsed = [spec, None]
1485
928
return parsed
1486
929
1487
1488
1489
class cmd_find_merge_base(Command):
1490
"""Find and print a base revision for merging two branches.
1491
1492
TODO: Options to specify revisions on either side, as if
1493
merging only part of the history.
1494
"""
1495
takes_args = ['branch', 'other']
1496
hidden = True
1497
1498
def run(self, branch, other):
1499
branch1 = find_branch(branch)
1500
branch2 = find_branch(other)
1501
1502
base_revno, base_revid = branch1.common_ancestor(branch2)
1503
1504
if base_revno is None:
1505
raise bzrlib.errors.UnrelatedBranches()
1506
1507
print 'merge base is revision %s' % base_revid
1508
print ' r%-6d in %s' % (base_revno, branch)
1509
1510
other_revno = branch2.revision_id_to_revno(base_revid)
1511
1512
print ' r%-6d in %s' % (other_revno, other)
1513
1514
1515
1516
930
class cmd_merge(Command):
1517
"""Perform a three-way merge.
1518
1519
The branch is the branch you will merge from. By default, it will merge
1520
the latest revision. If you specify a revision, that revision will be
1521
merged. If you specify two revisions, the first will be used as a BASE,
1522
and the second one as OTHER. Revision numbers are always relative to the
1523
specified branch.
1524
1525
Examples:
1526
1527
To merge the latest revision from bzr.dev
1528
bzr merge ../bzr.dev
1529
1530
To merge changes up to and including revision 82 from bzr.dev
1531
bzr merge -r 82 ../bzr.dev
1532
1533
To merge the changes introduced by 82, without previous changes:
1534
bzr merge -r 81..82 ../bzr.dev
1535
1536
merge refuses to run if there are any uncommitted changes, unless
1537
--force is given.
1538
"""
1539
takes_args = ['branch?']
1540
takes_options = ['revision', 'force', 'merge-type']
1541
1542
def run(self, branch='.', revision=None, force=False,
1543
merge_type=None):
1544
from bzrlib.merge import merge
1545
from bzrlib.merge_core import ApplyMerge3
1546
if merge_type is None:
1547
merge_type = ApplyMerge3
1548
1549
if revision is None or len(revision) < 1:
1550
base = (None, None)
1551
other = (branch, -1)
1552
else:
1553
if len(revision) == 1:
1554
other = (branch, revision[0])
1555
base = (None, None)
1556
else:
1557
assert len(revision) == 2
1558
if None in revision:
1559
raise BzrCommandError(
1560
"Merge doesn't permit that revision specifier.")
1561
base = (branch, revision[0])
1562
other = (branch, revision[1])
1563
1564
merge(other, base, check_clean=(not force), merge_type=merge_type)
1565
1566
1567
class cmd_revert(Command):
1568
"""Reverse all changes since the last commit.
1569
1570
Only versioned files are affected. Specify filenames to revert only
1571
those files. By default, any files that are changed will be backed up
1572
first. Backup files have a '~' appended to their name.
1573
"""
1574
takes_options = ['revision', 'no-backup']
1575
takes_args = ['file*']
1576
aliases = ['merge-revert']
1577
1578
def run(self, revision=None, no_backup=False, file_list=None):
1579
from bzrlib.merge import merge
1580
if file_list is not None:
1581
if len(file_list) == 0:
1582
raise BzrCommandError("No files specified")
1583
if revision is None:
1584
revision = [-1]
1585
elif len(revision) != 1:
1586
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1587
merge(('.', revision[0]), parse_spec('.'),
1588
check_clean=False,
1589
ignore_zero=True,
1590
backup_files=not no_backup,
1591
file_list=file_list)
1592
931
"""Perform a three-way merge of trees."""
932
takes_args = ['other_spec', 'base_spec']
933
934
def run(self, other_spec, base_spec):
935
merge.merge(parse_spec(other_spec), parse_spec(base_spec))
1593
936
1594
937
class cmd_assert_fail(Command):
1595
938
"""Test reporting of assertion failures"""
1602
945
"""Show help on a command or other topic.
1603
946
1604
947
For a list of all available commands, say 'bzr help commands'."""
1605
takes_options = ['long']
1606
948
takes_args = ['topic?']
1607
949
aliases = ['?']
1608
950
1609
def run(self, topic=None, long=False):
951
def run(self, topic=None):
1610
952
import help
1611
if topic is None and long:
1612
topic = "commands"
1613
953
help.help(topic)
1614
954
1615
955
1616
class cmd_shell_complete(Command):
1617
"""Show appropriate completions for context.
1618
1619
For a list of all available commands, say 'bzr shell-complete'."""
1620
takes_args = ['context?']
1621
aliases = ['s-c']
1622
hidden = True
1623
1624
def run(self, context=None):
1625
import shellcomplete
1626
shellcomplete.shellcomplete(context)
1627
1628
1629
class cmd_missing(Command):
1630
"""What is missing in this branch relative to other branch.
1631
"""
1632
takes_args = ['remote?']
1633
aliases = ['mis', 'miss']
1634
# We don't have to add quiet to the list, because
1635
# unknown options are parsed as booleans
1636
takes_options = ['verbose', 'quiet']
1637
1638
def run(self, remote=None, verbose=False, quiet=False):
1639
from bzrlib.branch import find_branch, DivergedBranches
1640
from bzrlib.errors import BzrCommandError
1641
from bzrlib.missing import get_parent, show_missing
1642
1643
if verbose and quiet:
1644
raise BzrCommandError('Cannot pass both quiet and verbose')
1645
1646
b = find_branch('.')
1647
parent = get_parent(b)
1648
if remote is None:
1649
if parent is None:
1650
raise BzrCommandError("No missing location known or specified.")
1651
else:
1652
if not quiet:
1653
print "Using last location: %s" % parent
1654
remote = parent
1655
elif parent is None:
1656
# We only update x-pull if it did not exist, missing should not change the parent
1657
b.controlfile('x-pull', 'wb').write(remote + '\n')
1658
br_remote = find_branch(remote)
1659
1660
return show_missing(b, br_remote, verbose=verbose, quiet=quiet)
1661
1662
1663
1664
class cmd_plugins(Command):
1665
"""List plugins"""
956
class cmd_update_stat_cache(Command):
957
"""Update stat-cache mapping inodes to SHA-1 hashes.
958
959
For testing only."""
1666
960
hidden = True
1667
961
def run(self):
1668
import bzrlib.plugin
1669
from inspect import getdoc
1670
from pprint import pprint
1671
for plugin in bzrlib.plugin.all_plugins:
1672
print plugin.__path__[0]
1673
d = getdoc(plugin)
1674
if d:
1675
print '\t', d.split('\n')[0]
1676
1677
#pprint(bzrlib.plugin.all_plugins)
1678
962
import statcache
963
b = Branch('.')
964
statcache.update_cache(b.base, b.read_working_inventory())
965
966
967
######################################################################
968
# main routine
1679
969
1680
970
1681
971
# list of all available options; the rhs can be either None for an
1683
973
# the type.
1684
974
OPTIONS = {
1685
975
'all': None,
1686
'diff-options': str,
1687
976
'help': None,
1688
977
'file': unicode,
1689
'force': None,
1690
'format': unicode,
1691
978
'forward': None,
1692
979
'message': unicode,
1693
'no-recurse': None,
1694
980
'profile': None,
1695
'revision': _parse_revision_str,
1696
'short': None,
981
'revision': int,
1697
982
'show-ids': None,
1698
983
'timezone': str,
1699
984
'verbose': None,
1700
985
'version': None,
1701
986
'email': None,
1702
'unchanged': None,
1703
'update': None,
1704
'long': None,
1705
'root': str,
1706
'no-backup': None,
1707
'merge-type': get_merge_type,
1708
987
}
1709
988
1710
989
SHORT_OPTIONS = {
990
'm': 'message',
1711
991
'F': 'file',
1712
'h': 'help',
1713
'm': 'message',
1714
992
'r': 'revision',
1715
993
'v': 'verbose',
1716
'l': 'long',
1717
994
}
1718
995
1719
996
1733
1010
(['status'], {'all': True})
1734
1011
>>> parse_args('commit --message=biter'.split())
1735
1012
(['commit'], {'message': u'biter'})
1736
>>> parse_args('log -r 500'.split())
1737
(['log'], {'revision': [500]})
1738
>>> parse_args('log -r500..600'.split())
1739
(['log'], {'revision': [500, 600]})
1740
>>> parse_args('log -vr500..600'.split())
1741
(['log'], {'verbose': True, 'revision': [500, 600]})
1742
>>> parse_args('log -rv500..600'.split()) #the r takes an argument
1743
(['log'], {'revision': ['v500', 600]})
1744
1013
"""
1745
1014
args = []
1746
1015
opts = {}
1760
1029
else:
1761
1030
optname = a[2:]
1762
1031
if optname not in OPTIONS:
1763
raise BzrError('unknown long option %r' % a)
1032
bailout('unknown long option %r' % a)
1764
1033
else:
1765
1034
shortopt = a[1:]
1766
if shortopt in SHORT_OPTIONS:
1767
# Multi-character options must have a space to delimit
1768
# their value
1769
optname = SHORT_OPTIONS[shortopt]
1770
else:
1771
# Single character short options, can be chained,
1772
# and have their value appended to their name
1773
shortopt = a[1:2]
1774
if shortopt not in SHORT_OPTIONS:
1775
# We didn't find the multi-character name, and we
1776
# didn't find the single char name
1777
raise BzrError('unknown short option %r' % a)
1778
optname = SHORT_OPTIONS[shortopt]
1779
1780
if a[2:]:
1781
# There are extra things on this option
1782
# see if it is the value, or if it is another
1783
# short option
1784
optargfn = OPTIONS[optname]
1785
if optargfn is None:
1786
# This option does not take an argument, so the
1787
# next entry is another short option, pack it back
1788
# into the list
1789
argv.insert(0, '-' + a[2:])
1790
else:
1791
# This option takes an argument, so pack it
1792
# into the array
1793
optarg = a[2:]
1035
if shortopt not in SHORT_OPTIONS:
1036
bailout('unknown short option %r' % a)
1037
optname = SHORT_OPTIONS[shortopt]
1794
1038
1795
1039
if optname in opts:
1796
1040
# XXX: Do we ever want to support this, e.g. for -r?
1797
raise BzrError('repeated option %r' % a)
1041
bailout('repeated option %r' % a)
1798
1042
1799
1043
optargfn = OPTIONS[optname]
1800
1044
if optargfn:
1801
1045
if optarg == None:
1802
1046
if not argv:
1803
raise BzrError('option %r needs an argument' % a)
1047
bailout('option %r needs an argument' % a)
1804
1048
else:
1805
1049
optarg = argv.pop(0)
1806
1050
opts[optname] = optargfn(optarg)
1807
1051
else:
1808
1052
if optarg != None:
1809
raise BzrError('option %r takes no argument' % optname)
1053
bailout('option %r takes no argument' % optname)
1810
1054
opts[optname] = True
1811
1055
else:
1812
1056
args.append(a)
1866
1110
1867
1111
This is similar to main(), but without all the trappings for
1868
1112
logging and error handling.
1869
1870
argv
1871
The command-line arguments, without the program name from argv[0]
1872
1873
Returns a command status or raises an exception.
1874
1875
Special master options: these must come before the command because
1876
they control how the command is interpreted.
1877
1878
--no-plugins
1879
Do not load plugin modules at all
1880
1881
--builtin
1882
Only use builtin commands. (Plugins are still allowed to change
1883
other behaviour.)
1884
1885
--profile
1886
Run under the Python profiler.
1887
1113
"""
1888
1889
1114
argv = [a.decode(bzrlib.user_encoding) for a in argv]
1890
1891
opt_profile = opt_no_plugins = opt_builtin = False
1892
1893
# --no-plugins is handled specially at a very early stage. We need
1894
# to load plugins before doing other command parsing so that they
1895
# can override commands, but this needs to happen first.
1896
1897
for a in argv[:]:
1898
if a == '--profile':
1899
opt_profile = True
1900
elif a == '--no-plugins':
1901
opt_no_plugins = True
1902
elif a == '--builtin':
1903
opt_builtin = True
1904
else:
1905
break
1906
argv.remove(a)
1907
1908
if not opt_no_plugins:
1909
from bzrlib.plugin import load_plugins
1910
load_plugins()
1911
1912
args, opts = parse_args(argv)
1913
1914
if 'help' in opts:
1915
from bzrlib.help import help
1916
if args:
1917
help(args[0])
1918
else:
1919
help()
1920
return 0
1921
1922
if 'version' in opts:
1923
show_version()
1924
return 0
1925
1926
if not args:
1927
from bzrlib.help import help
1928
help(None)
1929
return 0
1930
1931
cmd = str(args.pop(0))
1932
1933
canonical_cmd, cmd_class = \
1934
get_cmd_class(cmd, plugins_override=not opt_builtin)
1115
1116
try:
1117
args, opts = parse_args(argv[1:])
1118
if 'help' in opts:
1119
import help
1120
if args:
1121
help.help(args[0])
1122
else:
1123
help.help()
1124
return 0
1125
elif 'version' in opts:
1126
show_version()
1127
return 0
1128
cmd = str(args.pop(0))
1129
except IndexError:
1130
import help
1131
help.help()
1132
return 1
1133
1134
1135
canonical_cmd, cmd_class = get_cmd_class(cmd)
1136
1137
# global option
1138
if 'profile' in opts:
1139
profile = True
1140
del opts['profile']
1141
else:
1142
profile = False
1935
1143
1936
1144
# check options are reasonable
1937
1145
allowed = cmd_class.takes_options
1946
1154
for k, v in opts.items():
1947
1155
cmdopts[k.replace('-', '_')] = v
1948
1156
1949
if opt_profile:
1157
if profile:
1950
1158
import hotshot, tempfile
1951
1159
pffileno, pfname = tempfile.mkstemp()
1952
1160
try:
1971
1179
return cmd_class(cmdopts, cmdargs).status
1972
1180
1973
1181
1182
def _report_exception(summary, quiet=False):
1183
import traceback
1184
log_error('bzr: ' + summary)
1185
bzrlib.trace.log_exception()
1186
1187
if not quiet:
1188
tb = sys.exc_info()[2]
1189
exinfo = traceback.extract_tb(tb)
1190
if exinfo:
1191
sys.stderr.write(' at %s:%d in %s()\n' % exinfo[-1][:3])
1192
sys.stderr.write(' see ~/.bzr.log for debug information\n')
1193
1194
1195
1974
1196
def main(argv):
1975
import bzrlib.ui
1197
import errno
1976
1198
1977
bzrlib.trace.log_startup(argv)
1978
1979
bzrlib.ui.ui_factory = bzrlib.ui.TextUIFactory()
1199
bzrlib.open_tracefile(argv)
1980
1200
1981
1201
try:
1982
1202
try:
1983
return run_bzr(argv[1:])
1984
finally:
1985
# do this here inside the exception wrappers to catch EPIPE
1986
sys.stdout.flush()
1987
except BzrCommandError, e:
1988
# command line syntax error, etc
1989
log_error(str(e))
1990
return 1
1991
except BzrError, e:
1992
bzrlib.trace.log_exception()
1993
return 1
1994
except AssertionError, e:
1995
bzrlib.trace.log_exception('assertion failed: ' + str(e))
1996
return 3
1997
except KeyboardInterrupt, e:
1998
bzrlib.trace.note('interrupted')
1999
return 2
2000
except Exception, e:
2001
import errno
2002
if (isinstance(e, IOError)
2003
and hasattr(e, 'errno')
2004
and e.errno == errno.EPIPE):
2005
bzrlib.trace.note('broken pipe')
2006
return 2
2007
else:
2008
bzrlib.trace.log_exception()
2009
return 2
1203
try:
1204
return run_bzr(argv)
1205
finally:
1206
# do this here inside the exception wrappers to catch EPIPE
1207
sys.stdout.flush()
1208
except BzrError, e:
1209
quiet = isinstance(e, (BzrCommandError))
1210
_report_exception('error: ' + e.args[0], quiet=quiet)
1211
if len(e.args) > 1:
1212
for h in e.args[1]:
1213
# some explanation or hints
1214
log_error(' ' + h)
1215
return 1
1216
except AssertionError, e:
1217
msg = 'assertion failed'
1218
if str(e):
1219
msg += ': ' + str(e)
1220
_report_exception(msg)
1221
return 2
1222
except KeyboardInterrupt, e:
1223
_report_exception('interrupted', quiet=True)
1224
return 2
1225
except Exception, e:
1226
quiet = False
1227
if (isinstance(e, IOError)
1228
and hasattr(e, 'errno')
1229
and e.errno == errno.EPIPE):
1230
quiet = True
1231
msg = 'broken pipe'
1232
else:
1233
msg = str(e).rstrip('\n')
1234
_report_exception(msg, quiet)
1235
return 2
1236
finally:
1237
bzrlib.trace.close_trace()
2010
1238
2011
1239
2012
1240
if __name__ == '__main__':
Loggerhead is a web-based interface for Breezy
Version: 2.0.1