1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
|
#! /usr/bin/python
# Copyright (C) 2004, 2005 by Martin Pool
# Copyright (C) 2005 by Canonical Ltd
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Bazaar-NG -- a free distributed version-control tool
**WARNING: THIS IS AN UNSTABLE DEVELOPMENT VERSION**
Current limitation include:
* Metadata format is not stable yet -- you may need to
discard history in the future.
* No handling of subdirectories, symlinks or any non-text files.
* Insufficient error handling.
* Many commands unimplemented or partially implemented.
* Space-inefficient storage.
* No merge operators yet.
Interesting commands::
bzr help
Show summary help screen
bzr version
Show software version/licence/non-warranty.
bzr init
Start versioning the current directory
bzr add FILE...
Make files versioned.
bzr log
Show revision history.
bzr diff
Show changes from last revision to working copy.
bzr commit -m 'MESSAGE'
Store current state as new revision.
bzr export REVNO DESTINATION
Export the branch state at a previous version.
bzr status
Show summary of pending changes.
bzr remove FILE...
Make a file not versioned.
"""
# not currently working:
# bzr check
# Run internal consistency checks.
# bzr info
# Show some information about this branch.
__copyright__ = "Copyright 2005 Canonical Development Ltd."
__author__ = "Martin Pool <mbp@canonical.com>"
__docformat__ = "restructuredtext en"
__version__ = '0.0.0'
import sys, os, random, time, sha, sets, types, re, shutil, tempfile
import traceback, socket, fnmatch, difflib
from os import path
from sets import Set
from pprint import pprint
from stat import *
from glob import glob
import bzrlib
from bzrlib.store import ImmutableStore
from bzrlib.trace import mutter, note, log_error
from bzrlib.errors import bailout, BzrError
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
from bzrlib.tree import RevisionTree, EmptyTree, WorkingTree, Tree
from bzrlib.revision import Revision
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
format_date
BZR_DIFF_FORMAT = "## Bazaar-NG diff, format 0 ##\n"
BZR_PATCHNAME_FORMAT = 'cset:sha1:%s'
## standard representation
NONE_STRING = '(none)'
EMPTY = 'empty'
## TODO: Perhaps a different version of inventory commands that
## returns iterators...
## TODO: Perhaps an AtomicFile class that writes to a temporary file and then renames.
## TODO: Some kind of locking on branches. Perhaps there should be a
## parameter to the branch object saying whether we want a read or
## write lock; release it from destructor. Perhaps don't even need a
## read lock to look at immutable objects?
## TODO: Perhaps make UUIDs predictable in test mode to make it easier
## to compare output?
######################################################################
# check status
def cmd_status(all=False):
"""Display status summary.
For each file there is a single line giving its file state and name.
The name is that in the current revision unless it is deleted or
missing, in which case the old name is shown.
:todo: Don't show unchanged files unless ``--all`` is given?
"""
Branch('.').show_status(show_all=all)
######################################################################
# examining history
def cmd_get_revision(revision_id):
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
def cmd_get_inventory(inventory_id):
"""Return inventory in XML by hash"""
Branch('.').get_inventory(inventory_hash).write_xml(sys.stdout)
def cmd_get_revision_inventory(revision_id):
"""Output inventory for a revision."""
b = Branch('.')
b.get_revision_inventory(revision_id).write_xml(sys.stdout)
def cmd_get_file_text(text_id):
"""Get contents of a file by hash."""
sf = Branch('.').text_store[text_id]
pumpfile(sf, sys.stdout)
######################################################################
# commands
def cmd_revno():
"""Show number of revisions on this branch"""
print Branch('.').revno()
def cmd_add(file_list, verbose=False):
"""Add specified files.
Fails if the files are already added.
"""
Branch('.').add(file_list, verbose=verbose)
def cmd_inventory(revision=None):
"""Show inventory of the current working copy."""
## TODO: Also optionally show a previous inventory
## TODO: Format options
b = Branch('.')
if revision == None:
inv = b.read_working_inventory()
else:
inv = b.get_revision_inventory(b.lookup_revision(revision))
for path, entry in inv.iter_entries():
print '%-50s %s' % (entry.file_id, path)
def cmd_info():
b = Branch('.')
print 'branch format:', b.controlfile('branch-format', 'r').readline().rstrip('\n')
def plural(n, base='', pl=None):
if n == 1:
return base
elif pl is not None:
return pl
else:
return 's'
count_version_dirs = 0
count_status = {'A': 0, 'D': 0, 'M': 0, 'R': 0, '?': 0, 'I': 0, '.': 0}
for st_tup in bzrlib.diff_trees(b.basis_tree(), b.working_tree()):
fs = st_tup[0]
count_status[fs] += 1
if fs not in ['I', '?'] and st_tup[4] == 'directory':
count_version_dirs += 1
print
print 'in the working tree:'
for name, fs in (('unchanged', '.'),
('modified', 'M'), ('added', 'A'), ('removed', 'D'),
('renamed', 'R'), ('unknown', '?'), ('ignored', 'I'),
):
print ' %5d %s' % (count_status[fs], name)
print ' %5d versioned subdirector%s' % (count_version_dirs,
plural(count_version_dirs, 'y', 'ies'))
print
print 'branch history:'
history = b.revision_history()
revno = len(history)
print ' %5d revision%s' % (revno, plural(revno))
committers = Set()
for rev in history:
committers.add(b.get_revision(rev).committer)
print ' %5d committer%s' % (len(committers), plural(len(committers)))
if revno > 0:
firstrev = b.get_revision(history[0])
age = int((time.time() - firstrev.timestamp) / 3600 / 24)
print ' %5d day%s old' % (age, plural(age))
print ' first revision: %s' % format_date(firstrev.timestamp,
firstrev.timezone)
lastrev = b.get_revision(history[-1])
print ' latest revision: %s' % format_date(lastrev.timestamp,
lastrev.timezone)
def cmd_remove(file_list, verbose=False):
Branch('.').remove(file_list, verbose=verbose)
def cmd_file_id(filename):
i = Branch('.').read_working_inventory().path2id(filename)
if i is None:
bailout("%s is not a versioned file" % filename)
else:
print i
def cmd_find_filename(fileid):
n = find_filename(fileid)
if n is None:
bailout("%s is not a live file id" % fileid)
else:
print n
def cmd_revision_history():
for patchid in Branch('.').revision_history():
print patchid
def cmd_init():
# TODO: Check we're not already in a working directory? At the
# moment you'll get an ugly error.
# TODO: What if we're in a subdirectory of a branch? Would like
# to allow that, but then the parent may need to understand that
# the children have disappeared, or should they be versioned in
# both?
# TODO: Take an argument/option for branch name.
Branch('.', init=True)
def cmd_diff(revision=None):
"""Show diff from basis to working copy.
:todo: Take one or two revision arguments, look up those trees,
and diff them.
:todo: Allow diff across branches.
:todo: Mangle filenames in diff to be more relevant.
:todo: Shouldn't be in the cmd function.
"""
b = Branch('.')
if revision == None:
old_tree = b.basis_tree()
else:
old_tree = b.revision_tree(b.lookup_revision(revision))
new_tree = b.working_tree()
old_inv = old_tree.inventory
new_inv = new_tree.inventory
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
old_label = ''
new_label = ''
DEVNULL = '/dev/null'
# Windows users, don't panic about this filename -- it is a
# special signal to GNU patch that the file should be created or
# deleted respectively.
# TODO: Generation of pseudo-diffs for added/deleted files could
# be usefully made into a much faster special case.
# TODO: Better to return them in sorted order I think.
for file_state, fid, old_name, new_name, kind in bzrlib.diff_trees(old_tree, new_tree):
d = None
# Don't show this by default; maybe do it if an option is passed
# idlabel = ' {%s}' % fid
idlabel = ''
# FIXME: Something about the diff format makes patch unhappy
# with newly-added files.
def diffit(*a, **kw):
sys.stdout.writelines(difflib.unified_diff(*a, **kw))
print
if file_state in ['.', '?', 'I']:
continue
elif file_state == 'A':
print '*** added %s %r' % (kind, new_name)
if kind == 'file':
diffit([],
new_tree.get_file(fid).readlines(),
fromfile=DEVNULL,
tofile=new_label + new_name + idlabel)
elif file_state == 'D':
assert isinstance(old_name, types.StringTypes)
print '*** deleted %s %r' % (kind, old_name)
if kind == 'file':
diffit(old_tree.get_file(fid).readlines(), [],
fromfile=old_label + old_name + idlabel,
tofile=DEVNULL)
elif file_state in ['M', 'R']:
if file_state == 'M':
assert kind == 'file'
assert old_name == new_name
print '*** modified %s %r' % (kind, new_name)
elif file_state == 'R':
print '*** renamed %s %r => %r' % (kind, old_name, new_name)
if kind == 'file':
diffit(old_tree.get_file(fid).readlines(),
new_tree.get_file(fid).readlines(),
fromfile=old_label + old_name + idlabel,
tofile=new_label + new_name)
else:
bailout("can't represent state %s {%s}" % (file_state, fid))
def cmd_log(timezone='original'):
"""Show log of this branch.
:todo: Options for utc; to show ids; to limit range; etc.
"""
Branch('.').write_log(show_timezone=timezone)
def cmd_ls(revision=None, verbose=False):
"""List files in a tree.
:todo: Take a revision or remote path and list that tree instead.
"""
b = Branch('.')
if revision == None:
tree = b.working_tree()
else:
tree = b.revision_tree(b.lookup_revision(revision))
for fp, fc, kind, fid in tree.list_files():
if verbose:
if kind == 'directory':
kindch = '/'
elif kind == 'file':
kindch = ''
else:
kindch = '???'
print '%-8s %s%s' % (fc, fp, kindch)
else:
print fp
def cmd_unknowns():
"""List unknown files"""
for f in Branch('.').unknowns():
print quotefn(f)
def cmd_lookup_revision(revno):
try:
revno = int(revno)
except ValueError:
bailout("usage: lookup-revision REVNO",
["REVNO is a non-negative revision number for this branch"])
print Branch('.').lookup_revision(revno) or NONE_STRING
def cmd_export(revno, dest):
"""Export past revision to destination directory."""
b = Branch('.')
rh = b.lookup_revision(int(revno))
t = b.revision_tree(rh)
t.export(dest)
######################################################################
# internal/test commands
def cmd_uuid():
"""Print a newly-generated UUID."""
print uuid()
def cmd_local_time_offset():
print bzrlib.osutils.local_time_offset()
def cmd_commit(message, verbose=False):
Branch('.').commit(message, verbose=verbose)
def cmd_check():
"""Check consistency of the branch."""
check()
def cmd_is(pred, *rest):
"""Test whether PREDICATE is true."""
try:
cmd_handler = globals()['assert_' + pred.replace('-', '_')]
except KeyError:
bailout("unknown predicate: %s" % quotefn(pred))
try:
cmd_handler(*rest)
except BzrCheckError:
# by default we don't print the message so that this can
# be used from shell scripts without producing noise
sys.exit(1)
def cmd_username():
print bzrlib.osutils.username()
def cmd_user_email():
print bzrlib.osutils.user_email()
def cmd_gen_revision_id():
import time
print bzrlib.branch._gen_revision_id(time.time())
def cmd_doctest():
"""Run internal doctest suite"""
## -v, if present, is seen by doctest; the argument is just here
## so our parser doesn't complain
## TODO: --verbose option
import bzr, doctest, bzrlib.store
bzrlib.trace.verbose = False
doctest.testmod(bzr)
doctest.testmod(bzrlib.store)
doctest.testmod(bzrlib.inventory)
doctest.testmod(bzrlib.branch)
doctest.testmod(bzrlib.osutils)
doctest.testmod(bzrlib.tree)
# more strenuous tests;
import bzrlib.tests
doctest.testmod(bzrlib.tests)
######################################################################
# help
def cmd_help():
# TODO: Specific help for particular commands
print __doc__
def cmd_version():
print "bzr (bazaar-ng) %s" % __version__
print __copyright__
print "http://bazaar-ng.org/"
print
print \
"""bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and
you may use, modify and redistribute it under the terms of the GNU
General Public License version 2 or later."""
def cmd_rocks():
"""Statement of optimism."""
print "it sure does!"
######################################################################
# main routine
# list of all available options; the rhs can be either None for an
# option that takes no argument, or a constructor function that checks
# the type.
OPTIONS = {
'all': None,
'help': None,
'message': unicode,
'revision': int,
'show-ids': None,
'timezone': str,
'verbose': None,
'version': None,
}
SHORT_OPTIONS = {
'm': 'message',
'r': 'revision',
'v': 'verbose',
}
# List of options that apply to particular commands; commands not
# listed take none.
cmd_options = {
'add': ['verbose'],
'commit': ['message', 'verbose'],
'diff': ['revision'],
'inventory': ['revision'],
'log': ['show-ids', 'timezone'],
'ls': ['revision', 'verbose'],
'remove': ['verbose'],
'status': ['all'],
}
cmd_args = {
'init': [],
'add': ['file+'],
'commit': [],
'diff': [],
'file-id': ['filename'],
'get-file-text': ['text_id'],
'get-inventory': ['inventory_id'],
'get-revision': ['revision_id'],
'get-revision-inventory': ['revision_id'],
'log': [],
'lookup-revision': ['revno'],
'export': ['revno', 'dest'],
'remove': ['file+'],
'status': [],
}
def parse_args(argv):
"""Parse command line.
Arguments and options are parsed at this level before being passed
down to specific command handlers. This routine knows, from a
lookup table, something about the available options, what optargs
they take, and which commands will accept them.
>>> parse_args('bzr --help'.split())
([], {'help': True})
>>> parse_args('bzr --version'.split())
([], {'version': True})
>>> parse_args('bzr status --all'.split())
(['status'], {'all': True})
>>> parse_args('bzr commit --message=biter'.split())
(['commit'], {'message': u'biter'})
"""
args = []
opts = {}
# TODO: Maybe handle '--' to end options?
while argv:
a = argv.pop(0)
if a[0] == '-':
optarg = None
if a[1] == '-':
mutter(" got option %r" % a)
if '=' in a:
optname, optarg = a[2:].split('=', 1)
else:
optname = a[2:]
if optname not in OPTIONS:
bailout('unknown long option %r' % a)
else:
shortopt = a[1:]
if shortopt not in SHORT_OPTIONS:
bailout('unknown short option %r' % a)
optname = SHORT_OPTIONS[shortopt]
if optname in opts:
# XXX: Do we ever want to support this, e.g. for -r?
bailout('repeated option %r' % a)
optargfn = OPTIONS[optname]
if optargfn:
if optarg == None:
if not argv:
bailout('option %r needs an argument' % a)
else:
optarg = argv.pop(0)
opts[optname] = optargfn(optarg)
mutter(" option argument %r" % opts[optname])
else:
if optarg != None:
bailout('option %r takes no argument' % optname)
opts[optname] = True
else:
args.append(a)
return args, opts
def _match_args(cmd, args):
"""Check non-option arguments match required pattern.
>>> _match_args('status', ['asdasdsadasd'])
Traceback (most recent call last):
...
BzrError: ("extra arguments to command status: ['asdasdsadasd']", [])
>>> _match_args('add', ['asdasdsadasd'])
{'file_list': ['asdasdsadasd']}
>>> _match_args('add', 'abc def gj'.split())
{'file_list': ['abc', 'def', 'gj']}
"""
# match argument pattern
argform = cmd_args.get(cmd, [])
argdict = {}
# TODO: Need a way to express 'cp SRC... DEST', where it matches
# all but one.
for ap in argform:
argname = ap[:-1]
if ap[-1] == '?':
assert 0
elif ap[-1] == '*':
assert 0
elif ap[-1] == '+':
if not args:
bailout("command %r needs one or more %s"
% (cmd, argname.upper()))
else:
argdict[argname + '_list'] = args[:]
args = []
else:
# just a plain arg
argname = ap
if not args:
bailout("command %r requires argument %s"
% (cmd, argname.upper()))
else:
argdict[argname] = args.pop(0)
if args:
bailout("extra arguments to command %s: %r"
% (cmd, args))
return argdict
def run_bzr(argv):
"""Execute a command.
This is similar to main(), but without all the trappings for
logging and error handling.
"""
try:
args, opts = parse_args(argv[1:])
if 'help' in opts:
# TODO: pass down other arguments in case they asked for
# help on a command name?
cmd_help()
return 0
elif 'version' in opts:
cmd_version()
return 0
cmd = args.pop(0)
except IndexError:
log_error('usage: bzr COMMAND\n')
log_error(' try "bzr help"\n')
return 1
try:
cmd_handler = globals()['cmd_' + cmd.replace('-', '_')]
except KeyError:
bailout("unknown command " + `cmd`)
# TODO: special --profile option to turn on the Python profiler
# check options are reasonable
allowed = cmd_options.get(cmd, [])
for oname in opts:
if oname not in allowed:
bailout("option %r is not allowed for command %r"
% (oname, cmd))
cmdargs = _match_args(cmd, args)
cmdargs.update(opts)
ret = cmd_handler(**cmdargs) or 0
def main(argv):
## TODO: Handle command-line options; probably know what options are valid for
## each command
## TODO: If the arguments are wrong, give a usage message rather
## than just a backtrace.
try:
t = bzrlib.trace._tracefile
t.write('-' * 60 + '\n')
t.write('bzr invoked at %s\n' % format_date(time.time()))
t.write(' by %s on %s\n' % (bzrlib.osutils.username(), socket.gethostname()))
t.write(' arguments: %r\n' % argv)
starttime = os.times()[4]
import platform
t.write(' platform: %s\n' % platform.platform())
t.write(' python: %s\n' % platform.python_version())
ret = run_bzr(argv)
times = os.times()
mutter("finished, %.3fu/%.3fs cpu, %.3fu/%.3fs cum"
% times[:4])
mutter(" %.3f elapsed" % (times[4] - starttime))
return ret
except BzrError, e:
log_error('bzr: error: ' + e.args[0] + '\n')
if len(e.args) > 1:
for h in e.args[1]:
log_error(' ' + h + '\n')
return 1
except Exception, e:
log_error('bzr: exception: %s\n' % e)
log_error(' see .bzr.log for details\n')
traceback.print_exc(None, bzrlib.trace._tracefile)
traceback.print_exc(None, sys.stderr)
return 1
# TODO: Maybe nicer handling of IOError?
if __name__ == '__main__':
sys.exit(main(sys.argv))
##import profile
##profile.run('main(sys.argv)')
|