# HG changeset patch
# User Dirkjan Ochtman <dirkjan@ochtman.nl>
# Date 1224507178 -7200
# Node ID 67ba74938b157045567c4fcd3ba731e54eb8f89f
# Parent  099b4f9be5ab353fd76497eefdfe454a7a7586ed# Parent  380fda3eed13fccf29bd293d4aff953fc60a7b14
merge with crew-stable

diff -r 099b4f9be5ab -r 67ba74938b15 hgext/convert/subversion.py
--- a/hgext/convert/subversion.py	Mon Oct 20 14:13:37 2008 +0200
+++ b/hgext/convert/subversion.py	Mon Oct 20 14:52:58 2008 +0200
@@ -280,7 +280,7 @@
         # Check if branches bring a few more heads to the list
         if branches:
             rpath = self.url.strip('/')
-            branchnames = svn.client.ls(rpath + '/' + urllib.quote(branches), 
+            branchnames = svn.client.ls(rpath + '/' + urllib.quote(branches),
                                         rev, False, self.ctx)
             for branch in branchnames.keys():
                 module = '%s/%s/%s' % (oldmodule, branches, branch)
@@ -325,7 +325,7 @@
         else:
             # Perform a full checkout on roots
             uuid, module, revnum = self.revsplit(rev)
-            entries = svn.client.ls(self.baseurl + urllib.quote(module), 
+            entries = svn.client.ls(self.baseurl + urllib.quote(module),
                                     optrev(revnum), True, self.ctx)
             files = [n for n,e in entries.iteritems()
                      if e.kind == svn.core.svn_node_file]
@@ -872,7 +872,7 @@
         path = path.strip('/')
         pool = Pool()
         rpath = '/'.join([self.baseurl, urllib.quote(path)]).strip('/')
-        return ['%s/%s' % (path, x) for x in 
+        return ['%s/%s' % (path, x) for x in
                 svn.client.ls(rpath, optrev(revnum), True, self.ctx, pool).keys()]
 
     def getrelpath(self, path, module=None):
diff -r 099b4f9be5ab -r 67ba74938b15 mercurial/commands.py
diff -r 099b4f9be5ab -r 67ba74938b15 mercurial/strutil.py
--- a/mercurial/strutil.py	Mon Oct 20 14:13:37 2008 +0200
+++ b/mercurial/strutil.py	Mon Oct 20 14:52:58 2008 +0200
@@ -37,5 +37,5 @@
     try:
         return s.rsplit(sep, maxsplit)
     except AttributeError:
-        return  [chunk[::-1] for chunk in 
+        return  [chunk[::-1] for chunk in
                  s[::-1].split(sep, maxsplit)[::-1]]
diff -r 099b4f9be5ab -r 67ba74938b15 tests/test-doctest.py
--- a/tests/test-doctest.py	Mon Oct 20 14:13:37 2008 +0200
+++ b/tests/test-doctest.py	Mon Oct 20 14:52:58 2008 +0200
@@ -1,7 +1,7 @@
 # this is hack to make sure no escape characters are inserted into the output
 import os;
 if 'TERM' in os.environ:
-    del os.environ['TERM'] 
+    del os.environ['TERM']
 import doctest
 
 import mercurial.changelog