← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisionspec.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revisionspec.py
17
17
 
18
18
import datetime
19
19
import re
 
20
import bisect
20
21
from bzrlib.errors import BzrError, NoSuchRevision, NoCommits
21
22
 
22
23
_marker = []
248
249
SPEC_TYPES.append(RevisionSpec_tag)
249
250
 
250
251
 
 
252
class RevisionSpec_revs:
 
253
    def __init__(self, revs, branch):
 
254
        self.revs = revs
 
255
        self.branch = branch
 
256
    def __getitem__(self, index):
 
257
        r = self.branch.repository.get_revision(self.revs[index])
 
258
        # TODO: Handle timezone.
 
259
        return datetime.datetime.fromtimestamp(r.timestamp)
 
260
    def __len__(self):
 
261
        return len(self.revs)
 
262
 
 
263
 
 
264
class RevisionSpec_revs:
 
265
    def __init__(self, revs, branch):
 
266
        self.revs = revs
 
267
        self.branch = branch
 
268
    def __getitem__(self, index):
 
269
        r = self.branch.repository.get_revision(self.revs[index])
 
270
        # TODO: Handle timezone.
 
271
        return datetime.datetime.fromtimestamp(r.timestamp)
 
272
    def __len__(self):
 
273
        return len(self.revs)
 
274
 
 
275
 
251
276
class RevisionSpec_date(RevisionSpec):
252
277
    prefix = 'date:'
253
278
    _date_re = re.compile(
295
320
 
296
321
            dt = datetime.datetime(year=year, month=month, day=day,
297
322
                    hour=hour, minute=minute, second=second)
298
 
        first = dt
299
 
        for i in range(len(revs)):
300
 
            r = branch.repository.get_revision(revs[i])
301
 
            # TODO: Handle timezone.
302
 
            dt = datetime.datetime.fromtimestamp(r.timestamp)
303
 
            if first <= dt:
304
 
                return RevisionInfo(branch, i+1)
305
 
        return RevisionInfo(branch, None)
 
323
        branch.lock_read()
 
324
        try:
 
325
            rev = bisect.bisect(RevisionSpec_revs(revs, branch), dt)
 
326
        finally:
 
327
            branch.unlock()
 
328
        if rev == len(revs):
 
329
            return RevisionInfo(branch, None)
 
330
        else:
 
331
            return RevisionInfo(branch, rev + 1)
306
332
 
307
333
SPEC_TYPES.append(RevisionSpec_date)
308
334