[views] Restructure profile view, simplify bundle access

[patchwork] / apps / patchwork / parser.py

diff --git a/apps/patchwork/parser.py b/apps/patchwork/parser.py
index 16d1de4c6f8e03fdbed64231098d86a2774781e4..abec782f4f7c75cf74d7a83ef73b07f680addbdd 100644 (file)
--- a/apps/patchwork/parser.py
+++ b/apps/patchwork/parser.py
@@ -22,6 +22,16 @@
 
 import re
 
+try:
+    import hashlib
+    sha1_hash = hashlib.sha1
+except ImportError:
+    import sha
+    sha1_hash = sha.sha
+
+_hunk_re = re.compile('^\@\@ -\d+(?:,(\d+))? \+\d+(?:,(\d+))? \@\@')
+_filename_re = re.compile('^(---|\+\+\+) (\S+)')
+
 def parse_patch(text):
     patchbuf = ''
     commentbuf = ''
@@ -53,7 +63,6 @@ def parse_patch(text):
     lc = (0, 0)
     hunk = 0
 
-    hunk_re = re.compile('^\@\@ -\d+(?:,(\d+))? \+\d+(?:,(\d+))? \@\@')
 
     for line in text.split('\n'):
         line += '\n'
@@ -91,7 +100,7 @@ def parse_patch(text):
                 buf = ''
 
         elif state == 3:
-            match = hunk_re.match(line)
+            match = _hunk_re.match(line)
             if match:
 
                 def fn(x):
@@ -149,10 +158,78 @@ def parse_patch(text):
 
     return (patchbuf, commentbuf)
 
-if __name__ == '__main__':
-    import sys
+def hash_patch(str):
+    # normalise spaces
+    str = str.replace('\r', '')
+    str = str.strip() + '\n'
+
+    prefixes = ['-', '+', ' ']
+    hash = sha1_hash()
+
+    for line in str.split('\n'):
+
+        if len(line) <= 0:
+            continue
+
+        hunk_match = _hunk_re.match(line)
+        filename_match = _filename_re.match(line)
+
+        if filename_match:
+            # normalise -p1 top-directories
+            if filename_match.group(1) == '---':
+                filename = 'a/'
+            else:
+                filename = 'b/'
+            filename += '/'.join(filename_match.group(2).split('/')[1:])
+
+            line = filename_match.group(1) + ' ' + filename
+
+        elif hunk_match:
+            # remove line numbers, but leave line counts
+            def fn(x):
+                if not x:
+                    return 1
+                return int(x)
+            line_nos = map(fn, hunk_match.groups())
+            line = '@@ -%d +%d @@' % tuple(line_nos)
+
+        elif line[0] in prefixes:
+            # if we have a +, - or context line, leave as-is
+            pass
+
+        else:
+            # other lines are ignored
+            continue
+
+        hash.update(line.encode('utf-8') + '\n')
+
+    return hash
+
+
+def main(args):
+    from optparse import OptionParser
+
+    parser = OptionParser()
+    parser.add_option('-p', '--patch', action = 'store_true',
+            dest = 'print_patch', help = 'print parsed patch')
+    parser.add_option('-c', '--comment', action = 'store_true',
+            dest = 'print_comment', help = 'print parsed comment')
+    parser.add_option('-#', '--hash', action = 'store_true',
+            dest = 'print_hash', help = 'print patch hash')
+
+    (options, args) = parser.parse_args()
+
     (patch, comment) = parse_patch(sys.stdin.read())
-    if patch:
+
+    if options.print_hash and patch:
+        print hash_patch(patch).hexdigest()
+
+    if options.print_patch and patch:
         print "Patch: ------\n" + patch
-    if comment:
+
+    if options.print_comment and comment:
         print "Comment: ----\n" + comment
+
+if __name__ == '__main__':
+    import sys
+    sys.exit(main(sys.argv))