mirror of
https://github.com/git/git.git
synced 2024-11-01 14:57:52 +01:00
12da1d1f6f
This is a rewrite of much of Bo's work, mainly in an effort to split it into smaller, easier to understand routines. The algorithm is built around the struct range_set, which encodes a series of line ranges as intervals [a,b). This is used in two contexts: * A set of lines we are tracking (which will change as we dig through history). * To encode diffs, as pairs of ranges. The main routine is range_set_map_across_diff(). It processes the diff between a commit C and some parent P. It determines which diff hunks are relevant to the ranges tracked in C, and computes the new ranges for P. The algorithm is then simply to process history in topological order from newest to oldest, computing ranges and (partial) diffs. At branch points, we need to merge the ranges we are watching. We will find that many commits do not affect the chosen ranges, and mark them TREESAME (in addition to those already filtered by pathspec limiting). Another pass of history simplification then gets rid of such commits. This is wired as an extra filtering pass in the log machinery. This currently only reduces code duplication, but should allow for other simplifications and options to be used. Finally, we hook a diff printer into the output chain. Ideally we would wire directly into the diff logic, to optionally use features like word diff. However, that will require some major reworking of the diff chain, so we completely replace the output with our own diff for now. As this was a GSoC project, and has quite some history by now, many people have helped. In no particular order, thanks go to Jakub Narebski <jnareb@gmail.com> Jens Lehmann <Jens.Lehmann@web.de> Jonathan Nieder <jrnieder@gmail.com> Junio C Hamano <gitster@pobox.com> Ramsay Jones <ramsay@ramsay1.demon.co.uk> Will Palmer <wmpalmer@gmail.com> Apologies to everyone I forgot. Signed-off-by: Bo Yang <struggleyb.nku@gmail.com> Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
102 lines
1.6 KiB
Text
102 lines
1.6 KiB
Text
commit 4659538844daa2849b1a9e7d6fadb96fcd26fc83
|
|
Author: Thomas Rast <trast@student.ethz.ch>
|
|
Date: Thu Feb 28 10:48:43 2013 +0100
|
|
|
|
change back to complete line
|
|
|
|
diff --git a/a.c b/a.c
|
|
--- a/a.c
|
|
+++ b/a.c
|
|
@@ -18,5 +18,5 @@
|
|
int main ()
|
|
{
|
|
printf("%ld\n", f(15));
|
|
return 0;
|
|
-}
|
|
\ No newline at end of file
|
|
+}
|
|
|
|
commit 100b61a6f2f720f812620a9d10afb3a960ccb73c
|
|
Author: Thomas Rast <trast@student.ethz.ch>
|
|
Date: Thu Feb 28 10:48:10 2013 +0100
|
|
|
|
change to an incomplete line at end
|
|
|
|
diff --git a/a.c b/a.c
|
|
--- a/a.c
|
|
+++ b/a.c
|
|
@@ -18,5 +18,5 @@
|
|
int main ()
|
|
{
|
|
printf("%ld\n", f(15));
|
|
return 0;
|
|
-}
|
|
+}
|
|
\ No newline at end of file
|
|
|
|
commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
|
|
Author: Thomas Rast <trast@student.ethz.ch>
|
|
Date: Thu Feb 28 10:45:16 2013 +0100
|
|
|
|
touch both functions
|
|
|
|
diff --git a/a.c b/a.c
|
|
--- a/a.c
|
|
+++ b/a.c
|
|
@@ -3,9 +3,9 @@
|
|
-int f(int x)
|
|
+long f(long x)
|
|
{
|
|
int s = 0;
|
|
while (x) {
|
|
x >>= 1;
|
|
s++;
|
|
}
|
|
return s;
|
|
}
|
|
@@ -17,5 +17,5 @@
|
|
int main ()
|
|
{
|
|
- printf("%d\n", f(15));
|
|
+ printf("%ld\n", f(15));
|
|
return 0;
|
|
}
|
|
|
|
commit f04fb20f2c77850996cba739709acc6faecc58f7
|
|
Author: Thomas Rast <trast@student.ethz.ch>
|
|
Date: Thu Feb 28 10:44:55 2013 +0100
|
|
|
|
change f()
|
|
|
|
diff --git a/a.c b/a.c
|
|
--- a/a.c
|
|
+++ b/a.c
|
|
@@ -3,8 +3,9 @@
|
|
int f(int x)
|
|
{
|
|
int s = 0;
|
|
while (x) {
|
|
x >>= 1;
|
|
s++;
|
|
}
|
|
+ return s;
|
|
}
|
|
|
|
commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
|
|
Author: Thomas Rast <trast@student.ethz.ch>
|
|
Date: Thu Feb 28 10:44:48 2013 +0100
|
|
|
|
initial
|
|
|
|
diff --git a/a.c b/a.c
|
|
--- /dev/null
|
|
+++ b/a.c
|
|
@@ -0,0 +3,8 @@
|
|
+int f(int x)
|
|
+{
|
|
+ int s = 0;
|
|
+ while (x) {
|
|
+ x >>= 1;
|
|
+ s++;
|
|
+ }
|
|
+}
|