comparison hgext/record.py @ 6210:942287cb1f57

Removed trailing spaces from everything except test output
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 07 Mar 2008 00:24:36 +0100
parents 1f733c2f0165
children e75aab656f46
comparison
equal deleted inserted replaced
6209:4e8cd15240bf 6210:942287cb1f57
65 else: 65 else:
66 raise patch.PatchError('unknown patch content: %r' % line) 66 raise patch.PatchError('unknown patch content: %r' % line)
67 67
68 class header(object): 68 class header(object):
69 """patch header 69 """patch header
70 70
71 XXX shoudn't we move this to mercurial/patch.py ? 71 XXX shoudn't we move this to mercurial/patch.py ?
72 """ 72 """
73 diff_re = re.compile('diff --git a/(.*) b/(.*)$') 73 diff_re = re.compile('diff --git a/(.*) b/(.*)$')
74 allhunks_re = re.compile('(?:index|new file|deleted file) ') 74 allhunks_re = re.compile('(?:index|new file|deleted file) ')
75 pretty_re = re.compile('(?:new file|deleted file) ') 75 pretty_re = re.compile('(?:new file|deleted file) ')
76 special_re = re.compile('(?:index|new|deleted|copy|rename) ') 76 special_re = re.compile('(?:index|new|deleted|copy|rename) ')
132 rem = len([h for h in hunk if h[0] == '-']) 132 rem = len([h for h in hunk if h[0] == '-'])
133 return add, rem 133 return add, rem
134 134
135 class hunk(object): 135 class hunk(object):
136 """patch hunk 136 """patch hunk
137 137
138 XXX shouldn't we merge this with patch.hunk ? 138 XXX shouldn't we merge this with patch.hunk ?
139 """ 139 """
140 maxcontext = 3 140 maxcontext = 3
141 141
142 def __init__(self, header, fromline, toline, proc, before, hunk, after): 142 def __init__(self, header, fromline, toline, proc, before, hunk, after):
265 resp_all = [None] # this two are changed from inside prompt, 265 resp_all = [None] # this two are changed from inside prompt,
266 resp_file = [None] # so can't be usual variables 266 resp_file = [None] # so can't be usual variables
267 applied = {} # 'filename' -> [] of chunks 267 applied = {} # 'filename' -> [] of chunks
268 def prompt(query): 268 def prompt(query):
269 """prompt query, and process base inputs 269 """prompt query, and process base inputs
270 270
271 - y/n for the rest of file 271 - y/n for the rest of file
272 - y/n for the rest 272 - y/n for the rest
273 - ? (help) 273 - ? (help)
274 - q (quit) 274 - q (quit)
275 275