Skip to content

line-log: be more careful when adjusting multiple line ranges #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

line-log: be more careful when adjusting multiple line ranges #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cab7bb3
line-log: demonstrate a bug with nearly-overlapping ranges
dscho Aug 4, 2018
7f92d92
line-log: adjust start/end of ranges individually
dscho Aug 4, 2018
d5d9db3
line-log: optimize ranges by joining them when possible
dscho Aug 4, 2018
faf3521
line-log: convert an assertion to a full BUG() call
dscho Aug 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions line-log.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,13 @@ void range_set_append_unsafe(struct range_set *rs, long a, long b)

void range_set_append(struct range_set *rs, long a, long b)
{
assert(rs->nr == 0 || rs->ranges[rs->nr-1].end <= a);
if (rs->nr > 0 && rs->ranges[rs->nr-1].end + 1 == a) {
rs->ranges[rs->nr-1].end = b;
return;
}
if (rs->nr > 0 && rs->ranges[rs->nr-1].end > a)
BUG("append %ld-%ld, after %ld-%ld?!?", a, b,
rs->ranges[rs->nr-1].start, rs->ranges[rs->nr-1].end);
range_set_append_unsafe(rs, a, b);
}

Expand Down Expand Up @@ -427,7 +433,7 @@ static void range_set_shift_diff(struct range_set *out,
struct diff_ranges *diff)
{
unsigned int i, j = 0;
long offset = 0;
long offset = 0, start_offset;
struct range *src = rs->ranges;
struct range *target = diff->target.ranges;
struct range *parent = diff->parent.ranges;
Expand All @@ -438,7 +444,13 @@ static void range_set_shift_diff(struct range_set *out,
- (target[j].end-target[j].start);
j++;
}
range_set_append(out, src[i].start+offset, src[i].end+offset);
start_offset = offset;
while (j < diff->target.nr && src[i].end > target[j].end) {
offset += (parent[j].end-parent[j].start)
- (target[j].end-target[j].start);
j++;
}
range_set_append(out, src[i].start+start_offset, src[i].end+offset);
}
}

Expand Down
17 changes: 17 additions & 0 deletions t/t4211-line-log.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,21 @@ test_expect_success 'range_set_union' '
git log $(for x in $(test_seq 200); do echo -L $((2*x)),+1:c.c; done)
'

q_to_lf () {
tr Q '\012'
}

test_expect_success 'close to overlapping ranges' '
test_seq 5 >a1.c &&
git add a1.c &&
git commit -m "5 lines" a1.c &&
sed s/3/3QaQb/ <a1.c | q_to_lf >tmp &&
mv tmp a1.c &&
git commit -m "2 more lines" a1.c &&
sed s/4/cQ4/ <a1.c | q_to_lf >tmp &&
mv tmp a1.c &&
git commit -m "1 more line" a1.c &&
git --no-pager log -L 1,3:a1.c -L 5,8:a1.c
'

test_done