Mercurial > public > mercurial-scm > hg

diff mercurial/patch.py @ 5760:0145f9afb0e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed tabs and trailing whitespace in python files
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 29 Dec 2007 19:49:48 +0100
parents 89fe5b36c21e
children deb0d3518674
line wrap: on
line diff
--- a/mercurial/patch.py	Sat Dec 29 01:14:45 2007 +0100
+++ b/mercurial/patch.py	Sat Dec 29 19:49:48 2007 +0100
@@ -818,7 +818,7 @@
             fname = (afile in bfile) and afile or bfile
         elif gooda:
             fname = afile
-    
+
     if not fname:
         if not nullb:
             fname = (afile in bfile) and afile or bfile
@@ -826,7 +826,7 @@
             fname = afile
         else:
             raise PatchError(_("undefined source and destination files"))
-        
+
     return fname, missing
 
 class linereader:
@@ -1029,7 +1029,7 @@
             for gp in gitpatches:
                 if gp.op in ('COPY', 'RENAME'):
                     copyfile(gp.oldpath, gp.path)
-                changed[gp.path] = (gp.op, gp)                
+                changed[gp.path] = (gp.op, gp)
         else:
             raise util.Abort(_('unsupported parser state: %s') % state)