← 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/tigris/subversion/javahl/SVNClient.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/tigris/subversion/javahl/SVNClient.java
47
47
    private org.apache.subversion.javahl.SVNClient aSVNClient;
48
48
 
49
49
    /**
50
 
     * Standard empty contructor, builds just the native peer.
 
50
     * Standard empty constructor, builds just the native peer.
51
51
     */
52
52
    public SVNClient()
53
53
    {
377
377
 
378
378
        public boolean userAllowedSave()
379
379
        {
380
 
            return false;
 
380
            if (oldPrompt3 != null)
 
381
                return oldPrompt3.userAllowedSave();
 
382
            else
 
383
                return false;
381
384
        }
382
385
 
383
386
        public String askQuestion(String realm, String question,
756
759
            }
757
760
 
758
761
            public String getLogMessage(
759
 
                Set<org.apache.subversion.javahl.CommitItem> elementsToBeCommited)
 
762
                Set<org.apache.subversion.javahl.CommitItem> elementsToBeCommitted)
760
763
            {
761
764
                CommitItem[] aElements =
762
 
                        new CommitItem[elementsToBeCommited.size()];
 
765
                        new CommitItem[elementsToBeCommitted.size()];
763
766
 
764
767
                int i = 0;
765
768
                for (org.apache.subversion.javahl.CommitItem item
766
 
                                                        : elementsToBeCommited)
 
769
                                                        : elementsToBeCommitted)
767
770
                {
768
771
                    aElements[i] = new CommitItem(item);
769
772
                    i++;
2415
2418
    {
2416
2419
        try
2417
2420
        {
2418
 
                final List<org.apache.subversion.javahl.types.Info> infos =
2419
 
                        new ArrayList<org.apache.subversion.javahl.types.Info>();
2420
 
                aSVNClient.info2(path,
2421
 
                                                org.apache.subversion.javahl.types.Revision.HEAD,
2422
 
                                                org.apache.subversion.javahl.types.Revision.HEAD,
2423
 
                                                org.apache.subversion.javahl.types.Depth.empty,
2424
 
                                            null, new org.apache.subversion.javahl.callback.InfoCallback()
2425
 
                {
2426
 
                                public void singleInfo(org.apache.subversion.javahl.types.Info info) {
2427
 
                                        infos.add(info);
2428
 
                                }
2429
 
                });
 
2421
            final List<org.apache.subversion.javahl.types.Info> infos =
 
2422
                new ArrayList<org.apache.subversion.javahl.types.Info>();
 
2423
            aSVNClient.info2(path,
 
2424
                            org.apache.subversion.javahl.types.Revision.HEAD,
 
2425
                            org.apache.subversion.javahl.types.Revision.HEAD,
 
2426
                            org.apache.subversion.javahl.types.Depth.empty,
 
2427
                            null, new org.apache.subversion.javahl.callback.InfoCallback()
 
2428
            {
 
2429
                public void singleInfo(org.apache.subversion.javahl.types.Info info) {
 
2430
                    infos.add(info);
 
2431
                }
 
2432
            });
2430
2433
            return new Info(infos.get(0));
2431
2434
        }
2432
2435
        catch (org.apache.subversion.javahl.ClientException ex)