Skip to contentSkip to conversation

git-archimport: allow remapping branch names

PATCH In review Paolo Bonzini 3 participants 9 messages Jun 15, 2016 1 message not in the archive Documentation

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 git-archimport: allow remapping branch names

This patch add support to archimport for remapping the branch names to match those used in git more closely. This is useful for projects that *migrate* to git (as opposed to users that want to use clone into git from Arch-based projects). For example, one can choose the name "master" for the development branch.

The new command-line syntax should not be a problem, since a colon in a branch name would be a pretty weird choice even for Arch standards.

The new feature is implemented so that archives rotated every year can be remapped into a single git archive.

---
 Documentation/git-archimport.txt |   19 +++++++-
 git-archimport.perl              |   86 ++++++++++++++++++++++++++++----------
 2 files changed, 81 insertions(+), 24 deletions(-)
Documentation/git-archimport.txt +17 -2
index 5a13187..5794928 100644
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git-archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
-               <archive/branch> [ <archive/branch> ]
+               <archive/branch>[:<git-branch>] ...
 
 DESCRIPTION
 -----------
@@ -39,6 +39,19 @@ directory. To follow the development of a project that uses Arch, rerun
 `git-archimport` with the same parameters as the initial import to perform 
 incremental imports.
 
+While git-archimport will try to create sensible branch names for the
+archives that it imports, it is also possible to specify git branch names
+manually.  To do so, write a git branch name after each <archive/branch>
+parameter, separated by a colon.  This way, you can shorten the Arch
+branch names and convert Arch jargon to git jargon, for example mapping a
+"PROJECT--devo--VERSION" branch to "master".
+
+Associating multiple Arch branches to one git branch is possible; the
+result will make the most sense only if no commits are made to the first
+branch, after the second branch is created.  Still, this is useful to
+convert Arch repositories that had been rotated periodically.
+
+
 MERGES
 ------
 Patch merge data from Arch is used to mark merges in git as well. git 
@@ -73,7 +86,9 @@ OPTIONS
 	Use this for compatibility with old-style branch names used by
 	earlier versions of git-archimport.  Old-style branch names
 	were category--branch, whereas new-style branch names are
-	archive,category--branch--version.
+	archive,category--branch--version.  In both cases, names given
+	on the command-line will override the automatically-generated
+	ones.
 
 -D <depth>::
 	Follow merge ancestry and attempt to import trees that have been
git-archimport.perl +64 -22

125 lines not on this page · raw message

#1 lore raw
Quoted 8 lines · Paolo Bonzini

The new command-line syntax should not be a problem, since a colon in a branch name would be a pretty weird choice even for Arch standards.

The new feature is implemented so that archives rotated every year can be remapped into a single git archive.

'git-archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]

git-archimport.perl usage if $opt_h; · line 96

