« back to all changes in this revision
Viewing changes to bzrlib/branch.py
- browse files at revision 717
- compare with another revision
- download diff
- download tarball
- view history from revision 717
- Committer: Martin Pool
- Date: 2005-06-20 04:57:46 UTC
- Revision ID: mbp@sourcefrog.net-20050620045746-bbb1976f0af52b94
- correctly set parent list when committing first
revision to a branch
revision to a branch
- files added:
- bzrlib/statcache.py
- files removed:
- HACKING
- bzrlib/plugins
- bzrlib/selftest
- bzrlib/util
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- contrib/emacs
- tools
- files renamed:
- bzrlib/selftest/__init__.py => bzrlib/selftest.py
- bzrlib/selftest/whitebox.py => bzrlib/whitebox.py
- bzrlib/util/elementtree/ => elementtree/
- bzrlib/util/urlgrabber/ => urlgrabber/
- files modified:
- .bzrignore
added
removed
bzrlib/branch.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
16
17
17
18
import sys
19
import os
18
import sys, os, os.path, random, time, sha, sets, types, re, shutil, tempfile
19
import traceback, socket, fnmatch, difflib, time
20
from binascii import hexlify
20
21
21
22
import bzrlib
22
from bzrlib.trace import mutter, note
23
from bzrlib.osutils import isdir, quotefn, compact_date, rand_bytes, \
24
splitpath, \
25
sha_file, appendpath, file_kind
26
27
from bzrlib.errors import BzrError, InvalidRevisionNumber, InvalidRevisionId
28
import bzrlib.errors
29
from bzrlib.textui import show_status
30
from bzrlib.revision import Revision
31
from bzrlib.delta import compare_trees
32
from bzrlib.tree import EmptyTree, RevisionTree
33
import bzrlib.xml
34
import bzrlib.ui
35
36
23
from inventory import Inventory
24
from trace import mutter, note
25
from tree import Tree, EmptyTree, RevisionTree
26
from inventory import InventoryEntry, Inventory
27
from osutils import isdir, quotefn, isfile, uuid, sha_file, username, \
28
format_date, compact_date, pumpfile, user_email, rand_bytes, splitpath, \
29
joinpath, sha_file, sha_string, file_kind, local_time_offset, appendpath
30
from store import ImmutableStore
31
from revision import Revision
32
from errors import BzrError
33
from textui import show_status
37
34
38
35
BZR_BRANCH_FORMAT = "Bazaar-NG branch, format 0.0.4\n"
39
36
## TODO: Maybe include checks for common corruption of newlines, etc?
40
37
41
38
42
# TODO: Some operations like log might retrieve the same revisions
43
# repeatedly to calculate deltas. We could perhaps have a weakref
44
# cache in memory to make this faster.
45
46
# TODO: please move the revision-string syntax stuff out of the branch
47
# object; it's clutter
48
49
39
50
40
def find_branch(f, **args):
51
41
if f and (f.startswith('http://') or f.startswith('https://')):
55
45
return Branch(f, **args)
56
46
57
47
58
def find_cached_branch(f, cache_root, **args):
59
from remotebranch import RemoteBranch
60
br = find_branch(f, **args)
61
def cacheify(br, store_name):
62
from meta_store import CachedStore
63
cache_path = os.path.join(cache_root, store_name)
64
os.mkdir(cache_path)
65
new_store = CachedStore(getattr(br, store_name), cache_path)
66
setattr(br, store_name, new_store)
67
68
if isinstance(br, RemoteBranch):
69
cacheify(br, 'inventory_store')
70
cacheify(br, 'text_store')
71
cacheify(br, 'revision_store')
72
return br
73
74
48
75
49
def _relpath(base, path):
76
50
"""Return path relative to base, or raise exception.
108
82
It is not necessary that f exists.
109
83
110
84
Basically we keep looking up until we find the control directory or
111
run into the root. If there isn't one, raises NotBranchError.
112
"""
85
run into the root."""
113
86
if f == None:
114
87
f = os.getcwd()
115
88
elif hasattr(os.path, 'realpath'):
128
101
head, tail = os.path.split(f)
129
102
if head == f:
130
103
# reached the root, whatever that may be
131
raise bzrlib.errors.NotBranchError('%s is not in a branch' % orig_f)
104
raise BzrError('%r is not in a branch' % orig_f)
132
105
f = head
133
134
135
136
# XXX: move into bzrlib.errors; subclass BzrError
106
137
107
class DivergedBranches(Exception):
138
108
def __init__(self, branch1, branch2):
139
109
self.branch1 = branch1
141
111
Exception.__init__(self, "These branches have diverged.")
142
112
143
113
114
class NoSuchRevision(BzrError):
115
def __init__(self, branch, revision):
116
self.branch = branch
117
self.revision = revision
118
msg = "Branch %s has no revision %d" % (branch, revision)
119
BzrError.__init__(self, msg)
120
121
144
122
######################################################################
145
123
# branch objects
146
124
165
143
_lock_count = None
166
144
_lock = None
167
145
168
# Map some sort of prefix into a namespace
169
# stuff like "revno:10", "revid:", etc.
170
# This should match a prefix with a function which accepts
171
REVISION_NAMESPACES = {}
172
173
146
def __init__(self, base, init=False, find_root=True):
174
147
"""Create new branch object at a particular location.
175
148
185
158
In the test suite, creation of new trees is tested using the
186
159
`ScratchBranch` class.
187
160
"""
188
from bzrlib.store import ImmutableStore
189
161
if init:
190
162
self.base = os.path.realpath(base)
191
163
self._make_control()
219
191
self._lock.unlock()
220
192
221
193
194
222
195
def lock_write(self):
223
196
if self._lock_mode:
224
197
if self._lock_mode != 'w':
234
207
self._lock_count = 1
235
208
236
209
210
237
211
def lock_read(self):
238
212
if self._lock_mode:
239
213
assert self._lock_mode in ('r', 'w'), \
246
220
self._lock_mode = 'r'
247
221
self._lock_count = 1
248
222
223
224
249
225
def unlock(self):
250
226
if not self._lock_mode:
251
227
from errors import LockError
258
234
self._lock = None
259
235
self._lock_mode = self._lock_count = None
260
236
237
261
238
def abspath(self, name):
262
239
"""Return absolute filename for something in the branch"""
263
240
return os.path.join(self.base, name)
264
241
242
265
243
def relpath(self, path):
266
244
"""Return path relative to this branch of something inside it.
267
245
268
246
Raises an error if path is not in this branch."""
269
247
return _relpath(self.base, path)
270
248
249
271
250
def controlfilename(self, file_or_path):
272
251
"""Return location relative to branch."""
273
if isinstance(file_or_path, basestring):
252
if isinstance(file_or_path, types.StringTypes):
274
253
file_or_path = [file_or_path]
275
254
return os.path.join(self.base, bzrlib.BZRDIR, *file_or_path)
276
255
300
279
else:
301
280
raise BzrError("invalid controlfile mode %r" % mode)
302
281
282
283
303
284
def _make_control(self):
304
from bzrlib.inventory import Inventory
305
306
285
os.mkdir(self.controlfilename([]))
307
286
self.controlfile('README', 'w').write(
308
287
"This is a Bazaar-NG control directory.\n"
312
291
os.mkdir(self.controlfilename(d))
313
292
for f in ('revision-history', 'merged-patches',
314
293
'pending-merged-patches', 'branch-name',
315
'branch-lock',
316
'pending-merges'):
294
'branch-lock'):
317
295
self.controlfile(f, 'w').write('')
318
296
mutter('created control directory in ' + self.base)
319
320
# if we want per-tree root ids then this is the place to set
321
# them; they're not needed for now and so ommitted for
322
# simplicity.
323
f = self.controlfile('inventory','w')
324
bzrlib.xml.serializer_v4.write_inventory(Inventory(), f)
297
Inventory().write_xml(self.controlfile('inventory','w'))
325
298
326
299
327
300
def _check_format(self):
336
309
# on Windows from Linux and so on. I think it might be better
337
310
# to always make all internal files in unix format.
338
311
fmt = self.controlfile('branch-format', 'r').read()
339
fmt = fmt.replace('\r\n', '\n')
312
fmt.replace('\r\n', '')
340
313
if fmt != BZR_BRANCH_FORMAT:
341
314
raise BzrError('sorry, branch format %r not supported' % fmt,
342
315
['use a different bzr version',
343
316
'or remove the .bzr directory and "bzr init" again'])
344
317
345
def get_root_id(self):
346
"""Return the id of this branches root"""
347
inv = self.read_working_inventory()
348
return inv.root.file_id
349
318
350
def set_root_id(self, file_id):
351
inv = self.read_working_inventory()
352
orig_root_id = inv.root.file_id
353
del inv._byid[inv.root.file_id]
354
inv.root.file_id = file_id
355
inv._byid[inv.root.file_id] = inv.root
356
for fid in inv:
357
entry = inv[fid]
358
if entry.parent_id in (None, orig_root_id):
359
entry.parent_id = inv.root.file_id
360
self._write_inventory(inv)
361
319
362
320
def read_working_inventory(self):
363
321
"""Read the working inventory."""
364
from bzrlib.inventory import Inventory
322
before = time.time()
323
# ElementTree does its own conversion from UTF-8, so open in
324
# binary.
365
325
self.lock_read()
366
326
try:
367
# ElementTree does its own conversion from UTF-8, so open in
368
# binary.
369
f = self.controlfile('inventory', 'rb')
370
return bzrlib.xml.serializer_v4.read_inventory(f)
327
inv = Inventory.read_xml(self.controlfile('inventory', 'rb'))
328
mutter("loaded inventory of %d items in %f"
329
% (len(inv), time.time() - before))
330
return inv
371
331
finally:
372
332
self.unlock()
373
333
378
338
That is to say, the inventory describing changes underway, that
379
339
will be committed to the next revision.
380
340
"""
381
from bzrlib.atomicfile import AtomicFile
382
383
self.lock_write()
384
try:
385
f = AtomicFile(self.controlfilename('inventory'), 'wb')
386
try:
387
bzrlib.xml.serializer_v4.write_inventory(inv, f)
388
f.commit()
389
finally:
390
f.close()
391
finally:
392
self.unlock()
393
341
## TODO: factor out to atomicfile? is rename safe on windows?
342
## TODO: Maybe some kind of clean/dirty marker on inventory?
343
tmpfname = self.controlfilename('inventory.tmp')
344
tmpf = file(tmpfname, 'wb')
345
inv.write_xml(tmpf)
346
tmpf.close()
347
inv_fname = self.controlfilename('inventory')
348
if sys.platform == 'win32':
349
os.remove(inv_fname)
350
os.rename(tmpfname, inv_fname)
394
351
mutter('wrote working inventory')
395
352
396
353
398
355
"""Inventory for the working copy.""")
399
356
400
357
401
def add(self, files, ids=None):
358
def add(self, files, verbose=False, ids=None):
402
359
"""Make files versioned.
403
360
404
Note that the command line normally calls smart_add instead,
405
which can automatically recurse.
361
Note that the command line normally calls smart_add instead.
406
362
407
363
This puts the files in the Added state, so that they will be
408
364
recorded by the next commit.
418
374
TODO: Perhaps have an option to add the ids even if the files do
419
375
not (yet) exist.
420
376
421
TODO: Perhaps yield the ids and paths as they're added.
377
TODO: Perhaps return the ids of the files? But then again it
378
is easy to retrieve them if they're needed.
379
380
TODO: Adding a directory should optionally recurse down and
381
add all non-ignored children. Perhaps do that in a
382
higher-level method.
422
383
"""
423
384
# TODO: Re-adding a file that is removed in the working copy
424
385
# should probably put it back with the previous ID.
425
if isinstance(files, basestring):
426
assert(ids is None or isinstance(ids, basestring))
386
if isinstance(files, types.StringTypes):
387
assert(ids is None or isinstance(ids, types.StringTypes))
427
388
files = [files]
428
389
if ids is not None:
429
390
ids = [ids]
460
421
file_id = gen_file_id(f)
461
422
inv.add_path(f, kind=kind, file_id=file_id)
462
423
424
if verbose:
425
show_status('A', kind, quotefn(f))
426
463
427
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
464
428
465
429
self._write_inventory(inv)
475
439
# use inventory as it was in that revision
476
440
file_id = tree.inventory.path2id(file)
477
441
if not file_id:
478
raise BzrError("%r is not present in revision %s" % (file, revno))
442
raise BzrError("%r is not present in revision %d" % (file, revno))
479
443
tree.print_file(file_id)
480
444
finally:
481
445
self.unlock()
497
461
"""
498
462
## TODO: Normalize names
499
463
## TODO: Remove nested loops; better scalability
500
if isinstance(files, basestring):
464
if isinstance(files, types.StringTypes):
501
465
files = [files]
502
466
503
467
self.lock_write()
528
492
529
493
# FIXME: this doesn't need to be a branch method
530
494
def set_inventory(self, new_inventory_list):
531
from bzrlib.inventory import Inventory, InventoryEntry
532
inv = Inventory(self.get_root_id())
495
inv = Inventory()
533
496
for path, file_id, parent, kind in new_inventory_list:
534
497
name = os.path.basename(path)
535
498
if name == "":
557
520
return self.working_tree().unknowns()
558
521
559
522
560
def append_revision(self, *revision_ids):
561
from bzrlib.atomicfile import AtomicFile
562
563
for revision_id in revision_ids:
564
mutter("add {%s} to revision-history" % revision_id)
565
523
def append_revision(self, revision_id):
524
mutter("add {%s} to revision-history" % revision_id)
566
525
rev_history = self.revision_history()
567
rev_history.extend(revision_ids)
568
569
f = AtomicFile(self.controlfilename('revision-history'))
570
try:
571
for rev_id in rev_history:
572
print >>f, rev_id
573
f.commit()
574
finally:
575
f.close()
576
577
578
def get_revision_xml_file(self, revision_id):
579
"""Return XML file object for revision object."""
580
if not revision_id or not isinstance(revision_id, basestring):
581
raise InvalidRevisionId(revision_id)
582
583
self.lock_read()
584
try:
585
try:
586
return self.revision_store[revision_id]
587
except KeyError:
588
raise bzrlib.errors.NoSuchRevision(self, revision_id)
589
finally:
590
self.unlock()
591
592
593
#deprecated
594
get_revision_xml = get_revision_xml_file
526
527
tmprhname = self.controlfilename('revision-history.tmp')
528
rhname = self.controlfilename('revision-history')
529
530
f = file(tmprhname, 'wt')
531
rev_history.append(revision_id)
532
f.write('\n'.join(rev_history))
533
f.write('\n')
534
f.close()
535
536
if sys.platform == 'win32':
537
os.remove(rhname)
538
os.rename(tmprhname, rhname)
539
595
540
596
541
597
542
def get_revision(self, revision_id):
598
543
"""Return the Revision object for a named revision"""
599
xml_file = self.get_revision_xml_file(revision_id)
600
601
try:
602
r = bzrlib.xml.serializer_v4.read_revision(xml_file)
603
except SyntaxError, e:
604
raise bzrlib.errors.BzrError('failed to unpack revision_xml',
605
[revision_id,
606
str(e)])
607
544
if not revision_id or not isinstance(revision_id, basestring):
545
raise ValueError('invalid revision-id: %r' % revision_id)
546
r = Revision.read_xml(self.revision_store[revision_id])
608
547
assert r.revision_id == revision_id
609
548
return r
610
549
611
612
def get_revision_delta(self, revno):
613
"""Return the delta for one revision.
614
615
The delta is relative to its mainline predecessor, or the
616
empty tree for revision 1.
617
"""
618
assert isinstance(revno, int)
619
rh = self.revision_history()
620
if not (1 <= revno <= len(rh)):
621
raise InvalidRevisionNumber(revno)
622
623
# revno is 1-based; list is 0-based
624
625
new_tree = self.revision_tree(rh[revno-1])
626
if revno == 1:
627
old_tree = EmptyTree()
628
else:
629
old_tree = self.revision_tree(rh[revno-2])
630
631
return compare_trees(old_tree, new_tree)
632
633
634
635
550
def get_revision_sha1(self, revision_id):
636
551
"""Hash the stored value of a revision, and return it."""
637
552
# In the future, revision entries will be signed. At that
640
555
# the revision, (add signatures/remove signatures) and still
641
556
# have all hash pointers stay consistent.
642
557
# But for now, just hash the contents.
643
return bzrlib.osutils.sha_file(self.get_revision_xml(revision_id))
558
return sha_file(self.revision_store[revision_id])
644
559
645
560
646
561
def get_inventory(self, inventory_id):
649
564
TODO: Perhaps for this and similar methods, take a revision
650
565
parameter which can be either an integer revno or a
651
566
string hash."""
652
from bzrlib.inventory import Inventory
653
654
f = self.get_inventory_xml_file(inventory_id)
655
return bzrlib.xml.serializer_v4.read_inventory(f)
656
657
658
def get_inventory_xml(self, inventory_id):
659
"""Get inventory XML as a file object."""
660
return self.inventory_store[inventory_id]
661
662
get_inventory_xml_file = get_inventory_xml
663
567
i = Inventory.read_xml(self.inventory_store[inventory_id])
568
return i
664
569
665
570
def get_inventory_sha1(self, inventory_id):
666
571
"""Return the sha1 hash of the inventory entry
667
572
"""
668
return sha_file(self.get_inventory_xml(inventory_id))
573
return sha_file(self.inventory_store[inventory_id])
669
574
670
575
671
576
def get_revision_inventory(self, revision_id):
672
577
"""Return inventory of a past revision."""
673
# bzr 0.0.6 imposes the constraint that the inventory_id
674
# must be the same as its revision, so this is trivial.
675
578
if revision_id == None:
676
from bzrlib.inventory import Inventory
677
return Inventory(self.get_root_id())
579
return Inventory()
678
580
else:
679
return self.get_inventory(revision_id)
581
return self.get_inventory(self.get_revision(revision_id).inventory_id)
680
582
681
583
682
584
def revision_history(self):
737
639
return r+1, my_history[r]
738
640
return None, None
739
641
642
def enum_history(self, direction):
643
"""Return (revno, revision_id) for history of branch.
644
645
direction
646
'forward' is from earliest to latest
647
'reverse' is from latest to earliest
648
"""
649
rh = self.revision_history()
650
if direction == 'forward':
651
i = 1
652
for rid in rh:
653
yield i, rid
654
i += 1
655
elif direction == 'reverse':
656
i = len(rh)
657
while i > 0:
658
yield i, rh[i-1]
659
i -= 1
660
else:
661
raise ValueError('invalid history direction', direction)
662
740
663
741
664
def revno(self):
742
665
"""Return current revision number for this branch.
757
680
return None
758
681
759
682
760
def missing_revisions(self, other, stop_revision=None, diverged_ok=False):
683
def missing_revisions(self, other, stop_revision=None):
761
684
"""
762
685
If self and other have not diverged, return a list of the revisions
763
686
present in other, but missing from self.
796
719
if stop_revision is None:
797
720
stop_revision = other_len
798
721
elif stop_revision > other_len:
799
raise bzrlib.errors.NoSuchRevision(self, stop_revision)
722
raise NoSuchRevision(self, stop_revision)
800
723
801
724
return other_history[self_len:stop_revision]
802
725
803
726
804
727
def update_revisions(self, other, stop_revision=None):
805
728
"""Pull in all new revisions from other branch.
729
730
>>> from bzrlib.commit import commit
731
>>> bzrlib.trace.silent = True
732
>>> br1 = ScratchBranch(files=['foo', 'bar'])
733
>>> br1.add('foo')
734
>>> br1.add('bar')
735
>>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
736
>>> br2 = ScratchBranch()
737
>>> br2.update_revisions(br1)
738
Added 2 texts.
739
Added 1 inventories.
740
Added 1 revisions.
741
>>> br2.revision_history()
742
[u'REVISION-ID-1']
743
>>> br2.update_revisions(br1)
744
Added 0 texts.
745
Added 0 inventories.
746
Added 0 revisions.
747
>>> br1.text_store.total_size() == br2.text_store.total_size()
748
True
806
749
"""
807
from bzrlib.fetch import greedy_fetch
808
from bzrlib.revision import get_intervening_revisions
809
810
pb = bzrlib.ui.ui_factory.progress_bar()
750
from bzrlib.progress import ProgressBar
751
752
pb = ProgressBar()
753
811
754
pb.update('comparing histories')
812
if stop_revision is None:
813
other_revision = other.last_patch()
814
else:
815
other_revision = other.lookup_revision(stop_revision)
816
count = greedy_fetch(self, other, other_revision, pb)[0]
817
try:
818
revision_ids = self.missing_revisions(other, stop_revision)
819
except DivergedBranches, e:
820
try:
821
revision_ids = get_intervening_revisions(self.last_patch(),
822
other_revision, self)
823
assert self.last_patch() not in revision_ids
824
except bzrlib.errors.NotAncestor:
825
raise e
826
827
self.append_revision(*revision_ids)
828
pb.clear()
829
830
def install_revisions(self, other, revision_ids, pb):
831
if hasattr(other.revision_store, "prefetch"):
832
other.revision_store.prefetch(revision_ids)
833
if hasattr(other.inventory_store, "prefetch"):
834
inventory_ids = []
835
for rev_id in revision_ids:
836
try:
837
revision = other.get_revision(rev_id).inventory_id
838
inventory_ids.append(revision)
839
except bzrlib.errors.NoSuchRevision:
840
pass
841
other.inventory_store.prefetch(inventory_ids)
842
843
if pb is None:
844
pb = bzrlib.ui.ui_factory.progress_bar()
845
755
revision_ids = self.missing_revisions(other, stop_revision)
846
756
revisions = []
847
needed_texts = set()
757
needed_texts = sets.Set()
848
758
i = 0
849
850
failures = set()
851
for i, rev_id in enumerate(revision_ids):
852
pb.update('fetching revision', i+1, len(revision_ids))
853
try:
854
rev = other.get_revision(rev_id)
855
except bzrlib.errors.NoSuchRevision:
856
failures.add(rev_id)
857
continue
858
759
for rev_id in revision_ids:
760
i += 1
761
pb.update('fetching revision', i, len(revision_ids))
762
rev = other.get_revision(rev_id)
859
763
revisions.append(rev)
860
764
inv = other.get_inventory(str(rev.inventory_id))
861
765
for key, entry in inv.iter_entries():
866
770
867
771
pb.clear()
868
772
869
count, cp_fail = self.text_store.copy_multi(other.text_store,
870
needed_texts)
871
#print "Added %d texts." % count
773
count = self.text_store.copy_multi(other.text_store, needed_texts)
774
print "Added %d texts." % count
872
775
inventory_ids = [ f.inventory_id for f in revisions ]
873
count, cp_fail = self.inventory_store.copy_multi(other.inventory_store,
874
inventory_ids)
875
#print "Added %d inventories." % count
776
count = self.inventory_store.copy_multi(other.inventory_store,
777
inventory_ids)
778
print "Added %d inventories." % count
876
779
revision_ids = [ f.revision_id for f in revisions]
877
878
count, cp_fail = self.revision_store.copy_multi(other.revision_store,
879
revision_ids,
880
permit_failure=True)
881
assert len(cp_fail) == 0
882
return count, failures
883
884
780
count = self.revision_store.copy_multi(other.revision_store,
781
revision_ids)
782
for revision_id in revision_ids:
783
self.append_revision(revision_id)
784
print "Added %d revisions." % count
785
786
885
787
def commit(self, *args, **kw):
788
"""Deprecated"""
886
789
from bzrlib.commit import commit
887
790
commit(self, *args, **kw)
888
791
889
792
890
def lookup_revision(self, revision):
891
"""Return the revision identifier for a given revision information."""
892
revno, info = self._get_revision_info(revision)
893
return info
894
895
896
def revision_id_to_revno(self, revision_id):
897
"""Given a revision id, return its revno"""
898
history = self.revision_history()
899
try:
900
return history.index(revision_id) + 1
901
except ValueError:
902
raise bzrlib.errors.NoSuchRevision(self, revision_id)
903
904
905
def get_revision_info(self, revision):
906
"""Return (revno, revision id) for revision identifier.
907
908
revision can be an integer, in which case it is assumed to be revno (though
909
this will translate negative values into positive ones)
910
revision can also be a string, in which case it is parsed for something like
911
'date:' or 'revid:' etc.
912
"""
913
revno, rev_id = self._get_revision_info(revision)
914
if revno is None:
915
raise bzrlib.errors.NoSuchRevision(self, revision)
916
return revno, rev_id
917
918
def get_rev_id(self, revno, history=None):
919
"""Find the revision id of the specified revno."""
793
def lookup_revision(self, revno):
794
"""Return revision hash for revision number."""
920
795
if revno == 0:
921
796
return None
922
if history is None:
923
history = self.revision_history()
924
elif revno <= 0 or revno > len(history):
925
raise bzrlib.errors.NoSuchRevision(self, revno)
926
return history[revno - 1]
927
928
def _get_revision_info(self, revision):
929
"""Return (revno, revision id) for revision specifier.
930
931
revision can be an integer, in which case it is assumed to be revno
932
(though this will translate negative values into positive ones)
933
revision can also be a string, in which case it is parsed for something
934
like 'date:' or 'revid:' etc.
935
936
A revid is always returned. If it is None, the specifier referred to
937
the null revision. If the revid does not occur in the revision
938
history, revno will be None.
939
"""
940
941
if revision is None:
942
return 0, None
943
revno = None
944
try:# Convert to int if possible
945
revision = int(revision)
946
except ValueError:
947
pass
948
revs = self.revision_history()
949
if isinstance(revision, int):
950
if revision < 0:
951
revno = len(revs) + revision + 1
952
else:
953
revno = revision
954
rev_id = self.get_rev_id(revno, revs)
955
elif isinstance(revision, basestring):
956
for prefix, func in Branch.REVISION_NAMESPACES.iteritems():
957
if revision.startswith(prefix):
958
result = func(self, revs, revision)
959
if len(result) > 1:
960
revno, rev_id = result
961
else:
962
revno = result[0]
963
rev_id = self.get_rev_id(revno, revs)
964
break
965
else:
966
raise BzrError('No namespace registered for string: %r' %
967
revision)
968
else:
969
raise TypeError('Unhandled revision type %s' % revision)
970
971
if revno is None:
972
if rev_id is None:
973
raise bzrlib.errors.NoSuchRevision(self, revision)
974
return revno, rev_id
975
976
def _namespace_revno(self, revs, revision):
977
"""Lookup a revision by revision number"""
978
assert revision.startswith('revno:')
979
try:
980
return (int(revision[6:]),)
981
except ValueError:
982
return None
983
REVISION_NAMESPACES['revno:'] = _namespace_revno
984
985
def _namespace_revid(self, revs, revision):
986
assert revision.startswith('revid:')
987
rev_id = revision[len('revid:'):]
988
try:
989
return revs.index(rev_id) + 1, rev_id
990
except ValueError:
991
return None, rev_id
992
REVISION_NAMESPACES['revid:'] = _namespace_revid
993
994
def _namespace_last(self, revs, revision):
995
assert revision.startswith('last:')
996
try:
997
offset = int(revision[5:])
998
except ValueError:
999
return (None,)
1000
else:
1001
if offset <= 0:
1002
raise BzrError('You must supply a positive value for --revision last:XXX')
1003
return (len(revs) - offset + 1,)
1004
REVISION_NAMESPACES['last:'] = _namespace_last
1005
1006
def _namespace_tag(self, revs, revision):
1007
assert revision.startswith('tag:')
1008
raise BzrError('tag: namespace registered, but not implemented.')
1009
REVISION_NAMESPACES['tag:'] = _namespace_tag
1010
1011
def _namespace_date(self, revs, revision):
1012
assert revision.startswith('date:')
1013
import datetime
1014
# Spec for date revisions:
1015
# date:value
1016
# value can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
1017
# it can also start with a '+/-/='. '+' says match the first
1018
# entry after the given date. '-' is match the first entry before the date
1019
# '=' is match the first entry after, but still on the given date.
1020
#
1021
# +2005-05-12 says find the first matching entry after May 12th, 2005 at 0:00
1022
# -2005-05-12 says find the first matching entry before May 12th, 2005 at 0:00
1023
# =2005-05-12 says find the first match after May 12th, 2005 at 0:00 but before
1024
# May 13th, 2005 at 0:00
1025
#
1026
# So the proper way of saying 'give me all entries for today' is:
1027
# -r {date:+today}:{date:-tomorrow}
1028
# The default is '=' when not supplied
1029
val = revision[5:]
1030
match_style = '='
1031
if val[:1] in ('+', '-', '='):
1032
match_style = val[:1]
1033
val = val[1:]
1034
1035
today = datetime.datetime.today().replace(hour=0,minute=0,second=0,microsecond=0)
1036
if val.lower() == 'yesterday':
1037
dt = today - datetime.timedelta(days=1)
1038
elif val.lower() == 'today':
1039
dt = today
1040
elif val.lower() == 'tomorrow':
1041
dt = today + datetime.timedelta(days=1)
1042
else:
1043
import re
1044
# This should be done outside the function to avoid recompiling it.
1045
_date_re = re.compile(
1046
r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'
1047
r'(,|T)?\s*'
1048
r'(?P<time>(?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d))?)?'
1049
)
1050
m = _date_re.match(val)
1051
if not m or (not m.group('date') and not m.group('time')):
1052
raise BzrError('Invalid revision date %r' % revision)
1053
1054
if m.group('date'):
1055
year, month, day = int(m.group('year')), int(m.group('month')), int(m.group('day'))
1056
else:
1057
year, month, day = today.year, today.month, today.day
1058
if m.group('time'):
1059
hour = int(m.group('hour'))
1060
minute = int(m.group('minute'))
1061
if m.group('second'):
1062
second = int(m.group('second'))
1063
else:
1064
second = 0
1065
else:
1066
hour, minute, second = 0,0,0
1067
1068
dt = datetime.datetime(year=year, month=month, day=day,
1069
hour=hour, minute=minute, second=second)
1070
first = dt
1071
last = None
1072
reversed = False
1073
if match_style == '-':
1074
reversed = True
1075
elif match_style == '=':
1076
last = dt + datetime.timedelta(days=1)
1077
1078
if reversed:
1079
for i in range(len(revs)-1, -1, -1):
1080
r = self.get_revision(revs[i])
1081
# TODO: Handle timezone.
1082
dt = datetime.datetime.fromtimestamp(r.timestamp)
1083
if first >= dt and (last is None or dt >= last):
1084
return (i+1,)
1085
else:
1086
for i in range(len(revs)):
1087
r = self.get_revision(revs[i])
1088
# TODO: Handle timezone.
1089
dt = datetime.datetime.fromtimestamp(r.timestamp)
1090
if first <= dt and (last is None or dt <= last):
1091
return (i+1,)
1092
REVISION_NAMESPACES['date:'] = _namespace_date
1093
1094
1095
def _namespace_ancestor(self, revs, revision):
1096
from revision import common_ancestor, MultipleRevisionSources
1097
other_branch = find_branch(_trim_namespace('ancestor', revision))
1098
revision_a = self.last_patch()
1099
revision_b = other_branch.last_patch()
1100
for r, b in ((revision_a, self), (revision_b, other_branch)):
1101
if r is None:
1102
raise bzrlib.errors.NoCommits(b)
1103
revision_source = MultipleRevisionSources(self, other_branch)
1104
result = common_ancestor(revision_a, revision_b, revision_source)
1105
try:
1106
revno = self.revision_id_to_revno(result)
1107
except bzrlib.errors.NoSuchRevision:
1108
revno = None
1109
return revno,result
1110
1111
1112
REVISION_NAMESPACES['ancestor:'] = _namespace_ancestor
797
798
try:
799
# list is 0-based; revisions are 1-based
800
return self.revision_history()[revno-1]
801
except IndexError:
802
raise BzrError("no such revision %s" % revno)
803
1113
804
1114
805
def revision_tree(self, revision_id):
1115
806
"""Return Tree for a revision on this branch.
1179
870
1180
871
inv.rename(file_id, to_dir_id, to_tail)
1181
872
873
print "%s => %s" % (from_rel, to_rel)
874
1182
875
from_abs = self.abspath(from_rel)
1183
876
to_abs = self.abspath(to_rel)
1184
877
try:
1203
896
1204
897
Note that to_name is only the last component of the new name;
1205
898
this doesn't change the directory.
1206
1207
This returns a list of (from_path, to_path) pairs for each
1208
entry that is moved.
1209
899
"""
1210
result = []
1211
900
self.lock_write()
1212
901
try:
1213
902
## TODO: Option to move IDs only
1248
937
for f in from_paths:
1249
938
name_tail = splitpath(f)[-1]
1250
939
dest_path = appendpath(to_name, name_tail)
1251
result.append((f, dest_path))
940
print "%s => %s" % (f, dest_path)
1252
941
inv.rename(inv.path2id(f), to_dir_id, name_tail)
1253
942
try:
1254
943
os.rename(self.abspath(f), self.abspath(dest_path))
1260
949
finally:
1261
950
self.unlock()
1262
951
1263
return result
1264
1265
1266
def revert(self, filenames, old_tree=None, backups=True):
1267
"""Restore selected files to the versions from a previous tree.
1268
1269
backups
1270
If true (default) backups are made of files before
1271
they're renamed.
1272
"""
1273
from bzrlib.errors import NotVersionedError, BzrError
1274
from bzrlib.atomicfile import AtomicFile
1275
from bzrlib.osutils import backup_file
1276
1277
inv = self.read_working_inventory()
1278
if old_tree is None:
1279
old_tree = self.basis_tree()
1280
old_inv = old_tree.inventory
1281
1282
nids = []
1283
for fn in filenames:
1284
file_id = inv.path2id(fn)
1285
if not file_id:
1286
raise NotVersionedError("not a versioned file", fn)
1287
if not old_inv.has_id(file_id):
1288
raise BzrError("file not present in old tree", fn, file_id)
1289
nids.append((fn, file_id))
1290
1291
# TODO: Rename back if it was previously at a different location
1292
1293
# TODO: If given a directory, restore the entire contents from
1294
# the previous version.
1295
1296
# TODO: Make a backup to a temporary file.
1297
1298
# TODO: If the file previously didn't exist, delete it?
1299
for fn, file_id in nids:
1300
backup_file(fn)
1301
1302
f = AtomicFile(fn, 'wb')
1303
try:
1304
f.write(old_tree.get_file(file_id).read())
1305
f.commit()
1306
finally:
1307
f.close()
1308
1309
1310
def pending_merges(self):
1311
"""Return a list of pending merges.
1312
1313
These are revisions that have been merged into the working
1314
directory but not yet committed.
1315
"""
1316
cfn = self.controlfilename('pending-merges')
1317
if not os.path.exists(cfn):
1318
return []
1319
p = []
1320
for l in self.controlfile('pending-merges', 'r').readlines():
1321
p.append(l.rstrip('\n'))
1322
return p
1323
1324
1325
def add_pending_merge(self, revision_id):
1326
from bzrlib.revision import validate_revision_id
1327
1328
validate_revision_id(revision_id)
1329
1330
p = self.pending_merges()
1331
if revision_id in p:
1332
return
1333
p.append(revision_id)
1334
self.set_pending_merges(p)
1335
1336
1337
def set_pending_merges(self, rev_list):
1338
from bzrlib.atomicfile import AtomicFile
1339
self.lock_write()
1340
try:
1341
f = AtomicFile(self.controlfilename('pending-merges'))
1342
try:
1343
for l in rev_list:
1344
print >>f, l
1345
f.commit()
1346
finally:
1347
f.close()
1348
finally:
1349
self.unlock()
1350
1351
1352
def get_parent(self):
1353
"""Return the parent location of the branch.
1354
1355
This is the default location for push/pull/missing. The usual
1356
pattern is that the user can override it by specifying a
1357
location.
1358
"""
1359
import errno
1360
_locs = ['parent', 'pull', 'x-pull']
1361
for l in _locs:
1362
try:
1363
return self.controlfile(l, 'r').read().strip('\n')
1364
except IOError, e:
1365
if e.errno != errno.ENOENT:
1366
raise
1367
return None
1368
1369
1370
def set_parent(self, url):
1371
# TODO: Maybe delete old location files?
1372
from bzrlib.atomicfile import AtomicFile
1373
self.lock_write()
1374
try:
1375
f = AtomicFile(self.controlfilename('parent'))
1376
try:
1377
f.write(url + '\n')
1378
f.commit()
1379
finally:
1380
f.close()
1381
finally:
1382
self.unlock()
1383
1384
def check_revno(self, revno):
1385
"""\
1386
Check whether a revno corresponds to any revision.
1387
Zero (the NULL revision) is considered valid.
1388
"""
1389
if revno != 0:
1390
self.check_real_revno(revno)
1391
1392
def check_real_revno(self, revno):
1393
"""\
1394
Check whether a revno corresponds to a real revision.
1395
Zero (the NULL revision) is considered invalid
1396
"""
1397
if revno < 1 or revno > self.revno():
1398
raise InvalidRevisionNumber(revno)
1399
1400
1401
952
1402
953
1403
954
class ScratchBranch(Branch):
1418
969
1419
970
If any files are listed, they are created in the working copy.
1420
971
"""
1421
from tempfile import mkdtemp
1422
972
init = False
1423
973
if base is None:
1424
base = mkdtemp()
974
base = tempfile.mkdtemp()
1425
975
init = True
1426
976
Branch.__init__(self, base, init=init)
1427
977
for d in dirs:
1440
990
>>> os.path.isfile(os.path.join(clone.base, "file1"))
1441
991
True
1442
992
"""
1443
from shutil import copytree
1444
from tempfile import mkdtemp
1445
base = mkdtemp()
993
base = tempfile.mkdtemp()
1446
994
os.rmdir(base)
1447
copytree(self.base, base, symlinks=True)
995
shutil.copytree(self.base, base, symlinks=True)
1448
996
return ScratchBranch(base=base)
1449
1450
1451
997
1452
998
def __del__(self):
1453
999
self.destroy()
1454
1000
1455
1001
def destroy(self):
1456
1002
"""Destroy the test branch, removing the scratch directory."""
1457
from shutil import rmtree
1458
1003
try:
1459
1004
if self.base:
1460
1005
mutter("delete ScratchBranch %s" % self.base)
1461
rmtree(self.base)
1006
shutil.rmtree(self.base)
1462
1007
except OSError, e:
1463
1008
# Work around for shutil.rmtree failing on Windows when
1464
1009
# readonly files are encountered
1466
1011
for root, dirs, files in os.walk(self.base, topdown=False):
1467
1012
for name in files:
1468
1013
os.chmod(os.path.join(root, name), 0700)
1469
rmtree(self.base)
1014
shutil.rmtree(self.base)
1470
1015
self.base = None
1471
1016
1472
1017
1497
1042
cope with just randomness because running uuidgen every time is
1498
1043
slow."""
1499
1044
import re
1500
from binascii import hexlify
1501
from time import time
1502
1045
1503
1046
# get last component
1504
1047
idx = name.rfind('/')
1516
1059
name = re.sub(r'[^\w.]', '', name)
1517
1060
1518
1061
s = hexlify(rand_bytes(8))
1519
return '-'.join((name, compact_date(time()), s))
1520
1521
1522
def gen_root_id():
1523
"""Return a new tree-root file id."""
1524
return gen_file_id('TREE_ROOT')
1525
1526
1527
def pull_loc(branch):
1528
# TODO: Should perhaps just make attribute be 'base' in
1529
# RemoteBranch and Branch?
1530
if hasattr(branch, "baseurl"):
1531
return branch.baseurl
1532
else:
1533
return branch.base
1534
1535
1536
def copy_branch(branch_from, to_location, revision=None):
1537
"""Copy branch_from into the existing directory to_location.
1538
1539
revision
1540
If not None, only revisions up to this point will be copied.
1541
The head of the new branch will be that revision.
1542
1543
to_location
1544
The name of a local directory that exists but is empty.
1545
"""
1546
from bzrlib.merge import merge
1547
from bzrlib.branch import Branch
1548
1549
assert isinstance(branch_from, Branch)
1550
assert isinstance(to_location, basestring)
1551
1552
br_to = Branch(to_location, init=True)
1553
br_to.set_root_id(branch_from.get_root_id())
1554
if revision is None:
1555
revno = branch_from.revno()
1556
else:
1557
revno, rev_id = branch_from.get_revision_info(revision)
1558
br_to.update_revisions(branch_from, stop_revision=revno)
1559
merge((to_location, -1), (to_location, 0), this_dir=to_location,
1560
check_clean=False, ignore_zero=True)
1561
1562
from_location = pull_loc(branch_from)
1563
br_to.set_parent(pull_loc(branch_from))
1564
return br_to
1565
1566
def _trim_namespace(namespace, spec):
1567
full_namespace = namespace + ':'
1568
assert spec.startswith(full_namespace)
1569
return spec[len(full_namespace):]
1062
return '-'.join((name, compact_date(time.time()), s))
Loggerhead is a web-based interface for Breezy
Version: 2.0.1