← Back to branch summary

~ubuntu-branches/debian/sid/subversion/sid

« back to all changes in this revision

Viewing changes to subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2015-08-07 21:32:47 UTC
  • mfrom: (0.2.15) (4.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20150807213247-ozyewtmgsr6tkewl
Tags: 1.9.0-1
http://bugs.debian.org/791844
* Upload to unstable
* New upstream release.
  + Security fixes
    - CVE-2015-3184: Mixed anonymous/authenticated path-based authz with
      httpd 2.4
    - CVE-2015-3187: svn_repos_trace_node_locations() reveals paths hidden
      by authz
* Add >= 2.7 requirement for python-all-dev Build-Depends, needed to run
  tests.
* Remove Build-Conflicts against ruby-test-unit.  (Closes: #791844)
* Remove patches/apache_module_dependency in favor of expressing the
  dependencies in authz_svn.load/dav_svn.load.
* Build-Depend on apache2-dev (>= 2.4.16) to ensure ap_some_authn_required()
  is available when building mod_authz_svn and Depend on apache2-bin (>=
  2.4.16) for runtime support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java
37
37
 */
38
38
public class Mergeinfo implements java.io.Serializable
39
39
{
40
 
    // Update the serialVersionUID when there is a incompatible change
41
 
    // made to this class.  See any of the following, depending upon
42
 
    // the Java release.
43
 
    // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
44
 
    // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
45
 
    // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
46
 
    // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
 
40
    // Update the serialVersionUID when there is a incompatible change made to
 
41
    // this class.  See the java documentation for when a change is incompatible.
 
42
    // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
47
43
    private static final long serialVersionUID = 1L;
48
44
 
49
45
    /**
69
65
    }
70
66
 
71
67
    /**
 
68
     * The three ways to request mergeinfo affecting a given path
 
69
     * in {@link org.apache.subversion.javahl.ISVNRemote#getMergeinfo}.
 
70
     * @since 1.9
 
71
     */
 
72
    public static enum Inheritance
 
73
    {
 
74
        /** Explicit mergeinfo only. */
 
75
        explicit,
 
76
 
 
77
        /**
 
78
         * Explicit mergeinfo, or if that doesn't exist, the inherited
 
79
         * mergeinfo from a target's nearest (path-wise, not history-wise)
 
80
         * ancestor.
 
81
         */
 
82
        inherited,
 
83
 
 
84
        /**
 
85
         * Mergeinfo inherited from a target's nearest (path-wise,
 
86
         * not history-wise) ancestor, regardless of whether target
 
87
         * has explicit mergeinfo.
 
88
         */
 
89
        nearest_ancestor;
 
90
    }
 
91
 
 
92
    /**
72
93
     * Add one or more RevisionRange objects to merge info. If the
73
94
     * merge source is already stored, the list of revisions is
74
95
     * replaced.
83
104
            addRevisionRange(mergeSrc, range);
84
105
    }
85
106
 
 
107
    public void addRevisions(String mergeSrc, RevisionRangeList ranges)
 
108
    {
 
109
        addRevisions(mergeSrc, ranges.getRanges());
 
110
    }
 
111
 
86
112
    /**
87
113
     * Add a revision range to the merged revisions for a path.  If
88
114
     * the merge source already has associated revision ranges, add
131
157
    }
132
158
 
133
159
    /**
 
160
     * Like {@link #getReivsionRange}, but returns a {@link RevisionRangeList}.
 
161
     */
 
162
    public RevisionRangeList getRevisionRangeList(String mergeSrc)
 
163
    {
 
164
        return new RevisionRangeList(getRevisionRange(mergeSrc));
 
165
    }
 
166
 
 
167
    /**
134
168
     * Parse the <code>svn:mergeinfo</code> property to populate the
135
169
     * merge source URLs and revision ranges of this instance.
136
170
     * @param mergeinfo <code>svn:mergeinfo</code> property value.