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

  • Committer: John Arbash Meinel
  • Date: 2009-08-18 21:41:08 UTC
  • mto: This revision was merged to the branch mainline in revision 4629.
  • Revision ID: john@arbash-meinel.com-20090818214108-03e6hkoj7v4va7x8
Turns out that some code assumed passing NULL_REVISION to merge_sort
always was fine, and now that we are using 'keys' it was passing (NULL_REVISION,)
for now, that should be ok.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/branch.py
105
105
 
106
106
class SmartServerBranchSetTagsBytes(SmartServerLockedBranchRequest):
107
107
 
108
 
    def __init__(self, backing_transport, root_client_path='/', jail_root=None):
 
108
    def __init__(self, backing_transport, root_client_path='/'):
109
109
        SmartServerLockedBranchRequest.__init__(
110
 
            self, backing_transport, root_client_path, jail_root)
 
110
            self, backing_transport, root_client_path)
111
111
        self.locked = False
112
112
        
113
113
    def do_with_locked_branch(self, branch):