"Shawn O. Pearce" <spearce@xxxxxxxxxxx> writes:
> What about a patch format like this? I doubt people move more than
> 26 blocks in the same patch of the same file, so using a single
> character block prefix when the before/after images are identical
> might work OK.
>
> diff --git a/git-gui.sh b/git-gui.sh
> index 0443129..f13fa80 100755
> --- a/git-gui.sh
> +++ b/git-gui.sh
> a@@ -632,6 +632,43 a@@ You are using [git-version]:
>
> ######################################################################
> ##
> a+## feature option selection
> ...
> a+
> a+######################################################################
> a+##
> ## repository setup
>
> if {[catch {
> a@@ -1598,43 +1635,6 a@@ apply_config
>
> ######################################################################
> ##
> a-## feature option selection
> ....
> a-##
> ## ui construction
>
> set ui_comm {}
Gaah, my eyes, my *eyes*!!
runs, stays in bathroom for 10 minutes and washes, and
comes back...
It might not be actually so bad. But I wonder if it would be
more obvious if you do not show the whole "a-" lines but leave
just a marker there. That is (ugliness of "a@@" and "a-" that
made me wash my eyes needs to be fixed, though -- but that is
only the syntax):
a@@ -1598,43 +1635,6 a@@ apply_config
######################################################################
##
a-<<< Block a was originally here >>>
## ui construction
set ui_comm {}
You are coming up with a new output format that is only used
when it is a straight move and nothing else, so by definition
there is really no need to show both removal and addition.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
