git-debrebase: rename gbp2gdr to convert-from-gbp

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index ac5a72336b0dab1dce5040e7fa8192f00ac21690..2f2b1e8c2413811f6713401c23eedad4c82ff44f 100644 (file)
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -50,7 +50,7 @@ overall format
 [git-debrebase breakwater: new upstream NEW-UPSTREAM-VERSION, merge]
 [git-debrebase: new upstream NEW-UPSTREAM-VERSION, changelog]
 
-[git-debrebase: gbp2debrebase, drop patches]
+[git-debrebase convert-from-gbp: drop patches]
 [git-debrebase breakwater: declare upstream]
 [git-debrebase pseudomerge: stitch]
 
@@ -274,6 +274,3 @@ ideally, would make pseudomerge over dgit view
 would need to check that dgit view is actually dgit view of
   ond of our ancestors
 failing that first push will need --overwrite
-
-should this be called import or gbp2debrebase as it is now ?
-gbp uses "import" oddly but I'm tempted to use it normally here.

diff --git a/git-debrebase b/git-debrebase
index 8253cb7a17aec5cdfa9e964e7b705b808a5747f2..acf4c8564749a9a812c4d17dca4749cdb80584b0 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -32,7 +32,7 @@
 #    git-debrebase [<options>] stitch [--prose=<for commit message>]
 #    git-debrebase [<options>] downstream-rebase-launder-v0  # experimental
 #
-#    git-debrebase [<options>] gbp2debrebase-v0 \
+#    git-debrebase [<options>] convert-from-gbp \
 #             <upstream>
 
 # problems / outstanding questions:
@@ -1163,7 +1163,7 @@ END
     close U or failedcmd @upd_cmd;
 }
 
-sub cmd_gbp2debrebase () {
+sub cmd_convert_from_gbp () {
     badusage "needs 1 optional argument, the upstream" unless @ARGV<=1;
     my ($upstream_spec) = @ARGV;
     $upstream_spec //= 'refs/heads/upstream';
@@ -1210,9 +1210,9 @@ sub cmd_gbp2debrebase () {
        runcmd @git, qw(checkout -q gdr-internal~0);
        rm_subdir_cached 'debian/patches';
        $work = make_commit ['HEAD'], [
- 'git-debrebase import: drop patch queue',
+ 'git-debrebase convert-from-gbp: drop patch queue',
  'Delete debian/patches, as part of converting to git-debrebase format.',
- '[git-debrebase: gbp2debrebase, drop patches]'
+ '[git-debrebase convert-from-gbp: drop patches]'
                              ];
        # make the breakwater pseudomerge
        # the tree is already exactly right
@@ -1228,7 +1228,7 @@ sub cmd_gbp2debrebase () {
        $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 () {

diff --git a/tests/setup/gbp2gdr b/tests/setup/gdr-convert-gbp
similarity index 97%
rename from tests/setup/gbp2gdr
rename to tests/setup/gdr-convert-gbp
index ac949dfa0d2f0dfbbd3553340f918cbcaf09ca67..9bb9983d7871fe542d7f8dbdd2a3f638ef9498b6 100755 (executable)
--- a/tests/setup/gbp2gdr
+++ b/tests/setup/gdr-convert-gbp
@@ -77,7 +77,7 @@ git push --set-upstream origin master
 #    debian/2.0-1                          archive/debian/2.0-1
 #    remotes/origin/master                 remotes/dgit/dgit/sid
 
-t-git-debrebase -fupstream-has-debian gbp2debrebase
+t-git-debrebase -fupstream-has-debian convert-from-gbp
 
 v=2.0-2
 dch -v $v -m 'switch to git-debrebase, no other changes'

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index 776c91830741e3a4adf2a195396f9b5af538fd9d..d82c2383f1ab639a022bbb28deb7cfc7eb9c989f 100755 (executable)
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -4,7 +4,7 @@ set -e
 
 t-dependencies git-buildpackage libfile-fnmatch-perl
 
-t-setup-import gbp2gdr
+t-setup-import gdr-convert-gbp
 
 cd $p
 

diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index 26e7c5b5fbbcfefe41bad6e6b6e6e7f0d4411a61..0522818bb6f17ea89f43cc0cab96b22d34330e4e 100755 (executable)
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -4,7 +4,7 @@ set -e
 
 t-dependencies git-buildpackage libfile-fnmatch-perl
 
-t-setup-import gbp2gdr
+t-setup-import gdr-convert-gbp
 
 cd $p