/brz/remove-bazaar

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

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: John Arbash Meinel
  • Date: 2006-12-01 19:41:16 UTC
  • mfrom: (2158 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2159.
  • Revision ID: john@arbash-meinel.com-20061201194116-nvn5qhfxux5284jc
[merge] bzr.dev 2158

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
29
29
    check,
30
30
    delta,
31
31
    errors,
 
32
    generate_ids,
32
33
    gpg,
33
34
    graph,
34
35
    knit,
2357
2358
 
2358
2359
    def _gen_revision_id(self):
2359
2360
        """Return new revision-id."""
2360
 
        s = '%s-%s-' % (self._config.user_email(), 
2361
 
                        compact_date(self._timestamp))
2362
 
        s += hexlify(rand_bytes(8))
2363
 
        return s
 
2361
        return generate_ids.gen_revision_id(self._config.username(),
 
2362
                                            self._timestamp)
2364
2363
 
2365
2364
    def _generate_revision_if_needed(self):
2366
2365
        """Create a revision id if None was supplied.
2535
2534
    """Unescape predefined XML entities in a string of data."""
2536
2535
    global _unescape_re
2537
2536
    if _unescape_re is None:
2538
 
        _unescape_re = re.compile('\&([^;]*);')
 
2537
        _unescape_re = re.compile('\&([^;]*);')
2539
2538
    return _unescape_re.sub(_unescaper, data)