virtualenv/res/lib/patch.py
author grandjoncl
Thu, 11 Oct 2012 16:39:05 +0200
changeset 842 ca38abd140b3
parent 50 0d59e0522d36
permissions -rw-r--r--
Corrections of the code for the embed popup. Functions are now in the embed_popup.js With chrome the player used to play the video even when it wasn't supposed to be displayed and kept playing when we hid the player. When we changed between div and iframe the player started even when it was suppose to be hidden. It's now solved.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
     1
""" Patch utility to apply unified diffs
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
     2
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
     3
    Brute-force line-by-line non-recursive parsing 
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
     4
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
     5
    Copyright (c) 2008-2010 anatoly techtonik
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
     6
    Available under the terms of MIT license
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
     7
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
     8
    Project home: http://code.google.com/p/python-patch/
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
     9
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    10
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    11
    $Id: patch.py 76 2010-04-08 19:10:21Z techtonik $
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    12
    $HeadURL: https://python-patch.googlecode.com/svn/trunk/patch.py $
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    13
"""
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    14
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    15
__author__ = "techtonik.rainforce.org"
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    16
__version__ = "10.04"
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    17
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    18
import copy
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    19
import logging
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    20
import re
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    21
# cStringIO doesn't support unicode in 2.5
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    22
from StringIO import StringIO
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    23
from logging import debug, info, warning
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    24
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    25
from os.path import exists, isfile, abspath
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    26
from os import unlink
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    27
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    28
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    29
#------------------------------------------------
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    30
# Logging is controlled by "python_patch" logger
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    31
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    32
debugmode = False
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    33
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    34
logger = logging.getLogger("python_patch")
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    35
loghandler = logging.StreamHandler()
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    36
logger.addHandler(loghandler)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    37
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    38
debug = logger.debug
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    39
info = logger.info
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    40
warning = logger.warning
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    41
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    42
#: disable library logging by default
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    43
logger.setLevel(logging.CRITICAL)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    44
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    45
#------------------------------------------------
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    46
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    47
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    48
def fromfile(filename):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    49
  """ Parse patch file and return Patch() object
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    50
  """
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    51
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    52
  info("reading patch from file %s" % filename)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    53
  fp = open(filename, "rb")
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    54
  patch = Patch(fp)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    55
  fp.close()
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    56
  return patch
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    57
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    58
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    59
def fromstring(s):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    60
  """ Parse text string and return Patch() object
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    61
  """
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    62
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    63
  return Patch(
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    64
           StringIO.StringIO(s)    
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    65
         )
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    66
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    67
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    68
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    69
class HunkInfo(object):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    70
  """ Parsed hunk data container (hunk starts with @@ -R +R @@) """
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    71
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    72
  def __init__(self):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    73
    self.startsrc=None #: line count starts with 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    74
    self.linessrc=None
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    75
    self.starttgt=None
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    76
    self.linestgt=None
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    77
    self.invalid=False
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    78
    self.text=[]
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    79
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    80
  def copy(self):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    81
    return copy.copy(self)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    82
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    83
#  def apply(self, estream):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    84
#    """ write hunk data into enumerable stream
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    85
#        return strings one by one until hunk is
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    86
#        over
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    87
#
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    88
#        enumerable stream are tuples (lineno, line)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    89
#        where lineno starts with 0
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    90
#    """
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    91
#    pass
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    92
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    93
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    94
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    95
class Patch(object):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    96
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    97
  def __init__(self, stream=None):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    98
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
    99
    # define Patch data members
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   100
    # table with a row for every source file
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   101
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   102
    #: list of source filenames
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   103
    self.source=None
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   104
    self.target=None
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   105
    #: list of lists of hunks
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   106
    self.hunks=None
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   107
    #: file endings statistics for every hunk
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   108
    self.hunkends=None
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   109
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   110
    if stream:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   111
      self.parse(stream)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   112
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   113
  def copy(self):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   114
    return copy.copy(self)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   115
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   116
  def parse(self, stream):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   117
    """ parse unified diff """
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   118
    self.source = []
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   119
    self.target = []
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   120
    self.hunks = []
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   121
    self.hunkends = []
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   122
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   123
    # define possible file regions that will direct the parser flow
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   124
    header = False    # comments before the patch body
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   125
    filenames = False # lines starting with --- and +++
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   126
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   127
    hunkhead = False  # @@ -R +R @@ sequence
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   128
    hunkbody = False  #
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   129
    hunkskip = False  # skipping invalid hunk mode
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   130
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   131
    header = True
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   132
    lineends = dict(lf=0, crlf=0, cr=0)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   133
    nextfileno = 0
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   134
    nexthunkno = 0    #: even if index starts with 0 user messages number hunks from 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   135
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   136
    # hunkinfo holds parsed values, hunkactual - calculated
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   137
    hunkinfo = HunkInfo()
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   138
    hunkactual = dict(linessrc=None, linestgt=None)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   139
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   140
    fe = enumerate(stream)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   141
    for lineno, line in fe:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   142
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   143
      # analyze state
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   144
      if header and line.startswith("--- "):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   145
        header = False
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   146
        # switch to filenames state
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   147
        filenames = True
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   148
      #: skip hunkskip and hunkbody code until you read definition of hunkhead
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   149
      if hunkbody:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   150
        # process line first
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   151
        if re.match(r"^[- \+\\]", line):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   152
            # gather stats about line endings
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   153
            if line.endswith("\r\n"):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   154
              self.hunkends[nextfileno-1]["crlf"] += 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   155
            elif line.endswith("\n"):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   156
              self.hunkends[nextfileno-1]["lf"] += 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   157
            elif line.endswith("\r"):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   158
              self.hunkends[nextfileno-1]["cr"] += 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   159
              
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   160
            if line.startswith("-"):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   161
              hunkactual["linessrc"] += 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   162
            elif line.startswith("+"):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   163
              hunkactual["linestgt"] += 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   164
            elif not line.startswith("\\"):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   165
              hunkactual["linessrc"] += 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   166
              hunkactual["linestgt"] += 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   167
            hunkinfo.text.append(line)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   168
            # todo: handle \ No newline cases
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   169
        else:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   170
            warning("invalid hunk no.%d at %d for target file %s" % (nexthunkno, lineno+1, self.target[nextfileno-1]))
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   171
            # add hunk status node
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   172
            self.hunks[nextfileno-1].append(hunkinfo.copy())
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   173
            self.hunks[nextfileno-1][nexthunkno-1]["invalid"] = True
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   174
            # switch to hunkskip state
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   175
            hunkbody = False
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   176
            hunkskip = True
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   177
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   178
        # check exit conditions
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   179
        if hunkactual["linessrc"] > hunkinfo.linessrc or hunkactual["linestgt"] > hunkinfo.linestgt:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   180
            warning("extra hunk no.%d lines at %d for target %s" % (nexthunkno, lineno+1, self.target[nextfileno-1]))
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   181
            # add hunk status node
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   182
            self.hunks[nextfileno-1].append(hunkinfo.copy())
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   183
            self.hunks[nextfileno-1][nexthunkno-1]["invalid"] = True
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   184
            # switch to hunkskip state
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   185
            hunkbody = False
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   186
            hunkskip = True
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   187
        elif hunkinfo.linessrc == hunkactual["linessrc"] and hunkinfo.linestgt == hunkactual["linestgt"]:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   188
            self.hunks[nextfileno-1].append(hunkinfo.copy())
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   189
            # switch to hunkskip state
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   190
            hunkbody = False
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   191
            hunkskip = True
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   192
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   193
            # detect mixed window/unix line ends
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   194
            ends = self.hunkends[nextfileno-1]
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   195
            if ((ends["cr"]!=0) + (ends["crlf"]!=0) + (ends["lf"]!=0)) > 1:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   196
              warning("inconsistent line ends in patch hunks for %s" % self.source[nextfileno-1])
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   197
            if debugmode:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   198
              debuglines = dict(ends)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   199
              debuglines.update(file=self.target[nextfileno-1], hunk=nexthunkno)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   200
              debug("crlf: %(crlf)d  lf: %(lf)d  cr: %(cr)d\t - file: %(file)s hunk: %(hunk)d" % debuglines)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   201
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   202
      if hunkskip:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   203
        match = re.match("^@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))?", line)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   204
        if match:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   205
          # switch to hunkhead state
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   206
          hunkskip = False
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   207
          hunkhead = True
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   208
        elif line.startswith("--- "):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   209
          # switch to filenames state
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   210
          hunkskip = False
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   211
          filenames = True
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   212
          if debugmode and len(self.source) > 0:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   213
            debug("- %2d hunks for %s" % (len(self.hunks[nextfileno-1]), self.source[nextfileno-1]))
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   214
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   215
      if filenames:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   216
        if line.startswith("--- "):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   217
          if nextfileno in self.source:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   218
            warning("skipping invalid patch for %s" % self.source[nextfileno])
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   219
            del self.source[nextfileno]
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   220
            # double source filename line is encountered
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   221
            # attempt to restart from this second line
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   222
          re_filename = "^--- ([^\t]+)"
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   223
          match = re.match(re_filename, line)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   224
          # todo: support spaces in filenames
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   225
          if match:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   226
            self.source.append(match.group(1).strip())
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   227
          else:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   228
            warning("skipping invalid filename at line %d" % lineno)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   229
            # switch back to header state
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   230
            filenames = False
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   231
            header = True
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   232
        elif not line.startswith("+++ "):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   233
          if nextfileno in self.source:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   234
            warning("skipping invalid patch with no target for %s" % self.source[nextfileno])
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   235
            del self.source[nextfileno]
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   236
          else:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   237
            # this should be unreachable
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   238
            warning("skipping invalid target patch")
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   239
          filenames = False
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   240
          header = True
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   241
        else:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   242
          if nextfileno in self.target:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   243
            warning("skipping invalid patch - double target at line %d" % lineno)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   244
            del self.source[nextfileno]
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   245
            del self.target[nextfileno]
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   246
            nextfileno -= 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   247
            # double target filename line is encountered
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   248
            # switch back to header state
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   249
            filenames = False
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   250
            header = True
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   251
          else:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   252
            re_filename = "^\+\+\+ ([^\t]+)"
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   253
            match = re.match(re_filename, line)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   254
            if not match:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   255
              warning("skipping invalid patch - no target filename at line %d" % lineno)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   256
              # switch back to header state
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   257
              filenames = False
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   258
              header = True
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   259
            else:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   260
              self.target.append(match.group(1).strip())
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   261
              nextfileno += 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   262
              # switch to hunkhead state
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   263
              filenames = False
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   264
              hunkhead = True
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   265
              nexthunkno = 0
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   266
              self.hunks.append([])
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   267
              self.hunkends.append(lineends.copy())
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   268
              continue
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   269
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   270
      if hunkhead:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   271
        match = re.match("^@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))?", line)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   272
        if not match:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   273
          if nextfileno-1 not in self.hunks:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   274
            warning("skipping invalid patch with no hunks for file %s" % self.target[nextfileno-1])
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   275
            # switch to header state
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   276
            hunkhead = False
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   277
            header = True
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   278
            continue
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   279
          else:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   280
            # switch to header state
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   281
            hunkhead = False
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   282
            header = True
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   283
        else:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   284
          hunkinfo.startsrc = int(match.group(1))
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   285
          hunkinfo.linessrc = 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   286
          if match.group(3): hunkinfo.linessrc = int(match.group(3))
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   287
          hunkinfo.starttgt = int(match.group(4))
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   288
          hunkinfo.linestgt = 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   289
          if match.group(6): hunkinfo.linestgt = int(match.group(6))
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   290
          hunkinfo.invalid = False
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   291
          hunkinfo.text = []
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   292
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   293
          hunkactual["linessrc"] = hunkactual["linestgt"] = 0
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   294
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   295
          # switch to hunkbody state
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   296
          hunkhead = False
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   297
          hunkbody = True
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   298
          nexthunkno += 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   299
          continue
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   300
    else:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   301
      if not hunkskip:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   302
        warning("patch file incomplete - %s" % filename)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   303
        # sys.exit(?)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   304
      else:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   305
        # duplicated message when an eof is reached
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   306
        if debugmode and len(self.source) > 0:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   307
            debug("- %2d hunks for %s" % (len(self.hunks[nextfileno-1]), self.source[nextfileno-1]))
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   308
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   309
    info("total files: %d  total hunks: %d" % (len(self.source), sum(len(hset) for hset in self.hunks)))
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   310
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   311
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   312
  def apply(self):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   313
    """ apply parsed patch """
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   314
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   315
    total = len(self.source)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   316
    for fileno, filename in enumerate(self.source):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   317
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   318
      f2patch = filename
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   319
      if not exists(f2patch):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   320
        f2patch = self.target[fileno]
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   321
        if not exists(f2patch):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   322
          warning("source/target file does not exist\n--- %s\n+++ %s" % (filename, f2patch))
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   323
          continue
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   324
      if not isfile(f2patch):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   325
        warning("not a file - %s" % f2patch)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   326
        continue
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   327
      filename = f2patch
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   328
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   329
      info("processing %d/%d:\t %s" % (fileno+1, total, filename))
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   330
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   331
      # validate before patching
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   332
      f2fp = open(filename)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   333
      hunkno = 0
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   334
      hunk = self.hunks[fileno][hunkno]
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   335
      hunkfind = []
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   336
      hunkreplace = []
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   337
      validhunks = 0
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   338
      canpatch = False
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   339
      for lineno, line in enumerate(f2fp):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   340
        if lineno+1 < hunk.startsrc:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   341
          continue
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   342
        elif lineno+1 == hunk.startsrc:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   343
          hunkfind = [x[1:].rstrip("\r\n") for x in hunk.text if x[0] in " -"]
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   344
          hunkreplace = [x[1:].rstrip("\r\n") for x in hunk.text if x[0] in " +"]
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   345
          #pprint(hunkreplace)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   346
          hunklineno = 0
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   347
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   348
          # todo \ No newline at end of file
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   349
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   350
        # check hunks in source file
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   351
        if lineno+1 < hunk.startsrc+len(hunkfind)-1:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   352
          if line.rstrip("\r\n") == hunkfind[hunklineno]:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   353
            hunklineno+=1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   354
          else:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   355
            debug("hunk no.%d doesn't match source file %s" % (hunkno+1, filename))
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   356
            # file may be already patched, but we will check other hunks anyway
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   357
            hunkno += 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   358
            if hunkno < len(self.hunks[fileno]):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   359
              hunk = self.hunks[fileno][hunkno]
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   360
              continue
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   361
            else:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   362
              break
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   363
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   364
        # check if processed line is the last line
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   365
        if lineno+1 == hunk.startsrc+len(hunkfind)-1:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   366
          debug("file %s hunk no.%d -- is ready to be patched" % (filename, hunkno+1))
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   367
          hunkno+=1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   368
          validhunks+=1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   369
          if hunkno < len(self.hunks[fileno]):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   370
            hunk = self.hunks[fileno][hunkno]
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   371
          else:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   372
            if validhunks == len(self.hunks[fileno]):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   373
              # patch file
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   374
              canpatch = True
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   375
              break
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   376
      else:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   377
        if hunkno < len(self.hunks[fileno]):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   378
          warning("premature end of source file %s at hunk %d" % (filename, hunkno+1))
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   379
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   380
      f2fp.close()
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   381
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   382
      if validhunks < len(self.hunks[fileno]):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   383
        if self._match_file_hunks(filename, self.hunks[fileno]):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   384
          warning("already patched  %s" % filename)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   385
        else:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   386
          warning("source file is different - %s" % filename)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   387
      if canpatch:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   388
        backupname = filename+".orig"
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   389
        if exists(backupname):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   390
          warning("can't backup original file to %s - aborting" % backupname)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   391
        else:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   392
          import shutil
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   393
          shutil.move(filename, backupname)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   394
          if self.write_hunks(backupname, filename, self.hunks[fileno]):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   395
            warning("successfully patched %s" % filename)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   396
            unlink(backupname)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   397
          else:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   398
            warning("error patching file %s" % filename)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   399
            shutil.copy(filename, filename+".invalid")
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   400
            warning("invalid version is saved to %s" % filename+".invalid")
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   401
            # todo: proper rejects
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   402
            shutil.move(backupname, filename)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   403
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   404
    # todo: check for premature eof
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   405
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   406
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   407
  def can_patch(self, filename):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   408
    """ Check if specified filename can be patched. Returns None if file can
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   409
    not be found among source filenames. False if patch can not be applied
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   410
    clearly. True otherwise.
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   411
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   412
    :returns: True, False or None
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   413
    """
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   414
    idx = self._get_file_idx(filename, source=True)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   415
    if idx == None:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   416
      return None
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   417
    return self._match_file_hunks(filename, self.hunks[idx])
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   418
    
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   419
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   420
  def _match_file_hunks(self, filepath, hunks):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   421
    matched = True
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   422
    fp = open(abspath(filepath))
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   423
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   424
    class NoMatch(Exception):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   425
      pass
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   426
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   427
    lineno = 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   428
    line = fp.readline()
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   429
    hno = None
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   430
    try:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   431
      for hno, h in enumerate(hunks):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   432
        # skip to first line of the hunk
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   433
        while lineno < h.starttgt:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   434
          if not len(line): # eof
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   435
            debug("check failed - premature eof before hunk: %d" % (hno+1))
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   436
            raise NoMatch
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   437
          line = fp.readline()
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   438
          lineno += 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   439
        for hline in h.text:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   440
          if hline.startswith("-"):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   441
            continue
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   442
          if not len(line):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   443
            debug("check failed - premature eof on hunk: %d" % (hno+1))
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   444
            # todo: \ No newline at the end of file
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   445
            raise NoMatch
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   446
          if line.rstrip("\r\n") != hline[1:].rstrip("\r\n"):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   447
            debug("file is not patched - failed hunk: %d" % (hno+1))
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   448
            raise NoMatch
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   449
          line = fp.readline()
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   450
          lineno += 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   451
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   452
    except NoMatch:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   453
      matched = False
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   454
      # todo: display failed hunk, i.e. expected/found
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   455
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   456
    fp.close()
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   457
    return matched
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   458
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   459
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   460
  def patch_stream(self, instream, hunks):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   461
    """ Generator that yields stream patched with hunks iterable
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   462
    
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   463
        Converts lineends in hunk lines to the best suitable format
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   464
        autodetected from input
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   465
    """
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   466
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   467
    # todo: At the moment substituted lineends may not be the same
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   468
    #       at the start and at the end of patching. Also issue a
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   469
    #       warning/throw about mixed lineends (is it really needed?)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   470
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   471
    hunks = iter(hunks)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   472
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   473
    srclineno = 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   474
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   475
    lineends = {'\n':0, '\r\n':0, '\r':0}
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   476
    def get_line():
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   477
      """
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   478
      local utility function - return line from source stream
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   479
      collecting line end statistics on the way
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   480
      """
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   481
      line = instream.readline()
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   482
        # 'U' mode works only with text files
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   483
      if line.endswith("\r\n"):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   484
        lineends["\r\n"] += 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   485
      elif line.endswith("\n"):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   486
        lineends["\n"] += 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   487
      elif line.endswith("\r"):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   488
        lineends["\r"] += 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   489
      return line
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   490
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   491
    for hno, h in enumerate(hunks):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   492
      debug("hunk %d" % (hno+1))
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   493
      # skip to line just before hunk starts
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   494
      while srclineno < h.startsrc:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   495
        yield get_line()
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   496
        srclineno += 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   497
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   498
      for hline in h.text:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   499
        # todo: check \ No newline at the end of file
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   500
        if hline.startswith("-") or hline.startswith("\\"):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   501
          get_line()
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   502
          srclineno += 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   503
          continue
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   504
        else:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   505
          if not hline.startswith("+"):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   506
            get_line()
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   507
            srclineno += 1
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   508
          line2write = hline[1:]
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   509
          # detect if line ends are consistent in source file
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   510
          if sum([bool(lineends[x]) for x in lineends]) == 1:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   511
            newline = [x for x in lineends if lineends[x] != 0][0]
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   512
            yield line2write.rstrip("\r\n")+newline
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   513
          else: # newlines are mixed
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   514
            yield line2write
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   515
     
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   516
    for line in instream:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   517
      yield line
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   518
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   519
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   520
  def write_hunks(self, srcname, tgtname, hunks):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   521
    src = open(srcname, "rb")
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   522
    tgt = open(tgtname, "wb")
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   523
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   524
    debug("processing target file %s" % tgtname)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   525
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   526
    tgt.writelines(self.patch_stream(src, hunks))
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   527
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   528
    tgt.close()
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   529
    src.close()
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   530
    return True
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   531
  
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   532
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   533
  def _get_file_idx(self, filename, source=None):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   534
    """ Detect index of given filename within patch.
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   535
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   536
        :param filename:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   537
        :param source: search filename among sources (True),
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   538
                       targets (False), or both (None)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   539
        :returns: int or None
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   540
    """
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   541
    filename = abspath(filename)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   542
    if source == True or source == None:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   543
      for i,fnm in enumerate(self.source):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   544
        if filename == abspath(fnm):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   545
          return i  
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   546
    if source == False or source == None:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   547
      for i,fnm in enumerate(self.target):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   548
        if filename == abspath(fnm):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   549
          return i  
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   550
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   551
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   552
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   553
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   554
from optparse import OptionParser
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   555
from os.path import exists
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   556
import sys
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   557
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   558
if __name__ == "__main__":
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   559
  opt = OptionParser(usage="%prog [options] unipatch-file", version="python-patch %s" % __version__)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   560
  opt.add_option("--debug", action="store_true", dest="debugmode", help="debug mode")
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   561
  (options, args) = opt.parse_args()
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   562
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   563
  if not args:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   564
    opt.print_version()
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   565
    opt.print_help()
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   566
    sys.exit()
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   567
  debugmode = options.debugmode
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   568
  patchfile = args[0]
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   569
  if not exists(patchfile) or not isfile(patchfile):
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   570
    sys.exit("patch file does not exist - %s" % patchfile)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   571
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   572
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   573
  if debugmode:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   574
    loglevel = logging.DEBUG
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   575
    logformat = "%(levelname)8s %(message)s"
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   576
  else:
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   577
    loglevel = logging.INFO
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   578
    logformat = "%(message)s"
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   579
  logger.setLevel(loglevel)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   580
  loghandler.setFormatter(logging.Formatter(logformat))
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   581
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   582
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   583
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   584
  patch = fromfile(patchfile)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   585
  #pprint(patch)
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   586
  patch.apply()
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   587
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   588
  # todo: document and test line ends handling logic - patch.py detects proper line-endings
bdf22b140727 first import
ymh <ymh.work@gmail.com>
parents:
diff changeset
   589
  #       for inserted hunks and issues a warning if patched file has incosistent line ends