← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/atomicfile.py

  • Committer: John Arbash Meinel
  • Date: 2008-07-11 21:41:24 UTC
  • mto: This revision was merged to the branch mainline in revision 3543.
  • Revision ID: john@arbash-meinel.com-20080711214124-qi09irlj7pd5cuzg
Shortcut the case when one revision is in the ancestry of the other.

At the cost of a heads() check, when one parent supersedes, we don't have to extract
the text for the other. Changes merge time from 3m37s => 3m21s. Using a
CachingParentsProvider would drop the time down to 3m11s.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/atomicfile.py
53
53
        self._fd = None
54
54
 
55
55
        if _hostname is None:
56
 
            _hostname = osutils.get_host_name()
 
56
            _hostname = socket.gethostname()
57
57
 
58
 
        self.tmpfilename = '%s.%d.%s.%s.tmp' % (filename, _pid, _hostname,
59
 
                                                osutils.rand_chars(10))
 
58
        self.tmpfilename = '%s.%d.%s.tmp' % (filename, _pid, _hostname)
60
59
 
61
60
        self.realfilename = filename
62
61