← Back to branch summary

~ubuntu-branches/debian/stretch/subversion/stretch

« back to all changes in this revision

Viewing changes to subversion/libsvn_client/blame.c

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2013-10-18 23:23:06 UTC
  • mfrom: (17.1.9 sid)
  • Revision ID: package-import@ubuntu.com-20131018232306-etbd7h4i0stghrd5
Tags: 1.7.13-2
http://bugs.debian.org/726717
Remove unnecessary libapache2-svn.prem.  (Closes: #726717)

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/libsvn_client/blame.c
675
675
      SVN_ERR(svn_wc_status3(&status, ctx->wc_ctx, target_abspath_or_url, pool,
676
676
                             pool));
677
677
 
678
 
      if (status->text_status != svn_wc_status_normal)
 
678
      if (status->text_status != svn_wc_status_normal
 
679
          || (status->prop_status != svn_wc_status_normal
 
680
              && status->prop_status != svn_wc_status_none))
679
681
        {
680
 
          apr_hash_t *props;
681
682
          svn_stream_t *wcfile;
682
 
          svn_string_t *keywords;
683
683
          svn_stream_t *tempfile;
 
684
          svn_opt_revision_t rev;
 
685
          svn_boolean_t normalize_eols = FALSE;
684
686
          const char *temppath;
685
 
          apr_hash_t *kw = NULL;
686
 
 
687
 
          SVN_ERR(svn_wc_prop_list2(&props, ctx->wc_ctx, target_abspath_or_url,
688
 
                                    pool, pool));
689
 
          SVN_ERR(svn_stream_open_readonly(&wcfile, target, pool, pool));
690
 
 
691
 
          keywords = apr_hash_get(props, SVN_PROP_KEYWORDS,
692
 
                                  APR_HASH_KEY_STRING);
693
 
 
694
 
          if (keywords)
695
 
            SVN_ERR(svn_subst_build_keywords2(&kw, keywords->data, NULL, NULL,
696
 
                                              0, NULL, pool));
697
 
 
698
 
          wcfile = svn_subst_stream_translated(wcfile, "\n", TRUE, kw, FALSE,
699
 
                                               pool);
 
687
 
 
688
          if (status->prop_status != svn_wc_status_none)
 
689
            {
 
690
              const svn_string_t *eol_style;
 
691
              SVN_ERR(svn_wc_prop_get2(&eol_style, ctx->wc_ctx,
 
692
                                       target_abspath_or_url,
 
693
                                       SVN_PROP_EOL_STYLE,
 
694
                                       pool, pool));
 
695
 
 
696
              if (eol_style)
 
697
                {
 
698
                  svn_subst_eol_style_t style;
 
699
                  const char *eol;
 
700
                  svn_subst_eol_style_from_value(&style, &eol, eol_style->data);
 
701
 
 
702
                  normalize_eols = (style == svn_subst_eol_style_native);
 
703
                }
 
704
            }
 
705
 
 
706
          rev.kind = svn_opt_revision_working;
 
707
          SVN_ERR(svn_client__get_normalized_stream(&wcfile, ctx->wc_ctx,
 
708
                                                    target_abspath_or_url, &rev,
 
709
                                                    FALSE, normalize_eols,
 
710
                                                    ctx->cancel_func,
 
711
                                                    ctx->cancel_baton,
 
712
                                                    pool, pool));
700
713
 
701
714
          SVN_ERR(svn_stream_open_unique(&tempfile, &temppath, NULL,
702
715
                                         svn_io_file_del_on_pool_cleanup,