# HG changeset patch
# User Dirkjan Ochtman <dirkjan@ochtman.nl>
# Date 1219311317 -7200
# Node ID ebf1462f214584b4da3a20a41ead0086325f915d
# Parent  1ec2d227a5215bb8991f50e54273acd3b108308b
strip trailing whitespace, replace tabs by spaces

diff -r 1ec2d227a521 -r ebf1462f2145 hgext/convert/__init__.py
--- a/hgext/convert/__init__.py	Thu Aug 21 10:55:24 2008 +0200
+++ b/hgext/convert/__init__.py	Thu Aug 21 11:35:17 2008 +0200
@@ -127,7 +127,7 @@
             matched. If a match occurs, then the conversion process will
             add the most recent revision on the branch indicated in the
             regex as the second parent of the changeset.
-    
+
     The hgext/convert/cvsps wrapper script allows the builtin changeset
     merging code to be run without doing a conversion. Its parameters and
     output are similar to that of cvsps 2.1.
diff -r 1ec2d227a521 -r ebf1462f2145 hgext/convert/hg.py
--- a/hgext/convert/hg.py	Thu Aug 21 10:55:24 2008 +0200
+++ b/hgext/convert/hg.py	Thu Aug 21 11:35:17 2008 +0200
@@ -212,7 +212,7 @@
             try:
                 startnode = self.repo.lookup(startnode)
             except repo.RepoError:
-                raise util.Abort(_('%s is not a valid start revision') 
+                raise util.Abort(_('%s is not a valid start revision')
                                  % startnode)
             startrev = self.repo.changelog.rev(startnode)
             children = {startnode: 1}
@@ -229,7 +229,7 @@
         return self.lastctx
 
     def parents(self, ctx):
-        return [p.node() for p in ctx.parents() 
+        return [p.node() for p in ctx.parents()
                 if p and self.keep(p.node())]
 
     def getheads(self):
diff -r 1ec2d227a521 -r ebf1462f2145 hgext/rebase.py
--- a/hgext/rebase.py	Thu Aug 21 10:55:24 2008 +0200
+++ b/hgext/rebase.py	Thu Aug 21 11:35:17 2008 +0200
@@ -86,7 +86,7 @@
         ui.note(_('rebase merging completed\n'))
 
         if collapsef:
-            p1, p2 = defineparents(repo, min(state), target, 
+            p1, p2 = defineparents(repo, min(state), target,
                                                         state, targetancestors)
             concludenode(repo, rev, p1, external, state, collapsef,
                                                 last=True, skipped=skipped)
@@ -96,7 +96,7 @@
 
         if not opts.get('keep'):
             # Remove no more useful revisions
-            if (util.set(repo.changelog.descendants(min(state))) 
+            if (util.set(repo.changelog.descendants(min(state)))
                                                     - util.set(state.keys())):
                 ui.warn(_("warning: new changesets detected on source branch, "
                                                         "not stripping\n"))
@@ -174,7 +174,7 @@
             repo.ui.debug('next revision set to %s\n' % p1)
             skipped[rev] = True
         state[rev] = p1
-       
+
 def defineparents(repo, rev, target, state, targetancestors):
     'Return the new parent relationship of the revision that will be rebased'
     parents = repo[rev].parents()
@@ -224,7 +224,7 @@
             if rev not in skipped:
                 repo.ui.debug('import mq patch %d (%s)\n' % (state[rev],
                                                             mqrebase[rev]))
-                repo.mq.qimport(repo, (), patchname=mqrebase[rev], 
+                repo.mq.qimport(repo, (), patchname=mqrebase[rev],
                             git=opts.get('git', False),rev=[str(state[rev])])
         repo.mq.save_dirty()
 
@@ -330,7 +330,7 @@
         cwdancestors.add(cwd)
         rebasingbranch = cwdancestors - targetancestors
         source = min(rebasingbranch)
-        
+
     repo.ui.debug(_('rebase onto %d starting from %d\n') % (dest, source))
     state = dict.fromkeys(repo.changelog.descendants(source), nullrev)
     external = nullrev
@@ -379,7 +379,7 @@
     # make sure 'hg help cmd' still works
     decorator.__doc__ = cmdentry[0].__doc__
     decoratorentry = (decorator,) + cmdentry[1:]
-    rebaseopt = ('', 'rebase', None, 
+    rebaseopt = ('', 'rebase', None,
                             _("rebase working directory to branch head"))
     decoratorentry[1].append(rebaseopt)
     commands.table[cmdkey] = decoratorentry
diff -r 1ec2d227a521 -r ebf1462f2145 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Thu Aug 21 10:55:24 2008 +0200
+++ b/mercurial/localrepo.py	Thu Aug 21 11:35:17 2008 +0200
@@ -707,7 +707,7 @@
             if not cr:
                 self.ui.debug(_(" %s: searching for copy revision for %s\n") %
                               (fn, cf))
-		for a in self['.'].ancestors():
+                for a in self['.'].ancestors():
                     if cf in a:
                         cr = a[cf].filenode()
                         break
diff -r 1ec2d227a521 -r ebf1462f2145 tests/test-convert.out
--- a/tests/test-convert.out	Thu Aug 21 10:55:24 2008 +0200
+++ b/tests/test-convert.out	Thu Aug 21 11:35:17 2008 +0200
@@ -115,7 +115,7 @@
             matched. If a match occurs, then the conversion process will
             add the most recent revision on the branch indicated in the
             regex as the second parent of the changeset.
-    
+
     The hgext/convert/cvsps wrapper script allows the builtin changeset
     merging code to be run without doing a conversion. Its parameters and
     output are similar to that of cvsps 2.1.
diff -r 1ec2d227a521 -r ebf1462f2145 tests/test-revlog-ancestry.py
--- a/tests/test-revlog-ancestry.py	Thu Aug 21 10:55:24 2008 +0200
+++ b/tests/test-revlog-ancestry.py	Thu Aug 21 11:35:17 2008 +0200
@@ -49,26 +49,26 @@
     # Ancestors
     print 'Ancestors of 5'
     for r in repo.changelog.ancestors(5):
-        print r, 
+        print r,
 
     print '\nAncestors of 6 and 5'
     for r in repo.changelog.ancestors(6, 5):
-        print r, 
+        print r,
 
     print '\nAncestors of 5 and 4'
     for r in repo.changelog.ancestors(5, 4):
-        print r, 
+        print r,
 
     # Descendants
     print '\n\nDescendants of 5'
     for r in repo.changelog.descendants(5):
-        print r, 
+        print r,
 
     print '\nDescendants of 5 and 3'
     for r in repo.changelog.descendants(5, 3):
-        print r, 
+        print r,
 
     print '\nDescendants of 5 and 4'
     for r in repo.changelog.descendants(5, 4):
-        print r, 
+        print r,