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 'outstanding' => "OUTSTANDING",
20 'unmerge' => "UNMERGED",
23 'previous' => "PREVIOUS",
28 my ($msg, $data) = @_;
29 return $data if defined $data;
49 my $width = ($ENV{COLUMNS} || backtick 'tput', 'cols' || 80);
50 chomp(my $branch = backtick 'git', 'symbolic-ref', 'HEAD');
51 $branch =~ s/^refs\/heads\///
52 or die "Not in a branch";
53 chomp(my $master = (backtick 'git', 'config', '--get', "branch-manager.$branch.master" or 'master'));
54 chomp(my $datefilter = (backtick 'git', 'config', '--get', "branch-manager.$branch.startdate" or ''));
57 if($datefilter eq 'mergebase')
59 chomp($revprefix = check_defined "git-merge-base: $!", backtick 'git', 'merge-base', $master, "HEAD");
62 elsif($datefilter ne '')
64 @datefilter = "--since=$datefilter";
69 sub reset_to_commit($)
72 #run 'git', 'merge', '-s', 'ours', '--no-commit', $r
73 # or die "git-merge: $!";
74 run 'git', 'checkout', $r, '--', '.'
75 or die "git-checkout: $!";
79 run 'git', 'update-ref', 'MERGE_HEAD', $r
80 or die "git-update-ref: $!";
81 run 'git', 'commit', '--allow-empty', '-m', "::stable-branch::reset=$r"
82 or die "git-commit: $!";
96 my $msg = backtick 'git', 'log', '-1', '--pretty=fuller', $r
100 if(/^Author:\s*(.*) <(.*)>/)
105 elsif(/^AuthorDate:\s*(.*)/)
114 open my $fh, '>', '.commitmsg'
115 or die ">.commitmsg: $!";
116 print $fh "$cmsg" . "::stable-branch::merge=$r\n"
117 or die ">.commitmsg: $!";
119 or die ">.commitmsg: $!";
121 local $ENV{GIT_AUTHOR_NAME} = $author;
122 local $ENV{GIT_AUTHOR_EMAIL} = $email;
123 local $ENV{GIT_AUTHOR_DATE} = $date;
124 run 'git', 'cherry-pick', '-n', $r
125 or run 'git', 'mergetool'
126 or die "git-mergetool: $!";
129 run 'git', 'commit', '-F', '.commitmsg'
130 or die "git-commit: $!";
134 sub unmerge_commit($)
144 my $msg = backtick 'git', 'log', '-1', '--pretty=fuller', $r
145 or die "git-log: $!";
150 for(split /\n/, $msg)
152 if(/^Author:\s*(.*)/)
156 elsif(/^AuthorDate:\s*(.*)/)
165 open my $fh, '>', '.commitmsg'
166 or die ">.commitmsg: $!";
167 print $fh "UNMERGE\n$cmsg" . "::stable-branch::merge=$r\n"
168 or die ">.commitmsg: $!";
170 or die ">.commitmsg: $!";
172 local $ENV{GIT_AUTHOR_NAME} = $author;
173 local $ENV{GIT_AUTHOR_EMAIL} = $email;
174 local $ENV{GIT_AUTHOR_DATE} = $date;
175 run 'git', 'revert', '-n', $r
176 or run 'git', 'mergetool'
177 or die "git-mergetool: $!";
180 run 'git', 'commit', '-F', '.commitmsg'
181 or die "git-commit: $!";
189 my @applied = (0) x @{$log->{order_a}};
190 my $newbase_id = $log->{order_h}{$r};
193 my @outstanding = ();
197 if(!$log->{bitmap}[$_])
199 unshift @rlog, ['unmerge', $log->{order_a}[$_]];
203 for($newbase_id+1 .. @{$log->{order_a}}-1)
205 if($log->{bitmap}[$_])
207 push @rlog, ['merge', $log->{order_a}[$_]];
211 push @outstanding, ['outstanding', $log->{order_a}[$_]];
228 return $logcache if defined $logcache;
240 my $cur_commit = undef;
242 for((split /\n/, check_defined "git-log: $!", backtick 'git', 'log', '--topo-order', '--reverse', '--pretty=fuller', @datefilter, "$revprefix$master"), undef)
244 if(defined $cur_commit and (not defined $_ or /^commit (\S+)/))
246 $cur_msg =~ s/\s+$//s;
247 $history{$cur_commit} = scalar @history;
248 $logmsg{$cur_commit} = $cur_msg;
249 push @history, $cur_commit;
250 $cur_commit = $cur_msg = undef;
252 last if not defined $_;
262 $cur_commit = $cur_msg = undef;
264 for((split /\n/, check_defined "git-log: $!", backtick 'git', 'log', '--topo-order', '--reverse', '--pretty=fuller', @datefilter, "$revprefix"."HEAD"), undef)
266 if(defined $cur_commit and (not defined $_ or /^commit (\S+)/))
268 $cur_msg =~ s/\s+$//s;
269 $logmsg{$cur_commit} = $cur_msg;
270 push @commits, $cur_commit;
271 $cur_commit = $cur_msg = undef;
273 last if not defined $_;
283 my $lastrebase = undef;
286 my $data = $logmsg{$_};
287 if($data =~ /::stable-branch::unmerge=(\S+)/)
289 push @logdata, ['unmerge', $1];
291 elsif($data =~ /::stable-branch::merge=(\S+)/)
293 push @logdata, ['merge', $1];
295 elsif($data =~ /::stable-branch::reset=(\S+)/)
300 elsif($data =~ /::stable-branch::rebase=(\S+)/)
302 $lastrebase->[0] = 'ignore'
303 if defined $lastrebase;
304 push @logdata, ($lastrebase = ['rebase', $1]);
308 if(not defined $base)
310 warn 'This branch is not yet managed by git-branch-manager';
314 order_a => \@history,
315 order_h => \%history,
320 my $baseid = $history{$base};
329 my ($cmd, $data) = @{$logdata[$i]};
332 $bitmap[$history{$data}] = 1;
334 elsif($cmd eq 'unmerge')
336 $bitmap[$history{$data}] = 0;
338 elsif($cmd eq 'rebase')
340 # the bitmap is fine, but generate a new log from the bitmap
343 order_a => \@history,
344 order_h => \%history,
347 my $rebasedlog = rebase_log $data, $pseudolog;
348 my @l = grep { $_->[0] ne 'outstanding' } @{$rebasedlog->{log}};
349 splice @logdata, 0, $i+1, @l;
352 $baseid = $history{$base};
357 my @outstanding = ();
358 for($baseid+1 .. @history-1)
360 push @outstanding, ['outstanding', $history[$_]]
367 order_a => \@history,
368 order_h => \%history,
394 $r = backtick 'git', 'rev-parse', $r
395 or die "git-rev-parse: $!"
400 print "Executing: $cmd $r\n";
406 die "PEBKAC: invalid revision number, cannot reset"
407 unless defined $l->{order_h}{$r};
411 elsif($cmd eq 'hardreset')
416 die "PEBKAC: invalid revision number, cannot reset"
417 unless defined $l->{order_h}{$r};
419 run 'git', 'reset', '--hard', $r
420 or die "git-reset: $!";
423 elsif($cmd eq 'merge')
428 die "PEBKAC: invalid revision number, cannot reset"
429 unless defined $l->{order_h}{$r} and not $l->{bitmap}[$l->{order_h}{$r}];
430 die "PEBKAC: not initialized"
431 unless defined $l->{base};
435 elsif($cmd eq 'unmerge')
440 die "PEBKAC: invalid revision number, cannot reset"
441 unless defined $l->{order_h}{$r} and $l->{bitmap}[$l->{order_h}{$r}];
442 die "PEBKAC: not initialized"
443 unless defined $l->{base};
447 elsif($cmd eq 'outstanding')
452 die "Invalid command: $cmd $r";
463 $r = backtick 'git', 'rev-parse', $r
464 or die "git-rev-parse: $!"
469 die "PEBKAC: invalid revision number, cannot reset"
470 unless defined $l->{order_h}{$r};
471 die "PEBKAC: not initialized"
472 unless defined $l->{base};
474 my $msg = backtick 'git', 'log', '-1', '--pretty=fuller', @datefilter, 'HEAD'
475 or die "git-log: $!";
476 $msg =~ /^commit (\S+)/s
477 or die "Invalid git log output";
479 my $l = rebase_log $r, parse_log();
481 local $do_commit = 0;
485 run_script @{$l->{log}};
486 run 'git', 'commit', '--allow-empty', '-m', "::stable-branch::rebase=$r"
487 or die "git-commit: $!";
493 run 'git', 'reset', '--hard', $commit_id
494 or die "$err, and then git-reset failed: $!";
504 $r = undef if $r eq '';
507 ($r = backtick 'git', 'rev-parse', $r
508 or die "git-rev-parse: $!")
513 die "PEBKAC: invalid revision number, cannot reset"
514 unless !defined $r or defined $l->{order_h}{$r};
515 die "PEBKAC: not initialized"
516 unless defined $l->{base};
519 $l = rebase_log $r, $l
521 my $last = $l->{order_h}{$l->{base}};
522 my $first = $last - $histsize;
531 (map { $seen{$l->{order_a}[$_]} ? () : ['previous', $l->{order_a}[$_]] } $first..($last-1)),
532 ['base', $l->{base}],
535 if($cmd eq 'chronology')
537 @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);
539 elsif($cmd eq 'outstanding')
542 @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);
546 my ($action, $r) = @$_;
547 my $m = $l->{logmsg}->{$r};
548 my $m_short = join ' ', map { s/^ (?!git-svn-id)(.)/$1/ ? $_ : () } split /\n/, $m;
549 $m_short = substr $m_short, 0, $width - 11 - 1 - 40 - 1;
550 printf "%s%-11s%s %s %s\n", $color{$action}, $name{$action}, $color{''}, $r, $m_short;
556 my ($cmd, $one) = @_;
559 $0 [{--histsize|-s} n] {--chronology|-c}
560 $0 [{--histsize|-s} n] {--chronology|-c} revision-hash
561 $0 [{--histsize|-s} n] {--log|-l}
562 $0 [{--histsize|-s} n] {--log|-l} revision-hash
563 $0 {--merge|-m} revision-hash
564 $0 {--unmerge|-u} revision-hash
565 $0 {--reset|-R} revision-hash
566 $0 {--hardreset|-H} revision-hash
567 $0 {--rebase|-b} revision-hash
593 my $result = GetOptions(
594 "chronology|c:s", handler \&opt_list,
595 "log|l:s", handler \&opt_list,
596 "outstanding|o:s", handler \&opt_list,
597 "rebase|b=s", handler \&opt_rebase,
598 "merge|m=s{,}", handler sub { run_script ['merge', $_[1]]; },
599 "unmerge|u=s{,}", handler sub { run_script ['unmerge', $_[1]]; },
600 "reset|R=s", handler sub { run_script ['reset', $_[1]]; },
601 "hardreset|H=s", handler sub { run_script ['hardreset', $_[1]]; },
602 "help|h", handler \&opt_help,
603 "histsize|s=i", \$histsize
607 opt_list("outstanding", "");