← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Martin Pool
  • Date: 2010-07-21 09:58:42 UTC
  • mfrom: (4797.58.7 2.1)
  • mto: (5050.3.13 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: mbp@canonical.com-20100721095842-hz0obu8gl0x05nty
merge up 2.1 to 2.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
25
25
    check,
26
26
    chk_map,
27
27
    config,
28
 
    controldir,
29
28
    debug,
30
29
    fetch as _mod_fetch,
31
30
    fifo_cache,
243
242
 
244
243
    def _gen_revision_id(self):
245
244
        """Return new revision-id."""
246
 
        return generate_ids.gen_revision_id(self._committer, self._timestamp)
 
245
        return generate_ids.gen_revision_id(self._config.username(),
 
246
                                            self._timestamp)
247
247
 
248
248
    def _generate_revision_if_needed(self):
249
249
        """Create a revision id if None was supplied.
892
892
# Repositories
893
893
 
894
894
 
895
 
class Repository(_RelockDebugMixin, controldir.ControlComponent):
 
895
class Repository(_RelockDebugMixin, bzrdir.ControlComponent):
896
896
    """Repository holding history for one or more branches.
897
897
 
898
898
    The repository holds and retrieves historical information including