CODEWITHSUNDEEP
pythonregex
Kevin
Kevin

Reputation: 1133

splitting a diff file using regex in Python

I'm trying to split a diff (unified format) into each section using the re module in python. The format of a diff is like this...

diff --git a/src/core.js b/src/core.js
index 9c8314c..4242903 100644
--- a/src/core.js
+++ b/src/core.js
@@ -801,7 +801,7 @@ jQuery.extend({
        return proxy;
    },

-   // Mutifunctional method to get and set values to a collection
+   // Multifunctional method to get and set values of a collection
    // The value/s can optionally be executed if it's a function
    access: function( elems, fn, key, value, chainable, emptyGet, pass ) {
        var exec,
diff --git a/src/sizzle b/src/sizzle
index fe2f618..feebbd7 160000
--- a/src/sizzle
+++ b/src/sizzle
@@ -1 +1 @@
-Subproject commit fe2f618106bb76857b229113d6d11653707d0b22
+Subproject commit feebbd7e053bff426444c7b348c776c99c7490ee
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 18e1b8d..ff31c4d 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -7,7 +7,7 @@ var bareObj = function(value) { return value; };
 var functionReturningObj = function(value) { return (function() { return value; }); };

 test("text()", function() {
-   expect(4);
+   expect(5);
    var expected = "This link has class=\"blog\": Simon Willison's Weblog";
    equal( jQuery("#sap").text(), expected, "Check for merged text of more then one element." );

@@ -20,6 +20,10 @@ test("text()", function() {
        frag.appendChild( document.createTextNode("foo") );

    equal( jQuery( frag ).text(), "foo", "Document Fragment Text node was retreived from .text().");
+
+   var $newLineTest = jQuery("<div>test<br/>testy</div>").appendTo("#moretests");
+   $newLineTest.find("br").replaceWith("\n");
+   equal( $newLineTest.text(), "test\ntesty", "text() does not remove new lines (#11153)" );
 });

 test("text(undefined)", function() {
diff --git a/version.txt b/version.txt
index 0a182f2..0330b0e 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.7.2
\ No newline at end of file
+1.7.3pre
\ No newline at end of file

I've tried the following combinations of patterns but can't quite get it right. This is the closest I have come so far...

re.compile(r'(diff.*?[^\rdiff])', flags=re.S|re.M)

but this yields

['diff ', 'diff ', 'diff ', 'diff ']

How would I match all sections in this diff?

Upvotes: 2

Views: 473

Answers (4)

Alan Moore
Alan Moore

Reputation: 75242

Just split on any linefeed that's followed by the word diff:

result = re.split(r"\n(?=diff\b)", subject)

Though for safety's sake, you probably should try to match \r or \r\n as well:

result = re.split(r"(?:\r\n|[\r\n])(?=diff\b)", subject)

Upvotes: 0

the wolf
the wolf

Reputation: 35552

This does it:

r=re.compile(r'^(diff.*?)(?=^diff|\Z)', re.M | re.S)
for m in re.findall(r, s):
    print '===='
    print m

Upvotes: 1

mVChr
mVChr

Reputation: 50195

You don't need to use regex, just split the file:

diff_file = open('diff.txt', 'r')
diff_str = diff_file.read()
diff_split = ['diff --git%s' % x for x in diff_str.split('diff --git') \
              if x.strip()]
print diff_split

Upvotes: 1

JosefAssad
JosefAssad

Reputation: 4128

Why are you using regex? How about just iterating over the lines and starting a new section when a line starts with diff?

list_of_diffs = []
temp_diff = ''
for line in patch:
    if line.startswith('diff'):
        list_of_diffs.append(temp_diff)
        temp_diff = ''
    else: temp_diff.append(line)

Disclaimer, above code should be considered illustrative pseudocode only and is not expected to actually run.

Regex is a hammer but your problem isn't a nail.

Upvotes: 0

Related Questions