Merge remote-tracking branch 'memsharded/feature/new_remove'

Author: uilianries

.gitignore

@@ -0,0 +1 @@
+*.pyc

example/example.py

@@ -0,0 +1,42 @@
+import os
+import logging
+from patch import fromfile, fromstring
+
+class PatchLogHandler(logging.Handler):
+    def __init__(self):
+        logging.Handler.__init__(self, logging.DEBUG)
+
+    def emit(self, record):
+        logstr = self.format(record)
+        print logstr
+
+patchlog = logging.getLogger("patch")
+patchlog.handlers = []
+patchlog.addHandler(PatchLogHandler())
+
+patch = fromstring("""--- /dev/null
++++ b/newfile
+@@ -0,0 +0,3 @@
++New file1
++New file2
++New file3
+""")
+
+patch.apply(root=os.getcwd(), strip=0)
+
+
+with open("newfile", "rb") as f:
+    newfile = f.read()
+    assert "New file1\nNew file2\nNew file3\n" == newfile
+
+patch = fromstring("""--- a/newfile
++++ /dev/null
+@@ -0,3 +0,0 @@
+-New file1
+-New file2
+-New file3
+""")
+
+result = patch.apply(root=os.getcwd(), strip=0)
+
+assert os.path.exists("newfile") is False

patch.py

@@ -2,7 +2,7 @@
 """
     Patch utility to apply unified diffs
 
-    Brute-force line-by-line non-recursive parsing 
+    Brute-force line-by-line non-recursive parsing
 
     Copyright (c) 2008-2016 anatoly techtonik
     Available under the terms of MIT license
@@ -54,7 +54,7 @@ def tostr(b):
 
   # [ ] figure out how to print non-utf-8 filenames without
   #     information loss
-  return b.decode('utf-8')    
+  return b.decode('utf-8')
 
 
 #------------------------------------------------
@@ -233,7 +233,7 @@ class Patch(object):
       If used as an iterable, returns hunks.
   """
   def __init__(self):
-    self.source = None 
+    self.source = None
     self.target = None
     self.hunks = []
     self.hunkends = []
@@ -339,7 +339,7 @@ def lineno(self):
 
     # regexp to match start of hunk, used groups - 1,3,4,6
     re_hunk_start = re.compile(b"^@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))? @@")
-    
+
     self.errors = 0
     # temp buffers for header and filenames info
     header = []
@@ -375,7 +375,7 @@ def lineno(self):
             else:
               info("%d unparsed bytes left at the end of stream" % len(b''.join(header)))
               self.warnings += 1
-              # TODO check for \No new line at the end.. 
+              # TODO check for \No new line at the end..
               # TODO test for unparsed bytes
               # otherwise error += 1
             # this is actually a loop exit
@@ -408,7 +408,7 @@ def lineno(self):
               p.hunkends["lf"] += 1
             elif line.endswith(b"\r"):
               p.hunkends["cr"] += 1
-              
+
             if line.startswith(b"-"):
               hunkactual["linessrc"] += 1
             elif line.startswith(b"+"):
@@ -519,7 +519,7 @@ def lineno(self):
           headscan = True
         else:
           if tgtname != None:
-            # XXX seems to be a dead branch  
+            # XXX seems to be a dead branch
             warning("skipping invalid patch - double target at line %d" % (lineno+1))
             self.errors += 1
             srcname = None
@@ -612,7 +612,7 @@ def lineno(self):
           warning("error: no patch data found!")
           return False
         else: # extra data at the end of file
-          pass 
+          pass
       else:
         warning("error: patch stream is incomplete!")
         self.errors += 1
@@ -638,7 +638,7 @@ def lineno(self):
     # --------
 
     self._normalize_filenames()
-    
+
     return (self.errors == 0)
 
   def _detect_type(self, p):
@@ -681,14 +681,14 @@ def _detect_type(self, p):
             return GIT
 
     # HG check
-    # 
+    #
     #  - for plain HG format header is like "diff -r b2d9961ff1f5 filename"
     #  - for Git-style HG patches it is "diff --git a/oldname b/newname"
     #  - filename starts with a/, b/ or is equal to /dev/null
     #  - exported changesets also contain the header
     #    # HG changeset patch
     #    # User name@example.com
-    #    ...   
+    #    ...
     # TODO add MQ
     # TODO add revision info
     if len(p.header) > 0:
@@ -817,7 +817,7 @@ def diffstat(self):
         hist = "+"*int(iwidth) + "-"*int(dwidth)
       # -- /calculating +- histogram --
       output += (format % (tostr(names[i]), str(insert[i] + delete[i]), hist))
- 
+
     output += (" %d files changed, %d insertions(+), %d deletions(-), %+d bytes"
                % (len(names), sum(insert), sum(delete), delta))
     return output
@@ -854,6 +854,10 @@ def findfiles(self, old, new):
           return new, new
       return None, None
 
+  def _strip_prefix(self, filename):
+    if filename.startswith(b'a/') or filename.startswith(b'b/'):
+        return filename[2:]
+    return filename
 
   def apply(self, strip=0, root=None):
     """ Apply parsed patch, optionally stripping leading components
@@ -890,12 +894,25 @@ def apply(self, strip=0, root=None):
 
       filenameo, filenamen = self.findfiles(old, new)
 
-      if not filenameo or not filenamen:
-          warning("source/target file does not exist:\n  --- %s\n  +++ %s" % (old, new))
-          errors += 1
-          continue
-      if not isfile(filenameo):
-        warning("not a file - %s" % filenameo)
+      if not filename:
+          if "dev/null" in old:
+              # this is a file creation
+              filename = self._strip_prefix(new)
+              # I wish there would be something more clean to get the full contents
+              new_file = "".join(s[1:] for s in p.hunks[0].text)
+              with open(filename, "wb") as f:
+                  f.write(new_file)
+              continue
+          elif "dev/null" in new:
+              # this is a file removal
+              os.remove(self._strip_prefix(old))
+              continue
+          else:
+              warning("source/target file does not exist:\n  --- %s\n  +++ %s" % (old, new))
+              errors += 1
+              continue
+      if not isfile(filename):
+        warning("not a file - %s" % filename)
         errors += 1
         continue
 
@@ -1077,7 +1094,7 @@ class NoMatch(Exception):
 
   def patch_stream(self, instream, hunks):
     """ Generator that yields stream patched with hunks iterable
-    
+
         Converts lineends in hunk lines to the best suitable format
         autodetected from input
     """
@@ -1130,7 +1147,7 @@ def get_line():
             yield line2write.rstrip(b"\r\n")+newline
           else: # newlines are mixed
             yield line2write
-     
+
     for line in instream:
       yield line