66
107
"""Branch holding a history of revisions.
69
Base directory/url of the branch.
110
Base directory of the branch.
116
If _lock_mode is true, a positive count of the number of times the
120
Open file used for locking.
71
# this is really an instance variable - FIXME move it there
75
def __init__(self, *ignored, **ignored_too):
76
raise NotImplementedError('The Branch class is abstract')
79
"""Break a lock if one is present from another instance.
81
Uses the ui factory to ask for confirmation if the lock may be from
84
This will probe the repository for its lock as well.
86
self.control_files.break_lock()
87
self.repository.break_lock()
88
master = self.get_master_branch()
89
if master is not None:
93
@deprecated_method(zero_eight)
94
def open_downlevel(base):
95
"""Open a branch which may be of an old format."""
96
return Branch.open(base, _unsupported=True)
99
def open(base, _unsupported=False):
100
"""Open the branch rooted at base.
102
For instance, if the branch is at URL/.bzr/branch,
103
Branch.open(URL) -> a Branch instance.
105
control = bzrdir.BzrDir.open(base, _unsupported)
106
return control.open_branch(_unsupported)
109
def open_containing(url):
110
"""Open an existing branch which contains url.
112
This probes for a branch at url, and searches upwards from there.
114
Basically we keep looking up until we find the control directory or
115
run into the root. If there isn't one, raises NotBranchError.
116
If there is one and it is either an unrecognised format or an unsupported
117
format, UnknownFormatError or UnsupportedFormatError are raised.
118
If there is one, it is returned, along with the unused portion of url.
120
control, relpath = bzrdir.BzrDir.open_containing(url)
121
return control.open_branch(), relpath
124
@deprecated_function(zero_eight)
125
def initialize(base):
126
"""Create a new working tree and branch, rooted at 'base' (url)
128
NOTE: This will soon be deprecated in favour of creation
131
return bzrdir.BzrDir.create_standalone_workingtree(base).branch
133
def setup_caching(self, cache_root):
134
"""Subclasses that care about caching should override this, and set
135
up cached stores located under cache_root.
137
# seems to be unused, 2006-01-13 mbp
138
warn('%s is deprecated' % self.setup_caching)
139
self.cache_root = cache_root
141
def get_config(self):
142
return bzrlib.config.BranchConfig(self)
145
return self.get_config().get_nickname()
147
def _set_nick(self, nick):
148
self.get_config().set_user_option('nickname', nick)
150
nick = property(_get_nick, _set_nick)
153
raise NotImplementedError('is_locked is abstract')
155
def lock_write(self):
156
raise NotImplementedError('lock_write is abstract')
159
raise NotImplementedError('lock_read is abstract')
126
def __init__(self, base, init=False, find_root=True):
127
"""Create new branch object at a particular location.
129
base -- Base directory for the branch.
131
init -- If True, create new control files in a previously
132
unversioned directory. If False, the branch must already
135
find_root -- If true and init is false, find the root of the
136
existing branch containing base.
138
In the test suite, creation of new trees is tested using the
139
`ScratchBranch` class.
142
self.base = os.path.realpath(base)
145
self.base = find_branch_root(base)
147
self.base = os.path.realpath(base)
148
if not isdir(self.controlfilename('.')):
149
from errors import NotBranchError
150
raise NotBranchError("not a bzr branch: %s" % quotefn(base),
151
['use "bzr init" to initialize a new working tree',
152
'current bzr can only operate from top-of-tree'])
154
self._lockfile = self.controlfile('branch-lock', 'wb')
156
self.text_store = ImmutableStore(self.controlfilename('text-store'))
157
self.revision_store = ImmutableStore(self.controlfilename('revision-store'))
158
self.inventory_store = ImmutableStore(self.controlfilename('inventory-store'))
162
return '%s(%r)' % (self.__class__.__name__, self.base)
170
from warnings import warn
171
warn("branch %r was not explicitly unlocked" % self)
175
def lock(self, mode):
177
if mode == 'w' and cur_lm == 'r':
178
raise BzrError("can't upgrade to a write lock")
180
assert self._lock_count >= 1
181
self._lock_count += 1
183
from bzrlib.lock import lock, LOCK_SH, LOCK_EX
189
raise ValueError('invalid lock mode %r' % mode)
191
lock(self._lockfile, m)
192
self._lock_mode = mode
161
196
def unlock(self):
162
raise NotImplementedError('unlock is abstract')
164
def peek_lock_mode(self):
165
"""Return lock mode for the Branch: 'r', 'w' or None"""
166
raise NotImplementedError(self.peek_lock_mode)
168
def get_physical_lock_status(self):
169
raise NotImplementedError('get_physical_lock_status is abstract')
197
if not self._lock_mode:
198
raise BzrError('branch %r is not locked' % (self))
200
if self._lock_count > 1:
201
self._lock_count -= 1
203
assert self._lock_count == 1
204
from bzrlib.lock import unlock
205
unlock(self._lockfile)
206
self._lock_mode = self._lock_count = None
171
209
def abspath(self, name):
172
"""Return absolute filename for something in the branch
174
XXX: Robert Collins 20051017 what is this used for? why is it a branch
175
method and not a tree method.
177
raise NotImplementedError('abspath is abstract')
179
def bind(self, other):
180
"""Bind the local branch the other branch.
182
:param other: The branch to bind to
185
raise errors.UpgradeRequired(self.base)
188
def fetch(self, from_branch, last_revision=None, pb=None):
189
"""Copy revisions from from_branch into this branch.
191
:param from_branch: Where to copy from.
192
:param last_revision: What revision to stop at (None for at the end
194
:param pb: An optional progress bar to use.
196
Returns the copied revision count and the failed revisions in a tuple:
199
if self.base == from_branch.base:
202
nested_pb = ui.ui_factory.nested_progress_bar()
207
from_branch.lock_read()
209
if last_revision is None:
210
pb.update('get source history')
211
from_history = from_branch.revision_history()
213
last_revision = from_history[-1]
210
"""Return absolute filename for something in the branch"""
211
return os.path.join(self.base, name)
214
def relpath(self, path):
215
"""Return path relative to this branch of something inside it.
217
Raises an error if path is not in this branch."""
218
rp = os.path.realpath(path)
220
if not rp.startswith(self.base):
221
from errors import NotBranchError
222
raise NotBranchError("path %r is not within branch %r" % (rp, self.base))
223
rp = rp[len(self.base):]
224
rp = rp.lstrip(os.sep)
228
def controlfilename(self, file_or_path):
229
"""Return location relative to branch."""
230
if isinstance(file_or_path, types.StringTypes):
231
file_or_path = [file_or_path]
232
return os.path.join(self.base, bzrlib.BZRDIR, *file_or_path)
235
def controlfile(self, file_or_path, mode='r'):
236
"""Open a control file for this branch.
238
There are two classes of file in the control directory: text
239
and binary. binary files are untranslated byte streams. Text
240
control files are stored with Unix newlines and in UTF-8, even
241
if the platform or locale defaults are different.
243
Controlfiles should almost never be opened in write mode but
244
rather should be atomically copied and replaced using atomicfile.
247
fn = self.controlfilename(file_or_path)
249
if mode == 'rb' or mode == 'wb':
250
return file(fn, mode)
251
elif mode == 'r' or mode == 'w':
252
# open in binary mode anyhow so there's no newline translation;
253
# codecs uses line buffering by default; don't want that.
255
return codecs.open(fn, mode + 'b', 'utf-8',
258
raise BzrError("invalid controlfile mode %r" % mode)
262
def _make_control(self):
263
os.mkdir(self.controlfilename([]))
264
self.controlfile('README', 'w').write(
265
"This is a Bazaar-NG control directory.\n"
266
"Do not change any files in this directory.")
267
self.controlfile('branch-format', 'w').write(BZR_BRANCH_FORMAT)
268
for d in ('text-store', 'inventory-store', 'revision-store'):
269
os.mkdir(self.controlfilename(d))
270
for f in ('revision-history', 'merged-patches',
271
'pending-merged-patches', 'branch-name',
273
self.controlfile(f, 'w').write('')
274
mutter('created control directory in ' + self.base)
275
Inventory().write_xml(self.controlfile('inventory','w'))
278
def _check_format(self):
279
"""Check this branch format is supported.
281
The current tool only supports the current unstable format.
283
In the future, we might need different in-memory Branch
284
classes to support downlevel branches. But not yet.
286
# This ignores newlines so that we can open branches created
287
# on Windows from Linux and so on. I think it might be better
288
# to always make all internal files in unix format.
289
fmt = self.controlfile('branch-format', 'r').read()
290
fmt.replace('\r\n', '')
291
if fmt != BZR_BRANCH_FORMAT:
292
raise BzrError('sorry, branch format %r not supported' % fmt,
293
['use a different bzr version',
294
'or remove the .bzr directory and "bzr init" again'])
299
def read_working_inventory(self):
300
"""Read the working inventory."""
302
# ElementTree does its own conversion from UTF-8, so open in
304
inv = Inventory.read_xml(self.controlfile('inventory', 'rb'))
305
mutter("loaded inventory of %d items in %f"
306
% (len(inv), time.time() - before))
310
def _write_inventory(self, inv):
311
"""Update the working inventory.
313
That is to say, the inventory describing changes underway, that
314
will be committed to the next revision.
316
## TODO: factor out to atomicfile? is rename safe on windows?
317
## TODO: Maybe some kind of clean/dirty marker on inventory?
318
tmpfname = self.controlfilename('inventory.tmp')
319
tmpf = file(tmpfname, 'wb')
322
inv_fname = self.controlfilename('inventory')
323
if sys.platform == 'win32':
325
os.rename(tmpfname, inv_fname)
326
mutter('wrote working inventory')
329
inventory = property(read_working_inventory, _write_inventory, None,
330
"""Inventory for the working copy.""")
334
def add(self, files, verbose=False, ids=None):
335
"""Make files versioned.
337
Note that the command line normally calls smart_add instead.
339
This puts the files in the Added state, so that they will be
340
recorded by the next commit.
342
TODO: Perhaps have an option to add the ids even if the files do
345
TODO: Perhaps return the ids of the files? But then again it
346
is easy to retrieve them if they're needed.
348
TODO: Option to specify file id.
350
TODO: Adding a directory should optionally recurse down and
351
add all non-ignored children. Perhaps do that in a
354
# TODO: Re-adding a file that is removed in the working copy
355
# should probably put it back with the previous ID.
356
if isinstance(files, types.StringTypes):
357
assert(ids is None or isinstance(ids, types.StringTypes))
363
ids = [None] * len(files)
365
assert(len(ids) == len(files))
367
inv = self.read_working_inventory()
368
for f,file_id in zip(files, ids):
369
if is_control_file(f):
370
raise BzrError("cannot add control file %s" % quotefn(f))
375
raise BzrError("cannot add top-level %r" % f)
377
fullpath = os.path.normpath(self.abspath(f))
380
kind = file_kind(fullpath)
382
# maybe something better?
383
raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f))
385
if kind != 'file' and kind != 'directory':
386
raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f))
389
file_id = gen_file_id(f)
390
inv.add_path(f, kind=kind, file_id=file_id)
393
show_status('A', kind, quotefn(f))
395
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
397
self._write_inventory(inv)
400
def print_file(self, file, revno):
401
"""Print `file` to stdout."""
402
tree = self.revision_tree(self.lookup_revision(revno))
403
# use inventory as it was in that revision
404
file_id = tree.inventory.path2id(file)
406
raise BzrError("%r is not present in revision %d" % (file, revno))
407
tree.print_file(file_id)
411
def remove(self, files, verbose=False):
412
"""Mark nominated files for removal from the inventory.
414
This does not remove their text. This does not run on
416
TODO: Refuse to remove modified files unless --force is given?
418
TODO: Do something useful with directories.
420
TODO: Should this remove the text or not? Tough call; not
421
removing may be useful and the user can just use use rm, and
422
is the opposite of add. Removing it is consistent with most
423
other tools. Maybe an option.
425
## TODO: Normalize names
426
## TODO: Remove nested loops; better scalability
427
if isinstance(files, types.StringTypes):
430
tree = self.working_tree()
433
# do this before any modifications
437
raise BzrError("cannot remove unversioned file %s" % quotefn(f))
438
mutter("remove inventory entry %s {%s}" % (quotefn(f), fid))
440
# having remove it, it must be either ignored or unknown
441
if tree.is_ignored(f):
215
# no history in the source branch
216
last_revision = revision.NULL_REVISION
217
return self.repository.fetch(from_branch.repository,
218
revision_id=last_revision,
221
if nested_pb is not None:
225
def get_bound_location(self):
226
"""Return the URL of the branch we are bound to.
228
Older format branches cannot bind, please be sure to use a metadir
233
def get_commit_builder(self, parents, config=None, timestamp=None,
234
timezone=None, committer=None, revprops=None,
236
"""Obtain a CommitBuilder for this branch.
238
:param parents: Revision ids of the parents of the new revision.
239
:param config: Optional configuration to use.
240
:param timestamp: Optional timestamp recorded for commit.
241
:param timezone: Optional timezone for timestamp.
242
:param committer: Optional committer to set for commit.
243
:param revprops: Optional dictionary of revision properties.
244
:param revision_id: Optional revision id.
248
config = self.get_config()
250
return self.repository.get_commit_builder(self, parents, config,
251
timestamp, timezone, committer, revprops, revision_id)
253
def get_master_branch(self):
254
"""Return the branch we are bound to.
256
:return: Either a Branch, or None
260
def get_revision_delta(self, revno):
261
"""Return the delta for one revision.
263
The delta is relative to its mainline predecessor, or the
264
empty tree for revision 1.
266
assert isinstance(revno, int)
445
show_status(new_status, inv[fid].kind, quotefn(f))
448
self._write_inventory(inv)
451
def set_inventory(self, new_inventory_list):
453
for path, file_id, parent, kind in new_inventory_list:
454
name = os.path.basename(path)
457
inv.add(InventoryEntry(file_id, name, kind, parent))
458
self._write_inventory(inv)
462
"""Return all unknown files.
464
These are files in the working directory that are not versioned or
465
control files or ignored.
467
>>> b = ScratchBranch(files=['foo', 'foo~'])
468
>>> list(b.unknowns())
471
>>> list(b.unknowns())
474
>>> list(b.unknowns())
477
return self.working_tree().unknowns()
480
def append_revision(self, revision_id):
481
mutter("add {%s} to revision-history" % revision_id)
482
rev_history = self.revision_history()
484
tmprhname = self.controlfilename('revision-history.tmp')
485
rhname = self.controlfilename('revision-history')
487
f = file(tmprhname, 'wt')
488
rev_history.append(revision_id)
489
f.write('\n'.join(rev_history))
493
if sys.platform == 'win32':
495
os.rename(tmprhname, rhname)
499
def get_revision(self, revision_id):
500
"""Return the Revision object for a named revision"""
501
r = Revision.read_xml(self.revision_store[revision_id])
502
assert r.revision_id == revision_id
506
def get_inventory(self, inventory_id):
507
"""Get Inventory object by hash.
509
TODO: Perhaps for this and similar methods, take a revision
510
parameter which can be either an integer revno or a
512
i = Inventory.read_xml(self.inventory_store[inventory_id])
516
def get_revision_inventory(self, revision_id):
517
"""Return inventory of a past revision."""
518
if revision_id == None:
521
return self.get_inventory(self.get_revision(revision_id).inventory_id)
525
def revision_history(self):
526
"""Return sequence of revision hashes on to this branch.
528
>>> ScratchBranch().revision_history()
531
return [l.rstrip('\r\n') for l in self.controlfile('revision-history', 'r').readlines()]
534
def enum_history(self, direction):
535
"""Return (revno, revision_id) for history of branch.
538
'forward' is from earliest to latest
539
'reverse' is from latest to earliest
267
541
rh = self.revision_history()
268
if not (1 <= revno <= len(rh)):
269
raise InvalidRevisionNumber(revno)
270
return self.repository.get_revision_delta(rh[revno-1])
272
def get_root_id(self):
273
"""Return the id of this branches root"""
274
raise NotImplementedError('get_root_id is abstract')
276
def print_file(self, file, revision_id):
277
"""Print `file` to stdout."""
278
raise NotImplementedError('print_file is abstract')
280
def append_revision(self, *revision_ids):
281
raise NotImplementedError('append_revision is abstract')
283
def set_revision_history(self, rev_history):
284
raise NotImplementedError('set_revision_history is abstract')
286
def revision_history(self):
287
"""Return sequence of revision hashes on to this branch."""
288
raise NotImplementedError('revision_history is abstract')
542
if direction == 'forward':
547
elif direction == 'reverse':
553
raise ValueError('invalid history direction', direction)
291
557
"""Return current revision number for this branch.
384
684
Note that to_name is only the last component of the new name;
385
685
this doesn't change the directory.
387
This returns a list of (from_path, to_path) pairs for each
390
raise NotImplementedError('move is abstract')
392
def get_parent(self):
393
"""Return the parent location of the branch.
395
This is the default location for push/pull/missing. The usual
396
pattern is that the user can override it by specifying a
399
raise NotImplementedError('get_parent is abstract')
401
def get_submit_branch(self):
402
"""Return the submit location of the branch.
404
This is the default location for bundle. The usual
405
pattern is that the user can override it by specifying a
408
return self.get_config().get_user_option('submit_branch')
410
def set_submit_branch(self, location):
411
"""Return the submit location of the branch.
413
This is the default location for bundle. The usual
414
pattern is that the user can override it by specifying a
417
self.get_config().set_user_option('submit_branch', location)
419
def get_push_location(self):
420
"""Return the None or the location to push this branch to."""
421
raise NotImplementedError('get_push_location is abstract')
423
def set_push_location(self, location):
424
"""Set a new push location for this branch."""
425
raise NotImplementedError('set_push_location is abstract')
427
def set_parent(self, url):
428
raise NotImplementedError('set_parent is abstract')
432
"""Synchronise this branch with the master branch if any.
434
:return: None or the last_revision pivoted out during the update.
438
def check_revno(self, revno):
440
Check whether a revno corresponds to any revision.
441
Zero (the NULL revision) is considered valid.
444
self.check_real_revno(revno)
687
## TODO: Option to move IDs only
688
assert not isinstance(from_paths, basestring)
689
tree = self.working_tree()
691
to_abs = self.abspath(to_name)
692
if not isdir(to_abs):
693
raise BzrError("destination %r is not a directory" % to_abs)
694
if not tree.has_filename(to_name):
695
raise BzrError("destination %r not in working directory" % to_abs)
696
to_dir_id = inv.path2id(to_name)
697
if to_dir_id == None and to_name != '':
698
raise BzrError("destination %r is not a versioned directory" % to_name)
699
to_dir_ie = inv[to_dir_id]
700
if to_dir_ie.kind not in ('directory', 'root_directory'):
701
raise BzrError("destination %r is not a directory" % to_abs)
703
to_idpath = inv.get_idpath(to_dir_id)
706
if not tree.has_filename(f):
707
raise BzrError("%r does not exist in working tree" % f)
708
f_id = inv.path2id(f)
710
raise BzrError("%r is not versioned" % f)
711
name_tail = splitpath(f)[-1]
712
dest_path = appendpath(to_name, name_tail)
713
if tree.has_filename(dest_path):
714
raise BzrError("destination %r already exists" % dest_path)
715
if f_id in to_idpath:
716
raise BzrError("can't move %r to a subdirectory of itself" % f)
718
# OK, so there's a race here, it's possible that someone will
719
# create a file in this interval and then the rename might be
720
# left half-done. But we should have caught most problems.
723
name_tail = splitpath(f)[-1]
724
dest_path = appendpath(to_name, name_tail)
725
print "%s => %s" % (f, dest_path)
726
inv.rename(inv.path2id(f), to_dir_id, name_tail)
728
os.rename(self.abspath(f), self.abspath(dest_path))
730
raise BzrError("failed to rename %r to %r: %s" % (f, dest_path, e[1]),
731
["rename rolled back"])
733
self._write_inventory(inv)
738
class ScratchBranch(Branch):
739
"""Special test class: a branch that cleans up after itself.
741
>>> b = ScratchBranch()
749
def __init__(self, files=[], dirs=[]):
750
"""Make a test branch.
752
This creates a temporary directory and runs init-tree in it.
754
If any files are listed, they are created in the working copy.
756
Branch.__init__(self, tempfile.mkdtemp(), init=True)
758
os.mkdir(self.abspath(d))
446
def check_real_revno(self, revno):
448
Check whether a revno corresponds to a real revision.
449
Zero (the NULL revision) is considered invalid
451
if revno < 1 or revno > self.revno():
452
raise InvalidRevisionNumber(revno)
455
def clone(self, *args, **kwargs):
456
"""Clone this branch into to_bzrdir preserving all semantic values.
458
revision_id: if not None, the revision history in the new branch will
459
be truncated to end with revision_id.
461
# for API compatibility, until 0.8 releases we provide the old api:
462
# def clone(self, to_location, revision=None, basis_branch=None, to_branch_format=None):
463
# after 0.8 releases, the *args and **kwargs should be changed:
464
# def clone(self, to_bzrdir, revision_id=None):
465
if (kwargs.get('to_location', None) or
466
kwargs.get('revision', None) or
467
kwargs.get('basis_branch', None) or
468
(len(args) and isinstance(args[0], basestring))):
469
# backwards compatibility api:
470
warn("Branch.clone() has been deprecated for BzrDir.clone() from"
471
" bzrlib 0.8.", DeprecationWarning, stacklevel=3)
474
basis_branch = args[2]
476
basis_branch = kwargs.get('basis_branch', None)
478
basis = basis_branch.bzrdir
483
revision_id = args[1]
485
revision_id = kwargs.get('revision', None)
490
# no default to raise if not provided.
491
url = kwargs.get('to_location')
492
return self.bzrdir.clone(url,
493
revision_id=revision_id,
494
basis=basis).open_branch()
496
# generate args by hand
498
revision_id = args[1]
500
revision_id = kwargs.get('revision_id', None)
504
# no default to raise if not provided.
505
to_bzrdir = kwargs.get('to_bzrdir')
506
result = self._format.initialize(to_bzrdir)
507
self.copy_content_into(result, revision_id=revision_id)
511
def sprout(self, to_bzrdir, revision_id=None):
512
"""Create a new line of development from the branch, into to_bzrdir.
514
revision_id: if not None, the revision history in the new branch will
515
be truncated to end with revision_id.
517
result = self._format.initialize(to_bzrdir)
518
self.copy_content_into(result, revision_id=revision_id)
519
result.set_parent(self.bzrdir.root_transport.base)
523
def copy_content_into(self, destination, revision_id=None):
524
"""Copy the content of self into destination.
526
revision_id: if not None, the revision history in the new branch will
527
be truncated to end with revision_id.
529
new_history = self.revision_history()
530
if revision_id is not None:
532
new_history = new_history[:new_history.index(revision_id) + 1]
534
rev = self.repository.get_revision(revision_id)
535
new_history = rev.get_history(self.repository)[1:]
536
destination.set_revision_history(new_history)
537
parent = self.get_parent()
539
destination.set_parent(parent)
543
"""Check consistency of the branch.
545
In particular this checks that revisions given in the revision-history
546
do actually match up in the revision graph, and that they're all
547
present in the repository.
549
Callers will typically also want to check the repository.
551
:return: A BranchCheckResult.
553
mainline_parent_id = None
554
for revision_id in self.revision_history():
556
revision = self.repository.get_revision(revision_id)
557
except errors.NoSuchRevision, e:
558
raise errors.BzrCheckError("mainline revision {%s} not in repository"
560
# In general the first entry on the revision history has no parents.
561
# But it's not illegal for it to have parents listed; this can happen
562
# in imports from Arch when the parents weren't reachable.
563
if mainline_parent_id is not None:
564
if mainline_parent_id not in revision.parent_ids:
565
raise errors.BzrCheckError("previous revision {%s} not listed among "
567
% (mainline_parent_id, revision_id))
568
mainline_parent_id = revision_id
569
return BranchCheckResult(self)
572
class BranchFormat(object):
573
"""An encapsulation of the initialization and open routines for a format.
575
Formats provide three things:
576
* An initialization routine,
580
Formats are placed in an dict by their format string for reference
581
during branch opening. Its not required that these be instances, they
582
can be classes themselves with class methods - it simply depends on
583
whether state is needed for a given format or not.
585
Once a format is deprecated, just deprecate the initialize and open
586
methods on the format class. Do not deprecate the object, as the
587
object will be created every time regardless.
590
_default_format = None
591
"""The default format used for new branches."""
594
"""The known formats."""
597
def find_format(klass, a_bzrdir):
598
"""Return the format for the branch object in a_bzrdir."""
600
transport = a_bzrdir.get_branch_transport(None)
601
format_string = transport.get("format").read()
602
return klass._formats[format_string]
604
raise NotBranchError(path=transport.base)
606
raise errors.UnknownFormatError(format=format_string)
609
def get_default_format(klass):
610
"""Return the current default format."""
611
return klass._default_format
613
def get_format_string(self):
614
"""Return the ASCII format string that identifies this format."""
615
raise NotImplementedError(self.get_format_string)
617
def get_format_description(self):
618
"""Return the short format description for this format."""
619
raise NotImplementedError(self.get_format_string)
621
def initialize(self, a_bzrdir):
622
"""Create a branch of this format in a_bzrdir."""
623
raise NotImplementedError(self.initialize)
625
def is_supported(self):
626
"""Is this format supported?
628
Supported formats can be initialized and opened.
629
Unsupported formats may not support initialization or committing or
630
some other features depending on the reason for not being supported.
634
def open(self, a_bzrdir, _found=False):
635
"""Return the branch object for a_bzrdir
637
_found is a private parameter, do not use it. It is used to indicate
638
if format probing has already be done.
640
raise NotImplementedError(self.open)
643
def register_format(klass, format):
644
klass._formats[format.get_format_string()] = format
647
def set_default_format(klass, format):
648
klass._default_format = format
651
def unregister_format(klass, format):
652
assert klass._formats[format.get_format_string()] is format
653
del klass._formats[format.get_format_string()]
656
return self.get_format_string().rstrip()
659
class BzrBranchFormat4(BranchFormat):
660
"""Bzr branch format 4.
663
- a revision-history file.
664
- a branch-lock lock file [ to be shared with the bzrdir ]
667
def get_format_description(self):
668
"""See BranchFormat.get_format_description()."""
669
return "Branch format 4"
671
def initialize(self, a_bzrdir):
672
"""Create a branch of this format in a_bzrdir."""
673
mutter('creating branch in %s', a_bzrdir.transport.base)
674
branch_transport = a_bzrdir.get_branch_transport(self)
675
utf8_files = [('revision-history', ''),
678
control_files = LockableFiles(branch_transport, 'branch-lock',
680
control_files.create_lock()
681
control_files.lock_write()
683
for file, content in utf8_files:
684
control_files.put_utf8(file, content)
686
control_files.unlock()
687
return self.open(a_bzrdir, _found=True)
690
super(BzrBranchFormat4, self).__init__()
691
self._matchingbzrdir = bzrdir.BzrDirFormat6()
693
def open(self, a_bzrdir, _found=False):
694
"""Return the branch object for a_bzrdir
696
_found is a private parameter, do not use it. It is used to indicate
697
if format probing has already be done.
700
# we are being called directly and must probe.
701
raise NotImplementedError
702
return BzrBranch(_format=self,
703
_control_files=a_bzrdir._control_files,
705
_repository=a_bzrdir.open_repository())
708
return "Bazaar-NG branch format 4"
711
class BzrBranchFormat5(BranchFormat):
712
"""Bzr branch format 5.
715
- a revision-history file.
717
- a lock dir guarding the branch itself
718
- all of this stored in a branch/ subdirectory
719
- works with shared repositories.
721
This format is new in bzr 0.8.
724
def get_format_string(self):
725
"""See BranchFormat.get_format_string()."""
726
return "Bazaar-NG branch format 5\n"
728
def get_format_description(self):
729
"""See BranchFormat.get_format_description()."""
730
return "Branch format 5"
732
def initialize(self, a_bzrdir):
733
"""Create a branch of this format in a_bzrdir."""
734
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
735
branch_transport = a_bzrdir.get_branch_transport(self)
736
utf8_files = [('revision-history', ''),
739
control_files = LockableFiles(branch_transport, 'lock', lockdir.LockDir)
740
control_files.create_lock()
741
control_files.lock_write()
742
control_files.put_utf8('format', self.get_format_string())
744
for file, content in utf8_files:
745
control_files.put_utf8(file, content)
747
control_files.unlock()
748
return self.open(a_bzrdir, _found=True, )
751
super(BzrBranchFormat5, self).__init__()
752
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
754
def open(self, a_bzrdir, _found=False):
755
"""Return the branch object for a_bzrdir
757
_found is a private parameter, do not use it. It is used to indicate
758
if format probing has already be done.
761
format = BranchFormat.find_format(a_bzrdir)
762
assert format.__class__ == self.__class__
763
transport = a_bzrdir.get_branch_transport(None)
764
control_files = LockableFiles(transport, 'lock', lockdir.LockDir)
765
return BzrBranch5(_format=self,
766
_control_files=control_files,
768
_repository=a_bzrdir.find_repository())
771
return "Bazaar-NG Metadir branch format 5"
774
class BranchReferenceFormat(BranchFormat):
775
"""Bzr branch reference format.
777
Branch references are used in implementing checkouts, they
778
act as an alias to the real branch which is at some other url.
785
def get_format_string(self):
786
"""See BranchFormat.get_format_string()."""
787
return "Bazaar-NG Branch Reference Format 1\n"
789
def get_format_description(self):
790
"""See BranchFormat.get_format_description()."""
791
return "Checkout reference format 1"
793
def initialize(self, a_bzrdir, target_branch=None):
794
"""Create a branch of this format in a_bzrdir."""
795
if target_branch is None:
796
# this format does not implement branch itself, thus the implicit
797
# creation contract must see it as uninitializable
798
raise errors.UninitializableFormat(self)
799
mutter('creating branch reference in %s', a_bzrdir.transport.base)
800
branch_transport = a_bzrdir.get_branch_transport(self)
801
# FIXME rbc 20060209 one j-a-ms encoding branch lands this str() cast is not needed.
802
branch_transport.put('location', StringIO(str(target_branch.bzrdir.root_transport.base)))
803
branch_transport.put('format', StringIO(self.get_format_string()))
804
return self.open(a_bzrdir, _found=True)
807
super(BranchReferenceFormat, self).__init__()
808
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
810
def _make_reference_clone_function(format, a_branch):
811
"""Create a clone() routine for a branch dynamically."""
812
def clone(to_bzrdir, revision_id=None):
813
"""See Branch.clone()."""
814
return format.initialize(to_bzrdir, a_branch)
815
# cannot obey revision_id limits when cloning a reference ...
816
# FIXME RBC 20060210 either nuke revision_id for clone, or
817
# emit some sort of warning/error to the caller ?!
820
def open(self, a_bzrdir, _found=False):
821
"""Return the branch that the branch reference in a_bzrdir points at.
823
_found is a private parameter, do not use it. It is used to indicate
824
if format probing has already be done.
827
format = BranchFormat.find_format(a_bzrdir)
828
assert format.__class__ == self.__class__
829
transport = a_bzrdir.get_branch_transport(None)
830
real_bzrdir = bzrdir.BzrDir.open(transport.get('location').read())
831
result = real_bzrdir.open_branch()
832
# this changes the behaviour of result.clone to create a new reference
833
# rather than a copy of the content of the branch.
834
# I did not use a proxy object because that needs much more extensive
835
# testing, and we are only changing one behaviour at the moment.
836
# If we decide to alter more behaviours - i.e. the implicit nickname
837
# then this should be refactored to introduce a tested proxy branch
838
# and a subclass of that for use in overriding clone() and ....
840
result.clone = self._make_reference_clone_function(result)
844
# formats which have no format string are not discoverable
845
# and not independently creatable, so are not registered.
846
__default_format = BzrBranchFormat5()
847
BranchFormat.register_format(__default_format)
848
BranchFormat.register_format(BranchReferenceFormat())
849
BranchFormat.set_default_format(__default_format)
850
_legacy_formats = [BzrBranchFormat4(),
853
class BzrBranch(Branch):
854
"""A branch stored in the actual filesystem.
856
Note that it's "local" in the context of the filesystem; it doesn't
857
really matter if it's on an nfs/smb/afs/coda/... share, as long as
858
it's writable, and can be accessed via the normal filesystem API.
761
file(os.path.join(self.base, f), 'w').write('content of %s' % f)
768
"""Destroy the test branch, removing the scratch directory."""
770
mutter("delete ScratchBranch %s" % self.base)
771
shutil.rmtree(self.base)
773
# Work around for shutil.rmtree failing on Windows when
774
# readonly files are encountered
775
mutter("hit exception in destroying ScratchBranch: %s" % e)
776
for root, dirs, files in os.walk(self.base, topdown=False):
778
os.chmod(os.path.join(root, name), 0700)
779
shutil.rmtree(self.base)
861
def __init__(self, transport=DEPRECATED_PARAMETER, init=DEPRECATED_PARAMETER,
862
relax_version_check=DEPRECATED_PARAMETER, _format=None,
863
_control_files=None, a_bzrdir=None, _repository=None):
864
"""Create new branch object at a particular location.
866
transport -- A Transport object, defining how to access files.
868
init -- If True, create new control files in a previously
869
unversioned directory. If False, the branch must already
872
relax_version_check -- If true, the usual check for the branch
873
version is not applied. This is intended only for
874
upgrade/recovery type use; it's not guaranteed that
875
all operations will work on old format branches.
878
self.bzrdir = bzrdir.BzrDir.open(transport.base)
880
self.bzrdir = a_bzrdir
881
self._transport = self.bzrdir.transport.clone('..')
882
self._base = self._transport.base
883
self._format = _format
884
if _control_files is None:
885
raise ValueError('BzrBranch _control_files is None')
886
self.control_files = _control_files
887
if deprecated_passed(init):
888
warn("BzrBranch.__init__(..., init=XXX): The init parameter is "
889
"deprecated as of bzr 0.8. Please use Branch.create().",
893
# this is slower than before deprecation, oh well never mind.
895
self._initialize(transport.base)
896
self._check_format(_format)
897
if deprecated_passed(relax_version_check):
898
warn("BzrBranch.__init__(..., relax_version_check=XXX_: The "
899
"relax_version_check parameter is deprecated as of bzr 0.8. "
900
"Please use BzrDir.open_downlevel, or a BzrBranchFormat's "
904
if (not relax_version_check
905
and not self._format.is_supported()):
906
raise errors.UnsupportedFormatError(format=fmt)
907
if deprecated_passed(transport):
908
warn("BzrBranch.__init__(transport=XXX...): The transport "
909
"parameter is deprecated as of bzr 0.8. "
910
"Please use Branch.open, or bzrdir.open_branch().",
913
self.repository = _repository
916
return '%s(%r)' % (self.__class__.__name__, self.base)
921
# TODO: It might be best to do this somewhere else,
922
# but it is nice for a Branch object to automatically
923
# cache it's information.
924
# Alternatively, we could have the Transport objects cache requests
925
# See the earlier discussion about how major objects (like Branch)
926
# should never expect their __del__ function to run.
927
# XXX: cache_root seems to be unused, 2006-01-13 mbp
928
if hasattr(self, 'cache_root') and self.cache_root is not None:
930
osutils.rmtree(self.cache_root)
933
self.cache_root = None
938
base = property(_get_base, doc="The URL for the root of this branch.")
940
def _finish_transaction(self):
941
"""Exit the current transaction."""
942
return self.control_files._finish_transaction()
944
def get_transaction(self):
945
"""Return the current active transaction.
947
If no transaction is active, this returns a passthrough object
948
for which all data is immediately flushed and no caching happens.
950
# this is an explicit function so that we can do tricky stuff
951
# when the storage in rev_storage is elsewhere.
952
# we probably need to hook the two 'lock a location' and
953
# 'have a transaction' together more delicately, so that
954
# we can have two locks (branch and storage) and one transaction
955
# ... and finishing the transaction unlocks both, but unlocking
956
# does not. - RBC 20051121
957
return self.control_files.get_transaction()
959
def _set_transaction(self, transaction):
960
"""Set a new active transaction."""
961
return self.control_files._set_transaction(transaction)
963
def abspath(self, name):
964
"""See Branch.abspath."""
965
return self.control_files._transport.abspath(name)
967
def _check_format(self, format):
968
"""Identify the branch format if needed.
970
The format is stored as a reference to the format object in
971
self._format for code that needs to check it later.
973
The format parameter is either None or the branch format class
974
used to open this branch.
976
FIXME: DELETE THIS METHOD when pre 0.8 support is removed.
979
format = BranchFormat.find_format(self.bzrdir)
980
self._format = format
981
mutter("got branch format %s", self._format)
984
def get_root_id(self):
985
"""See Branch.get_root_id."""
986
tree = self.repository.revision_tree(self.last_revision())
987
return tree.inventory.root.file_id
990
return self.control_files.is_locked()
992
def lock_write(self):
993
self.repository.lock_write()
995
self.control_files.lock_write()
997
self.repository.unlock()
1000
def lock_read(self):
1001
self.repository.lock_read()
1003
self.control_files.lock_read()
1005
self.repository.unlock()
1009
# TODO: test for failed two phase locks. This is known broken.
1011
self.control_files.unlock()
1013
self.repository.unlock()
1015
def peek_lock_mode(self):
1016
if self.control_files._lock_count == 0:
1019
return self.control_files._lock_mode
1021
def get_physical_lock_status(self):
1022
return self.control_files.get_physical_lock_status()
1025
def print_file(self, file, revision_id):
1026
"""See Branch.print_file."""
1027
return self.repository.print_file(file, revision_id)
1030
def append_revision(self, *revision_ids):
1031
"""See Branch.append_revision."""
1032
for revision_id in revision_ids:
1033
mutter("add {%s} to revision-history" % revision_id)
1034
rev_history = self.revision_history()
1035
rev_history.extend(revision_ids)
1036
self.set_revision_history(rev_history)
1039
def set_revision_history(self, rev_history):
1040
"""See Branch.set_revision_history."""
1041
self.control_files.put_utf8(
1042
'revision-history', '\n'.join(rev_history))
1043
transaction = self.get_transaction()
1044
history = transaction.map.find_revision_history()
1045
if history is not None:
1046
# update the revision history in the identity map.
1047
history[:] = list(rev_history)
1048
# this call is disabled because revision_history is
1049
# not really an object yet, and the transaction is for objects.
1050
# transaction.register_dirty(history)
1052
transaction.map.add_revision_history(rev_history)
1053
# this call is disabled because revision_history is
1054
# not really an object yet, and the transaction is for objects.
1055
# transaction.register_clean(history)
1058
def revision_history(self):
1059
"""See Branch.revision_history."""
1060
transaction = self.get_transaction()
1061
history = transaction.map.find_revision_history()
1062
if history is not None:
1063
mutter("cache hit for revision-history in %s", self)
1064
return list(history)
1065
history = [l.rstrip('\r\n') for l in
1066
self.control_files.get_utf8('revision-history').readlines()]
1067
transaction.map.add_revision_history(history)
1068
# this call is disabled because revision_history is
1069
# not really an object yet, and the transaction is for objects.
1070
# transaction.register_clean(history, precious=True)
1071
return list(history)
1074
def generate_revision_history(self, revision_id, last_rev=None,
1076
"""Create a new revision history that will finish with revision_id.
1078
:param revision_id: the new tip to use.
1079
:param last_rev: The previous last_revision. If not None, then this
1080
must be a ancestory of revision_id, or DivergedBranches is raised.
1081
:param other_branch: The other branch that DivergedBranches should
1082
raise with respect to.
1084
# stop_revision must be a descendant of last_revision
1085
stop_graph = self.repository.get_revision_graph(revision_id)
1086
if last_rev is not None and last_rev not in stop_graph:
1087
# our previous tip is not merged into stop_revision
1088
raise errors.DivergedBranches(self, other_branch)
1089
# make a new revision history from the graph
1090
current_rev_id = revision_id
1092
while current_rev_id not in (None, revision.NULL_REVISION):
1093
new_history.append(current_rev_id)
1094
current_rev_id_parents = stop_graph[current_rev_id]
1096
current_rev_id = current_rev_id_parents[0]
1098
current_rev_id = None
1099
new_history.reverse()
1100
self.set_revision_history(new_history)
1103
def update_revisions(self, other, stop_revision=None):
1104
"""See Branch.update_revisions."""
1107
if stop_revision is None:
1108
stop_revision = other.last_revision()
1109
if stop_revision is None:
1110
# if there are no commits, we're done.
1112
# whats the current last revision, before we fetch [and change it
1114
last_rev = self.last_revision()
1115
# we fetch here regardless of whether we need to so that we pickup
1117
self.fetch(other, stop_revision)
1118
my_ancestry = self.repository.get_ancestry(last_rev)
1119
if stop_revision in my_ancestry:
1120
# last_revision is a descendant of stop_revision
1122
self.generate_revision_history(stop_revision, last_rev=last_rev,
1127
def basis_tree(self):
1128
"""See Branch.basis_tree."""
1129
return self.repository.revision_tree(self.last_revision())
1131
@deprecated_method(zero_eight)
1132
def working_tree(self):
1133
"""Create a Working tree object for this branch."""
1135
from bzrlib.transport.local import LocalTransport
1136
if (self.base.find('://') != -1 or
1137
not isinstance(self._transport, LocalTransport)):
1138
raise NoWorkingTree(self.base)
1139
return self.bzrdir.open_workingtree()
1142
def pull(self, source, overwrite=False, stop_revision=None):
1143
"""See Branch.pull."""
1146
old_count = len(self.revision_history())
1148
self.update_revisions(source,stop_revision)
1149
except DivergedBranches:
1153
self.set_revision_history(source.revision_history())
1154
new_count = len(self.revision_history())
1155
return new_count - old_count
1159
def get_parent(self):
1160
"""See Branch.get_parent."""
1162
_locs = ['parent', 'pull', 'x-pull']
1163
assert self.base[-1] == '/'
1166
parent = self.control_files.get(l).read().strip('\n')
1169
# This is an old-format absolute path to a local branch
1170
# turn it into a url
1171
if parent.startswith('/'):
1172
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1173
return urlutils.join(self.base[:-1], parent)
1176
def get_push_location(self):
1177
"""See Branch.get_push_location."""
1178
push_loc = self.get_config().get_user_option('push_location')
1181
def set_push_location(self, location):
1182
"""See Branch.set_push_location."""
1183
self.get_config().set_user_option('push_location', location,
1187
def set_parent(self, url):
1188
"""See Branch.set_parent."""
1189
# TODO: Maybe delete old location files?
1190
# URLs should never be unicode, even on the local fs,
1191
# FIXUP this and get_parent in a future branch format bump:
1192
# read and rewrite the file, and have the new format code read
1193
# using .get not .get_utf8. RBC 20060125
1195
self.control_files._transport.delete('parent')
1197
if isinstance(url, unicode):
1199
url = url.encode('ascii')
1200
except UnicodeEncodeError:
1201
raise bzrlib.errors.InvalidURL(url,
1202
"Urls must be 7-bit ascii, "
1203
"use bzrlib.urlutils.escape")
1205
url = urlutils.relative_url(self.base, url)
1206
self.control_files.put('parent', url + '\n')
1208
@deprecated_function(zero_nine)
1209
def tree_config(self):
1210
"""DEPRECATED; call get_config instead.
1211
TreeConfig has become part of BranchConfig."""
1212
return TreeConfig(self)
1215
class BzrBranch5(BzrBranch):
1216
"""A format 5 branch. This supports new features over plan branches.
1218
It has support for a master_branch which is the data for bound branches.
1226
super(BzrBranch5, self).__init__(_format=_format,
1227
_control_files=_control_files,
1229
_repository=_repository)
1232
def pull(self, source, overwrite=False, stop_revision=None):
1233
"""Updates branch.pull to be bound branch aware."""
1234
bound_location = self.get_bound_location()
1235
if source.base != bound_location:
1236
# not pulling from master, so we need to update master.
1237
master_branch = self.get_master_branch()
1239
master_branch.pull(source)
1240
source = master_branch
1241
return super(BzrBranch5, self).pull(source, overwrite, stop_revision)
1243
def get_bound_location(self):
1245
return self.control_files.get_utf8('bound').read()[:-1]
1246
except errors.NoSuchFile:
1250
def get_master_branch(self):
1251
"""Return the branch we are bound to.
1253
:return: Either a Branch, or None
1255
This could memoise the branch, but if thats done
1256
it must be revalidated on each new lock.
1257
So for now we just don't memoise it.
1258
# RBC 20060304 review this decision.
1260
bound_loc = self.get_bound_location()
1264
return Branch.open(bound_loc)
1265
except (errors.NotBranchError, errors.ConnectionError), e:
1266
raise errors.BoundBranchConnectionFailure(
1270
def set_bound_location(self, location):
1271
"""Set the target where this branch is bound to.
1273
:param location: URL to the target branch
1276
self.control_files.put_utf8('bound', location+'\n')
1279
self.control_files._transport.delete('bound')
784
######################################################################
788
def is_control_file(filename):
789
## FIXME: better check
790
filename = os.path.normpath(filename)
791
while filename != '':
792
head, tail = os.path.split(filename)
793
## mutter('check %r for control file' % ((head, tail), ))
794
if tail == bzrlib.BZRDIR:
1285
def bind(self, other):
1286
"""Bind the local branch the other branch.
1288
:param other: The branch to bind to
1291
# TODO: jam 20051230 Consider checking if the target is bound
1292
# It is debatable whether you should be able to bind to
1293
# a branch which is itself bound.
1294
# Committing is obviously forbidden,
1295
# but binding itself may not be.
1296
# Since we *have* to check at commit time, we don't
1297
# *need* to check here
1300
# we are now equal to or a suffix of other.
1302
# Since we have 'pulled' from the remote location,
1303
# now we should try to pull in the opposite direction
1304
# in case the local tree has more revisions than the
1306
# There may be a different check you could do here
1307
# rather than actually trying to install revisions remotely.
1308
# TODO: capture an exception which indicates the remote branch
1310
# If it is up-to-date, this probably should not be a failure
1312
# lock other for write so the revision-history syncing cannot race
1316
# if this does not error, other now has the same last rev we do
1317
# it can only error if the pull from other was concurrent with
1318
# a commit to other from someone else.
1320
# until we ditch revision-history, we need to sync them up:
1321
self.set_revision_history(other.revision_history())
1322
# now other and self are up to date with each other and have the
1323
# same revision-history.
1327
self.set_bound_location(other.base)
1331
"""If bound, unbind"""
1332
return self.set_bound_location(None)
1336
"""Synchronise this branch with the master branch if any.
1338
:return: None or the last_revision that was pivoted out during the
1341
master = self.get_master_branch()
1342
if master is not None:
1343
old_tip = self.last_revision()
1344
self.pull(master, overwrite=True)
1345
if old_tip in self.repository.get_ancestry(self.last_revision()):
1351
class BranchTestProviderAdapter(object):
1352
"""A tool to generate a suite testing multiple branch formats at once.
1354
This is done by copying the test once for each transport and injecting
1355
the transport_server, transport_readonly_server, and branch_format
1356
classes into each copy. Each copy is also given a new id() to make it
1360
def __init__(self, transport_server, transport_readonly_server, formats):
1361
self._transport_server = transport_server
1362
self._transport_readonly_server = transport_readonly_server
1363
self._formats = formats
1365
def adapt(self, test):
1366
result = TestSuite()
1367
for branch_format, bzrdir_format in self._formats:
1368
new_test = deepcopy(test)
1369
new_test.transport_server = self._transport_server
1370
new_test.transport_readonly_server = self._transport_readonly_server
1371
new_test.bzrdir_format = bzrdir_format
1372
new_test.branch_format = branch_format
1373
def make_new_test_id():
1374
new_id = "%s(%s)" % (new_test.id(), branch_format.__class__.__name__)
1375
return lambda: new_id
1376
new_test.id = make_new_test_id()
1377
result.addTest(new_test)
1381
class BranchCheckResult(object):
1382
"""Results of checking branch consistency.
1387
def __init__(self, branch):
1388
self.branch = branch
1390
def report_results(self, verbose):
1391
"""Report the check results via trace.note.
1393
:param verbose: Requests more detailed display of what was checked,
1396
note('checked branch %s format %s',
1398
self.branch._format)
1401
######################################################################
1405
@deprecated_function(zero_eight)
1406
def is_control_file(*args, **kwargs):
1407
"""See bzrlib.workingtree.is_control_file."""
1408
return bzrlib.workingtree.is_control_file(*args, **kwargs)
803
def gen_file_id(name):
804
"""Return new file id.
806
This should probably generate proper UUIDs, but for the moment we
807
cope with just randomness because running uuidgen every time is
812
idx = name.rfind('/')
814
name = name[idx+1 : ]
815
idx = name.rfind('\\')
817
name = name[idx+1 : ]
819
# make it not a hidden file
820
name = name.lstrip('.')
822
# remove any wierd characters; we don't escape them but rather
824
name = re.sub(r'[^\w.]', '', name)
826
s = hexlify(rand_bytes(8))
827
return '-'.join((name, compact_date(time.time()), s))
added
removed
bzrlib/branch.py
