Changeset 1470


Ignore:
Timestamp:
Mar 19, 2012, 8:18:49 AM (9 years ago)
Author:
Peter Johansson
Message:

merge patch release 0.9.5 into trunk

Location:
trunk
Files:
7 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/Makefile.am

    r1452 r1470  
    6262MAINTAINER_CHECK_LOCAL += syntax-check
    6363# extra check in release rule
    64 RELEASE_LOCAL = check-svn_revision check-readme
     64RELEASE_LOCAL = check-svn_revision check-readme check-openssl
    6565
    66 .PHONY: check-svn_revision
     66.PHONY: check-svn_revision check-openssl
    6767
    6868FORCE:
     69
     70check-openssl:
     71  @openssl version > /dev/null || exit 1
    6972
    7073check-svn_revision:
     
    101104  -e 's|@VERSION[@]|$(VERSION)|g'
    102105
    103 build_support/Portfile: $(distdir).tar.gz Makefile build_support/Portfile.in
     106build_support/Portfile: $(distdir).tar.gz Makefile build_support/Portfile.in check-openssl
    104107  @rm -f $@ $@.t
    105   @openssl version > /dev/null || exit 1
    106   @openssl sha1 $(distdir).tar.gz > $(distdir).tar.gz.sha1
     108  @openssl sha256 $(distdir).tar.gz > $(distdir).tar.gz.sha256
    107109  @openssl rmd160 $(distdir).tar.gz > $(distdir).tar.gz.rmd160
    108   @sha1=`cut -f 2 -d ' ' $(distdir).tar.gz.sha1`;\
     110  @sha256=`cut -f 2 -d ' ' $(distdir).tar.gz.sha256`;\
    109111  rmd160=`cut -f 2 -d ' ' $(distdir).tar.gz.rmd160`;\
    110   $(edit) -e "s|@SHA1SUM[@]|$$sha1|g" -e "s|@RMD160SUM[@]|$$rmd160|g" \
     112  $(edit) -e "s|@SHA256SUM[@]|$$sha256|g" \
     113  -e "s|@RMD160SUM[@]|$$rmd160|g" \
    111114  '$(srcdir)/build_support/Portfile.in' > $@.t
    112115  @chmod a-w $@.t
  • trunk/NEWS

    r1465 r1470  
    1414svndigest 0.9.x series from
    1515    http://dev.thep.lu.se/svndigest/svn/branches/0.9-stable
     16
     17Version 0.9.5 (released 19 March 2012)
     18  Fixed bug that directories belonging to other WC were traversed (bug #512)
     19
     20  A complete list of closed tickets can be found here [[br]]
     21  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=svndigest+0.9.5
    1622
    1723Version 0.9.4 (released 22 October 2011)
     
    228234Copyright (C) 2005, 2006 Jari Häkkinen
    229235Copyright (C) 2007, 2008, 2009 Jari Häkkinen, Peter Johansson
    230 Copyright (C) 2010, 2011 Peter Johansson
     236Copyright (C) 2010, 2011, 2012 Peter Johansson
    231237
    232238This file is part of svndigest, http://dev.thep.lu.se/svndigest
  • trunk/build_support/Portfile.in

    r1405 r1470  
    2020
    2121homepage            @PACKAGE_URL@
    22 master_sites        sourceforge
     22master_sites        sourceforge:project/svndigest
    2323
    24 checksums           sha1    @SHA1SUM@ \
    25                     rmd160  @RMD160SUM@
     24checksums           rmd160  @RMD160SUM@ \
     25                    sha256  @SHA256SUM@
    2626
    2727depends_build       port:pkgconfig
  • trunk/lib/Directory.cc

    r1449 r1470  
    33/*
    44  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Jari Häkkinen, Peter Johansson
     5  Copyright (C) 2012 Peter Johansson
    56
    67  This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    3031#include "NodeVisitor.h"
    3132#include "SVN.h"
     33#include "SVNinfo.h"
    3234#include "SVNlog.h"
    3335#include "TinyStats.h"
     
    6062
    6163    SVN* svn=SVN::instance();
     64    std::string mother_url = SVNinfo(path).url();
     65    assert(mother_url.size());
    6266    for (DirectoryUtil::const_iterator i=dir.begin(); i!=dir.end(); ++i) {
    6367      std::string fn = file_name(i->path());
     
    6670        switch(svn->version_controlled(fullpath)) {
    6771        case SVN::uptodate:
     72          std::cout << "uptodate\n";
    6873          struct stat nodestat;                // C api from sys/stat.h
    6974          lstat(fullpath,&nodestat);   // C api from sys/stat.h
    70           if (S_ISDIR(nodestat.st_mode))       // C api from sys/stat.h
     75          if (S_ISDIR(nodestat.st_mode)) {     // C api from sys/stat.h
     76            // ignore directory if it is not a daughter of 'path' in repo
     77            std::string url = SVNinfo(fullpath).url();
     78            if (mother_url != directory_name(url))
     79              continue;
    7180            daughters_.push_back(new Directory(level_+1,fullpath,local_path()));
     81          }
    7282          else
    7383            daughters_.push_back(new File(level_,fullpath,local_path()));
  • trunk/m4/version.m4

    r1392 r1470  
    22#
    33# Copyright (C) 2008 Jari Häkkinen, Peter Johansson
    4 # Copyright (C) 2009, 2010, 2011 Peter Johansson
     4# Copyright (C) 2009, 2010, 2011, 2012 Peter Johansson
    55#
    66# This file is part of svndigest, http://dev.thep.lu.se/svndigest
  • trunk/test/Makefile.am

    r1455 r1470  
    44
    55# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Jari Häkkinen, Peter Johansson
    6 # Copyright (C) 2011 Peter Johansson
     6# Copyright (C) 2011, 2012 Peter Johansson
    77#
    88# This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    5353distributed_TESTS += svncopyright_test.sh
    5454distributed_TESTS += svndigest_copy_cache_test.sh
     55distributed_TESTS += traverse_test.sh
    5556distributed_TESTS += try_help_test.sh
    5657
  • trunk/test/traverse_test.sh

    r1469 r1470  
    5050$SVN log $rootdir/$daughter
    5151SVNCOPYRIGHT_run 0 -v -r $rootdir
    52 $GREP "^Parsing.*$rootdir/.svndigest" stdout || exit_fail
     52$GREP "^Parsing.*$rootdir/bin/" stdout || exit_fail
    5353$GREP "^Parsing.*$rootdir/$daughter" stdout && exit_fail
    5454
Note: See TracChangeset for help on using the changeset viewer.