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
|
# 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
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>]
"""
# 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:
next_prefix = None
for x in revstr.split('..'):
if not x:
revs.append(RevisionSpec(None))
elif x[-1] == ':':
# looks like a namespace:.. has happened
next_prefix = x + '..'
else:
if next_prefix is not None:
x = next_prefix + x
revs.append(RevisionSpec(x))
next_prefix = None
if next_prefix is not None:
revs.append(RevisionSpec(next_prefix))
return revs
def _parse_merge_type(typestring):
return bzrlib.commands.get_merge_type(typestring)
class Option(object):
OPTIONS = {}
SHORT_OPTIONS = {}
def __init__(self, name, help='help string', type=None):
# need to add some description of the parameters here
self.name = name
self.help = help
self.type = type
def _global_option(name, **kwargs):
"""Register o as a global option."""
Option.OPTIONS[name] = Option(name, **kwargs)
_global_option('all', type=None)
_global_option('basis', type=str)
_global_option('diff-options', type=str)
_global_option('help', type=None)
_global_option('file', type=unicode)
_global_option('force', type=None)
_global_option('format', type=unicode)
_global_option('forward', type=None)
_global_option('message', type=unicode)
_global_option('no-recurse', type=None)
_global_option('profile', type=None)
_global_option('revision', type=_parse_revision_str)
_global_option('short', type=None)
_global_option('show-ids', type=None)
_global_option('timezone', type=str)
_global_option('verbose', type=None)
_global_option('version', type=None)
_global_option('email', type=None)
_global_option('unchanged', type=None)
_global_option('update', type=None)
_global_option('long', type=None)
_global_option('root', type=str)
_global_option('no-backup', type=None)
_global_option('merge-type', type=_parse_merge_type)
_global_option('pattern', type=str)
_global_option('quiet', type=None)
_global_option('remember', type=None)
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']
|