/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/revisionspec.py

  • Committer: Jan Balster
  • Date: 2006-08-15 12:39:42 UTC
  • mfrom: (1923 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1928.
  • Revision ID: jan@merlinux.de-20060815123942-22c388c6e9a8ac91
merge bzr.dev 1923

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
149
149
            raise NoSuchRevision(branch, str(self.spec))
150
150
 
151
151
    def in_history(self, branch):
152
 
        revs = branch.revision_history()
 
152
        if branch:
 
153
            revs = branch.revision_history()
 
154
        else:
 
155
            revs = None
153
156
        return self._match_on_and_check(branch, revs)
154
157
 
155
158
        # FIXME: in_history is somewhat broken,
167
170
        return '<%s %s%s>' % (self.__class__.__name__,
168
171
                              self.prefix or '',
169
172
                              self.spec)
 
173
    
 
174
    def needs_branch(self):
 
175
        """Whether this revision spec needs a branch.
170
176
 
 
177
        Set this to False the branch argument of _match_on is not used.
 
178
        """
 
179
        return True
171
180
 
172
181
# private API
173
182
 
190
199
 
191
200
    def _match_on(self, branch, revs):
192
201
        """Lookup a revision by revision number"""
193
 
        try:
194
 
            return RevisionInfo(branch, int(self.spec))
195
 
        except ValueError:
196
 
            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
197
220
 
198
221
SPEC_TYPES.append(RevisionSpec_revno)
199
222
 
278
301
          at a specified time).
279
302
 
280
303
          So the proper way of saying 'give me all entries for today' is:
281
 
              -r date:today..date:tomorrow
 
304
              -r date:yesterday..date:today
282
305
        """
283
306
        today = datetime.datetime.fromordinal(datetime.date.today().toordinal())
284
307
        if self.spec.lower() == 'yesterday':