9

So, I've got a file I've been working on in branch A, and I'm just about ready to commit it. However, looking at the diff, I think it's better to put it into two separate commits (Well, in this case, two separate branches, maybe). I've used git add --patch before to stage separate hunks, so I thought I could use this. The problem is, I need to split one of my hunks. Running git add --patch SdA.py and using e to edit the problem hunk...

# Manual hunk edit mode -- see bottom for a quick guide @@ -50,13 +50,74 @@ import PIL.Image as im import constant + +def exp_range(min=None, max=None, step=None): + """ + Generate an exponentially increasing value scaled and offset such + that it covers the range (min, max]. Behaviour is similar to + exp(x), scaled such that the final value generated is equal to + 'max'. 'step' defines the granularity of the exponential + function. The default value is 5, corresponding to a step-size + of tau. + + :type min: float + :param min: minimum value of range (offset) + + :type max: float + :param max: Maximum (final) value of range + + :type step: int + :param step: Number of incremental steps within the range + (min, max] + + """ + if min is None: + raise StopIteration + + # One input argument (same as range(10)) + if min is not None and max is None and step is None: + step = min + min = 0. + max = 1. + elif step is None: + step = 5 + + for i in xrange(step): + exp_rate = np.exp(i - (step-1)) + yield min + (max - min) * exp_rate + raise StopIteration + + def norm(input): + """ + Return the norm of a vector or row-wise norm of a matrix + + :type input: theano.tensor.TensorType + :param input: Theano array or matrix to take the norm of. + + """ return T.sqrt((input * input).sum(axis=0)) def normalize(vector, scale=1.0, offset=0.5): + """ + Normalize (Zero and scale) a vector such that it's peak to peak + value is equal to 'scale', and it is centered about 'offset'. + + :type vector: numpy.ndarray + :param vector: Vector to normalize to the given parameters. + + :type scale: float + :param scale: Peak-to-peak range to stretch or shrink the vector's + current peak-to-peak range to. + + :type offset: float + :param offset: Value at which to center the peak-to-peak range at. + + """ return (vector - vector.min()) * scale / vector.ptp() +

That's okay. There's a mini-guide on the bottom. I get that. So, we want to put the new function in this commit, and the documentation for the other functions into another commit. According to the mini-doc: # To remove '+' lines, delete them.

# Manual hunk edit mode -- see bottom for a quick guide @@ -50,13 +50,74 @@ import PIL.Image as im import constant + +def exp_range(min=None, max=None, step=None): + """ + Generate an exponentially increasing value scaled and offset such + that it covers the range (min, max]. Behaviour is similar to + exp(x), scaled such that the final value generated is equal to + 'max'. 'step' defines the granularity of the exponential + function. The default value is 5, corresponding to a step-size + of tau. + + :type min: float + :param min: minimum value of range (offset) + + :type max: float + :param max: Maximum (final) value of range + + :type step: int + :param step: Number of incremental steps within the range + (min, max] + + """ + if min is None: + raise StopIteration + + # One input argument (same as range(10)) + if min is not None and max is None and step is None: + step = min + min = 0. + max = 1. + elif step is None: + step = 5 + + for i in xrange(step): + exp_rate = np.exp(i - (step-1)) + yield min + (max - min) * exp_rate + raise StopIteration + + def norm(input): return T.sqrt((input * input).sum(axis=0)) def normalize(vector, scale=1.0, offset=0.5): return (vector - vector.min()) * scale / vector.ptp()

That looks good. Let's add that puppy...

error: patch failed: SdA.py:50 error: SdA.py: patch does not apply Your edited hunk does not apply. Edit again (saying "no" discards!) [y/n]?

Mmkay... git add --interactive "Your edited hunk does not apply" and How to read the output from git diff? explain that I have to update the affected line numbers. To do this, now, I can manually count and say "Hmm, I've removed 1, 2, 3... 23 lines. I was editing 74 lines previously, now I'm editing... hmm... wish I had a calculator... .... 51 lines" ('whew, I'm sweaty')

This seems like an overcomplicated method. I still think patch is the right approach, but I must be doing something wrong if I need to manually update the number of affected lines in the to-file. Anyone have any advice on how to do this more easily and efficiently?

Improve this question

2 Answers 2

Reset to default
8

Commenting out the lines to remove, with #, rather than deleting them, solves this issue. I'm not certain if the behaviour is part of emacs, but commenting a line actually decrements the counter at the top of the patch message. Another feature I found useful was to use s to first split the hunk, then add each one independently. In this particular example, that would have been the better solution.

Improve this answer
Sign up to request clarification or add additional context in comments.

2 Comments

This works for me in sublime as well (no counter is automatically decremented though)
Fwiw, my confusion with the edit patch mode stemmed from the fact that there's an extra leading space on each line. All worked for me once I realized that.
1

There are Git GUIs that make it so easy to selectively stage lines, all you have to do is select individual lines and add them, no need to edit hunks manually.

Two such GUIs are SourceTree and Git Cola.

Improve this answer

4 Comments

I'm kind of averse to GUIs as I feel they add an unnecessary abstraction to most things. This can be both good and bad. For complex operations, the GUI becomes a tool, and is likely much better than I could ever be. For simple operations, however, (and I feel this patch is a simple operation), I think the commandline should be preferred. I'll wait on this a couple days, and see if any other answers come in. Thanks for the suggestion, though.
@Phox for what it's worth, I use Git almost exclusively from the command line, but for selective staging, it's been my experience that GUIs make it faster and easier.
+1 for git-cola, i have been looking that feature for linux for a while, I use git add -p often but for some reason the "s" doesn't work well.
This does not answer the question at all. This question concerned CLI git (which is a proper client) and there is a way to do this with it, regardless of opinions about how other tools compare.

Start asking to get answers

Find the answer to your question by asking.

Ask question

Explore related questions

See similar questions with these tags.