chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: classify: provide Why for Unknown
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index 5fa4f47377ae3e4035606f989beaee4aed40afb2..32737269a48120fa3f55720d8b778ca618ad3858 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-32,8
+32,7
@@
# git-debrebase [<options>] stitch [--prose=<for commit message>]
# git-debrebase [<options>] downstream-rebase-launder-v0 # experimental
#
# git-debrebase [<options>] stitch [--prose=<for commit message>]
# git-debrebase [<options>] downstream-rebase-launder-v0 # experimental
#
-# git-debrebase [<options>] gbp2debrebase-v0 \
-# <upstream>
+# git-debrebase [<options>] convert-from-gbp <upstream-git-rev>
# problems / outstanding questions:
#
# problems / outstanding questions:
#
@@
-318,7
+317,6
@@
sub any_fproblems () {
# Upstream
# AddPatches
# Mixed
# Upstream
# AddPatches
# Mixed
-# Unknown
#
# Pseudomerge
# has additional entres in classification result
#
# Pseudomerge
# has additional entres in classification result
@@
-332,6
+330,10
@@
sub any_fproblems () {
# BreakwaterUpstreamMerge
# has additional entry in classification result
# OrigParents = [ subset of Parents ] # singleton list
# BreakwaterUpstreamMerge
# has additional entry in classification result
# OrigParents = [ subset of Parents ] # singleton list
+#
+# Unknown
+# has additional entry in classification result
+# Why => "prose"
sub parsecommit ($;$) {
my ($objid, $p_ref) = @_;
sub parsecommit ($;$) {
my ($objid, $p_ref) = @_;
@@
-390,7
+392,7
@@
sub classify ($) {
};
my $unknown = sub {
my ($why) = @_;
};
my $unknown = sub {
my ($why) = @_;
- $r = { %$r, Type => qw(Unknown) };
+ $r = { %$r, Type => qw(Unknown)
, Why => $why
};
printdebug " ** Unknown\n";
return $r;
};
printdebug " ** Unknown\n";
return $r;
};
@@
-738,7
+740,6
@@
sub walk ($;$$) {
next;
} elsif ($method eq 'DgitImportDebianUpdate') {
$read_tree_debian->($cltree);
next;
} elsif ($method eq 'DgitImportDebianUpdate') {
$read_tree_debian->($cltree);
- rm_subdir_cached qw(debian/patches);
} elsif ($method eq 'DgitImportUpstreamUpdate') {
confess unless $rewriting;
my $differs = (get_differs $build, $cltree);
} elsif ($method eq 'DgitImportUpstreamUpdate') {
confess unless $rewriting;
my $differs = (get_differs $build, $cltree);
@@
-758,7
+759,7
@@
sub walk ($;$$) {
my $newtree = cmdoutput @git, qw(write-tree);
my $ch = $cl->{Hdr};
$ch =~ s{^tree .*}{tree $newtree}m or confess "$ch ?";
my $newtree = cmdoutput @git, qw(write-tree);
my $ch = $cl->{Hdr};
$ch =~ s{^tree .*}{tree $newtree}m or confess "$ch ?";
- $ch =~ s{^parent .*\n}{}m;
+ $ch =~ s{^parent .*\n}{}m
g
;
$ch =~ s{(?=^author)}{
join '', map { "parent $_\n" } @parents
}me or confess "$ch ?";
$ch =~ s{(?=^author)}{
join '', map { "parent $_\n" } @parents
}me or confess "$ch ?";
@@
-1164,8
+1165,9
@@
END
close U or failedcmd @upd_cmd;
}
close U or failedcmd @upd_cmd;
}
-sub cmd_gbp2debrebase () {
- badusage "needs 1 optional argument, the upstream" unless @ARGV<=1;
+sub cmd_convert_from_gbp () {
+ badusage "needs 1 optional argument, the upstream git rev"
+ unless @ARGV<=1;
my ($upstream_spec) = @ARGV;
$upstream_spec //= 'refs/heads/upstream';
my $upstream = git_rev_parse $upstream_spec;
my ($upstream_spec) = @ARGV;
$upstream_spec //= 'refs/heads/upstream';
my $upstream = git_rev_parse $upstream_spec;
@@
-1211,9
+1213,9
@@
sub cmd_gbp2debrebase () {
runcmd @git, qw(checkout -q gdr-internal~0);
rm_subdir_cached 'debian/patches';
$work = make_commit ['HEAD'], [
runcmd @git, qw(checkout -q gdr-internal~0);
rm_subdir_cached 'debian/patches';
$work = make_commit ['HEAD'], [
- 'git-debrebase
import: drop patch queu
e',
+ 'git-debrebase
convert-from-gbp: drop patches from tre
e',
'Delete debian/patches, as part of converting to git-debrebase format.',
'Delete debian/patches, as part of converting to git-debrebase format.',
- '[git-debrebase
: gbp2debrebase, drop patches
]'
+ '[git-debrebase
convert-from-gbp: drop patches from tree
]'
];
# make the breakwater pseudomerge
# the tree is already exactly right
];
# make the breakwater pseudomerge
# the tree is already exactly right
@@
-1229,7
+1231,7
@@
sub cmd_gbp2debrebase () {
$work = git_rev_parse 'HEAD';
};
$work = git_rev_parse 'HEAD';
};
- update_head_checkout $old_head, $work, '
gbp2debrebase
';
+ update_head_checkout $old_head, $work, '
convert-from-gbp
';
}
sub cmd_downstream_rebase_launder_v0 () {
}
sub cmd_downstream_rebase_launder_v0 () {