Changeset 3581

Timestamp:

04/30/08 17:41:53 (5 months ago)

Author:

eblot

Message:

Update hook scripts for the RevtreePlugin/LogEnhancer

Files:

• revtreeplugin/0.11/hooks/README (modified) (1 prop)
• revtreeplugin/0.11/hooks/repproxy.py (modified) (7 diffs, 1 prop)
• revtreeplugin/0.11/hooks/svnstubs/config (deleted)
• revtreeplugin/0.11/hooks/svnstubs/hook.conf (added)
• revtreeplugin/0.11/hooks/svnstubs/post-commit (modified) (1 diff, 1 prop)
• revtreeplugin/0.11/hooks/svnstubs/post-revprop-change (modified) (1 diff, 1 prop)
• revtreeplugin/0.11/hooks/svnstubs/pre-commit (modified) (1 diff, 1 prop)
• revtreeplugin/0.11/hooks/svnstubs/pre-revprop-change (modified) (1 diff, 1 prop)
• revtreeplugin/0.11/hooks/svnstubs/README (modified) (1 diff, 1 prop)
• revtreeplugin/0.11/hooks/svnstubs/winstubs (added)
• revtreeplugin/0.11/hooks/svnstubs/winstubs/post-commit.bat (added)
• revtreeplugin/0.11/hooks/svnstubs/winstubs/post-revprop-change.bat (added)
• revtreeplugin/0.11/hooks/svnstubs/winstubs/pre-commit.bat (added)
• revtreeplugin/0.11/hooks/svnstubs/winstubs/pre-revprop-change.bat (added)
• revtreeplugin/0.11/hooks/trac-commit-hook (modified) (22 diffs, 1 prop)
• revtreeplugin/0.11/hooks/trac-revprop-hook (modified) (6 diffs, 1 prop)

revtreeplugin/0.11/hooks/repproxy.py

