/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/bzrdir.py

  • Committer: John Arbash Meinel
  • Date: 2009-04-21 23:54:16 UTC
  • mto: (4300.1.7 groupcompress_info)
  • mto: This revision was merged to the branch mainline in revision 4301.
  • Revision ID: john@arbash-meinel.com-20090421235416-f0cz6ilf5cufbugi
https://launchpad.net/bugs/364900
Fix bug #364900, properly remove the 64kB that was just encoded in the copy.
Also, stop supporting None as a copy length in 'encode_copy_instruction'.
It was only used by the test suite, and it is good to pull that sort of thing out of
production code. (Besides, setting the copy to 64kB has the same effect.)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/bzrdir.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006 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
17
17
"""Server-side bzrdir related request implmentations."""
18
18
 
19
19
 
20
 
from bzrlib import branch, errors, repository, urlutils
21
 
from bzrlib.bzrdir import (
22
 
    BzrDir,
23
 
    BzrDirFormat,
24
 
    BzrDirMetaFormat1,
25
 
    network_format_registry,
26
 
    )
 
20
from bzrlib import branch, errors, repository
 
21
from bzrlib.bzrdir import BzrDir, BzrDirFormat, BzrDirMetaFormat1
27
22
from bzrlib.smart.request import (
28
23
    FailedSmartServerResponse,
29
24
    SmartServerRequest,
34
29
class SmartServerRequestOpenBzrDir(SmartServerRequest):
35
30
 
36
31
    def do(self, path):
 
32
        from bzrlib.bzrdir import BzrDirFormat
37
33
        try:
38
34
            t = self.transport_from_client_path(path)
39
35
        except errors.PathNotChild:
55
51
        return SuccessfulSmartServerResponse((answer,))
56
52
 
57
53
 
58
 
class SmartServerRequestOpenBzrDir_2_1(SmartServerRequest):
59
 
 
60
 
    def do(self, path):
61
 
        """Is there a BzrDir present, and if so does it have a working tree?
62
 
 
63
 
        New in 2.1.
64
 
        """
65
 
        try:
66
 
            t = self.transport_from_client_path(path)
67
 
        except errors.PathNotChild:
68
 
            # The client is trying to ask about a path that they have no access
69
 
            # to.
70
 
            return SuccessfulSmartServerResponse(('no',))
71
 
        try:
72
 
            bd = BzrDir.open_from_transport(t)
73
 
        except errors.NotBranchError:
74
 
            answer = ('no',)
75
 
        else:
76
 
            answer = ('yes',)
77
 
            if bd.has_workingtree():
78
 
                answer += ('yes',)
79
 
            else:
80
 
                answer += ('no',)
81
 
        return SuccessfulSmartServerResponse(answer)
82
 
 
83
 
 
84
54
class SmartServerRequestBzrDir(SmartServerRequest):
85
55
 
86
56
    def do(self, path, *args):
88
58
        try:
89
59
            self._bzrdir = BzrDir.open_from_transport(
90
60
                self.transport_from_client_path(path))
91
 
        except errors.NotBranchError, e:
92
 
            return FailedSmartServerResponse(('nobranch',))
 
61
        except errors.NotBranchError:
 
62
            return FailedSmartServerResponse(('nobranch', ))
93
63
        return self.do_bzrdir_request(*args)
94
64
 
95
65
    def _boolean_to_yes_no(self, a_boolean):
110
80
        """Get the relative path for repository from current_transport."""
111
81
        # the relpath of the bzrdir in the found repository gives us the
112
82
        # path segments to pop-out.
113
 
        relpath = repository.user_transport.relpath(
 
83
        relpath = repository.bzrdir.root_transport.relpath(
114
84
            current_transport.base)
115
85
        if len(relpath):
116
86
            segments = ['..'] * len(relpath.split('/'))
355
325
        return SuccessfulSmartServerResponse(('ok', ))
356
326
 
357
327
 
358
 
class SmartServerRequestBzrDirInitializeEx(SmartServerRequestBzrDir):
359
 
 
360
 
    def parse_NoneTrueFalse(self, arg):
361
 
        if not arg:
362
 
            return None
363
 
        if arg == 'False':
364
 
            return False
365
 
        if arg == 'True':
366
 
            return True
367
 
        raise AssertionError("invalid arg %r" % arg)
368
 
 
369
 
    def parse_NoneString(self, arg):
370
 
        return arg or None
371
 
 
372
 
    def _serialize_NoneTrueFalse(self, arg):
373
 
        if arg is False:
374
 
            return 'False'
375
 
        if not arg:
376
 
            return ''
377
 
        return 'True'
378
 
 
379
 
    def do(self, bzrdir_network_name, path, use_existing_dir, create_prefix,
380
 
        force_new_repo, stacked_on, stack_on_pwd, repo_format_name,
381
 
        make_working_trees, shared_repo):
382
 
        """Initialize a bzrdir at path as per
383
 
        BzrDirFormat.initialize_on_transport_ex.
384
 
 
385
 
        New in 1.16.  (Replaces BzrDirFormat.initialize_ex verb from 1.15).
386
 
 
387
 
        :return: return SuccessfulSmartServerResponse((repo_path, rich_root,
388
 
            tree_ref, external_lookup, repo_network_name,
389
 
            repo_bzrdir_network_name, bzrdir_format_network_name,
390
 
            NoneTrueFalse(stacking), final_stack, final_stack_pwd,
391
 
            repo_lock_token))
392
 
        """
393
 
        target_transport = self.transport_from_client_path(path)
394
 
        format = network_format_registry.get(bzrdir_network_name)
395
 
        use_existing_dir = self.parse_NoneTrueFalse(use_existing_dir)
396
 
        create_prefix = self.parse_NoneTrueFalse(create_prefix)
397
 
        force_new_repo = self.parse_NoneTrueFalse(force_new_repo)
398
 
        stacked_on = self.parse_NoneString(stacked_on)
399
 
        stack_on_pwd = self.parse_NoneString(stack_on_pwd)
400
 
        make_working_trees = self.parse_NoneTrueFalse(make_working_trees)
401
 
        shared_repo = self.parse_NoneTrueFalse(shared_repo)
402
 
        if stack_on_pwd == '.':
403
 
            stack_on_pwd = target_transport.base
404
 
        repo_format_name = self.parse_NoneString(repo_format_name)
405
 
        repo, bzrdir, stacking, repository_policy = \
406
 
            format.initialize_on_transport_ex(target_transport,
407
 
            use_existing_dir=use_existing_dir, create_prefix=create_prefix,
408
 
            force_new_repo=force_new_repo, stacked_on=stacked_on,
409
 
            stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
410
 
            make_working_trees=make_working_trees, shared_repo=shared_repo)
411
 
        if repo is None:
412
 
            repo_path = ''
413
 
            repo_name = ''
414
 
            rich_root = tree_ref = external_lookup = ''
415
 
            repo_bzrdir_name = ''
416
 
            final_stack = None
417
 
            final_stack_pwd = None
418
 
            repo_lock_token = ''
419
 
        else:
420
 
            repo_path = self._repo_relpath(bzrdir.root_transport, repo)
421
 
            if repo_path == '':
422
 
                repo_path = '.'
423
 
            rich_root, tree_ref, external_lookup = self._format_to_capabilities(
424
 
                repo._format)
425
 
            repo_name = repo._format.network_name()
426
 
            repo_bzrdir_name = repo.bzrdir._format.network_name()
427
 
            final_stack = repository_policy._stack_on
428
 
            final_stack_pwd = repository_policy._stack_on_pwd
429
 
            # It is returned locked, but we need to do the lock to get the lock
430
 
            # token.
431
 
            repo.unlock()
432
 
            repo_lock_token = repo.lock_write() or ''
433
 
            if repo_lock_token:
434
 
                repo.leave_lock_in_place()
435
 
            repo.unlock()
436
 
        final_stack = final_stack or ''
437
 
        final_stack_pwd = final_stack_pwd or ''
438
 
 
439
 
        # We want this to be relative to the bzrdir.
440
 
        if final_stack_pwd:
441
 
            final_stack_pwd = urlutils.relative_url(
442
 
                target_transport.base, final_stack_pwd)
443
 
 
444
 
        # Can't meaningfully return a root path.
445
 
        if final_stack.startswith('/'):
446
 
            client_path = self._root_client_path + final_stack[1:]
447
 
            final_stack = urlutils.relative_url(
448
 
                self._root_client_path, client_path)
449
 
            final_stack_pwd = '.'
450
 
 
451
 
        return SuccessfulSmartServerResponse((repo_path, rich_root, tree_ref,
452
 
            external_lookup, repo_name, repo_bzrdir_name,
453
 
            bzrdir._format.network_name(),
454
 
            self._serialize_NoneTrueFalse(stacking), final_stack,
455
 
            final_stack_pwd, repo_lock_token))
456
 
 
457
 
 
458
328
class SmartServerRequestOpenBranch(SmartServerRequestBzrDir):
459
329
 
460
330
    def do_bzrdir_request(self):
465
335
                return SuccessfulSmartServerResponse(('ok', ''))
466
336
            else:
467
337
                return SuccessfulSmartServerResponse(('ok', reference_url))
468
 
        except errors.NotBranchError, e:
469
 
            return FailedSmartServerResponse(('nobranch',))
 
338
        except errors.NotBranchError:
 
339
            return FailedSmartServerResponse(('nobranch', ))
470
340
 
471
341
 
472
342
class SmartServerRequestOpenBranchV2(SmartServerRequestBzrDir):
481
351
                return SuccessfulSmartServerResponse(('branch', format))
482
352
            else:
483
353
                return SuccessfulSmartServerResponse(('ref', reference_url))
484
 
        except errors.NotBranchError, e:
485
 
            return FailedSmartServerResponse(('nobranch',))
486
 
 
487
 
 
488
 
class SmartServerRequestOpenBranchV3(SmartServerRequestBzrDir):
489
 
 
490
 
    def do_bzrdir_request(self):
491
 
        """Open a branch at path and return the reference or format.
492
 
        
493
 
        This version introduced in 2.1.
494
 
 
495
 
        Differences to SmartServerRequestOpenBranchV2:
496
 
          * can return 2-element ('nobranch', extra), where 'extra' is a string
497
 
            with an explanation like 'location is a repository'.  Previously
498
 
            a 'nobranch' response would never have more than one element.
499
 
        """
500
 
        try:
501
 
            reference_url = self._bzrdir.get_branch_reference()
502
 
            if reference_url is None:
503
 
                br = self._bzrdir.open_branch(ignore_fallbacks=True)
504
 
                format = br._format.network_name()
505
 
                return SuccessfulSmartServerResponse(('branch', format))
506
 
            else:
507
 
                return SuccessfulSmartServerResponse(('ref', reference_url))
508
 
        except errors.NotBranchError, e:
509
 
            # Stringify the exception so that its .detail attribute will be
510
 
            # filled out.
511
 
            str(e)
512
 
            resp = ('nobranch',)
513
 
            detail = e.detail
514
 
            if detail:
515
 
                if detail.startswith(': '):
516
 
                    detail = detail[2:]
517
 
                resp += (detail,)
518
 
            return FailedSmartServerResponse(resp)
519
 
 
 
354
        except errors.NotBranchError:
 
355
            return FailedSmartServerResponse(('nobranch', ))