[PATCH guilt] Handles slashes in branch names

[PATCH guilt] Handles slashes in branch names

[Eric Lesh]

When a branch name has a slash and autotagging is enabled, guilt barfs
when updating the stack tags.  Escape the branch name in the tags to
allow this to work.

Also allow guilt to create the patches directory for these branches.

Signed-off-by: Eric Lesh <eclesh@ucla.edu>
---
 guilt      |   15 +++++++++------
 guilt-init |    2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/guilt b/guilt
index 214def4..9e4789a 100755
--- a/guilt
+++ b/guilt
@@ -334,20 +334,23 @@ update_stack_tags()
 		return 0
 	fi
 
+        # handle branches with slashes
+        newbranch=`echo $branch | sed -e 's,\/,-,'`
+
 	if [ `wc -l < $applied` -gt 0 ]; then
 		# there are patches applied, therefore we must get the top,
 		# bottom and base hashes, and update the tags
 
-		git-rev-parse HEAD > "$GIT_DIR/refs/tags/${branch}_top"
-		head -1 < $applied | cut -d: -f1 > "$GIT_DIR/refs/tags/${branch}_bottom"
-		git-rev-parse $(head -1 < $applied | cut -d: -f1)^ > "$GIT_DIR/refs/tags/${branch}_base"
+		git-rev-parse HEAD > "$GIT_DIR/refs/tags/${newbranch}_top"
+		head -1 < $applied | cut -d: -f1 > "$GIT_DIR/refs/tags/${newbranch}_bottom"
+		git-rev-parse $(head -1 < $applied | cut -d: -f1)^ > "$GIT_DIR/refs/tags/${newbranch}_base"
 	else
 		# there are no patches applied, therefore we must remove the
 		# tags to old top, bottom, and base
 
-		rm -f "$GIT_DIR/refs/tags/${branch}_top"
-		rm -f "$GIT_DIR/refs/tags/${branch}_bottom"
-		rm -f "$GIT_DIR/refs/tags/${branch}_base"
+		rm -f "$GIT_DIR/refs/tags/${newbranch}_top"
+		rm -f "$GIT_DIR/refs/tags/${newbranch}_bottom"
+		rm -f "$GIT_DIR/refs/tags/${newbranch}_base"
 	fi
 }
 
diff --git a/guilt-init b/guilt-init
index ffe2434..9136f89 100755
--- a/guilt-init
+++ b/guilt-init
@@ -24,7 +24,7 @@ if [ -d "$GUILT_DIR/$branch" ]; then
 fi
 
 [ ! -d "$GUILT_DIR" ] && mkdir $GUILT_DIR
-mkdir $GUILT_DIR/$branch
+mkdir -p $GUILT_DIR/$branch
 touch $GUILT_DIR/$branch/series
 touch $GUILT_DIR/$branch/status
 
-- 
1.5.2

Re: [PATCH guilt] Handles slashes in branch names

[Josef Sipek]

On Thu, Jul 19, 2007 at 11:35:11AM -0700, Eric Lesh wrote:
> When a branch name has a slash and autotagging is enabled, guilt barfs
> when updating the stack tags.  Escape the branch name in the tags to
> allow this to work.
...
> -		git-rev-parse HEAD > "$GIT_DIR/refs/tags/${branch}_top"
> -		head -1 < $applied | cut -d: -f1 > "$GIT_DIR/refs/tags/${branch}_bottom"
> -		git-rev-parse $(head -1 < $applied | cut -d: -f1)^ > "$GIT_DIR/refs/tags/${branch}_base"
> +		git-rev-parse HEAD > "$GIT_DIR/refs/tags/${newbranch}_top"
> +		head -1 < $applied | cut -d: -f1 > "$GIT_DIR/refs/tags/${newbranch}_bottom"
> +		git-rev-parse $(head -1 < $applied | cut -d: -f1)^ > "$GIT_DIR/refs/tags/${newbranch}_base"

Why mangle the branch name when we can do:

mkdir -p `basename $GIT_DIR/refs/tags/${branch}_top`
git-rev-parse .... 

Sure, it is ugly, but it preserves the branch name. Am I missing something?

Josef 'Jeff' Sipek.

-- 
A computer without Microsoft is like chocolate cake without mustard.

[PATCH guilt] Handles slashes in branch names

[Eric Lesh]

When a branch name has a slash and autotagging is enabled, guilt barfs
when updating the stack tags.  Make these branch names work.

Also allow guilt to create the patches directory for these branches.

Signed-off-by: Eric Lesh <eclesh@ucla.edu>
---
Josef Sipek <jsipek@fsl.cs.sunysb.edu> writes:

>
> Why mangle the branch name when we can do:
>
> mkdir -p `basename $GIT_DIR/refs/tags/${branch}_top`
> git-rev-parse .... 
>
> Sure, it is ugly, but it preserves the branch name. Am I missing something?
>

Yours is a lot less ugly than mine was.

 guilt      |    1 +
 guilt-init |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/guilt b/guilt
index 214def4..c913bd6 100755
--- a/guilt
+++ b/guilt
@@ -338,6 +338,7 @@ update_stack_tags()
 		# there are patches applied, therefore we must get the top,
 		# bottom and base hashes, and update the tags
 
+		mkdir -p `dirname $GIT_DIR/refs/tags/${branch}_top`
 		git-rev-parse HEAD > "$GIT_DIR/refs/tags/${branch}_top"
 		head -1 < $applied | cut -d: -f1 > "$GIT_DIR/refs/tags/${branch}_bottom"
 		git-rev-parse $(head -1 < $applied | cut -d: -f1)^ > "$GIT_DIR/refs/tags/${branch}_base"
diff --git a/guilt-init b/guilt-init
index ffe2434..9136f89 100755
--- a/guilt-init
+++ b/guilt-init
@@ -24,7 +24,7 @@ if [ -d "$GUILT_DIR/$branch" ]; then
 fi
 
 [ ! -d "$GUILT_DIR" ] && mkdir $GUILT_DIR
-mkdir $GUILT_DIR/$branch
+mkdir -p $GUILT_DIR/$branch
 touch $GUILT_DIR/$branch/series
 touch $GUILT_DIR/$branch/status
 
-- 
1.5.2

Re: [PATCH guilt] Handles slashes in branch names

[Josef Sipek]

On Thu, Jul 19, 2007 at 12:17:01PM -0700, Eric Lesh wrote:
> When a branch name has a slash and autotagging is enabled, guilt barfs
> when updating the stack tags.  Make these branch names work.
> 
> Also allow guilt to create the patches directory for these branches.
> 
> Signed-off-by: Eric Lesh <eclesh@ucla.edu>

Applied. I just added quotes around the mkdir -p in guilt in case someone
likes to have whitespace in their branch names.

Thanks,

Josef 'Jeff' Sipek.

-- 
Real Programmers consider "what you see is what you get" to be just as bad a
concept in Text Editors as it is in women. No, the Real Programmer wants a
"you asked for it, you got it" text editor -- complicated, cryptic,
powerful, unforgiving, dangerous.