@@ -1 +1 @@
-#!/usr/bin/env python
+# -*- coding: utf8 -*-
-#
-
-
-
-
+
+
-
-import sys
@@ -78 +77 @@
-        for chgpath in chgpaths:
-            (srcrev, srcpath) = fs.svn_fs_copied_from(root, chgpath, self.pool)
+            #print >>sys.stderr, "chgpath: %s -> %s @ %d" % (chgpath, srcpath, srcrev)
-            if srcrev > 0 and srcpath is not None:
-                return (srcrev, srcpath)
@@ -93 +93 @@
-        for chgpath in chgpaths:
-            (srcrev, srcpath) = fs.svn_fs_copied_from(root, chgpath, self.pool)
+            #print >>sys.stderr, "chgpath: %s -> %s @ %d" % (chgpath, srcpath, srcrev)
-            if srcrev > 0 and srcpath is not None:
-                return (srcrev, srcpath)
@@ -135 +136 @@
-    def get_revision_changed_paths(self, revision):
-        root = self.get_revision_root(revision)
-
-
+
-
-    def _get_changed_paths(self, root):
@@ -152 +152 @@
-        return rev
-
-1
+True
-        """Provides a generator to iterate through the history of a path
-          
@@ -164 +164 @@
- 
-        # svn_repos_history does not support the None argument
-        if not traverse:
-            traverse = 0
-        repos.svn_repos_history(self.fs, path, history_cb, 0, revision, \
-
+ and 1 or 0
-        for h in history:
-            yield h
@@ -177 +175 @@
-        for rev in range(youngest,0,-1):
-            root = self.get_revision_root(rev)
-revpath
+(revpath, change)
-                if revpath[:length] == path:
-                    return rev

revtreeplugin/0.11/hooks/svnstubs/post-commit

@@ -1 +1 @@
-#!/bin/sh
-
-# POST-COMMIT HOOK
-#
-#   [1] REPOS-PATH   (the path to this repository)
-#   [2] TRANSACTION  (the transaction being processed)
-
-REPOS="$1"
-REV="$2"
-CONFIG_PATH=`dirname $0`
-
-
-
-
+
+
+
+
-else
-
+
+
-fi
-
-
-
-
-
-
+
+
+
-date >> "$LOGFILE"
-echo "Revision: $REV" >> "$LOGFILE"
-TRAC_PATH}/hooks/trac-commit-hook
--d "$REPOS" -r "$REV" -p "$TRAC_ENV"
+HOOKPATH}/trac-commit-hook -d "$REPOS" -r "$REV" -p "$TRAC_ENV"
+
-if [ $? -ne 0 ]; then
-if [ -n ${MAIL_ADMIN} ];
-tail -5 "$LOGFILE" | mail ${MAIL_ADMIN} \
-
+  tail -5 "$LOGFILE" | \
+  cat
+#mail admin 
-fi
+

revtreeplugin/0.11/hooks/svnstubs/post-revprop-change

@@ -17 +17 @@
-PROPNAME="$4"
-ACTION="$5"
-CONFIG_PATH=`dirname $0`
-
-
-
+
+
+
+
-else
-
+
+
-fi
-
-
-
-
-
-
+
+
+
-date >> "$LOGFILE"
-echo "Revprop: $REV $PROPNAME" >> $LOGFILE
-TRACPATH}/hooks
+HOOKPATH}
-    -n "$PROPNAME" -d "$REPOS" -r "$REV" -a "$ACTION" post 2>> "$LOGFILE"
-if [ $? -ne 0 ]; then

revtreeplugin/0.11/hooks/svnstubs/pre-commit

@@ -1 +1 @@
-#!/bin/sh
-
-# PRE-COMMIT HOOK
-#
-#   [1] REPOS-PATH   (the path to this repository)
-#   [2] TRANSACTION  (the transaction being processed)
-
-REPOS="$1"
-TXN="$2"
-CONFIG_PATH=`dirname $0`
-
-
-
+
+
+
+
-else
-
+
+
-fi
-
-
-
-
-
-
+
+
+
-echo "Transaction: $TXN" >> $LOGFILE
-
-
+
-RC=$?
-echo "RESULT $RC" >>  $LOGFILE

revtreeplugin/0.11/hooks/svnstubs/pre-revprop-change

@@ -15 +15 @@
-PROPNAME="$4"
-ACTION="$5"
-CONFIG_PATH=`dirname $0`
-
-
-
+
+
+
+
-else
-
+
+
-fi
-
-
-
-
-
-
+
+
+
-echo "Revprop: $REV $PROPNAME action:$ACTION" >> $LOGFILE
-TRACPATH}/hooks
-
+HOOKPATH}
+2>> "$LOGFILE"
-RC=$?
-echo "RESULT $RC" >>  $LOGFILE

revtreeplugin/0.11/hooks/svnstubs/README

@@ -3 +3 @@
-environment.
-
-config
+hook.conf

revtreeplugin/0.11/hooks/trac-commit-hook

@@ -4 +4 @@
-# ----------------------------------------------------------------------------
-# Copyright (c) 2004 Stephen Hansen 
-7
+8
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -16 +16 @@
-#   all copies or substantial portions of the Software. 
-# ----------------------------------------------------------------------------
-
-# This Subversion unified pre/post-commit hook script is meant to interface
-# to the Trac (http://www.edgewall.com/products/trac/) issue tracking/wiki/etc 
-# system.
-#
-# It should be called from the 'pre-commit' script in Subversion, such as
-# via:
-#
-#  REPOS="$1"
-#  TXN="$2"
-#  TRAC_ENV="/somewhere/trac/project/"
-#
-# /usr/bin/python /usr/local/src/trac/contrib/trac-uni-commit-hook \
-#  -d "$REPOS" \
-#  -p "$TRAC_ENV"  \
-#  -t "$TXN"
-#
-# 
-# It should be called from the 'post-commit' script in Subversion, such as
-# via:
-#
-# REPOS="$1"
-# REV="$2"
-# TRAC_ENV='/somewhere/trac/project/'
-#
-# /usr/bin/python /usr/local/src/trac/contrib/trac-uni-commit-hook \
-#  -d "$REPOS" \
-#  -p "$TRAC_ENV"  \
-#  -r "$REV"
-#
-
-import re
@@ -84 +54 @@
-#
-ticket_cmd_pattern = re.compile(r'^(?P<action>refs|closes|fixes).?#(?P<ticket>[0-9]+)', re.IGNORECASE)
-.?)\s+((\[(?P<first>\d+)\])(:
+\!)?\s+((\[(?P<first>\d+)\])(\s*:\s*
-create_pattern = re.compile(r'^(?P<action>creates)', re.IGNORECASE)
-.?)
+\!)?
-admin_pattern = re.compile(r'^(?P<action>admins)', re.IGNORECASE)
-
@@ -99 +69 @@
-# SVN directories
-#
-
+
-trunk_directory = '/trunk'
-C:/V
+/local/v
-
-#
@@ -137 +107 @@
-        self.author = self._get_author()
-        self.log = self._get_log()
-        os.environ['PYTHON_EGG_CACHE'] = \
-            os.path.join(project, '..', '..', 'eggcache')
-        if not os.path.isdir(os.environ['PYTHON_EGG_CACHE']):
-            raise AssertionError("Invalid egg cache directory: %s" % \
@@ -148 +116 @@
-                  r'(?:/(?P<path>.*))?$')
-        self.bcre = re.compile(bre)
+        
+        # Nearly empty log message
+        if not self.log:
+            print>>sys.stderr, 'Log message is invalid'
+            self.finalize(ERROR)  
-
-        # Administration commit
@@ -158 +131 @@
-        terminate = terminate_pattern.search(self.log)
-        if terminate:            
-
+ and True
-            self.finalize(OK)
-
@@ -174 +147 @@
-                func = getattr(self, CommitHook._changeset_cmds[cmd])
-                rc = func(chgset_cmd.group('first'), chgset_cmd.group('second'), 
-
+ and True
-                self.finalize(rc)
-            else:
@@ -189 +162 @@
-                self.finalize(rc)
-            else:
-specified 
+
-                self.finalize(ERROR)
-
-        # Unrecognized log message
-action specified
+known action
-        self.finalize(ERROR)  
-
@@ -270 +243 @@
-        ticket_dict = {}
-        for rev in revisions:
-
+
+
-            if bring_prop and len(bring_prop) > 0:
-                bring_revs = bring_prop.split(',')
@@ -295 +269 @@
-        return is_open
-
+    def _is_admin(self, author):
+        '''
+        Verify whether the author has administrator priviledges
+        '''
+        config = ConfigParser()
+        if not os.path.isfile(configpath):
+            raise AssertionError('Unable to find Subversion ACL for admins')
+        config.read(configpath)
+        admins = config.get('groups','admins')
+        if not admins:
+            raise AssertionError('Unable to retrieve Subversion ACL for admins')
+        if not author.lower() in [s.strip() for s in admins.lower().split(',')]:
+            return False
+        return True
+
+    def _is_dev_branch(self, dir_path):
+        '''
+        Tell whether a directory is located inside a development branch or not
+        '''
+        for dev_br in dev_branch_dirs:
+            if dir_path[:len(dev_br)] == dev_br:
+                return True
+        return False
+
-
-class PreCommitHook(CommitHook):
@@ -323 +321 @@
-        '''
-        log = self.proxy.get_txn_log_message()
+        if len(log) < 2:
+            return None
+        # Be sure the first letter is uppercased
+        log = log[0].upper() + log[1:]
-        return log
-
+    def _update_log(self, log):
+        '''
+        Update the transaction log message
+        '''
+        self.proxy.set_txn_log_message(log)
+
-    def _is_txn_branch_directory(self):
-        '''
-        Check if the directory of the transaction is a branch directory
-/branches
+the branches directory
-        '''
-        dst_branch = self.proxy.find_txn_branch(self.bcre)
-
-
+
-
-    def finalize(self, result):
+        if OK == result:
+            self._update_log(self.log)
-        sys.exit(result) 
-
@@ -340 +349 @@
-        '''
-        Administrative commit
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-            print >>sys.stderr, 'Only administrator can execute admin commits'
-            self.finalize(ERROR)
@@ -368 +367 @@
-            self.finalize(ERROR)
-        dstbranch = self.proxy.find_txn_branch(self.bcre)
-dstbranch[:len(branch_directory)] != branch_directory
+not self._is_dev_branch(dstbranch)
-            print >> sys.stderr, 'Cannot create a new branch outside %s' \
-branch_directory
+dev_branch_dirs
-            self.finalize(ERROR)
-        return OK
@@ -383 +382 @@
-            item = change_gen.next()
-        except StopIteration:
-"No deleted path in the submitted revision"
+'No deleted path in the submitted revision'
-            self.finalize(ERROR)
-        try:
@@ -390 +389 @@
-            pass
-        else:
-
+
+
-            self.finalize(ERROR)
-        (path, change) = item
@@ -397 +397 @@
-            self.finalize(ERROR)
-        dstbranch = self.proxy.find_txn_branch(self.bcre)
-dstbranch[:len(branch_directory)] != branch_directory
+not self._is_dev_branch(dstbranch)
-            print >> sys.stderr, 'Cannot terminates a non-branch dir (%s)' \
-branch_directory
-
-force != '!'
+dev_branch_dirs
+
+not force
-            youngest = self.proxy.get_youngest_path_revision(path) 
-            # now checks that the deleter is the creator of the branch
@@ -428 +428 @@
-            self.finalize(ERROR)
-        if not self._is_txn_branch_directory():
- (%s)
- % branch_directory
+
+' (%s)' % dev_branch_dirs
-            self.finalize(ERROR)
-        return OK
@@ -489 +489 @@
-            print >> sys.stderr, "Revisions %s %s %s" % (rev1, rev2, revisions)
-            self.finalize(ERROR)
+
-        # On error, the transaction is destroyed, so it is safe to apply the
-        # property even if the hook fails.
@@ -498 +499 @@
-            print >> sys.stderr, 'Unable to locate delivery destination'
-            self.finalize(ERROR)
+
+        # Ensure the branch is not delivered to self
-        branch1 = self.proxy.find_revision_branch(int(rev1), self.bcre)
-        if dstbranch == branch1:
-            print >> sys.stderr, 'Cannot deliver to self (%s -> %s)' % \
-                                  (branch1, dstbranch)
+            self.finalize(ERROR)
+
+        # Ensure that the 'branch creation' revision is not selected as a source
+        print >> sys.stderr, "BRANCH1: (%s) [%s]" % (rev1, branch1)
+        brevs = [h[0] for h in self.proxy.get_history(int(rev1), branch1, None)]
+        if rev1 == brevs[0]:
+            print >> sys.stderr, \
+                'Cannot deliver the initial branch revision (%d)' % rev1
-            self.finalize(ERROR)
-
@@ -523 +534 @@
-                #    'as the latest CC export (rev %d on %s) has not been ' \
-                #    'tagged and imported back into SVN' % (rev, exportval)
-force != '!'
+not force
-                #        # Aborts if no force mode is specified
-                #        self.finalize(ERROR)
@@ -530 +541 @@
-        # @todo there's probably a better way to format this
-        tickets = self._collect_tickets(revisions)
-
-
+.decode('utf8')
+u
-        for tkt_id in tickets:
-            ticket = Ticket(self.env, tkt_id)
-
-
-
-
-
-
+
+
+
+
+
+
+
-        # Check if there is a next milestone defined in Trac
-        # This is a bit too conservative, as a next milestone is only needed if

revtreeplugin/0.11/hooks/trac-revprop-hook

@@ -3 +3 @@
-# trac-revprop-hook
-# ----------------------------------------------------------------------------
-
+-2008
-# ----------------------------------------------------------------------------
-
@@ -35 +35 @@
-ERROR = 1
-
-
+
+
+
-
-class RevpropHook(object):
@@ -42 +44 @@
-    def __init__(self, post, project, rev, name, value, 
-                 action=None, author=None, repos=None):
-        os.environ['PYTHON_EGG_CACHE'] = os.path.join(project, '..', '..', 'eggcache')
-        if not os.path.isdir(os.environ['PYTHON_EGG_CACHE']):
-            raise AssertionError("Invalid egg cache directory: %s" % os.environ['PYTHON_EGG_CACHE']);
@@ -89 +90 @@
-
-    def _verify_log_msg(self):
-
-
+
-        self.proxy = RepositoryProxy(self.repospath)
-        oldlog = self.proxy.get_revision_log_message(self.rev)
@@ -96 +96 @@
-        if oldmo:
-            newmo = regex.search(self.value)
-
-
+
+
+
+
+
-               (oldmo.group('second') != newmo.group('second')):
-
-
-
-
+
+
+
+
+
-
-    def _verify_rth_deliver(self):
@@ -134 +138 @@
-        repos = self.env.get_repository()
-        repos.sync_changeset(self.rev)
+
+    def _is_admin(self, author):
+        '''
+        Verify whether the author has administrator priviledges
+        '''
+        config = ConfigParser()
+        if not os.path.isfile(configpath):
+            raise AssertionError('Unable to find Subversion ACL for admins')
+        config.read(configpath)
+        admins = config.get('groups','admins')
+        if not admins:
+            raise AssertionError('Unable to retrieve Subversion ACL for admins')
+        if not author.lower() in [s.strip() for s in admins.lower().split(',')]:
+            return False
+        return True
-
-