5 use Getopt::Long qw/:config no_ignore_case no_auto_abbrev gnu_compat/;
10 'outstanding' => "\e[1;33m",
11 'unmerge' => "\e[1;31m",
14 'previous' => "\e[34m",
19 '' => "color: black; background-color: black",
20 'outstanding' => "color: black; background-color: yellow",
21 'unmerge' => "color: black; background-color: red",
22 'merge' => "color: black; background-color: green",
23 'base' => "color: black; background-color: lightblue",
24 'previous' => "color: black; background-color: blue",
29 'outstanding' => "OUTSTANDING",
30 'unmerge' => "UNMERGED",
33 'previous' => "PREVIOUS",
38 my ($msg, $data) = @_;
39 return $data if defined $data;
59 my $width = ($ENV{COLUMNS} || backtick 'tput', 'cols' || 80);
60 my $branch = $ENV{GIT_BRANCH};
63 chomp($branch = backtick 'git', 'symbolic-ref', 'HEAD');
64 $branch =~ s/^refs\/heads\///
65 or die "Not in a branch";
67 chomp(my $master = (backtick 'git', 'config', '--get', "branch-manager.$branch.master" or 'master'));
68 chomp(my $datefilter = (backtick 'git', 'config', '--get', "branch-manager.$branch.startdate" or ''));
71 if($datefilter eq 'mergebase')
73 chomp($revprefix = check_defined "git-merge-base: $!", backtick 'git', 'merge-base', $master, $branch);
76 elsif($datefilter ne '')
78 @datefilter = "--since=$datefilter";
83 sub reset_to_commit($)
86 #run 'git', 'merge', '-s', 'ours', '--no-commit', $r
87 # or die "git-merge: $!";
88 run 'git', 'checkout', $r, '--', '.'
89 or die "git-checkout: $!";
93 run 'git', 'update-ref', 'MERGE_HEAD', $r
94 or die "git-update-ref: $!";
95 run 'git', 'commit', '--allow-empty', '-m', "::stable-branch::reset=$r"
96 or die "git-commit: $!";
110 my $msg = backtick 'git', 'log', '-1', '--pretty=fuller', $r
111 or die "git-log: $!";
112 for(split /\n/, $msg)
114 if(/^Author:\s*(.*) <(.*)>/)
119 elsif(/^AuthorDate:\s*(.*)/)
128 open my $fh, '>', '.commitmsg'
129 or die ">.commitmsg: $!";
130 print $fh "$cmsg" . "::stable-branch::merge=$r\n"
131 or die ">.commitmsg: $!";
133 or die ">.commitmsg: $!";
135 local $ENV{GIT_AUTHOR_NAME} = $author;
136 local $ENV{GIT_AUTHOR_EMAIL} = $email;
137 local $ENV{GIT_AUTHOR_DATE} = $date;
138 run 'git', 'cherry-pick', '-n', $r
139 or run 'git', 'mergetool'
140 or die "git-mergetool: $!";
143 run 'git', 'commit', '--allow-empty', '-F', '.commitmsg'
144 or die "git-commit: $!";
148 sub unmerge_commit($)
158 my $msg = backtick 'git', 'log', '-1', '--pretty=fuller', $r
159 or die "git-log: $!";
160 for(split /\n/, $msg)
162 if(/^Author:\s*(.*) <(.*)>/)
167 elsif(/^AuthorDate:\s*(.*)/)
176 open my $fh, '>', '.commitmsg'
177 or die ">.commitmsg: $!";
178 print $fh "UNMERGE $cmsg" . "::stable-branch::unmerge=$r\n"
179 or die ">.commitmsg: $!";
181 or die ">.commitmsg: $!";
183 local $ENV{GIT_AUTHOR_NAME} = $author;
184 local $ENV{GIT_AUTHOR_EMAIL} = $email;
185 local $ENV{GIT_AUTHOR_DATE} = $date;
186 run 'git', 'revert', '-n', $r
187 or run 'git', 'mergetool'
188 or die "git-mergetool: $!";
191 run 'git', 'commit', '--allow-empty', '-F', '.commitmsg'
192 or die "git-commit: $!";
200 my @applied = (0) x @{$log->{order_a}};
201 my $newbase_id = $log->{order_h}{$r};
204 my @outstanding = ();
208 if(!$log->{bitmap}[$_])
210 unshift @rlog, ['unmerge', $log->{order_a}[$_]];
214 for($newbase_id+1 .. @{$log->{order_a}}-1)
216 if($log->{bitmap}[$_])
218 push @rlog, ['merge', $log->{order_a}[$_]];
222 push @outstanding, ['outstanding', $log->{order_a}[$_]];
239 return $logcache if defined $logcache;
251 my $cur_commit = undef;
253 for((split /\n/, check_defined "git-log: $!", backtick 'git', 'log', '--topo-order', '--reverse', '--pretty=fuller', @datefilter, "$revprefix$master"), undef)
255 if(defined $cur_commit and (not defined $_ or /^commit (\S+)/))
257 $cur_msg =~ s/\s+$//s;
258 $history{$cur_commit} = scalar @history;
259 $logmsg{$cur_commit} = $cur_msg;
260 push @history, $cur_commit;
261 $cur_commit = $cur_msg = undef;
263 last if not defined $_;
273 $cur_commit = $cur_msg = undef;
275 for((split /\n/, check_defined "git-log: $!", backtick 'git', 'log', '--topo-order', '--reverse', '--pretty=fuller', @datefilter, "$revprefix$branch"), undef)
277 if(defined $cur_commit and (not defined $_ or /^commit (\S+)/))
279 $cur_msg =~ s/\s+$//s;
280 $logmsg{$cur_commit} = $cur_msg;
281 push @commits, $cur_commit;
282 $cur_commit = $cur_msg = undef;
284 last if not defined $_;
294 my $lastrebase = undef;
297 my $data = $logmsg{$_};
298 if($data =~ /::stable-branch::unmerge=(\S+)/)
300 push @logdata, ['unmerge', $1];
302 elsif($data =~ /::stable-branch::merge=(\S+)/)
304 push @logdata, ['merge', $1];
306 elsif($data =~ /::stable-branch::reset=(\S+)/)
311 elsif($data =~ /::stable-branch::rebase=(\S+)/)
313 $lastrebase->[0] = 'ignore'
314 if defined $lastrebase;
315 push @logdata, ($lastrebase = ['rebase', $1]);
319 if(not defined $base)
321 warn 'This branch is not yet managed by git-branch-manager';
325 order_a => \@history,
326 order_h => \%history,
331 my $baseid = $history{$base};
340 my ($cmd, $data) = @{$logdata[$i]};
343 $bitmap[$history{$data}] = 1;
345 elsif($cmd eq 'unmerge')
347 $bitmap[$history{$data}] = 0;
349 elsif($cmd eq 'rebase')
351 # the bitmap is fine, but generate a new log from the bitmap
354 order_a => \@history,
355 order_h => \%history,
358 my $rebasedlog = rebase_log $data, $pseudolog;
359 my @l = grep { $_->[0] ne 'outstanding' } @{$rebasedlog->{log}};
360 splice @logdata, 0, $i+1, @l;
363 $baseid = $history{$base};
368 my @outstanding = ();
369 for($baseid+1 .. @history-1)
371 push @outstanding, ['outstanding', $history[$_]]
378 order_a => \@history,
379 order_h => \%history,
405 $r = backtick 'git', 'rev-parse', $r
406 or die "git-rev-parse: $!"
411 print "Executing: $cmd $r\n";
417 die "PEBKAC: invalid revision number, cannot reset"
418 unless defined $l->{order_h}{$r};
422 elsif($cmd eq 'hardreset')
427 die "PEBKAC: invalid revision number, cannot reset"
428 unless defined $l->{order_h}{$r};
430 run 'git', 'reset', '--hard', $r
431 or die "git-reset: $!";
434 elsif($cmd eq 'merge')
439 die "PEBKAC: invalid revision number, cannot reset"
440 unless defined $l->{order_h}{$r} and not $l->{bitmap}[$l->{order_h}{$r}];
441 die "PEBKAC: not initialized"
442 unless defined $l->{base};
446 elsif($cmd eq 'unmerge')
451 die "PEBKAC: invalid revision number, cannot reset"
452 unless defined $l->{order_h}{$r} and $l->{bitmap}[$l->{order_h}{$r}];
453 die "PEBKAC: not initialized"
454 unless defined $l->{base};
458 elsif($cmd eq 'outstanding')
463 die "Invalid command: $cmd $r";
474 $r = backtick 'git', 'rev-parse', $r
475 or die "git-rev-parse: $!"
480 die "PEBKAC: invalid revision number, cannot reset"
481 unless defined $l->{order_h}{$r};
482 die "PEBKAC: not initialized"
483 unless defined $l->{base};
485 my $msg = backtick 'git', 'log', '-1', '--pretty=fuller', @datefilter, $branch
486 or die "git-log: $!";
487 $msg =~ /^commit (\S+)/s
488 or die "Invalid git log output";
490 my $l = rebase_log $r, parse_log();
492 local $do_commit = 0;
496 run_script @{$l->{log}};
497 run 'git', 'commit', '--allow-empty', '-m', "::stable-branch::rebase=$r"
498 or die "git-commit: $!";
504 run 'git', 'reset', '--hard', $commit_id
505 or die "$err, and then git-reset failed: $!";
511 my ($toencode,$newlinestoo) = @_;
512 return undef unless defined($toencode);
513 $toencode =~ s{&}{&}gso;
514 $toencode =~ s{<}{<}gso;
515 $toencode =~ s{>}{>}gso;
516 $toencode =~ s{"}{"}gso;
527 $r = undef if $r eq '';
530 ($r = backtick 'git', 'rev-parse', $r
531 or die "git-rev-parse: $!")
536 die "PEBKAC: invalid revision number, cannot reset"
537 unless !defined $r or defined $l->{order_h}{$r};
538 die "PEBKAC: not initialized"
539 unless defined $l->{base};
542 $l = rebase_log $r, $l
544 my $last = $l->{order_h}{$l->{base}};
545 my $first = $last - $histsize;
554 (map { $seen{$l->{order_a}[$_]} ? () : ['previous', $l->{order_a}[$_]] } $first..($last-1)),
555 ['base', $l->{base}],
558 if($cmd eq 'chronology')
560 @l = map { [$_->[1], $_->[2]] } sort { $l->{order_h}{$a->[2]} <=> $l->{order_h}{$b->[2]} or $a->[0] <=> $b->[0] } map { [$_, $l[$_]->[0], $l[$_]->[1]] } 0..(@l-1);
562 elsif($cmd eq 'outstanding')
565 @l = reverse grep { !$seen{$_->[1]}++ && !$l->{bitmap}->[$l->{order_h}->{$_->[1]}] } reverse map { [$_->[1], $_->[2]] } sort { $l->{order_h}{$a->[2]} <=> $l->{order_h}{$b->[2]} or $a->[0] <=> $b->[0] } map { [$_, $l[$_]->[0], $l[$_]->[1]] } 0..(@l-1);
569 print "Content-Type: text/html\n\n<table border>\n";
572 my ($action, $r) = @$_;
573 my $m = $l->{logmsg}->{$r};
574 my $m_short = join ' ', map { s/^ (?!git-svn-id)(.)/$1/ ? $_ : () } split /\n/, $m;
575 printf "<tr style=\"%s\"><td>%s</td><td><a href=\"%s%s\">%s</a></td><td style=\"white-space: pre\">%s</td></tr>\n", $html_style{$action}, $name{$action}, escapeHTML($cgi_url), escapeHTML($r), escapeHTML($r), escapeHTML($m_short);
583 my ($action, $r) = @$_;
584 my $m = $l->{logmsg}->{$r};
585 my $m_short = join ' ', map { s/^ (?!git-svn-id)(.)/$1/ ? $_ : () } split /\n/, $m;
586 $m_short = substr $m_short, 0, $width - 11 - 1 - 40 - 1;
587 printf "%s%-11s%s %s %s\n", $color{$action}, $name{$action}, $color{''}, $r, $m_short;
594 my ($cmd, $one) = @_;
597 $0 [{--histsize|-s} n] {--chronology|-c}
598 $0 [{--histsize|-s} n] {--chronology|-c} revision-hash
599 $0 [{--histsize|-s} n] {--log|-l}
600 $0 [{--histsize|-s} n] {--log|-l} revision-hash
601 $0 {--merge|-m} revision-hash
602 $0 {--unmerge|-u} revision-hash
603 $0 {--reset|-R} revision-hash
604 $0 {--hardreset|-H} revision-hash
605 $0 {--rebase|-b} revision-hash
631 my $result = GetOptions(
632 "chronology|c:s", handler \&opt_list,
633 "log|l:s", handler \&opt_list,
634 "outstanding|o:s", handler \&opt_list,
635 "rebase|b=s", handler \&opt_rebase,
636 "merge|m=s{,}", handler sub { run_script ['merge', $_[1]]; },
637 "unmerge|u=s{,}", handler sub { run_script ['unmerge', $_[1]]; },
638 "reset|R=s", handler sub { run_script ['reset', $_[1]]; },
639 "hardreset|H=s", handler sub { run_script ['hardreset', $_[1]]; },
640 "help|h", handler \&opt_help,
641 "histsize|s=i", \$histsize,
646 opt_list("outstanding", "");