« back to all changes in this revision
Viewing changes to bzrlib/branch.py
- browse files at revision 1052
- compare with another revision
- download diff
- download tarball
- view history from revision 1052
- Committer: Martin Pool
- Date: 2005-08-12 15:24:19 UTC
- Revision ID: mbp@sourcefrog.net-20050812152419-8f65f048a739f44d
- add revert command to tutorial
- files added:
- plugins/changeset
- files removed:
- Makefile
- bzrlib/util
- files renamed:
- bzrlib/util/effbot/ => effbot/
- bzrlib/util/elementtree/ => elementtree/
- bzrlib/plugins/ => plugins/
- bzrlib/util/urlgrabber/ => urlgrabber/
- files modified:
- .bzrignore
added
removed
bzrlib/branch.py
23
23
from bzrlib.osutils import isdir, quotefn, compact_date, rand_bytes, \
24
24
splitpath, \
25
25
sha_file, appendpath, file_kind
26
27
from bzrlib.errors import BzrError, InvalidRevisionNumber, InvalidRevisionId, \
28
DivergedBranches, NotBranchError
26
from bzrlib.errors import BzrError, InvalidRevisionNumber, InvalidRevisionId
27
import bzrlib.errors
29
28
from bzrlib.textui import show_status
30
29
from bzrlib.revision import Revision
30
from bzrlib.xml import unpack_xml
31
31
from bzrlib.delta import compare_trees
32
32
from bzrlib.tree import EmptyTree, RevisionTree
33
import bzrlib.xml
34
import bzrlib.ui
35
36
37
33
38
34
BZR_BRANCH_FORMAT = "Bazaar-NG branch, format 0.0.4\n"
39
35
## TODO: Maybe include checks for common corruption of newlines, etc?
40
36
43
39
# repeatedly to calculate deltas. We could perhaps have a weakref
44
40
# cache in memory to make this faster.
45
41
46
# TODO: please move the revision-string syntax stuff out of the branch
47
# object; it's clutter
48
49
42
50
43
def find_branch(f, **args):
51
44
if f and (f.startswith('http://') or f.startswith('https://')):
52
from bzrlib.remotebranch import RemoteBranch
53
return RemoteBranch(f, **args)
45
import remotebranch
46
return remotebranch.RemoteBranch(f, **args)
54
47
else:
55
return LocalBranch(f, **args)
48
return Branch(f, **args)
56
49
57
50
58
51
def find_cached_branch(f, cache_root, **args):
59
from bzrlib.remotebranch import RemoteBranch
52
from remotebranch import RemoteBranch
60
53
br = find_branch(f, **args)
61
54
def cacheify(br, store_name):
62
from bzrlib.meta_store import CachedStore
55
from meta_store import CachedStore
63
56
cache_path = os.path.join(cache_root, store_name)
64
57
os.mkdir(cache_path)
65
58
new_store = CachedStore(getattr(br, store_name), cache_path)
94
87
if tail:
95
88
s.insert(0, tail)
96
89
else:
90
from errors import NotBranchError
97
91
raise NotBranchError("path %r is not within branch %r" % (rp, base))
98
92
99
93
return os.sep.join(s)
107
101
It is not necessary that f exists.
108
102
109
103
Basically we keep looking up until we find the control directory or
110
run into the root. If there isn't one, raises NotBranchError.
111
"""
104
run into the root."""
112
105
if f == None:
113
106
f = os.getcwd()
114
107
elif hasattr(os.path, 'realpath'):
127
120
head, tail = os.path.split(f)
128
121
if head == f:
129
122
# reached the root, whatever that may be
130
raise NotBranchError('%s is not in a branch' % orig_f)
123
raise BzrError('%r is not in a branch' % orig_f)
131
124
f = head
132
133
125
126
class DivergedBranches(Exception):
127
def __init__(self, branch1, branch2):
128
self.branch1 = branch1
129
self.branch2 = branch2
130
Exception.__init__(self, "These branches have diverged.")
134
131
135
132
136
133
######################################################################
140
137
"""Branch holding a history of revisions.
141
138
142
139
base
143
Base directory/url of the branch.
144
"""
145
base = None
146
147
def __new__(cls, *a, **kw):
148
"""this is temporary, till we get rid of all code that does
149
b = Branch()
150
"""
151
# XXX: AAARGH! MY EYES! UUUUGLY!!!
152
if cls == Branch:
153
cls = LocalBranch
154
b = object.__new__(cls)
155
return b
156
157
158
class LocalBranch(Branch):
159
"""A branch stored in the actual filesystem.
160
161
Note that it's "local" in the context of the filesystem; it doesn't
162
really matter if it's on an nfs/smb/afs/coda/... share, as long as
163
it's writable, and can be accessed via the normal filesystem API.
140
Base directory of the branch.
164
141
165
142
_lock_mode
166
143
None, or 'r' or 'w'
172
149
_lock
173
150
Lock object from bzrlib.lock.
174
151
"""
175
# We actually expect this class to be somewhat short-lived; part of its
176
# purpose is to try to isolate what bits of the branch logic are tied to
177
# filesystem access, so that in a later step, we can extricate them to
178
# a separarte ("storage") class.
152
base = None
179
153
_lock_mode = None
180
154
_lock_count = None
181
155
_lock = None
156
157
# Map some sort of prefix into a namespace
158
# stuff like "revno:10", "revid:", etc.
159
# This should match a prefix with a function which accepts
160
REVISION_NAMESPACES = {}
182
161
183
162
def __init__(self, base, init=False, find_root=True):
184
163
"""Create new branch object at a particular location.
204
183
else:
205
184
self.base = os.path.realpath(base)
206
185
if not isdir(self.controlfilename('.')):
186
from errors import NotBranchError
207
187
raise NotBranchError("not a bzr branch: %s" % quotefn(base),
208
188
['use "bzr init" to initialize a new working tree',
209
189
'current bzr can only operate from top-of-tree'])
223
203
224
204
def __del__(self):
225
205
if self._lock_mode or self._lock:
226
from bzrlib.warnings import warn
206
from warnings import warn
227
207
warn("branch %r was not explicitly unlocked" % self)
228
208
self._lock.unlock()
229
209
230
210
211
231
212
def lock_write(self):
232
213
if self._lock_mode:
233
214
if self._lock_mode != 'w':
234
from bzrlib.errors import LockError
215
from errors import LockError
235
216
raise LockError("can't upgrade to a write lock from %r" %
236
217
self._lock_mode)
237
218
self._lock_count += 1
243
224
self._lock_count = 1
244
225
245
226
227
246
228
def lock_read(self):
247
229
if self._lock_mode:
248
230
assert self._lock_mode in ('r', 'w'), \
255
237
self._lock_mode = 'r'
256
238
self._lock_count = 1
257
239
240
241
258
242
def unlock(self):
259
243
if not self._lock_mode:
260
from bzrlib.errors import LockError
244
from errors import LockError
261
245
raise LockError('branch %r is not locked' % (self))
262
246
263
247
if self._lock_count > 1:
267
251
self._lock = None
268
252
self._lock_mode = self._lock_count = None
269
253
254
270
255
def abspath(self, name):
271
256
"""Return absolute filename for something in the branch"""
272
257
return os.path.join(self.base, name)
273
258
259
274
260
def relpath(self, path):
275
261
"""Return path relative to this branch of something inside it.
276
262
277
263
Raises an error if path is not in this branch."""
278
264
return _relpath(self.base, path)
279
265
266
280
267
def controlfilename(self, file_or_path):
281
268
"""Return location relative to branch."""
282
269
if isinstance(file_or_path, basestring):
309
296
else:
310
297
raise BzrError("invalid controlfile mode %r" % mode)
311
298
299
300
312
301
def _make_control(self):
313
302
from bzrlib.inventory import Inventory
303
from bzrlib.xml import pack_xml
314
304
315
305
os.mkdir(self.controlfilename([]))
316
306
self.controlfile('README', 'w').write(
329
319
# if we want per-tree root ids then this is the place to set
330
320
# them; they're not needed for now and so ommitted for
331
321
# simplicity.
332
f = self.controlfile('inventory','w')
333
bzrlib.xml.serializer_v4.write_inventory(Inventory(), f)
322
pack_xml(Inventory(), self.controlfile('inventory','w'))
334
323
335
324
336
325
def _check_format(self):
345
334
# on Windows from Linux and so on. I think it might be better
346
335
# to always make all internal files in unix format.
347
336
fmt = self.controlfile('branch-format', 'r').read()
348
fmt = fmt.replace('\r\n', '\n')
337
fmt.replace('\r\n', '')
349
338
if fmt != BZR_BRANCH_FORMAT:
350
339
raise BzrError('sorry, branch format %r not supported' % fmt,
351
340
['use a different bzr version',
371
360
def read_working_inventory(self):
372
361
"""Read the working inventory."""
373
362
from bzrlib.inventory import Inventory
363
from bzrlib.xml import unpack_xml
364
from time import time
365
before = time()
374
366
self.lock_read()
375
367
try:
376
368
# ElementTree does its own conversion from UTF-8, so open in
377
369
# binary.
378
f = self.controlfile('inventory', 'rb')
379
return bzrlib.xml.serializer_v4.read_inventory(f)
370
inv = unpack_xml(Inventory,
371
self.controlfile('inventory', 'rb'))
372
mutter("loaded inventory of %d items in %f"
373
% (len(inv), time() - before))
374
return inv
380
375
finally:
381
376
self.unlock()
382
377
388
383
will be committed to the next revision.
389
384
"""
390
385
from bzrlib.atomicfile import AtomicFile
386
from bzrlib.xml import pack_xml
391
387
392
388
self.lock_write()
393
389
try:
394
390
f = AtomicFile(self.controlfilename('inventory'), 'wb')
395
391
try:
396
bzrlib.xml.serializer_v4.write_inventory(inv, f)
392
pack_xml(inv, f)
397
393
f.commit()
398
394
finally:
399
395
f.close()
407
403
"""Inventory for the working copy.""")
408
404
409
405
410
def add(self, files, ids=None):
406
def add(self, files, verbose=False, ids=None):
411
407
"""Make files versioned.
412
408
413
Note that the command line normally calls smart_add instead,
414
which can automatically recurse.
409
Note that the command line normally calls smart_add instead.
415
410
416
411
This puts the files in the Added state, so that they will be
417
412
recorded by the next commit.
427
422
TODO: Perhaps have an option to add the ids even if the files do
428
423
not (yet) exist.
429
424
430
TODO: Perhaps yield the ids and paths as they're added.
425
TODO: Perhaps return the ids of the files? But then again it
426
is easy to retrieve them if they're needed.
427
428
TODO: Adding a directory should optionally recurse down and
429
add all non-ignored children. Perhaps do that in a
430
higher-level method.
431
431
"""
432
432
# TODO: Re-adding a file that is removed in the working copy
433
433
# should probably put it back with the previous ID.
469
469
file_id = gen_file_id(f)
470
470
inv.add_path(f, kind=kind, file_id=file_id)
471
471
472
if verbose:
473
print 'added', quotefn(f)
474
472
475
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
473
476
474
477
self._write_inventory(inv)
480
483
"""Print `file` to stdout."""
481
484
self.lock_read()
482
485
try:
483
tree = self.revision_tree(self.get_rev_id(revno))
486
tree = self.revision_tree(self.lookup_revision(revno))
484
487
# use inventory as it was in that revision
485
488
file_id = tree.inventory.path2id(file)
486
489
if not file_id:
584
587
f.close()
585
588
586
589
587
def get_revision_xml_file(self, revision_id):
590
def get_revision_xml(self, revision_id):
588
591
"""Return XML file object for revision object."""
589
592
if not revision_id or not isinstance(revision_id, basestring):
590
593
raise InvalidRevisionId(revision_id)
599
602
self.unlock()
600
603
601
604
602
#deprecated
603
get_revision_xml = get_revision_xml_file
604
605
606
605
def get_revision(self, revision_id):
607
606
"""Return the Revision object for a named revision"""
608
xml_file = self.get_revision_xml_file(revision_id)
607
xml_file = self.get_revision_xml(revision_id)
609
608
610
609
try:
611
r = bzrlib.xml.serializer_v4.read_revision(xml_file)
610
r = unpack_xml(Revision, xml_file)
612
611
except SyntaxError, e:
613
612
raise bzrlib.errors.BzrError('failed to unpack revision_xml',
614
613
[revision_id,
659
658
parameter which can be either an integer revno or a
660
659
string hash."""
661
660
from bzrlib.inventory import Inventory
662
663
f = self.get_inventory_xml_file(inventory_id)
664
return bzrlib.xml.serializer_v4.read_inventory(f)
665
666
667
def get_inventory_xml(self, inventory_id):
668
"""Get inventory XML as a file object."""
669
return self.inventory_store[inventory_id]
670
671
get_inventory_xml_file = get_inventory_xml
661
from bzrlib.xml import unpack_xml
662
663
return unpack_xml(Inventory, self.inventory_store[inventory_id])
672
664
673
665
674
666
def get_inventory_sha1(self, inventory_id):
675
667
"""Return the sha1 hash of the inventory entry
676
668
"""
677
return sha_file(self.get_inventory_xml(inventory_id))
669
return sha_file(self.inventory_store[inventory_id])
678
670
679
671
680
672
def get_revision_inventory(self, revision_id):
704
696
705
697
def common_ancestor(self, other, self_revno=None, other_revno=None):
706
698
"""
707
>>> from bzrlib.commit import commit
699
>>> import commit
708
700
>>> sb = ScratchBranch(files=['foo', 'foo~'])
709
701
>>> sb.common_ancestor(sb) == (None, None)
710
702
True
711
>>> commit(sb, "Committing first revision", verbose=False)
703
>>> commit.commit(sb, "Committing first revision", verbose=False)
712
704
>>> sb.common_ancestor(sb)[0]
713
705
1
714
706
>>> clone = sb.clone()
715
>>> commit(sb, "Committing second revision", verbose=False)
707
>>> commit.commit(sb, "Committing second revision", verbose=False)
716
708
>>> sb.common_ancestor(sb)[0]
717
709
2
718
710
>>> sb.common_ancestor(clone)[0]
719
711
1
720
>>> commit(clone, "Committing divergent second revision",
712
>>> commit.commit(clone, "Committing divergent second revision",
721
713
... verbose=False)
722
714
>>> sb.common_ancestor(clone)[0]
723
715
1
766
758
return None
767
759
768
760
769
def missing_revisions(self, other, stop_revision=None, diverged_ok=False):
761
def missing_revisions(self, other, stop_revision=None):
770
762
"""
771
763
If self and other have not diverged, return a list of the revisions
772
764
present in other, but missing from self.
805
797
if stop_revision is None:
806
798
stop_revision = other_len
807
799
elif stop_revision > other_len:
808
raise bzrlib.errors.NoSuchRevision(self, stop_revision)
800
raise NoSuchRevision(self, stop_revision)
809
801
810
802
return other_history[self_len:stop_revision]
811
803
812
804
813
805
def update_revisions(self, other, stop_revision=None):
814
806
"""Pull in all new revisions from other branch.
807
808
>>> from bzrlib.commit import commit
809
>>> bzrlib.trace.silent = True
810
>>> br1 = ScratchBranch(files=['foo', 'bar'])
811
>>> br1.add('foo')
812
>>> br1.add('bar')
813
>>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
814
>>> br2 = ScratchBranch()
815
>>> br2.update_revisions(br1)
816
Added 2 texts.
817
Added 1 inventories.
818
Added 1 revisions.
819
>>> br2.revision_history()
820
[u'REVISION-ID-1']
821
>>> br2.update_revisions(br1)
822
Added 0 texts.
823
Added 0 inventories.
824
Added 0 revisions.
825
>>> br1.text_store.total_size() == br2.text_store.total_size()
826
True
815
827
"""
816
from bzrlib.fetch import greedy_fetch
817
818
pb = bzrlib.ui.ui_factory.progress_bar()
828
from bzrlib.progress import ProgressBar
829
830
pb = ProgressBar()
831
819
832
pb.update('comparing histories')
820
821
833
revision_ids = self.missing_revisions(other, stop_revision)
822
834
823
if len(revision_ids) > 0:
824
count = greedy_fetch(self, other, revision_ids[-1], pb)[0]
825
else:
826
count = 0
827
self.append_revision(*revision_ids)
828
## note("Added %d revisions." % count)
829
pb.clear()
830
831
def install_revisions(self, other, revision_ids, pb):
832
835
if hasattr(other.revision_store, "prefetch"):
833
836
other.revision_store.prefetch(revision_ids)
834
837
if hasattr(other.inventory_store, "prefetch"):
835
838
inventory_ids = [other.get_revision(r).inventory_id
836
839
for r in revision_ids]
837
840
other.inventory_store.prefetch(inventory_ids)
838
839
if pb is None:
840
pb = bzrlib.ui.ui_factory.progress_bar()
841
841
842
842
revisions = []
843
843
needed_texts = set()
844
844
i = 0
845
846
failures = set()
847
for i, rev_id in enumerate(revision_ids):
848
pb.update('fetching revision', i+1, len(revision_ids))
849
try:
850
rev = other.get_revision(rev_id)
851
except bzrlib.errors.NoSuchRevision:
852
failures.add(rev_id)
853
continue
854
845
for rev_id in revision_ids:
846
i += 1
847
pb.update('fetching revision', i, len(revision_ids))
848
rev = other.get_revision(rev_id)
855
849
revisions.append(rev)
856
850
inv = other.get_inventory(str(rev.inventory_id))
857
851
for key, entry in inv.iter_entries():
862
856
863
857
pb.clear()
864
858
865
count, cp_fail = self.text_store.copy_multi(other.text_store,
866
needed_texts)
867
#print "Added %d texts." % count
859
count = self.text_store.copy_multi(other.text_store, needed_texts)
860
print "Added %d texts." % count
868
861
inventory_ids = [ f.inventory_id for f in revisions ]
869
count, cp_fail = self.inventory_store.copy_multi(other.inventory_store,
870
inventory_ids)
871
#print "Added %d inventories." % count
862
count = self.inventory_store.copy_multi(other.inventory_store,
863
inventory_ids)
864
print "Added %d inventories." % count
872
865
revision_ids = [ f.revision_id for f in revisions]
873
874
count, cp_fail = self.revision_store.copy_multi(other.revision_store,
875
revision_ids,
876
permit_failure=True)
877
assert len(cp_fail) == 0
878
return count, failures
879
880
866
count = self.revision_store.copy_multi(other.revision_store,
867
revision_ids)
868
for revision_id in revision_ids:
869
self.append_revision(revision_id)
870
print "Added %d revisions." % count
871
872
881
873
def commit(self, *args, **kw):
882
874
from bzrlib.commit import commit
883
875
commit(self, *args, **kw)
884
876
885
877
886
878
def lookup_revision(self, revision):
887
"""Return the revision identifier for a given revision specifier."""
888
# XXX: I'm not sure this method belongs here; I'd rather have the
889
# revision spec stuff be an UI thing, and branch blissfully unaware
890
# of it.
891
# Also, I'm not entirely happy with this method returning None
892
# when the revision doesn't exist.
893
# But I'm keeping the contract I found, because this seems to be
894
# used in a lot of places - and when I do change these, I'd rather
895
# figure out case-by-case which ones actually want to care about
896
# revision specs (eg, they are UI-level) and which ones should trust
897
# that they have a revno/revid.
898
# -- lalo@exoweb.net, 2005-09-07
899
from bzrlib.errors import NoSuchRevision
900
from bzrlib.revisionspec import RevisionSpec
901
try:
902
spec = RevisionSpec(self, revision)
903
except NoSuchRevision:
904
return None
905
return spec.rev_id
906
907
908
def revision_id_to_revno(self, revision_id):
909
"""Given a revision id, return its revno"""
910
history = self.revision_history()
911
try:
912
return history.index(revision_id) + 1
913
except ValueError:
914
raise bzrlib.errors.NoSuchRevision(self, revision_id)
915
916
917
def get_rev_id(self, revno, history=None):
918
"""Find the revision id of the specified revno."""
919
if revno == 0:
920
return None
921
if history is None:
922
history = self.revision_history()
923
elif revno <= 0 or revno > len(history):
924
raise bzrlib.errors.NoSuchRevision(self, revno)
925
return history[revno - 1]
879
"""Return the revision identifier for a given revision information."""
880
revno, info = self.get_revision_info(revision)
881
return info
882
883
def get_revision_info(self, revision):
884
"""Return (revno, revision id) for revision identifier.
885
886
revision can be an integer, in which case it is assumed to be revno (though
887
this will translate negative values into positive ones)
888
revision can also be a string, in which case it is parsed for something like
889
'date:' or 'revid:' etc.
890
"""
891
if revision is None:
892
return 0, None
893
revno = None
894
try:# Convert to int if possible
895
revision = int(revision)
896
except ValueError:
897
pass
898
revs = self.revision_history()
899
if isinstance(revision, int):
900
if revision == 0:
901
return 0, None
902
# Mabye we should do this first, but we don't need it if revision == 0
903
if revision < 0:
904
revno = len(revs) + revision + 1
905
else:
906
revno = revision
907
elif isinstance(revision, basestring):
908
for prefix, func in Branch.REVISION_NAMESPACES.iteritems():
909
if revision.startswith(prefix):
910
revno = func(self, revs, revision)
911
break
912
else:
913
raise BzrError('No namespace registered for string: %r' % revision)
914
915
if revno is None or revno <= 0 or revno > len(revs):
916
raise BzrError("no such revision %s" % revision)
917
return revno, revs[revno-1]
918
919
def _namespace_revno(self, revs, revision):
920
"""Lookup a revision by revision number"""
921
assert revision.startswith('revno:')
922
try:
923
return int(revision[6:])
924
except ValueError:
925
return None
926
REVISION_NAMESPACES['revno:'] = _namespace_revno
927
928
def _namespace_revid(self, revs, revision):
929
assert revision.startswith('revid:')
930
try:
931
return revs.index(revision[6:]) + 1
932
except ValueError:
933
return None
934
REVISION_NAMESPACES['revid:'] = _namespace_revid
935
936
def _namespace_last(self, revs, revision):
937
assert revision.startswith('last:')
938
try:
939
offset = int(revision[5:])
940
except ValueError:
941
return None
942
else:
943
if offset <= 0:
944
raise BzrError('You must supply a positive value for --revision last:XXX')
945
return len(revs) - offset + 1
946
REVISION_NAMESPACES['last:'] = _namespace_last
947
948
def _namespace_tag(self, revs, revision):
949
assert revision.startswith('tag:')
950
raise BzrError('tag: namespace registered, but not implemented.')
951
REVISION_NAMESPACES['tag:'] = _namespace_tag
952
953
def _namespace_date(self, revs, revision):
954
assert revision.startswith('date:')
955
import datetime
956
# Spec for date revisions:
957
# date:value
958
# value can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
959
# it can also start with a '+/-/='. '+' says match the first
960
# entry after the given date. '-' is match the first entry before the date
961
# '=' is match the first entry after, but still on the given date.
962
#
963
# +2005-05-12 says find the first matching entry after May 12th, 2005 at 0:00
964
# -2005-05-12 says find the first matching entry before May 12th, 2005 at 0:00
965
# =2005-05-12 says find the first match after May 12th, 2005 at 0:00 but before
966
# May 13th, 2005 at 0:00
967
#
968
# So the proper way of saying 'give me all entries for today' is:
969
# -r {date:+today}:{date:-tomorrow}
970
# The default is '=' when not supplied
971
val = revision[5:]
972
match_style = '='
973
if val[:1] in ('+', '-', '='):
974
match_style = val[:1]
975
val = val[1:]
976
977
today = datetime.datetime.today().replace(hour=0,minute=0,second=0,microsecond=0)
978
if val.lower() == 'yesterday':
979
dt = today - datetime.timedelta(days=1)
980
elif val.lower() == 'today':
981
dt = today
982
elif val.lower() == 'tomorrow':
983
dt = today + datetime.timedelta(days=1)
984
else:
985
import re
986
# This should be done outside the function to avoid recompiling it.
987
_date_re = re.compile(
988
r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'
989
r'(,|T)?\s*'
990
r'(?P<time>(?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d))?)?'
991
)
992
m = _date_re.match(val)
993
if not m or (not m.group('date') and not m.group('time')):
994
raise BzrError('Invalid revision date %r' % revision)
995
996
if m.group('date'):
997
year, month, day = int(m.group('year')), int(m.group('month')), int(m.group('day'))
998
else:
999
year, month, day = today.year, today.month, today.day
1000
if m.group('time'):
1001
hour = int(m.group('hour'))
1002
minute = int(m.group('minute'))
1003
if m.group('second'):
1004
second = int(m.group('second'))
1005
else:
1006
second = 0
1007
else:
1008
hour, minute, second = 0,0,0
1009
1010
dt = datetime.datetime(year=year, month=month, day=day,
1011
hour=hour, minute=minute, second=second)
1012
first = dt
1013
last = None
1014
reversed = False
1015
if match_style == '-':
1016
reversed = True
1017
elif match_style == '=':
1018
last = dt + datetime.timedelta(days=1)
1019
1020
if reversed:
1021
for i in range(len(revs)-1, -1, -1):
1022
r = self.get_revision(revs[i])
1023
# TODO: Handle timezone.
1024
dt = datetime.datetime.fromtimestamp(r.timestamp)
1025
if first >= dt and (last is None or dt >= last):
1026
return i+1
1027
else:
1028
for i in range(len(revs)):
1029
r = self.get_revision(revs[i])
1030
# TODO: Handle timezone.
1031
dt = datetime.datetime.fromtimestamp(r.timestamp)
1032
if first <= dt and (last is None or dt <= last):
1033
return i+1
1034
REVISION_NAMESPACES['date:'] = _namespace_date
926
1035
927
1036
def revision_tree(self, revision_id):
928
1037
"""Return Tree for a revision on this branch.
940
1049
941
1050
def working_tree(self):
942
1051
"""Return a `Tree` for the working copy."""
943
from bzrlib.workingtree import WorkingTree
1052
from workingtree import WorkingTree
944
1053
return WorkingTree(self.base, self.read_working_inventory())
945
1054
946
1055
992
1101
993
1102
inv.rename(file_id, to_dir_id, to_tail)
994
1103
1104
print "%s => %s" % (from_rel, to_rel)
1105
995
1106
from_abs = self.abspath(from_rel)
996
1107
to_abs = self.abspath(to_rel)
997
1108
try:
1016
1127
1017
1128
Note that to_name is only the last component of the new name;
1018
1129
this doesn't change the directory.
1019
1020
This returns a list of (from_path, to_path) pairs for each
1021
entry that is moved.
1022
1130
"""
1023
result = []
1024
1131
self.lock_write()
1025
1132
try:
1026
1133
## TODO: Option to move IDs only
1061
1168
for f in from_paths:
1062
1169
name_tail = splitpath(f)[-1]
1063
1170
dest_path = appendpath(to_name, name_tail)
1064
result.append((f, dest_path))
1171
print "%s => %s" % (f, dest_path)
1065
1172
inv.rename(inv.path2id(f), to_dir_id, name_tail)
1066
1173
try:
1067
1174
os.rename(self.abspath(f), self.abspath(dest_path))
1073
1180
finally:
1074
1181
self.unlock()
1075
1182
1076
return result
1077
1078
1183
1079
1184
def revert(self, filenames, old_tree=None, backups=True):
1080
1185
"""Restore selected files to the versions from a previous tree.
1162
1267
self.unlock()
1163
1268
1164
1269
1165
def get_parent(self):
1166
"""Return the parent location of the branch.
1167
1168
This is the default location for push/pull/missing. The usual
1169
pattern is that the user can override it by specifying a
1170
location.
1171
"""
1172
import errno
1173
_locs = ['parent', 'pull', 'x-pull']
1174
for l in _locs:
1175
try:
1176
return self.controlfile(l, 'r').read().strip('\n')
1177
except IOError, e:
1178
if e.errno != errno.ENOENT:
1179
raise
1180
return None
1181
1182
1183
def set_parent(self, url):
1184
# TODO: Maybe delete old location files?
1185
from bzrlib.atomicfile import AtomicFile
1186
self.lock_write()
1187
try:
1188
f = AtomicFile(self.controlfilename('parent'))
1189
try:
1190
f.write(url + '\n')
1191
f.commit()
1192
finally:
1193
f.close()
1194
finally:
1195
self.unlock()
1196
1197
def check_revno(self, revno):
1198
"""\
1199
Check whether a revno corresponds to any revision.
1200
Zero (the NULL revision) is considered valid.
1201
"""
1202
if revno != 0:
1203
self.check_real_revno(revno)
1204
1205
def check_real_revno(self, revno):
1206
"""\
1207
Check whether a revno corresponds to a real revision.
1208
Zero (the NULL revision) is considered invalid
1209
"""
1210
if revno < 1 or revno > self.revno():
1211
raise InvalidRevisionNumber(revno)
1212
1213
1214
1215
1216
class ScratchBranch(LocalBranch):
1270
1271
class ScratchBranch(Branch):
1217
1272
"""Special test class: a branch that cleans up after itself.
1218
1273
1219
1274
>>> b = ScratchBranch()
1236
1291
if base is None:
1237
1292
base = mkdtemp()
1238
1293
init = True
1239
LocalBranch.__init__(self, base, init=init)
1294
Branch.__init__(self, base, init=init)
1240
1295
for d in dirs:
1241
1296
os.mkdir(self.abspath(d))
1242
1297
1259
1314
os.rmdir(base)
1260
1315
copytree(self.base, base, symlinks=True)
1261
1316
return ScratchBranch(base=base)
1262
1263
1264
1317
1265
1318
def __del__(self):
1266
1319
self.destroy()
1336
1389
"""Return a new tree-root file id."""
1337
1390
return gen_file_id('TREE_ROOT')
1338
1391
1339
1340
def copy_branch(branch_from, to_location, revision=None):
1341
"""Copy branch_from into the existing directory to_location.
1342
1343
revision
1344
If not None, only revisions up to this point will be copied.
1345
The head of the new branch will be that revision.
1346
1347
to_location
1348
The name of a local directory that exists but is empty.
1349
"""
1350
from bzrlib.merge import merge
1351
from bzrlib.revisionspec import RevisionSpec
1352
1353
assert isinstance(branch_from, Branch)
1354
assert isinstance(to_location, basestring)
1355
1356
br_to = Branch(to_location, init=True)
1357
br_to.set_root_id(branch_from.get_root_id())
1358
if revision is None:
1359
revno = branch_from.revno()
1360
else:
1361
revno, rev_id = RevisionSpec(branch_from, revision)
1362
br_to.update_revisions(branch_from, stop_revision=revno)
1363
merge((to_location, -1), (to_location, 0), this_dir=to_location,
1364
check_clean=False, ignore_zero=True)
1365
1366
from_location = branch_from.base
1367
br_to.set_parent(branch_from.base)
1368
Loggerhead is a web-based interface for Breezy
Version: 2.0.1