1.0.1dev: Stripped all trailing whitespace, and fixed the tests that relied on its being present. This was a ticking bomb, and is especially annoying when using an editor that strips trailing whitespace (as it should), because it will add noise to every changeset.

I know that this will make it slightly more difficult to apply patches that contain the old trailing whitespace, but theres an easy fix for that: strip trailing whitespace from the patch as well.


git-svn-id: http://trac.edgewall.org/intertrac/log:/branches/1.0-stable@11490 af82e41b-90c4-0310-8c96-b1721e28e2e2

Author: rblank

AUTHORS

@@ -3,7 +3,7 @@
  * Rocky Burt <[email protected]>
  * Christopher Lenz <[email protected]>
  * Francois Harvey <[email protected]>
- * Mark Rowe <[email protected]> 
+ * Mark Rowe <[email protected]>
  * Matthew Good <[email protected]>
  * Christian Boos <[email protected]>
  * Emmanuel Blot <[email protected]>

ChangeLog

@@ -40,7 +40,7 @@ http://svn.edgewall.org/repos/trac/tags/trac-1.0b1
 Trac 0.12.4 (September 7, 2012)
 http://svn.edgewall.org/repos/trac/tags/trac-0.12.4
 
-Trac 0.12.4 is a regular maintenance release and contains 
+Trac 0.12.4 is a regular maintenance release and contains
 a few minor fixes.
 
 Trac 0.12.3 (February 6, 2012)
@@ -122,8 +122,8 @@ Trac 0.11.7 (March 10, 2010)
 http://svn.edgewall.org/repos/trac/tags/trac-0.11.7
 
  Trac 0.11.7 is nearly identical to 0.11.7rc1 except for a few more fixes:
