merge with beta

.hgignore

@@ -19,6 +19,6 @@ syntax: regexp
 ^rhodecode\.db$
 ^test\.db$
 ^RhodeCode\.egg-info$
-^rc\.ini$
+^rc.*\.ini$
 ^fabfile.py
 ^\.rhodecode$

CONTRIBUTORS

@@ -28,4 +28,7 @@ List of contributors to RhodeCode project:
     Vincent Caron <vcaron@bearstech.com>
     Zachary Auclair <zach101@gmail.com>
     Stefan Engel <mail@engel-stefan.de>
-    Andrew Shadura <bugzilla@tut.by>
+    Andrew Shadura <bugzilla@tut.by>
+    Raoul Thill <raoul.thill@gmail.com>
+    Philip Jameson <philip.j@hostdime.com>
+    Mads Kiilerich <madski@unity3d.com>

development.ini

@@ -29,6 +29,7 @@ pdebug = false
 #smtp_auth = 
 
 [server:main]
+## PASTE
 ##nr of threads to spawn
 #threadpool_workers = 5
 
@@ -39,7 +40,11 @@ pdebug = false
 #use_threadpool = true
 
 #use = egg:Paste#http
+
+#WAITRESS
+threads = 5
 use = egg:waitress#main
+
 host = 0.0.0.0
 port = 5000
 
@@ -54,16 +59,26 @@ use = egg:rhodecode
 full_stack = true
 static_files = true
 # Optional Languages
-# en, fr, ja, pt_BR, zh_CN, zh_TW
+# en, fr, ja, pt_BR, zh_CN, zh_TW, pl
 lang = en
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
 app_instance_uuid = rc-develop
 cut_off_limit = 256000
+vcs_full_cache = True
 force_https = false
 commit_parse_limit = 25
+# number of items displayed in lightweight dashboard before paginating
+dashboard_items = 100
 use_gravatar = true
 
+## RSS feed options
+
+rss_cut_off_limit = 256000
+rss_items_per_page = 10
+rss_include_diff = false
+
+
 ## alternative_gravatar_url allows you to use your own avatar server application
 ## the following parts of the URL will be replaced
 ## {email}        user email
@@ -76,6 +91,8 @@ use_gravatar = true
 
 container_auth_enabled = false
 proxypass_auth_enabled = false
+## default encoding used to convert from and to unicode
+## can be also a comma seperated list of encoding in case of mixed encodings
 default_encoding = utf8
 
 ## overwrite schema of clone url
@@ -227,6 +244,87 @@ beaker.session.auto = False
 #beaker.session.cookie_expires = 3600
 
 
+############################
+## ERROR HANDLING SYSTEMS ##
+############################
+
+####################
+### [errormator] ###
+####################
+
+# Errormator is tailored to work with RhodeCode, see 
+# http://errormator.com for details how to obtain an account
+# you must install python package `errormator_client` to make it work
+
+# errormator enabled
+errormator = true
+
+errormator.server_url = https://api.errormator.com
+errormator.api_key = YOUR_API_KEY
+
+# TWEAK AMOUNT OF INFO SENT HERE
+
+# enables 404 error logging (default False)
+errormator.report_404 = false
+
+# time in seconds after request is considered being slow (default 1)
+errormator.slow_request_time = 1
+
+# record slow requests in application
+# (needs to be enabled for slow datastore recording and time tracking)
+errormator.slow_requests = true
+
+# enable hooking to application loggers
+# errormator.logging = true
+
+# minimum log level for log capture
+# errormator.logging.level = WARNING
+
+# send logs only from erroneous/slow requests
+# (saves API quota for intensive logging)
+errormator.logging_on_error = false
+
+# list of additonal keywords that should be grabbed from environ object 
+# can be string with comma separated list of words in lowercase
+# (by default client will always send following info:
+# 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that 
+# start with HTTP* this list be extended with additional keywords here
+errormator.environ_keys_whitelist = 
+
+
+# list of keywords that should be blanked from request object 
+# can be string with comma separated list of words in lowercase
+# (by default client will always blank keys that contain following words 
+# 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
+# this list be extended with additional keywords set here
+errormator.request_keys_blacklist =
+
+
+# list of namespaces that should be ignores when gathering log entries
+# can be string with comma separated list of namespaces
+# (by default the client ignores own entries: errormator_client.client)
+errormator.log_namespace_blacklist =  
+
+
+################
+### [sentry] ###
+################
+
+# sentry is a alternative open source error aggregator
+# you must install python packages `sentry` and `raven` to enable 
+
+sentry.dsn = YOUR_DNS
+sentry.servers =
+sentry.name =
+sentry.key =
+sentry.public_key =
+sentry.secret_key =
+sentry.project =
+sentry.site =
+sentry.include_paths =
+sentry.exclude_paths =
+
+
 ################################################################################
 ## WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT*  ##
 ## Debug mode will enable the interactive debugging tool, allowing ANYONE to  ##

docs/changelog.rst

@@ -4,6 +4,71 @@
 Changelog
 =========
 
