X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=5fa62b55b848e927556717379897f27df1401edd;hp=e3835e3d0d796442dc1bb9ba849e0d8b66fb80a2;hb=167be8cc683c1f8b47d5f05f7792c04d57fac092;hpb=842f62c97bc4d78cfda3ed76d3335bafd20e9fd0 diff --git a/git-debrebase b/git-debrebase index e3835e3d..5fa62b55 100755 --- a/git-debrebase +++ b/git-debrebase @@ -145,6 +145,46 @@ our $rd = ".git/git-debrebase"; our $ud = "$rd/work"; our @git = qw(git); +sub get_differs ($$) { + my ($x,$y) = @_; + # This resembles quiltify_trees_differ, in dgit, a bit. But: we + # don't care about modes, or dpkg-source-unrepresentable changes, + # and we don't need the plethora of different modes. + + my $differs = 0; + + my $f; + my $rundiff = sub { + my ($opts, $sfx, $fn) = @_; + $opts //= [qw(--name-only)]; + my @cmd = (@git, qw(diff-tree -z --no-renames)); + push @cmd, @$opts; + push @cmd, "$_:$sfx" foreach $x, $y; + my $diffs = cmdoutput @bcmd, $x, $y; + foreach $f (split /\0/, $diffs) { $fn->(); } + }; + + $rundiff(undef, '', sub { + $differs |= $f eq 'debian' ? D_DEB : D_UPS; + }); + + if ($differs & D_DEB) { + $differs &= ~D_DEB; + $rundiff(undef, ':debian', sub { + $differs |= $f eq 'patches' ? D_PAT_OTH : D_DEB; + }); + } + + if ($differs & D_PAT_OTH) { + $rundiff([qw(--name-status)], ':debian/patches', sub { + + }); + + + + } + $f eq ' + sub commit_pr_info ($) { my ($r) = @_; return Data::Dumper->dump([$r], [qw(commit)]);