Quoted 9 lines
git-archimport.perl +6 -2
-               <archive/branch> [ <archive/branch> ]
+               <archive/branch>[:<git-branch>] ...
...
-my %arch_branches = map { $_ => 1 } @ARGV;
+my %arch_branches = map { my $branch = $_; $branch =~ s/:.*//; $branch => 1 } @ARGV;
+
+# $branch_name_map:
+# maps arch branches to git branch names
+my %branch_name_map = map { m/^([^:]*):(.*)/; $1 => $2 } grep { m/:/ } @ARGV;

I am no arch/tla expert, but at least git does not allow colon in branch names at all, so if you make your command line parser to match left-greedy-anything, colon and then right-non-colon (i.e. m/^(.*):([^:]*)$/), you should be able to handle colons in arch archive names.

#2 lore raw

PATCH 1/1 git-archimport: allow remapping branch names

This patch add support to archimport for remapping the branch names to match those used in git more closely. This is useful for projects that *migrate* to git (as opposed to users that want to use git on Arch-based projects). For example, one can choose a branch name and call it "master".

The new command-line syntax works even if there is a colon in a branch name, since only the part after the last colon is taken to be the git name (git does not allow colons in branch names).

The new feature is implemented so that archives rotated every year can also be remapped into a single git archive.

---
 Documentation/git-archimport.txt |   19 +++++++-
 git-archimport.perl              |   86 ++++++++++++++++++++++++++++----------
 2 files changed, 81 insertions(+), 24 deletions(-)

> I am no arch/tla expert, but at least git does not allow colon > in branch names at all, so if you make your command line parser > to match left-greedy-anything, colon and then right-non-colon > (i.e. m/^(.*):([^:]*)$/), you should be able to handle colons in > arch archive names.

Great idea. Thanks. By the way, this patch was tested on my Arch repositories.

Documentation/git-archimport.txt +17 -2
index 5a13187..5794928 100644
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git-archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
-               <archive/branch> [ <archive/branch> ]
+               <archive/branch>[:<git-branch>] ...
 
 DESCRIPTION
 -----------
@@ -39,6 +39,19 @@ directory. To follow the development of a project that uses Arch, rerun
 `git-archimport` with the same parameters as the initial import to perform 
 incremental imports.
 
+While git-archimport will try to create sensible branch names for the
+archives that it imports, it is also possible to specify git branch names
+manually.  To do so, write a git branch name after each <archive/branch>
+parameter, separated by a colon.  This way, you can shorten the Arch
+branch names and convert Arch jargon to git jargon, for example mapping a
+"PROJECT--devo--VERSION" branch to "master".
+
+Associating multiple Arch branches to one git branch is possible; the
+result will make the most sense only if no commits are made to the first
+branch, after the second branch is created.  Still, this is useful to
+convert Arch repositories that had been rotated periodically.
+
+
 MERGES
 ------
 Patch merge data from Arch is used to mark merges in git as well. git 
@@ -73,7 +86,9 @@ OPTIONS
 	Use this for compatibility with old-style branch names used by
 	earlier versions of git-archimport.  Old-style branch names
 	were category--branch, whereas new-style branch names are
-	archive,category--branch--version.
+	archive,category--branch--version.  In both cases, names given
+	on the command-line will override the automatically-generated
+        ones.
 
 -D <depth>::
 	Follow merge ancestry and attempt to import trees that have been
git-archimport.perl +64 -22

125 lines not on this page · raw message

Signature · 1 line
1.4.4.2
#5 lore raw
In reply to Paolo Bonzini
Quoted 2 lines · Paolo Bonzini

Great idea. Thanks. By the way, this patch was tested on my Arch repositories.

Just to make sure. Was it tested with AND WITHOUT the new colon feature? I am asking how likely is there a regression.

git-archimport.perl usage if $opt_h; · line 92

Quoted 10 lines
git-archimport.perl +1 -1
index 0fcb156..1044695 100755
@@ -89,7 +89,11 @@ usage if $opt_h;
 # values associated with keys:
 #   =1 - Arch version / git 'branch' detected via abrowse on a limit
 #   >1 - Arch version / git 'branch' of an auxiliary branch we've merged
-my %arch_branches = map { $_ => 1 } @ARGV;
+my %arch_branches = map { my $branch = $_; $branch =~ s/:.*//; $branch => 1 } @ARGV;

I am a bit puzzled here. Let's consider four cases.

(0) No colon in arch archive, no mapping
(1) No colon in arch archive, mapped to 'master'
(2) A colon in arch archive, no mapping specified
(3) A colon in arch archive, mapped to 'master'

The above s/:.*// would do:

(0) bonzini-2005/devo ==> bonzini-2005/devo
(1) bonzini-2005/devo:master ==> bonzini-2005/devo
(2) bonzini:gnu-2005/devo ==> bonzini
(3) bonzini:gnu-2005/devo:master ==> bonzini

and then later branch_name_map splits them to:

(0) bonzini-2005/devo ==> no entry in %branch_name_map
(1) bonzini-2005/devo ==> no entry in %branch_name_map
(2) bonzini:gnu-2005/devo ==> (bonzini => gnu-2005/devo)
(3) bonzini:gnu-2005/devo:master ==> (bonzini:gnu-2005/devo => master)

In effect, (2) is an error, which is fine, because if the arch archive had colon in its name then the user can ask explicitly to map it by having an extra ':<branchname>'. However, I think your s/:.*// above breaks case (3).

git-archimport.perl ... · line 113

Quoted 12 lines
git-archimport.perl +10 -0
+
+# $branch_name_map:
+# maps arch branches to git branch names
+my %branch_name_map = map { m/^(.*):([^:]*)$/; $1 => $2 } grep { m/:/ } @ARGV;
...
@@ -104,6 +108,7 @@ ...
+sub git_branchname {
+    my $revision = shift;
+    my $name = extract_versionname($revision);
+
+    if (defined $branch_name_map{$name}) {
+	return $branch_name_map{$name};

This is purely a style issue, but I tend to prefer 'exists' over 'defined' when checking if a name is something that was placed in a hash we set up earlier by reading configuration or command, even if we _know_ that the hash was created with 'defined' values in them.

git-archimport.perl sub process_patchset_accurate { · line 369

Quoted 11 lines
git-archimport.perl +2 -3
 sub process_patchset_accurate {
     my $ps = shift;
@@ -333,19 +365,23 @@ sub process_patchset_accurate {
         if ($ps->{tag} && (my $branchpoint = eval { ptag($ps->{tag}) })) {
 
             # find where we are supposed to branch from
-            system('git-checkout','-f','-b',$ps->{branch},
-                            $branchpoint) == 0 or die "$! $?\n";
-            
+	    if (! -e "$git_dir/refs/heads/$ps->{branch}") {
+		system('git-branch',$ps->{branch},$branchpoint) == 0 or die "$! $?\n";

Strictly speaking (-e "$git_dir/refs/heads/$branch") test would not work if the repository was pack-ref'ed with --all option. Run "git show-ref -q --verify refs/heads/$branch" and check its exit status, or run it without -q and read its output.

git-archimport.perl sub tag { · line 879

Quoted 12 lines
git-archimport.perl +3 -2
@@ -830,8 +871,9 @@ sub tag {
     if ($opt_o) {
         $tag =~ s|/|--|g;
     } else {
-        # don't use subdirs for tags yet, it could screw up other porcelains
-        $tag =~ s|/|,|g;
+	my $patchname = $tag;
+	$patchname =~ s/.*--//;
+        $tag = git_branchname ($tag) . '--' . $patchname;
     }
 
     if ($commit) {

The call to git_branchname() is essential for mapping the name we get from arch using the command line mapping, but if the user is not using this remapping feature, does this keep the original behaviour?

With the original code, a tag "t--a/g" was mapped to "t--a,g" in the else clause, but the new code yields git_branchname("t--a/g") followed by '--' followed by "g", which would evaluate to I do not know what exactly, but I am sure it would not evaluate to "t--a,g". Would it be a non-issue? As archimport seems to support incremental import, I suspect it might upset existing users.

#6 lore raw
Quoted 3 lines

Just to make sure. Was it tested with AND WITHOUT the new colon feature? I am asking how likely is there a regression.

Yes. But my Arch repositories do not have colons in the name (I mean I tested on real-world repositories and not weird ones created exactly to make the patch fail).

Quoted 2 lines

git-archimport.perl usage if $opt_h; · line 92

Quoted 2 lines
git-archimport.perl +1 -1
-my %arch_branches = map { $_ => 1 } @ARGV;
+my %arch_branches = map { my $branch = $_; $branch =~ s/:.*//; $branch => 1 } @ARGV;

In fact, I was too headlong on your suggestion. I should have noticed that this substitution must be changed to

$branch =~ s/:[^:]*$//

I just realized, however, that branches with colons in the names would have failed before my patch too, because git would have failed creating a branch with a colon in it. So this is not a regression, strictly speaking.

Quoted 4 lines

Strictly speaking (-e "$git_dir/refs/heads/$branch") test would not work if the repository was pack-ref'ed with --all option. Run "git show-ref -q --verify refs/heads/$branch" and check its exit status, or run it without -q and read its output.

Unfortunately this is pervasive in git-archimport. I can fix it, but I think it belongs in a separate patch.

Quoted 6 lines

With the original code, a tag "t--a/g" was mapped to "t--a,g" in the else clause, but the new code yields git_branchname("t--a/g") followed by '--' followed by "g", which would evaluate to I do not know what exactly, but I am sure it would not evaluate to "t--a,g". Would it be a non-issue? As archimport seems to support incremental import, I suspect it might upset existing users.

In this case, this input will always be of the form t--a/g--REVISION.

So the old one would change to t--a,g--REVISION; the new one would strip to t--a/g and convert it to t--a,g (using git_default_branchname) and file tack --REVISION at the end again.

I will shortly send an updated patch

Paolo

#7 lore raw
Quoted 4 lines · Paolo Bonzini
Quoted 2 lines

Just to make sure. Was it tested with AND WITHOUT the new colon feature? I am asking how likely is there a regression.

Yes. But my Arch repositories do not have colons in the name (I mean I tested on real-world repositories and not weird ones created exactly to make the patch fail).

That's fine.

Quoted 5 lines

In this case, this input will always be of the form t--a/g--REVISION.

So the old one would change to t--a,g--REVISION; the new one would strip to t--a/g and convert it to t--a,g (using git_default_branchname) and file tack --REVISION at the end again.

Ah, thanks.

#8 lore raw

This patch add support to archimport for remapping the branch names to match those used in git more closely. This is useful for projects that *migrate* to git (as opposed to users that want to use git on Arch-based projects). For example, one can choose a branch name and call it "master".

The new command-line syntax works even if there is a colon in a branch name, since only the part after the last colon is taken to be the git name (git does not allow colons in branch names).

The new feature is implemented so that archives rotated every year can also be remapped into a single git archive.

---
 Documentation/git-archimport.txt |   19 +++++++-
 git-archimport.perl              |   86 ++++++++++++++++++++++++++++----------
 2 files changed, 81 insertions(+), 24 deletions(-)

>> In this case, this input will always be of the form t--a/g--REVISION. >>
>> So the old one would change to t--a,g--REVISION; the new one would >> strip to t--a/g and convert it to t--a,g (using git_default_branchname) >> and file tack --REVISION at the end again.
>
> Ah, thanks.

Good, here's the final version then. Thanks for putting up with me.

Documentation/git-archimport.txt +17 -2
index 5a13187..5794928 100644
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git-archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
-               <archive/branch> [ <archive/branch> ]
+               <archive/branch>[:<git-branch>] ...
 
 DESCRIPTION
 -----------
@@ -39,6 +39,19 @@ directory. To follow the development of a project that uses Arch, rerun
 `git-archimport` with the same parameters as the initial import to perform 
 incremental imports.
 
+While git-archimport will try to create sensible branch names for the
+archives that it imports, it is also possible to specify git branch names
+manually.  To do so, write a git branch name after each <archive/branch>
+parameter, separated by a colon.  This way, you can shorten the Arch
+branch names and convert Arch jargon to git jargon, for example mapping a
+"PROJECT--devo--VERSION" branch to "master".
+
+Associating multiple Arch branches to one git branch is possible; the
+result will make the most sense only if no commits are made to the first
+branch, after the second branch is created.  Still, this is useful to
+convert Arch repositories that had been rotated periodically.
+
+
 MERGES
 ------
 Patch merge data from Arch is used to mark merges in git as well. git 
@@ -73,7 +86,9 @@ OPTIONS
 	Use this for compatibility with old-style branch names used by
 	earlier versions of git-archimport.  Old-style branch names
 	were category--branch, whereas new-style branch names are
-	archive,category--branch--version.
+	archive,category--branch--version.  In both cases, names given
+	on the command-line will override the automatically-generated
+	ones.
 
 -D <depth>::
 	Follow merge ancestry and attempt to import trees that have been
git-archimport.perl +64 -22

125 lines not on this page · raw message

-- 1.4.4.2

#9 lore raw
Quoted 7 lines

This patch add support to archimport for remapping the branch names to match those used in git more closely. This is useful for projects that *migrate* to git (as opposed to users that want to use git on Arch-based projects). For example, one can choose a branch name and call it "master".

Quoted 6 lines

The new command-line syntax works even if there is a colon in a branch name, since only the part after the last colon is taken to be the git name (git does not allow colons in branch names).

The new feature is implemented so that archives rotated every year can also be remapped into a single git archive.

ARGH!

paolo