/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/smart/request.py

  • Committer: Jelmer Vernooij
  • Date: 2010-03-21 21:39:33 UTC
  • mfrom: (5102 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5143.
  • Revision ID: jelmer@samba.org-20100321213933-fexeh9zcoz8oaju2
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/request.py
1
 
# Copyright (C) 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
32
32
 
33
33
 
34
34
import tempfile
 
35
import thread
35
36
import threading
36
37
 
37
38
from bzrlib import (
291
292
        self._command = None
292
293
        if 'hpss' in debug.debug_flags:
293
294
            self._request_start_time = osutils.timer_func()
294
 
            cur_thread = threading.currentThread()
295
 
            self._thread_id = getattr(cur_thread, 'ident', None)
296
 
            if self._thread_id is None:
297
 
                self._thread_id = cur_thread.getName()
 
295
            self._thread_id = thread.get_ident()
298
296
 
299
297
    def _trace(self, action, message, extra_bytes=None, include_time=False):
300
298
        # It is a bit of a shame that this functionality overlaps with that of 
563
561
    'BzrDir.open_branchV2', 'bzrlib.smart.bzrdir',
564
562
    'SmartServerRequestOpenBranchV2')
565
563
request_handlers.register_lazy(
 
564
    'BzrDir.open_branchV3', 'bzrlib.smart.bzrdir',
 
565
    'SmartServerRequestOpenBranchV3')
 
566
request_handlers.register_lazy(
566
567
    'delete', 'bzrlib.smart.vfs', 'DeleteRequest')
567
568
request_handlers.register_lazy(
568
569
    'get', 'bzrlib.smart.vfs', 'GetRequest')