← Back to branch summary

~ubuntu-branches/ubuntu/quantal/bzr-svn/quantal

« back to all changes in this revision

Viewing changes to repository.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2008-11-10 02:31:45 UTC
  • mfrom: (1.1.16 upstream)
  • Revision ID: james.westby@ubuntu.com-20081110023145-h7vtophkjmcajp9g
Tags: 0.4.15-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
92
92
        else:
93
93
            previous = logwalker.lazy_dict({}, self.repository.branchprop_list.get_properties, prev_path.encode("utf-8"), prev_revnum)
94
94
 
95
 
        return tuple(self.repository._svk_merged_revisions(self.branch_path, self.revnum, mapping, self.fileprops, previous))
 
95
        return tuple(self.repository._svk_merged_revisions(self.branch_path, self.revnum, mapping, 
 
96
            self.fileprops))
96
97
 
97
98
    def get_parent_ids(self, mapping):
98
99
        parents_cache = getattr(self.repository._real_parents_provider, "_cache", None)
437
438
 
438
439
    def set_make_working_trees(self, new_value):
439
440
        """See Repository.set_make_working_trees()."""
440
 
        pass # FIXME: ignored, nowhere to store it... 
 
441
        pass # ignored, nowhere to store it... 
441
442
 
442
443
    def make_working_trees(self):
443
444
        """See Repository.make_working_trees().
555
556
        return parent_map
556
557
 
557
558
    def _svk_merged_revisions(self, branch, revnum, mapping, 
558
 
                              current_fileprops, previous_fileprops):
 
559
                              changed_fileprops):
559
560
        """Find out what SVK features were merged in a revision.
560
561
 
561
562
        """
562
 
        current = current_fileprops.get(SVN_PROP_SVK_MERGE, "")
563
 
        if current == "":
 
563
        previous, current = changed_fileprops.get(SVN_PROP_SVK_MERGE, ("", ""))
 
564
        if current in (None, ""):
564
565
            return
565
 
        previous = previous_fileprops.get(SVN_PROP_SVK_MERGE, "")
566
 
        for feature in svk_features_merged_since(current, previous):
 
566
        for feature in svk_features_merged_since(current, previous or ""):
567
567
            # We assume svk:merge is only relevant on non-bzr-svn revisions. 
568
568
            # If this is a bzr-svn revision, the bzr-svn properties 
569
569
            # would be parsed instead.
870
870
                            if not changes.changes_path(newpaths, p, False) and layout.is_branch(cf):
871
871
                                tp = cf
872
872
                                tr = int(self.transport.get_dir(cf, cr)[2][properties.PROP_ENTRY_COMMITTED_REV])
873
 
                            tags[p] = self.generate_revision_id(tr, tp, mapping)
 
873
                            try:
 
874
                                tags[p] = self.generate_revision_id(tr, tp, mapping)
 
875
                            except SubversionException, (_, errors.ERR_FS_NOT_DIRECTORY):
 
876
                                pass
874
877
                        else:
875
 
                            tags[bp] = self.generate_revision_id(revnum, bp, mapping, revprops=revprops)
 
878
                            try:
 
879
                                tags[bp] = self.generate_revision_id(revnum, bp, mapping, revprops=revprops)
 
880
                            except SubversionException, (_, errors.ERR_FS_NOT_DIRECTORY):
 
881
                                pass
876
882
        finally:
877
883
            pb.finished()
878
884