merge with crew-stable

hgext/convert/subversion.py

@@ -280,7 +280,7 b' class svn_source(converter_source):'
         # 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 b' class svn_source(converter_source):'
         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 b' class svn_source(converter_source):'
         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):

mercurial/strutil.py

@@ -37,5 +37,5 b' def rsplit(s, sep=None, maxsplit=-1):'
     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]]

tests/test-doctest.py

@@ -1,7 +1,7 b''
 # 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