+
+1.5.0 (**2012-12-12**)
+----------------------
+
+news
+++++
+
+- new rewritten from scratch diff engine. 10x faster in edge cases. Handling
+  of file renames, copies, change flags and binary files
+- added lightweight dashboard option. ref #500. New version of dashboard
+  page that doesn't use any VCS data and is super fast to render. Recommended
+  for large amount of repositories.
+- implements #648 write Script for updating last modification time for
+  lightweight dashboard
+- implemented compare engine for git repositories.
+- LDAP failover, option to specify multiple servers
+- added Errormator and Sentry support for monitoring RhodeCode
+- implemented #628: Pass server URL to rc-extensions hooks
+- new tooltip implementation - added lazy loading of changesets from journal
+  pages. This can significantly improve speed of rendering the page
+- implements #632,added branch/tag/bookmarks info into feeds
+  added changeset link to body of message
+- implemented #638 permissions overview to groups
+- implements #636, lazy loading of history and authors to speed up source
+  pages rendering
+- implemented #647, option to pass list of default encoding used to 
+  encode to/decode from unicode
+- added caching layer into RSS/ATOM feeds.
+- basic implementation of cherry picking changesets for pull request, ref #575
+- implemented #661 Add option to include diff in RSS feed
+- implemented file history page for showing detailed changelog for a given file
+- implemented #663 Admin/permission: specify default repogroup perms
+- implemented #379 defaults settings page for creation of repositories, locking
+  statistics, downloads, repository type
+- implemented #210 filtering of admin journal based on Whoosh Query language
+- added parents/children links in changeset viewref #650
+
+fixes
++++++
+
+- fixed git version checker
+- #586 patched basic auth handler to fix issues with git behind proxy
+- #589 search urlgenerator didn't properly escape special characters
+- fixed issue #614 Include repo name in delete confirmation dialog
+- fixed #623: Lang meta-tag doesn't work with C#/C++
+- fixes #612 Double quotes to Single quotes result in bad html in diff
+- fixes #630 git statistics do too much work making them slow.
+- fixes #625 Git-Tags are not displayed in Shortlog
+- fix for issue #602, enforce str when setting mercurial UI object. 
+  When this is used together with mercurial internal translation system
+  it can lead to UnicodeDecodeErrors
+- fixes #645 Fix git handler when doing delete remote branch
+- implements #649 added two seperate method for author and commiter to VCS
+  changeset class switch author for git backed to be the real author not commiter
+- fix issue #504 RhodeCode is showing different versions of README on
+  different summary page loads
+- implemented #658 Changing username in LDAP-Mode should not be allowed.
+- fixes #652 switch to generator approach when doing file annotation to prevent
+  huge memory consumption 
+- fixes #666 move lockkey path location to cache_dir to ensure this path is
+  always writable for rhodecode server
+- many more small fixes and improvements
+- fixed issues with recursive scans on removed repositories that could take
+  long time on instance start
+
 1.4.4 (**2012-10-08**)
 ----------------------
 

docs/index.rst

@@ -25,6 +25,7 @@ Users Guide
    usage/locking
    usage/statistics
    usage/backup
+   usage/subrepos
    usage/debugging
    usage/troubleshooting
 

docs/setup.rst

@@ -204,7 +204,8 @@ Enable LDAP : required
 .. _ldap_host:
 
 Host : required
-    LDAP server hostname or IP address.
+    LDAP server hostname or IP address. Can be also a comma separated
+    list of servers to support LDAP fail-over.
 
 .. _Port:
 

docs/usage/git_support.rst

@@ -8,16 +8,15 @@ GIT support
 Git support in RhodeCode 1.3 was enabled by default. You need to have a git
 client installed on the machine to make git fully work.
 
-Although There are some limitations on git usage.
+Although There is one limitation on git usage.
 
-- hooks that are executed on pull/push are not *real* hooks, they are 
-  just emulating the behavior, and are executed **BEFORE** action takes place.
-- large pushes needs http server with chunked encoding support.
+- large pushes requires a http server with chunked encoding support.
 
 if you plan to use git you need to run RhodeCode with some
 http server that supports chunked encoding which git http protocol uses, 
 i recommend using waitress_ or gunicorn_ (linux only) for `paste` wsgi app 
-replacement.
+replacement. Starting from version 1.4 waitress_ is the default wsgi server
+used in RhodeCode.
 
 To use, simply change change the following in the .ini file::
 

docs/usage/subrepos.rst

@@ -0,0 +1,37 @@
+.. _subrepos:
+
+=============================================
+working with RhodeCode and mercurial subrepos
+=============================================
+
+example usage of Subrepos with RhodeCode::
+    
+    ## init a simple repo
+    hg init repo1                                                                                                                                                                                         
+    cd repo1
+    echo "file1" > file1
+    hg add file1 
+    hg ci --message "initial file 1"
+        
+    #clone subrepo we want to add
+    hg clone http://rc.local/subrepo
+
+    ## use path like url to existing repo in RhodeCode
+    echo "subrepo = http://rc.local/subrepo" > .hgsub
+
+    hg add .hgsub
+    hg ci --message "added remote subrepo"
+
+    
+
+In file list of repo1 you will see a connected subrepo at revision it was
+during cloning.
+Clicking in subrepos link should send you to proper repository in RhodeCode
+
+cloning repo1 will also clone attached subrepository.
+
+Next we can edit the subrepo data, and push back to RhodeCode. This will update
+both of repositories.
+
+see http://mercurial.aragost.com/kick-start/en/subrepositories/ for more
+information about subrepositories