-  - avoid an infinite loop when using an AtomicFile in a read-only 
-    directory (#9081) 
+  - avoid an infinite loop when using an AtomicFile in a read-only
+    directory (#9081)
   - don't report client disconnects during writes as internal errors (#9103)
   - don't reuse a closed cursor, which could happen in one specific case
     for the pysqlite backend (#9104)
@@ -250,7 +250,7 @@ http://svn.edgewall.org/repos/trac/tags/trac-0.11.2.1
 
  Trac 0.11.2.1 fixes a Python 2.3 incompatibility introduced in Trac 0.11.2.
  Python 2.4+ users already running Trac 0.11.2 do not need to upgrade.
-  
+
 Trac 0.11.2 (November 8, 2008)
 http://svn.edgewall.org/repos/trac/tags/trac-0.11.2
 
@@ -271,7 +271,7 @@ Bug fixes:
  * Same order for ticket fields for new and existing tickets (#7018)
  * Enforce fine-grained permission for "quickjump" search results (#7655)
  * E-mail obfuscation was not done in a few remaining places (#7688, #6532)
- * Uninstall of plugins from WebAdmin was not working - feature disabled 
+ * Uninstall of plugins from WebAdmin was not working - feature disabled
    for now
  * More robust pagination of results for reports and custom queries (#7424,
    #7544)
@@ -280,7 +280,7 @@ Bug fixes:
 
 Minor improvements:
 
- * Better support for Wiki page hierarchy (show path #2780, link to 
+ * Better support for Wiki page hierarchy (show path #2780, link to
    parent #2150)
  * Custom query allow to search in description and other text fields (#4824)
 
@@ -350,7 +350,7 @@ http://svn.edgewall.org/repos/trac/tags/trac-0.10.5
 
  Trac 0.10.5 contains two security fixes and a couple of bug fixes.
  The following list contains only a few highlights:
- 
+
  * Fixes a cross-site redirection vulnerability in the quickjump function
    reported by Russ McRee.
  * Fixes a wiki engine XSS vulnerability found by Nathan Collins.
@@ -364,7 +364,7 @@ http://svn.edgewall.org/repos/trac/tags/trac-0.10.5
 Trac 0.10.4 (April 20, 2007)
 http://svn.edgewall.org/repos/trac/tags/trac-0.10.4
 
- Trac 0.10.4 is a bug fix release. The following list contains only a 
+ Trac 0.10.4 is a bug fix release. The following list contains only a
  few highlights:
 
  * Repository cache improvements. The new syncing scheme is
@@ -381,10 +381,10 @@ Trac 0.10.3.1 (Mar 8, 2007)
 http://svn.edgewall.org/repos/trac/tags/trac-0.10.3.1
 
  Trac 0.10.3.1 is a security fix release.
-	
- * Always send "Content-Disposition: attachment" headers where potentially 
+
+ * Always send "Content-Disposition: attachment" headers where potentially
    unsafe (user provided) content is available for download. This behaviour
-   can be altered using the "render_unsafe_content" option in the 
+   can be altered using the "render_unsafe_content" option in the
    "attachment" and "browser" sections of trac.ini.
  * Fixed XSS vulnerability in "download wiki page as text" in
    combination with Microsoft IE. Reported by Yoshinori Oota, Business
@@ -393,7 +393,7 @@ http://svn.edgewall.org/repos/trac/tags/trac-0.10.3.1
 Trac 0.10.3 (Dec 12, 2006)
 http://svn.edgewall.org/repos/trac/tags/trac-0.10.3
 
- Trac 0.10.3 is a bug fix release. The following list contains only a 
+ Trac 0.10.3 is a bug fix release. The following list contains only a
  few highlights:
 
  * Timeline fail to load with a "!NoSuchChangeset" error message (#4132).
@@ -411,7 +411,7 @@ http://svn.edgewall.org/repos/trac/tags/trac-0.10.3rc1
 Trac 0.10.2 (Nov 13, 2006)
 http://svn.edgewall.org/repos/trac/tags/trac-0.10.2
 
- Trac 0.10.2 is a bug fix release. The following list contains only a 
+ Trac 0.10.2 is a bug fix release. The following list contains only a
  few highlights:
 
  * Fixes deadlock when using authz_file config option (#3996).
@@ -476,7 +476,7 @@ http://svn.edgewall.org/repos/trac/tags/trac-0.9.5
  * Fixed wiki macro XSS vulnerability found by Mr. Kazuhiro Nishiyama:
    http://jvn.jp/jp/JVN%2384091359/index.html
  * Smaller memory usage when accessing subversion history.
- * Fixed issue with incorrectly generated urls when installed behind a web 
+ * Fixed issue with incorrectly generated urls when installed behind a web
    proxy (#2531).
  * Fixed bugs: #2531, #2777, #3020.
 
@@ -533,7 +533,7 @@ http://svn.edgewall.org/repos/trac/tags/trac-0.9
    #1983, #1988, #2019, #2051, #2061, #2229, #2106, #2107, #2116, #2120,
    #2124, #2129, #2135, #2136, #2138, #2140, #2144, #2164, #2166, #2170,
    #2172, #2191, #2192, #2196, #2201, #2202, #2203, #2208, #2215, #2218,
-   #2223, #2230, #2232, #2239, #2240, #2241, #2243, #2251, 
+   #2223, #2230, #2232, #2239, #2240, #2241, #2243, #2251,
 
 
 Trac 0.9-beta2  (Sept 25, 2005)
@@ -563,9 +563,9 @@ http://svn.edgewall.org/repos/trac/tags/trac-0.9b1
  * Improved modularity and extendibility (plugin support).
  * Support for both pysqlite 1.x and pysqlite 2.x.
  * Postgresql database support (with psycopg or pyPgSQL).
- * Repository subsets. Multiple Trac environments can share a single 
+ * Repository subsets. Multiple Trac environments can share a single
    repository.
- * Version control abstraction layer making it possible to support 
+ * Version control abstraction layer making it possible to support
    other version control systems besides subversion in the future.
  * FastCGI frontend support.
  * Python version >= 2.3 is now required.
@@ -619,35 +619,35 @@ http://svn.edgewall.org/repos/trac/tags/trac-0.8
  * User preferences.
  * Wiki editing (near-wysiwyg) aids a la wikipedia.
  * Improved email notification.
- * Fixed bugs: #13, #63, #99, #100, #158, #164, #203, #210, 
-   #225, #264, #304, #306, #326, #346, #347, #351, 
-   #352, #364, #373, #375, #405, #411, #416, #431, 
-   #433, #434, #436, #438, #443, #445, #446, #447, 
-   #450, #452, #453, #455, #458, #460, #465, #468, 
-   #471, #472, #473, #474, #477, #478, #479, #480, 
-   #482, #483, #486, #487, #489, #491, #492, #494, 
-   #496, #501, #503, #506, #510, #512, #513, #514, 
-   #516, #522, #524, #526, #527, #528, #530, #532, 
-   #536, #537, #538, #539, #542, #543, #545, #546, 
-   #550, #551, #552, #553, #555, #556, #557, #558, 
-   #559, #560, #565, #567, #568, #570, #572, #574, 
-   #577, #578, #580, #581, #583, #587, #589, #591, 
-   #593, #594, #597, #598, #599, #600, #601, #602, 
-   #606, #609, #610, #612, #613, #616, #618, #619, 
-   #620, #622, #623, #626, #627, #628, #630, #631, 
-   #634, #644, #647, #648, #651, #652, #657, #658, 
-   #660, #664, #668, #669, #670, #671, #674, #675, 
-   #676, #677, #678, #680, #690, #692, #696, #698, 
-   #699, #703, #705, #706, #708, #709, #713, #714, 
-   #715, #716, #718, #720, #721, #722, #726, #727, 
-   #730, #732, #734, #735, #736, #737, #738, #741, 
-   #742, #743, #744, #745, #748, #749, #750, #751, 
-   #752, #759, #762, #764, #768, #769, #770, #771, 
-   #774, #775, #776, #778, #779, #780, #785, #789, 
-   #793, #798, #800, #806, #807, #815, #816, #817, 
-   #818, #829, #830, #831, #833, #836, #844, #846, 
-   #848, #850, #851, #852, #872, #873, #877, #878, 
-   #885, #888, #889, #892, #901, #903, #907, #912, 
+ * Fixed bugs: #13, #63, #99, #100, #158, #164, #203, #210,
+   #225, #264, #304, #306, #326, #346, #347, #351,
+   #352, #364, #373, #375, #405, #411, #416, #431,
+   #433, #434, #436, #438, #443, #445, #446, #447,
+   #450, #452, #453, #455, #458, #460, #465, #468,
+   #471, #472, #473, #474, #477, #478, #479, #480,
+   #482, #483, #486, #487, #489, #491, #492, #494,
+   #496, #501, #503, #506, #510, #512, #513, #514,
+   #516, #522, #524, #526, #527, #528, #530, #532,
+   #536, #537, #538, #539, #542, #543, #545, #546,
+   #550, #551, #552, #553, #555, #556, #557, #558,
+   #559, #560, #565, #567, #568, #570, #572, #574,
+   #577, #578, #580, #581, #583, #587, #589, #591,
+   #593, #594, #597, #598, #599, #600, #601, #602,
+   #606, #609, #610, #612, #613, #616, #618, #619,
+   #620, #622, #623, #626, #627, #628, #630, #631,
+   #634, #644, #647, #648, #651, #652, #657, #658,
+   #660, #664, #668, #669, #670, #671, #674, #675,
+   #676, #677, #678, #680, #690, #692, #696, #698,
+   #699, #703, #705, #706, #708, #709, #713, #714,
+   #715, #716, #718, #720, #721, #722, #726, #727,
+   #730, #732, #734, #735, #736, #737, #738, #741,
+   #742, #743, #744, #745, #748, #749, #750, #751,
+   #752, #759, #762, #764, #768, #769, #770, #771,
+   #774, #775, #776, #778, #779, #780, #785, #789,
+   #793, #798, #800, #806, #807, #815, #816, #817,
+   #818, #829, #830, #831, #833, #836, #844, #846,
+   #848, #850, #851, #852, #872, #873, #877, #878,
+   #885, #888, #889, #892, #901, #903, #907, #912,
    #916, #923, #929, #931, #932, #935
 
 -----------------------------------------------------------------------------
@@ -719,15 +719,15 @@ http://svn.edgewall.org/repos/trac/tags/trac-0.6
  * View diffs between wiki page edits.
  * Improved Search module.
  * Support for tables in the wiki. (Thanks to Stephen Hansen)
- * Colored reports. Use colors to show priority, etc. 
+ * Colored reports. Use colors to show priority, etc.
  * Support for custom wiki processor macros.
  * ReStructuredText markup support (through a processor macro)
  * HTML markup support (through a processor macro)
  * Report groups. Group results by a column.
  * Multi-line report rows.
  * Download report in CSV (Comma Separated Value) and tab-separated format
  * RSS 2.0 content syndication support in Timeline, Reports and Log/Browser
- * Better, locale-based date and time formatting. 
+ * Better, locale-based date and time formatting.
  * Wiki RecentChanges support.
  * Overall usability, consistency and cosmetic improvements.
  * More documentation.
@@ -754,7 +754,7 @@ http://svn.edgewall.org/repos/trac/tags/trac-0.5.2
     export/import all pages to/from a directory.
  * Most of the inline css is removed.
  * IE6 navbar problem fixed.
- * Fixed bugs: #69, #73, #77, #78, #79, #80, #84, #85, #86, #89, #90, 
+ * Fixed bugs: #69, #73, #77, #78, #79, #80, #84, #85, #86, #89, #90,
    #91, #93, #97
 
 

Makefile.cfg.sample

@@ -1,4 +1,4 @@
-# -*- Makefile -*- configuration file sample 
+# -*- Makefile -*- configuration file sample
 #
 # Adapt to your local setting and copy to Makefile.cfg
 #
@@ -42,7 +42,7 @@ auth = *,~/tracenvs/htdigest.realm,realm
 dotpath = /usr/local/bin/dot
 
 # ----------------------------------------------------------------------------
-# Custom rules 
+# Custom rules
 
 .PHONY: bigtest
 

README

@@ -14,7 +14,7 @@ Trac is distributed using the modified BSD License.
 
  * If you are upgrading from a previous Trac version, please read UPGRADE
    for a short overview and the trac/wiki/default-pages/TracUpgrade for
-   complete, up-to-date instructions 
+   complete, up-to-date instructions
 
 You might also want to take a look at the RELEASE and ChangeLog files
 for more information about this release.

RELEASE

@@ -18,7 +18,7 @@ http://trac.edgewall.org/wiki/TracDev/ReleaseNotes/1.0
 Developer-visible changes
 -------------------------
 
-A detailed view of the API changes since 0.12.x can be found in 
+A detailed view of the API changes since 0.12.x can be found in
 http://trac.edgewall.org/wiki/TracDev/ApiChanges/1.0
 
 Acknowledgements

contrib/bugzilla2trac.py

@@ -387,7 +387,7 @@ def addTicketComment(self, ticket, time, author, value):
             db("""INSERT INTO ticket_change (ticket, time, author, field,
                                              oldvalue, newvalue)
                   VALUES (%s, %s, %s, %s, %s, %s)
-                  """, (ticket, datetime2epoch(time), author, 'comment', '', 
+                  """, (ticket, datetime2epoch(time), author, 'comment', '',
                         comment))
 
     def addTicketChange(self, ticket, time, author, field, oldvalue, newvalue):
@@ -428,7 +428,7 @@ def addAttachment(self, author, a):
             attachment = Attachment(self.env, 'ticket', id)
             attachment.author = author
             attachment.description = description
-            attachment.insert(filename, filedata, filesize, 
+            attachment.insert(filename, filedata, filesize,
                               datetime2epoch(time))
             del attachment
 
@@ -480,7 +480,7 @@ def makeWhereClause(fieldName, values, negative=False):
         connector, op = ' AND ', '!='
     else:
         connector, op = ' OR ', '='
-    clause = connector.join(["%s %s '%s'" % (fieldName, op, value) 
+    clause = connector.join(["%s %s '%s'" % (fieldName, op, value)
                              for value in values])
     return ' (' + clause + ')'
 
@@ -567,12 +567,12 @@ def convert(_db, _host, _user, _password, _env, _force):
             sql = ("SELECT p.name AS product, c.name AS comp, "
                    " c.initialowner AS owner "
                    "FROM components c, products p "
-                   "WHERE c.product_id = p.id AND" + 
+                   "WHERE c.product_id = p.id AND" +
                    makeWhereClause('p.name', PRODUCTS))
         else:
             sql = ("SELECT program AS product, value AS comp, "
                    " initialowner AS owner "
-                   "FROM components WHERE" + 
+                   "FROM components WHERE" +
                    makeWhereClause('program', PRODUCTS))
         mysql_cur.execute(sql)
         lines = mysql_cur.fetchall()
@@ -623,7 +623,7 @@ def convert(_db, _host, _user, _password, _env, _force):
     trac.setMilestoneList(milestones, 'value')
 
     print "\n6. Retrieving bugs..."
-    if BZ_VERSION >= 2180: 
+    if BZ_VERSION >= 2180:
         sql = """SELECT DISTINCT b.*, c.name AS component, p.name AS product
                             FROM bugs AS b, components AS c, products AS p """
         sql += " WHERE" + makeWhereClause('p.name', PRODUCTS)
@@ -664,7 +664,7 @@ def convert(_db, _host, _user, _password, _env, _force):
             # priorities
             ticket['severity'] = ''
             ticket['priority'] = bug['bug_severity']
-        
+
         ticket['owner'] = trac.getLoginName(mysql_cur, bug['assigned_to'])
         ticket['reporter'] = trac.getLoginName(mysql_cur, bug['reporter'])
 
@@ -680,7 +680,7 @@ def convert(_db, _host, _user, _password, _env, _force):
         cc_list = []
         for cc in cc_records:
             cc_list.append(trac.getLoginName(mysql_cur, cc['who']))
-        cc_list = [cc for cc in cc_list if cc not in IGNORE_CC]  
+        cc_list = [cc for cc in cc_list if cc not in IGNORE_CC]
         ticket['cc'] = string.join(cc_list, ', ')
 
         ticket['version'] = bug['version']
@@ -831,7 +831,7 @@ def convert(_db, _host, _user, _password, _env, _force):
                   oldChange['oldvalue'] += " " + ticketChange['oldvalue']
                   oldChange['newvalue'] += " " + ticketChange['newvalue']
                   break
-              # cc and attachments.isobsolete sometime appear 
+              # cc and attachments.isobsolete sometime appear
               # in different activities with same time
               if ((field_name == "cc" or field_name == "attachments.isobsolete") \
                   and oldChange['time'] == ticketChange['time']):
@@ -877,7 +877,7 @@ def convert(_db, _host, _user, _password, _env, _force):
                               "WHERE attachments.bug_id = %s AND "
                               "attachments.attach_id = attach_data.id" % bugid)
         else:
-            mysql_cur.execute("SELECT * FROM attachments WHERE bug_id = %s" % 
+            mysql_cur.execute("SELECT * FROM attachments WHERE bug_id = %s" %
                               bugid)
         attachments = mysql_cur.fetchall()
         for a in attachments:
@@ -899,7 +899,7 @@ def convert(_db, _host, _user, _password, _env, _force):
             login = LOGIN_MAP[user['login_name']]
         else:
             login = user['login_name']
-        
+
         htpasswd.write(login + ":" + user['cryptpassword'] + "\n")
 
     htpasswd.close()
@@ -927,7 +927,7 @@ def usage():
   -p | --passwd <MySQL password>   - Bugzilla's user password
   -c | --clean                     - Remove current Trac tickets before
                                      importing
-  -n | --noseverities              - import Bugzilla severities as Trac 
+  -n | --noseverities              - import Bugzilla severities as Trac
                                      priorities and forget Bugzilla priorities
   --help | help                    - This help info
 

contrib/emailfilter.py

@@ -7,7 +7,7 @@
 Copyright 2005, Daniel Lundin <[email protected]>
 Copyright 2005, Edgewall Software
 
-Please note: 
+Please note:
 
 This is only a starting point. See
  * http://trac.edgewall.org/ticket/5327 and

contrib/migrateticketmodel.py

@@ -1,12 +1,12 @@
 #!/usr/bin/env python
-# 
+#
 # This script completely migrates a <= 0.8.x Trac environment to use the new
 # default ticket model introduced in Trac 0.9.
-# 
+#
 # In particular, this means that the severity field is removed (or rather
 # disabled by removing all possible values), and the priority values are
 # changed to the more meaningful new defaults.
-# 
+#
 # Make sure to make a backup of the Trac environment before running this!
 
 from __future__ import with_statement