Add -C option to stg import and stg fold

This option maps to the -C option of `git apply` to select the amount of
surrounding context to ensure when an external patch is applied.

Resolves #18.

Signed-off-by: Peter Grayson <[email protected]>

Author: jpgrayson

stgit/commands/common.py

@@ -230,7 +230,7 @@ def address_or_alias(addr_pair):
     raise CmdException('unknown e-mail alias: %s' % addr)
 
 
-def apply_patch(stack, diff, base=None, reject=False, strip=None):
+def apply_patch(stack, diff, base=None, reject=False, strip=None, context_lines=None):
     iw = stack.repository.default_iw
     iw.refresh_index()
     if base:
@@ -239,7 +239,9 @@ def apply_patch(stack, diff, base=None, reject=False, strip=None):
         stack.set_head(base, msg='apply patch')
 
     try:
-        iw.apply(diff, quiet=False, reject=reject, strip=strip)
+        iw.apply(
+            diff, quiet=False, reject=reject, strip=strip, context_lines=context_lines
+        )
     except MergeException:
         if base:
             iw.checkout_hard(orig_head.data.tree)

stgit/commands/fold.py

@@ -62,6 +62,13 @@
         metavar='N',
         short='Remove N leading slashes from diff paths (default 1)',
     ),
+    opt(
+        '-C',
+        dest='context_lines',
+        type='int',
+        metavar='N',
+        short='Ensure N lines of surrounding context for each change',
+    ),
     opt(
         '--reject',
         action='store_true',
@@ -113,6 +120,7 @@ def func(parser, options, args):
             base=stack.patches[current].data.parent,
             strip=options.strip,
             reject=options.reject,
+            context_lines=options.context_lines,
         )
     elif options.base:
         apply_patch(
@@ -121,13 +129,15 @@ def func(parser, options, args):
             base=git_commit(options.base, repository),
             reject=options.reject,
             strip=options.strip,
+            context_lines=options.context_lines,
         )
     else:
         apply_patch(
             stack,
             diff,
             strip=options.strip,
             reject=options.reject,
+            context_lines=options.context_lines,
         )
 
     out.done()

stgit/commands/imprt.py

@@ -102,6 +102,13 @@
             action='store_true',
             short='Strip numbering and extension from patch name',
         ),
+        opt(
+            '-C',
+            dest='context_lines',
+            type='int',
+            metavar='N',
+            short='Ensure N lines of surrounding context for each change',
+        ),
         opt(
             '-i',
             '--ignore',
@@ -203,7 +210,13 @@ def __create_patch(
             tree = stack.head.data.tree
         else:
             iw = stack.repository.default_iw
-            iw.apply(diff, quiet=False, reject=options.reject, strip=options.strip)
+            iw.apply(
+                diff,
+                quiet=False,
+                reject=options.reject,
+                strip=options.strip,
+                context_lines=options.context_lines,
+            )
             tree = iw.index.write_tree()
 
         cd = CommitData(

stgit/lib/git/iw.py

@@ -302,13 +302,15 @@ def diff(self, tree, diff_opts=(), pathlimits=(), binary=True, stat=False):
         cmd.extend(pathlimits)
         return self.run(cmd).decoding(None).raw_output()
 
-    def apply(self, patch_bytes, quiet, reject=False, strip=None):
+    def apply(self, patch_bytes, quiet, reject=False, strip=None, context_lines=None):
         """Apply patch to worktree."""
         cmd = ['git', 'apply', '--index']
         if reject:
             cmd.append('--reject')
         if strip is not None:
             cmd.append('-p%s' % (strip,))
+        if context_lines is not None:
+            cmd.append('-C%s' % (context_lines,))
         try:
             r = self.run(cmd).encoding(None).raw_input(patch_bytes)
             if quiet:

t/t1800-import.sh

@@ -206,6 +206,7 @@ test_expect_success \
                --authemail "[email protected]" \
                --authdate 2005-04-07T22:13:13 \
                --stripname \
+               -C5 \
                some.patch &&
     stg show | grep -e "Author: Some Author <[email protected]>" &&
     stg show | grep -E "Date: +Thu Apr 7 22:13:13 2005 \+0000" &&

t/t3600-fold.sh

@@ -93,6 +93,14 @@ test_expect_success 'Attempt to fold conflicting patch with rejects' '
     rm foo.txt.rej
 '
 
+test_expect_success 'Attempt to fold conflicting patch with -C0' '
+    stg fold -C0 --reject fold1.diff &&
+    stg status --porcelain foo.txt | grep -e "M  foo.txt" &&
+    test "$(tail -n 1 foo.txt)" = "and fold1" &&
+    git reset -- foo.txt &&
+    git checkout foo.txt
+'
+
 test_expect_success 'Fold with base' '
     stg fold --base p1 threeway.diff &&
     test "preface hello from p2" = "$(echo $(cat foo.txt))" &&