← Back to branch summary

~maxb/bzr-svn/fetch-svn-rev-info-progress-bar

« back to all changes in this revision

Viewing changes to branch.py

  • Committer: Max Bowsher
  • Date: 2010-07-30 22:50:54 UTC
  • mfrom: (3324.1.37 trunk)
  • Revision ID: maxb@f2s.com-20100730225054-un1llcngdofg585w
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
119
119
class SubversionWriteLock(object):
120
120
    """A (dummy) write lock on a Subversion object."""
121
121
 
 
122
    __slots__ = ('unlock')
 
123
 
122
124
    def __init__(self, unlock):
123
125
        self.unlock = unlock
124
126
 
129
131
class SubversionReadLock(object):
130
132
    """A (dummy) read lock on a Subversion object."""
131
133
 
 
134
    __slots__ = ('unlock')
 
135
 
132
136
    def __init__(self, unlock):
133
137
        self.unlock = unlock
134
138
 
179
183
        except NoSuchRevision:
180
184
            # Last resort
181
185
            return len(
182
 
                self.target_branch.repository.iter_reverse_revision_history(
183
 
                    self.old_revid))
 
186
                list(self.target_branch.repository.iter_reverse_revision_history(
 
187
                    self.old_revid)))
184
188
 
185
189
    @property
186
190
    def new_revno(self):
647
651
class SvnBranchFormat(BranchFormat):
648
652
    """Branch format for Subversion Branches."""
649
653
 
650
 
    def __init__(self):
651
 
        BranchFormat.__init__(self)
652
 
 
653
654
    def network_name(self):
654
655
        return "subversion"
655
656
 
703
704
 
704
705
    def _update_revisions(self, stop_revision=None, overwrite=False,
705
706
            graph=None, limit=None):
706
 
        """Like InterBranch.update_revisions, but with a few additional 
 
707
        """Like InterBranch.update_revisions, but with a few additional
707
708
            parameters.
708
709
 
709
710
        :param limit: Optional maximum number of revisions to fetch
844
845
 
845
846
    @staticmethod
846
847
    def _get_branch_formats_to_test():
847
 
        return None, None
 
848
        return []
848
849
 
849
850
    def update_revisions(self, stop_revision=None, overwrite=False, graph=None):
850
851
        """See Branch.update_revisions()."""
996
997
        return self.source.tags.merge_to(self.target.tags, overwrite)
997
998
 
998
999
    def push(self, overwrite=False, stop_revision=None,
999
 
            _push_merged=None, _override_svn_revprops=None):
 
1000
            _push_merged=None, _override_svn_revprops=None,
 
1001
            _override_hook_source_branch=None):
1000
1002
        """See InterBranch.push()."""
1001
1003
        result = SubversionTargetBranchPushResult()
1002
1004
        result.target_branch = self.target