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
|
#!/usr/bin/env python
"""\
Common entries, like strings, etc, for the changeset reading + writing code.
"""
header_str = 'Bazaar-NG (bzr) changeset v'
version = (0, 0, 5)
def get_header():
return [
header_str + '.'.join([str(v) for v in version]),
'This changeset can be applied with bzr apply-changeset',
''
]
def canonicalize_revision(branch, revnos):
"""Turn some sort of revision information into a single
set of from-to revision ids.
A revision id can be None if there is no associated revison.
:param revnos: A list of revisions to lookup, should be at most 2 long
:return: (old, new)
"""
# If only 1 entry is given, then we assume we want just the
# changeset between that entry and it's base (we assume parents[0])
if len(revnos) == 0:
revnos = [None, None]
elif len(revnos) == 1:
revnos = [None, revnos[0]]
if revnos[1] is None:
new = branch.last_patch()
else:
new = branch.lookup_revision(revnos[1])
if revnos[0] is None:
old = branch.get_revision(new).parents[0].revision_id
else:
old = branch.lookup_revision(revnos[0])
return old, new
class ChangesetTree(object):
"""This class is designed to take a base tree, and re-create
a final tree based on the information contained within a
changeset.
"""
def __init__(self, branch, changeset_info):
"""Initialize this ChangesetTree.
:param branch: This is where information will be acquired
and updated.
:param changeset_info: Information about a given changeset,
so that we can identify the base,
and other information.
"""
self.branch = branch
self.changeset_info = changeset_info
self._build_tree()
def _build_tree(self):
"""Build the final description of the tree, based on
the changeset_info object.
"""
self.base_tree = self.branch.revision_tree(self.changeset_info.base)
def format_highres_date(t, offset=0):
"""Format a date, such that it includes higher precision in the
seconds field.
:param t: The local time in fractional seconds since the epoch
:type t: float
:param offset: The timezone offset in integer seconds
:type offset: int
Example: format_highres_date(time.time(), -time.timezone)
this will return a date stamp for right now,
formatted for the local timezone.
>>> from bzrlib.osutils import format_date
>>> format_date(1120153132.350850105, 0)
'Thu 2005-06-30 17:38:52 +0000'
>>> format_highres_date(1120153132.350850105, 0)
'Thu 2005-06-30 17:38:52.350850105 +0000'
>>> format_date(1120153132.350850105, -5*3600)
'Thu 2005-06-30 12:38:52 -0500'
>>> format_highres_date(1120153132.350850105, -5*3600)
'Thu 2005-06-30 12:38:52.350850105 -0500'
>>> format_highres_date(1120153132.350850105, 7200)
'Thu 2005-06-30 19:38:52.350850105 +0200'
"""
import time
assert isinstance(t, float)
# This has to be formatted for "original" date, so that the
# revision XML entry will be reproduced faithfully.
if offset == None:
offset = 0
tt = time.gmtime(t + offset)
return (time.strftime("%a %Y-%m-%d %H:%M:%S", tt)
+ ('%.9f' % (t - int(t)))[1:] # Get the high-res seconds, but ignore the 0
+ ' %+03d%02d' % (offset / 3600, (offset / 60) % 60))
def unpack_highres_date(date):
"""This takes the high-resolution date stamp, and
converts it back into the tuple (timestamp, timezone)
Where timestamp is in real seconds, and timezone is an integer
number of seconds offset.
:param date: A date formated by format_highres_date
:type date: string
>>> import time, random
>>> unpack_highres_date('Thu 2005-06-30 12:38:52.350850105 -0500')
(1120153132.3508501, -18000)
>>> unpack_highres_date('Thu 2005-06-30 17:38:52.350850105 +0000')
(1120153132.3508501, 0)
>>> unpack_highres_date('Thu 2005-06-30 19:38:52.350850105 +0200')
(1120153132.3508501, 7200)
>>> from bzrlib.osutils import local_time_offset
>>> t = time.time()
>>> o = local_time_offset()
>>> t2, o2 = unpack_highres_date(format_highres_date(t, o))
>>> t == t2
True
>>> o == o2
True
>>> for count in xrange(500):
... t += random.random()*24*3600*365*2 - 24*3600*364 # Random time within +/- 1 year
... o = random.randint(-12,12)*3600 # Random timezone
... date = format_highres_date(t, o)
... t2, o2 = unpack_highres_date(date)
... if t != t2 or o != o2:
... print 'Failed on date %r, %s,%s diff:%s' % (date, t, o, t2-t)
"""
#from bzrlib.errors import BzrError
from bzrlib.osutils import local_time_offset
import time
# Up until the first period is a datestamp that is generated
# as normal from time.strftime, so use time.strptime to
# parse it
dot_loc = date.find('.')
if dot_loc == -1:
raise ValueError('Date string does not contain high-precision seconds: %r' % date)
base_time = time.strptime(date[:dot_loc], "%a %Y-%m-%d %H:%M:%S")
fract_seconds, offset = date[dot_loc:].split()
fract_seconds = float(fract_seconds)
offset = int(offset)
offset = int(offset / 100) * 3600 + offset % 100
# mktime returns the a local timestamp, not the timestamp based
# on the offset given in the file, so we need to adjust based
# on what the local offset is, and then re-adjust based on
# offset read
timestamp = time.mktime(base_time)
timestamp += local_time_offset(timestamp) - offset
# Add back in the fractional seconds
timestamp += fract_seconds
return (timestamp, offset)
if __name__ == '__main__':
import doctest
doctest.testmod()
|