← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisionspec.py

  • Committer: Alexander Belchenko
  • Date: 2006-07-30 07:23:36 UTC
  • mto: (1711.2.111 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1906.
  • Revision ID: bialix@ukr.net-20060730072336-3e9fd7ddb67b5f47
More branding: bazaar-ng -> Bazaar; bazaar-ng.org -> bazaar-vcs.org

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revisionspec.py
1
1
# Copyright (C) 2005 Canonical Ltd
2
 
 
 
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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 = []
148
149
            raise NoSuchRevision(branch, str(self.spec))
149
150
 
150
151
    def in_history(self, branch):
151
 
        revs = branch.revision_history()
 
152
        if branch:
 
153
            revs = branch.revision_history()
 
154
        else:
 
155
            revs = None
152
156
        return self._match_on_and_check(branch, revs)
153
157
 
154
158
        # FIXME: in_history is somewhat broken,
166
170
        return '<%s %s%s>' % (self.__class__.__name__,
167
171
                              self.prefix or '',
168
172
                              self.spec)
 
173
    
 
174
    def needs_branch(self):
 
175
        """Whether this revision spec needs a branch.
169
176
 
 
177
        Set this to False the branch argument of _match_on is not used.
 
178
        """
 
179
        return True
170
180
 
171
181
# private API
172
182
 
189
199
 
190
200
    def _match_on(self, branch, revs):
191
201
        """Lookup a revision by revision number"""
192
 
        try:
193
 
            return RevisionInfo(branch, int(self.spec))
194
 
        except ValueError:
195
 
            return RevisionInfo(branch, None)
 
202
        if self.spec.find(':') == -1:
 
203
            try:
 
204
                return RevisionInfo(branch, int(self.spec))
 
205
            except ValueError:
 
206
                return RevisionInfo(branch, None)
 
207
        else:
 
208
            from branch import Branch
 
209
            revname = self.spec[self.spec.find(':')+1:]
 
210
            other_branch = Branch.open_containing(revname)[0]
 
211
            try:
 
212
                revno = int(self.spec[:self.spec.find(':')])
 
213
            except ValueError:
 
214
                return RevisionInfo(other_branch, None)
 
215
            revid = other_branch.get_rev_id(revno)
 
216
            return RevisionInfo(other_branch, revno)
 
217
        
 
218
    def needs_branch(self):
 
219
        return self.spec.find(':') == -1
196
220
 
197
221
SPEC_TYPES.append(RevisionSpec_revno)
198
222
 
248
272
SPEC_TYPES.append(RevisionSpec_tag)
249
273
 
250
274
 
 
275
class RevisionSpec_revs:
 
276
    def __init__(self, revs, branch):
 
277
        self.revs = revs
 
278
        self.branch = branch
 
279
    def __getitem__(self, index):
 
280
        r = self.branch.repository.get_revision(self.revs[index])
 
281
        # TODO: Handle timezone.
 
282
        return datetime.datetime.fromtimestamp(r.timestamp)
 
283
    def __len__(self):
 
284
        return len(self.revs)
 
285
 
 
286
 
251
287
class RevisionSpec_date(RevisionSpec):
252
288
    prefix = 'date:'
253
289
    _date_re = re.compile(
265
301
          at a specified time).
266
302
 
267
303
          So the proper way of saying 'give me all entries for today' is:
268
 
              -r date:today..date:tomorrow
 
304
              -r date:yesterday..date:today
269
305
        """
270
306
        today = datetime.datetime.fromordinal(datetime.date.today().toordinal())
271
307
        if self.spec.lower() == 'yesterday':
295
331
 
296
332
            dt = datetime.datetime(year=year, month=month, day=day,
297
333
                    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)
 
334
        branch.lock_read()
 
335
        try:
 
336
            rev = bisect.bisect(RevisionSpec_revs(revs, branch), dt)
 
337
        finally:
 
338
            branch.unlock()
 
339
        if rev == len(revs):
 
340
            return RevisionInfo(branch, None)
 
341
        else:
 
342
            return RevisionInfo(branch, rev + 1)
306
343
 
307
344
SPEC_TYPES.append(RevisionSpec_date)
308
345
 
339
376
 
340
377
    def _match_on(self, branch, revs):
341
378
        from branch import Branch
342
 
        from fetch import greedy_fetch
343
379
        other_branch = Branch.open_containing(self.spec)[0]
344
380
        revision_b = other_branch.last_revision()
345
381
        if revision_b is None:
346
382
            raise NoCommits(other_branch)
347
383
        # pull in the remote revisions so we can diff
348
 
        greedy_fetch(branch, other_branch, revision=revision_b)
 
384
        branch.fetch(other_branch, revision_b)
349
385
        try:
350
386
            revno = branch.revision_id_to_revno(revision_b)
351
387
        except NoSuchRevision: