Mercurial > public > mercurial-scm > hg
diff mercurial/patch.py @ 5143:d4fa6bafc43a
Remove trailing spaces, fix indentation
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 07 Aug 2007 10:28:43 +0200 |
parents | 35d47b06d4e3 |
children | 0fc16031bb45 |
line wrap: on
line diff
--- a/mercurial/patch.py Tue Aug 07 10:28:14 2007 +0200 +++ b/mercurial/patch.py Tue Aug 07 10:28:43 2007 +0200 @@ -321,7 +321,7 @@ os.mkdir(d) self.lines = [] self.exists = False - + self.hash = {} self.dirty = 0 self.offset = 0 @@ -350,7 +350,7 @@ vala = abs(a - linenum) valb = abs(b - linenum) return cmp(vala, valb) - + try: cand = self.hash[l] except: @@ -706,7 +706,7 @@ def old(self, fuzz=0, toponly=False): return self.fuzzit(self.a, fuzz, toponly) - + def newctrl(self): res = [] for x in self.hunk: @@ -842,7 +842,7 @@ """reads a patch from fp and tries to apply it. The dict 'changed' is filled in with all of the filenames changed by the patch. Returns 0 for a clean patch, -1 if any rejects were found and 1 if there was - any fuzz.""" + any fuzz.""" def scangitpatch(fp, firstline, cwd=None): '''git patches can modify a file, then copy that file to