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
|
# Copyright (C) 2004, 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
import re
import bzrlib.commands
from bzrlib.trace import warning, mutter
from bzrlib.revisionspec import RevisionSpec
from bzrlib.errors import BzrCommandError
def _parse_revision_str(revstr):
"""This handles a revision string -> revno.
This always returns a list. The list will have one element for
each revision specifier supplied.
>>> _parse_revision_str('234')
[<RevisionSpec_int 234>]
>>> _parse_revision_str('234..567')
[<RevisionSpec_int 234>, <RevisionSpec_int 567>]
>>> _parse_revision_str('..')
[<RevisionSpec None>, <RevisionSpec None>]
>>> _parse_revision_str('..234')
[<RevisionSpec None>, <RevisionSpec_int 234>]
>>> _parse_revision_str('234..')
[<RevisionSpec_int 234>, <RevisionSpec None>]
>>> _parse_revision_str('234..456..789') # Maybe this should be an error
[<RevisionSpec_int 234>, <RevisionSpec_int 456>, <RevisionSpec_int 789>]
>>> _parse_revision_str('234....789') #Error ?
[<RevisionSpec_int 234>, <RevisionSpec None>, <RevisionSpec_int 789>]
>>> _parse_revision_str('revid:test@other.com-234234')
[<RevisionSpec_revid revid:test@other.com-234234>]
>>> _parse_revision_str('revid:test@other.com-234234..revid:test@other.com-234235')
[<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_revid revid:test@other.com-234235>]
>>> _parse_revision_str('revid:test@other.com-234234..23')
[<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_int 23>]
>>> _parse_revision_str('date:2005-04-12')
[<RevisionSpec_date date:2005-04-12>]
>>> _parse_revision_str('date:2005-04-12 12:24:33')
[<RevisionSpec_date date:2005-04-12 12:24:33>]
>>> _parse_revision_str('date:2005-04-12T12:24:33')
[<RevisionSpec_date date:2005-04-12T12:24:33>]
>>> _parse_revision_str('date:2005-04-12,12:24:33')
[<RevisionSpec_date date:2005-04-12,12:24:33>]
>>> _parse_revision_str('-5..23')
[<RevisionSpec_int -5>, <RevisionSpec_int 23>]
>>> _parse_revision_str('-5')
[<RevisionSpec_int -5>]
>>> _parse_revision_str('123a')
Traceback (most recent call last):
...
BzrError: No namespace registered for string: '123a'
>>> _parse_revision_str('abc')
Traceback (most recent call last):
...
BzrError: No namespace registered for string: 'abc'
>>> _parse_revision_str('branch:../branch2')
[<RevisionSpec_branch branch:../branch2>]
>>> _parse_revision_str('branch:../../branch2')
[<RevisionSpec_branch branch:../../branch2>]
>>> _parse_revision_str('branch:../../branch2..23')
[<RevisionSpec_branch branch:../../branch2>, <RevisionSpec_int 23>]
"""
# TODO: Maybe move this into revisionspec.py
old_format_re = re.compile('\d*:\d*')
m = old_format_re.match(revstr)
revs = []
if m:
warning('Colon separator for revision numbers is deprecated.'
' Use .. instead')
for rev in revstr.split(':'):
if rev:
revs.append(RevisionSpec(int(rev)))
else:
revs.append(RevisionSpec(None))
else:
sep = re.compile("\\.\\.(?!/)")
for x in sep.split(revstr):
revs.append(RevisionSpec(x or None))
return revs
def _parse_merge_type(typestring):
return get_merge_type(typestring)
def get_merge_type(typestring):
"""Attempt to find the merge class/factory associated with a string."""
from merge import merge_types
try:
return merge_types[typestring][0]
except KeyError:
templ = '%s%%7s: %%s' % (' '*12)
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
type_list = '\n'.join(lines)
msg = "No known merge type %s. Supported types are:\n%s" %\
(typestring, type_list)
raise BzrCommandError(msg)
class Option(object):
"""Description of a command line option"""
# TODO: Some way to show in help a description of the option argument
OPTIONS = {}
SHORT_OPTIONS = {}
def __init__(self, name, help='', type=None, argname=None):
"""Make a new command option.
name -- regular name of the command, used in the double-dash
form and also as the parameter to the command's run()
method.
help -- help message displayed in command help
type -- function called to parse the option argument, or
None (default) if this option doesn't take an argument.
argname -- name of option argument, if any
"""
# TODO: perhaps a subclass that automatically does
# --option, --no-option for reversable booleans
self.name = name
self.help = help
self.type = type
if type is None:
assert argname is None
elif argname is None:
argname = 'ARG'
self.argname = argname
def short_name(self):
"""Return the single character option for this command, if any.
Short options are globally registered.
"""
for short, option in Option.SHORT_OPTIONS.iteritems():
if option is self:
return short
def _global_option(name, **kwargs):
"""Register o as a global option."""
Option.OPTIONS[name] = Option(name, **kwargs)
_global_option('all')
_global_option('overwrite', help='Ignore differences between branches and '
'overwrite unconditionally')
_global_option('basis', type=str)
_global_option('diff-options', type=str)
_global_option('help',
help='show help message')
_global_option('file', type=unicode)
_global_option('force')
_global_option('format', type=unicode)
_global_option('forward')
_global_option('message', type=unicode)
_global_option('no-recurse')
_global_option('profile',
help='show performance profiling information')
_global_option('revision', type=_parse_revision_str)
_global_option('short')
_global_option('show-ids',
help='show internal object ids')
_global_option('timezone',
type=str,
help='display timezone as local, original, or utc')
_global_option('verbose',
help='display more information')
_global_option('version')
_global_option('email')
_global_option('update')
_global_option('log-format', type=str, help="Use this log format")
_global_option('long', help='Use detailed log format. Same as --log-format long')
_global_option('short', help='Use moderately short log format. Same as --log-format short')
_global_option('line', help='Use log format with one line per revision. Same as --log-format line')
_global_option('root', type=str)
_global_option('no-backup')
_global_option('merge-type', type=_parse_merge_type)
_global_option('pattern', type=str)
_global_option('quiet')
_global_option('remember', help='Remember the specified location as a'
' default.')
_global_option('reprocess', help='Reprocess to reduce spurious conflicts')
_global_option('kind', type=str)
_global_option('dry-run',
help="show what would be done, but don't actually do anything")
def _global_short(short_name, long_name):
assert short_name not in Option.SHORT_OPTIONS
Option.SHORT_OPTIONS[short_name] = Option.OPTIONS[long_name]
Option.SHORT_OPTIONS['F'] = Option.OPTIONS['file']
Option.SHORT_OPTIONS['h'] = Option.OPTIONS['help']
Option.SHORT_OPTIONS['m'] = Option.OPTIONS['message']
Option.SHORT_OPTIONS['r'] = Option.OPTIONS['revision']
Option.SHORT_OPTIONS['v'] = Option.OPTIONS['verbose']
Option.SHORT_OPTIONS['l'] = Option.OPTIONS['long']
Option.SHORT_OPTIONS['q'] = Option.OPTIONS['quiet']
|