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