[pacman-dev] [PATCH 2/2] Accept all bzr URLs in the source array

older
[pacman-dev] [PATCH] makepkg: fix...

Maxime Gauduin

9 Apr 2013 9 Apr '13

2:28 a.m.

From: Alucryd This check will run 'bzr info' on the distant URL provided in the source array and compare the branch root URL with the output of 'bzr config parent_location' run inside the local repo to make sure we are building from the right sources. Previously, the check was only run locally, as a result the local parent_location had to be used in the source array. makepkg will fallback to this behavior for offline builds. Signed-off-by: Maxime Gauduin --- scripts/makepkg.sh.in | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d5b9077..0ac4975 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -474,10 +474,21 @@ download_bzr() { fi elif (( ! HOLDVER )); then # Make sure we are fetching the right repo - if [[ "$url" != "$(bzr config parent_location -d $dir)" ]] ; then - error "$(gettext "%s is not a branch of %s")" "$dir" "$url" - plain "$(gettext "Aborting...")" - exit 1 + local distant_url="$(bzr info "$url" 2> /dev/null | grep 'branch root' | sed 's| branch root: ||')" + local local_url="$(bzr config parent_location -d "$dir")" + if [[ -n "$distant_url" ]]; then + if [[ "$distant_url" != "$local_url" ]]; then + error "$(gettext "%s is not a branch of %s")" "$dir" "$url" + plain "$(gettext "Aborting...")" + exit 1 + fi + else + if [[ "$url" != "$local_url" ]] ; then + error "$(gettext "%s is not a branch of %s")" "$dir" "$url" + error "$(gettext "The local URL is %s")" "$local_url" + plain "$(gettext "Aborting...")" + exit 1 + fi fi msg2 "$(gettext "Pulling %s ...")" "${displaylocation}" cd_safe "$dir" -- 1.8.2

Show replies by thread

Dave Reisner

9 Apr 9 Apr

5:30 a.m.

On Tue, Apr 9, 2013 at 5:28 AM, Maxime Gauduin wrote:

...

From: Alucryd

This check will run 'bzr info' on the distant URL provided in the source array and compare the branch root URL with the output of 'bzr config parent_location' run inside the local repo to make sure we are building from the right sources. Previously, the check was only run locally, as a result the local parent_location had to be used in the source array. makepkg will fallback to this behavior for offline builds.

Signed-off-by: Maxime Gauduin --- scripts/makepkg.sh.in | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d5b9077..0ac4975 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -474,10 +474,21 @@ download_bzr() { fi elif (( ! HOLDVER )); then # Make sure we are fetching the right repo - if [[ "$url" != "$(bzr config parent_location -d $dir)" ]] ; then - error "$(gettext "%s is not a branch of %s")" "$dir" "$url" - plain "$(gettext "Aborting...")" - exit 1 + local distant_url="$(bzr info "$url" 2> /dev/null | grep 'branch root' | sed 's| branch root: ||')"

grep|sed is pretty much always redundant -- sed can do this match on its own: sed -n '/branch root/ { s/ branch root: //p; q; }' And, just nitpicking, but quoting isn't needed for simple variable assignment. + local local_url="$(bzr config parent_location -d "$dir") Same here.

...

+ if [[ -n "$distant_url" ]]; then

Quoting isn't needed here either.

...

+ if [[ "$distant_url" != "$local_url" ]]; then

Or on the LHS here.

...

+ error "$(gettext "%s is not a branch of %s")" "$dir" "$url" + plain "$(gettext "Aborting...")" + exit 1 + fi + else + if [[ "$url" != "$local_url" ]] ; then

And same here.

...

+ error "$(gettext "%s is not a branch of %s")" "$dir" "$url" + error "$(gettext "The local URL is %s")" "$local_url" + plain "$(gettext "Aborting...")" + exit 1 + fi fi msg2 "$(gettext "Pulling %s ...")" "${displaylocation}" cd_safe "$dir" -- 1.8.2

Maxime Gauduin

6:25 a.m.

On Tue, 2013-04-09 at 08:30 -0400, Dave Reisner wrote:

...

On Tue, Apr 9, 2013 at 5:28 AM, Maxime Gauduin wrote:

...
From: Alucryd

This check will run 'bzr info' on the distant URL provided in the source array and compare the branch root URL with the output of 'bzr config parent_location' run inside the local repo to make sure we are building from the right sources. Previously, the check was only run locally, as a result the local parent_location had to be used in the source array. makepkg will fallback to this behavior for offline builds.

Signed-off-by: Maxime Gauduin --- scripts/makepkg.sh.in | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d5b9077..0ac4975 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -474,10 +474,21 @@ download_bzr() { fi elif (( ! HOLDVER )); then # Make sure we are fetching the right repo - if [[ "$url" != "$(bzr config parent_location -d $dir)" ]] ; then - error "$(gettext "%s is not a branch of %s")" "$dir" "$url" - plain "$(gettext "Aborting...")" - exit 1 + local distant_url="$(bzr info "$url" 2> /dev/null | grep 'branch root' | sed 's| branch root: ||')"

grep|sed is pretty much always redundant -- sed can do this match on its own:

sed -n '/branch root/ { s/ branch root: //p; q; }'

Thx for the suggestion, somebody suggested the following on the previous thread, which seems to do the trick too: `bzr info lp:lightdm 2> /dev/null | sed -n 's| branch root: ||p'`. It's a bit shorter, if you're okay with it.

...

And, just nitpicking, but quoting isn't needed for simple variable assignment.

+ local local_url="$(bzr config parent_location -d "$dir")

Same here.

...
+ if [[ -n "$distant_url" ]]; then

Quoting isn't needed here either.

...
+ if [[ "$distant_url" != "$local_url" ]]; then

Or on the LHS here.

I apologize if it's a dumb question, but why not the RHS too?

...

...
+ error "$(gettext "%s is not a branch of %s")" "$dir" "$url" + plain "$(gettext "Aborting...")" + exit 1 + fi + else + if [[ "$url" != "$local_url" ]] ; then

And same here.

...
+ error "$(gettext "%s is not a branch of %s")" "$dir" "$url" + error "$(gettext "The local URL is %s")" "$local_url" + plain "$(gettext "Aborting...")" + exit 1 + fi fi msg2 "$(gettext "Pulling %s ...")" "${displaylocation}" cd_safe "$dir" -- 1.8.2

Alright, to sum it up, I have now 3 patches named "Add support for bzr lp URLs in makepkg", "Fix dest dir when using lp: bzr URLs in the source array" (both should be good as is), and this one. Now, would you prefer if I merged the 3 into something like "Full Bazaar support for makepkg" with a full explanation to make it easier for you to merge (and forget about the mess I've made on the mailing list, sorry), or should I just send only this one again with Dave's suggestion? Cheers. -- Maxime

Dave Reisner

9:29 a.m.

On Tue, Apr 9, 2013 at 9:25 AM, Maxime Gauduin wrote:

...

On Tue, 2013-04-09 at 08:30 -0400, Dave Reisner wrote:

...
On Tue, Apr 9, 2013 at 5:28 AM, Maxime Gauduin

...

...
...
From: Alucryd

This check will run 'bzr info' on the distant URL provided in the

wrote: source

...

...
...
array and compare the branch root URL with the output of 'bzr config parent_location' run inside the local repo to make sure we are building from the right sources. Previously, the check was only run locally, as a result the local parent_location had to be used in the source array. makepkg will fallback to this behavior for offline builds.

Signed-off-by: Maxime Gauduin --- scripts/makepkg.sh.in | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d5b9077..0ac4975 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -474,10 +474,21 @@ download_bzr() { fi elif (( ! HOLDVER )); then # Make sure we are fetching the right repo - if [[ "$url" != "$(bzr config parent_location -d $dir)" ]] ; then - error "$(gettext "%s is not a branch of %s")" "$dir" "$url" - plain "$(gettext "Aborting...")" - exit 1 + local distant_url="$(bzr info "$url" 2> /dev/null | grep 'branch root' | sed 's| branch root: ||')"

grep|sed is pretty much always redundant -- sed can do this match on its own:

sed -n '/branch root/ { s/ branch root: //p; q; }'

Thx for the suggestion, somebody suggested the following on the previous thread, which seems to do the trick too: `bzr info lp:lightdm 2> /dev/null | sed -n 's| branch root: ||p'`. It's a bit shorter, if you're okay with it.

Well, its shorter, but its not necessarily equivalent. If "branch root" appears on two different lines, the shorter version prints twice. I'm not sure that this would ever happen, but better to be safe, imo.

...

...
And, just nitpicking, but quoting isn't needed for simple variable assignment.

+ local local_url="$(bzr config parent_location -d "$dir")

Same here.

...
+ if [[ -n "$distant_url" ]]; then

Quoting isn't needed here either.

...
+ if [[ "$distant_url" != "$local_url" ]]; then

Or on the LHS here.

I apologize if it's a dumb question, but why not the RHS too?

glob metachars will be interpreted on the RHS, but the LHS is always taken as literal. It allows for matching: [[ foobar = foo* ]] # this is true [[ foo[a-z]bar = "foo[a-z]bar" ]] # this is true [[ foo[a-z]bar = foo[a-z]bar ]] # this is false [[ foobar = "foo*" ]] # this is false In single argument tests, there's never any interpretation and strings are always treated as literals.

...

...
...
+ error "$(gettext "%s is not a branch

...

...
...
%s")" "$dir" "$url" + plain "$(gettext "Aborting...")" + exit 1 + fi + else + if [[ "$url" != "$local_url" ]] ; then

And same here.

...
+ error "$(gettext "%s is not a branch of %s")" "$dir" "$url" + error "$(gettext "The local URL is %s")" "$local_url" + plain "$(gettext "Aborting...")" + exit 1 + fi fi msg2 "$(gettext "Pulling %s ...")" "${displaylocation}" cd_safe "$dir" -- 1.8.2

Alright, to sum it up, I have now 3 patches named "Add support for bzr lp URLs in makepkg", "Fix dest dir when using lp: bzr URLs in the source array" (both should be good as is), and this one. Now, would you prefer if I merged the 3 into something like "Full Bazaar support for makepkg" with a full explanation to make it easier for you to merge (and forget about the mess I've made on the mailing list, sorry), or should I just send only this one again with Dave's suggestion?

No mess. Just send another version. Though, I suggest versioning your patches and threading: [PATCH] I added an awesome new feature (review happens) [PATCHv2] I added an awesome new feature (This patch is in-reply-to the message-id of the original patch. more review happens, perhaps) [PATCHv3] I added an awesome new feature (This patch is in-reply-to the message-id of patchv2)

Maxime GAUDUIN

10:49 a.m.

On Tue, Apr 9, 2013 at 6:29 PM, Dave Reisner wrote:

...

On Tue, Apr 9, 2013 at 9:25 AM, Maxime Gauduin wrote:

...
On Tue, 2013-04-09 at 08:30 -0400, Dave Reisner wrote:

...
On Tue, Apr 9, 2013 at 5:28 AM, Maxime Gauduin

...
...
...
From: Alucryd

This check will run 'bzr info' on the distant URL provided in the

wrote: source

...
...
...
array and compare the branch root URL with the output of 'bzr config parent_location' run inside the local repo to make sure we are building from the right sources. Previously, the check was only run locally, as a result the local parent_location had to be used in the source array. makepkg will fallback to this behavior for offline builds.

Signed-off-by: Maxime Gauduin --- scripts/makepkg.sh.in | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d5b9077..0ac4975 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -474,10 +474,21 @@ download_bzr() { fi elif (( ! HOLDVER )); then # Make sure we are fetching the right repo - if [[ "$url" != "$(bzr config parent_location -d $dir)" ]] ; then - error "$(gettext "%s is not a branch of %s")" "$dir" "$url" - plain "$(gettext "Aborting...")" - exit 1 + local distant_url="$(bzr info "$url" 2> /dev/null | grep 'branch root' | sed 's| branch root: ||')"

grep|sed is pretty much always redundant -- sed can do this match on its own:

sed -n '/branch root/ { s/ branch root: //p; q; }'

Thx for the suggestion, somebody suggested the following on the previous thread, which seems to do the trick too: `bzr info lp:lightdm 2> /dev/null | sed -n 's| branch root: ||p'`. It's a bit shorter, if you're okay with it.

Well, its shorter, but its not necessarily equivalent. If "branch root" appears on two different lines, the shorter version prints twice. I'm not sure that this would ever happen, but better to be safe, imo.

It should not but I agree, I'll use the version you provided then.

...

...
...
And, just nitpicking, but quoting isn't needed for simple variable assignment.

+ local local_url="$(bzr config parent_location -d

"$dir")

...
...
Same here.

...
+ if [[ -n "$distant_url" ]]; then

Quoting isn't needed here either.

...
+ if [[ "$distant_url" != "$local_url" ]]; then

Or on the LHS here.

I apologize if it's a dumb question, but why not the RHS too?

glob metachars will be interpreted on the RHS, but the LHS is always taken as literal. It allows for matching:

[[ foobar = foo* ]] # this is true [[ foo[a-z]bar = "foo[a-z]bar" ]] # this is true [[ foo[a-z]bar = foo[a-z]bar ]] # this is false [[ foobar = "foo*" ]] # this is false

In single argument tests, there's never any interpretation and strings are always treated as literals.

I see, thank you for the kind explanation.

...

...
...
...
+ error "$(gettext "%s is not a branch

of

...
...
...
%s")" "$dir" "$url" + plain "$(gettext "Aborting...")" + exit 1 + fi + else + if [[ "$url" != "$local_url" ]] ; then

And same here.

...
+ error "$(gettext "%s is not a branch of %s")" "$dir" "$url" + error "$(gettext "The local URL is %s")" "$local_url" + plain "$(gettext "Aborting...")" + exit 1 + fi fi msg2 "$(gettext "Pulling %s ...")" "${displaylocation}" cd_safe "$dir" -- 1.8.2

Alright, to sum it up, I have now 3 patches named "Add support for bzr lp URLs in makepkg", "Fix dest dir when using lp: bzr URLs in the source array" (both should be good as is), and this one. Now, would you prefer if I merged the 3 into something like "Full Bazaar support for makepkg" with a full explanation to make it easier for you to merge (and forget about the mess I've made on the mailing list, sorry), or should I just send only this one again with Dave's suggestion?

No mess. Just send another version. Though, I suggest versioning your patches and threading:

[PATCH] I added an awesome new feature

(review happens)

[PATCHv2] I added an awesome new feature

(This patch is in-reply-to the message-id of the original patch. more review happens, perhaps)

[PATCHv3] I added an awesome new feature

(This patch is in-reply-to the message-id of patchv2)

Sure, I'll try to send a v2 patch tomorrow then, merging the 2 others into this one. No need to fragment since they're tiny. Thanks again. -- Maxime

Maxime Gauduin

10 Apr 10 Apr

9:54 a.m.

New subject: [pacman-dev] [PATCHv2] Add support for all bzr URLs in the PKGBUILD source array

This patch is a merge of "[PATCH] More verbose bzr branching error", "[PATCH 1/2] Add support for bzr lp URLs in makepkg", "[PATCH 2/2] Accept all bzr URLs in the source array" and "[PATCH] Fix dest dir when using lp: URLs in the source array". It adds support for all bzr URLs, including "lp:" URLs, in the source array. This, however, requires an internet connection and will fall back to the current behavior for offline builds. In that case, only the URL reported by 'bzr config parent_location' run inside the local repo can be used. Signed-off-by: Maxime Gauduin --- scripts/makepkg.sh.in | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index da620a4..7319504 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -245,6 +245,9 @@ get_filename() { filename=${netfile%%#*} filename=${filename%/} filename=${filename##*/} + if [[ $proto = bzr* ]]; then + filename=${filename#*lp:} + fi if [[ $proto = git* ]]; then filename=${filename%%.git*} fi @@ -269,6 +272,9 @@ get_protocol() { # strip leading filename local proto="${1##*::}" printf "%s\n" "${proto%%://*}" + elif [[ $1 = *lp:* ]]; then + local proto="${1##*::}" + printf "%s\n" "${proto%%lp:*}" else printf "%s\n" local fi @@ -471,10 +477,21 @@ download_bzr() { fi elif (( ! HOLDVER )); then # Make sure we are fetching the right repo - if [[ "$url" != "$(bzr config parent_location -d $dir)" ]] ; then - error "$(gettext "%s is not a branch of %s")" "$dir" "$url" - plain "$(gettext "Aborting...")" - exit 1 + local distant_url="$(bzr info $url 2> /dev/null | sed -n '/branch root/{s/ branch root: //p;q;}')" + local local_url="$(bzr config parent_location -d $dir)" + if [[ -n $distant_url ]]; then + if [[ $distant_url != "$local_url" ]]; then + error "$(gettext "%s is not a branch of %s")" "$dir" "$url" + plain "$(gettext "Aborting...")" + exit 1 + fi + else + if [[ $url != "$local_url" ]] ; then + error "$(gettext "%s is not a branch of %s")" "$dir" "$url" + error "$(gettext "The local URL is %s")" "$local_url" + plain "$(gettext "Aborting...")" + exit 1 + fi fi msg2 "$(gettext "Pulling %s ...")" "${displaylocation}" cd_safe "$dir" -- 1.8.2

Allan McRae

5:56 p.m.

New subject: [pacman-dev] [PATCHv2] Add support for all bzr URLs in the PKGBUILD source array

On 11/04/13 02:54, Maxime Gauduin wrote:

...

This patch is a merge of "[PATCH] More verbose bzr branching error", "[PATCH 1/2] Add support for bzr lp URLs in makepkg", "[PATCH 2/2] Accept all bzr URLs in the source array" and "[PATCH] Fix dest dir when using lp: URLs in the source array".

All of this ^ should not go in the commit message but below the "---" after the sign-off line. Fixed and pulled to maint. Allan It adds support for all bzr URLs,

...

including "lp:" URLs, in the source array. This, however, requires an internet connection and will fall back to the current behavior for offline builds. In that case, only the URL reported by 'bzr config parent_location' run inside the local repo can be used.

Signed-off-by: Maxime Gauduin --- scripts/makepkg.sh.in | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index da620a4..7319504 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -245,6 +245,9 @@ get_filename() { filename=${netfile%%#*} filename=${filename%/} filename=${filename##*/} + if [[ $proto = bzr* ]]; then + filename=${filename#*lp:} + fi if [[ $proto = git* ]]; then filename=${filename%%.git*} fi @@ -269,6 +272,9 @@ get_protocol() { # strip leading filename local proto="${1##*::}" printf "%s\n" "${proto%%://*}" + elif [[ $1 = *lp:* ]]; then + local proto="${1##*::}" + printf "%s\n" "${proto%%lp:*}" else printf "%s\n" local fi @@ -471,10 +477,21 @@ download_bzr() { fi elif (( ! HOLDVER )); then # Make sure we are fetching the right repo - if [[ "$url" != "$(bzr config parent_location -d $dir)" ]] ; then - error "$(gettext "%s is not a branch of %s")" "$dir" "$url" - plain "$(gettext "Aborting...")" - exit 1 + local distant_url="$(bzr info $url 2> /dev/null | sed -n '/branch root/{s/ branch root: //p;q;}')" + local local_url="$(bzr config parent_location -d $dir)" + if [[ -n $distant_url ]]; then + if [[ $distant_url != "$local_url" ]]; then + error "$(gettext "%s is not a branch of %s")" "$dir" "$url" + plain "$(gettext "Aborting...")" + exit 1 + fi + else + if [[ $url != "$local_url" ]] ; then + error "$(gettext "%s is not a branch of %s")" "$dir" "$url" + error "$(gettext "The local URL is %s")" "$local_url" + plain "$(gettext "Aborting...")" + exit 1 + fi fi msg2 "$(gettext "Pulling %s ...")" "${displaylocation}" cd_safe "$dir"

Maxime GAUDUIN

11:53 p.m.

New subject: [pacman-dev] [PATCHv2] Add support for all bzr URLs in the PKGBUILD source array

On Apr 11, 2013 2:56 AM, "Allan McRae" wrote:

...

On 11/04/13 02:54, Maxime Gauduin wrote:

...
This patch is a merge of "[PATCH] More verbose bzr branching error", "[PATCH 1/2] Add support for bzr lp URLs in makepkg", "[PATCH 2/2] Accept all bzr URLs in the source array" and "[PATCH] Fix dest dir when using lp: URLs in the source array".

All of this ^ should not go in the commit message but below the "---" after the sign-off line.

Fixed and pulled to maint.

Allan

It adds support for all bzr URLs,

...
including "lp:" URLs, in the source array. This, however, requires an internet connection and will fall back to the current behavior for offline builds. In that case, only the URL reported by 'bzr config parent_location' run inside the local repo can be used.

Signed-off-by: Maxime Gauduin --- scripts/makepkg.sh.in | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index da620a4..7319504 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -245,6 +245,9 @@ get_filename() { filename=${netfile%%#*} filename=${filename%/} filename=${filename##*/} + if [[ $proto = bzr* ]]; then + filename=${filename#*lp:} + fi if [[ $proto = git* ]]; then filename=${filename%%.git*} fi @@ -269,6 +272,9 @@ get_protocol() { # strip leading filename local proto="${1##*::}" printf "%s\n" "${proto%%://*}" + elif [[ $1 = *lp:* ]]; then + local proto="${1##*::}" + printf "%s\n" "${proto%%lp:*}" else printf "%s\n" local fi @@ -471,10 +477,21 @@ download_bzr() { fi elif (( ! HOLDVER )); then # Make sure we are fetching the right repo - if [[ "$url" != "$(bzr config parent_location -d $dir)"

]] ; then

...

...
- error "$(gettext "%s is not a branch of %s")" "$dir" "$url" - plain "$(gettext "Aborting...")" - exit 1 + local distant_url="$(bzr info $url 2> /dev/null | sed -n '/branch root/{s/ branch root: //p;q;}')" + local local_url="$(bzr config parent_location -d $dir)" + if [[ -n $distant_url ]]; then + if [[ $distant_url != "$local_url" ]]; then + error "$(gettext "%s is not a branch of %s")" "$dir" "$url" + plain "$(gettext "Aborting...")" + exit 1 + fi + else + if [[ $url != "$local_url" ]] ; then + error "$(gettext "%s is not a branch of %s")" "$dir" "$url" + error "$(gettext "The local URL is %s")" "$local_url" + plain "$(gettext "Aborting...")" + exit 1 + fi fi msg2 "$(gettext "Pulling %s ...")" "${displaylocation}" cd_safe "$dir"

Thank you, by my third or fourth patch l may have made all possible mistakes. Thx for pointing them out. -- Maxime

Gesh

11 Apr 11 Apr

8:56 a.m.

New subject: [pacman-dev] [PATCHv2] Add support for all bzr URLs in the PKGBUILD source array

On 11/04/2013 03:56, Allan McRae wrote:

...

On 11/04/13 02:54, Maxime Gauduin wrote:

...
This patch is a merge of "[PATCH] More verbose bzr branching error", "[PATCH 1/2] Add support for bzr lp URLs in makepkg", "[PATCH 2/2] Accept all bzr URLs in the source array" and "[PATCH] Fix dest dir when using lp: URLs in the source array".

All of this ^ should not go in the commit message but below the "---" after the sign-off line.

Fixed and pulled to maint.

Allan

From what I can see in the Git docs, wouldn't this make the message a part of the commit (i.e. the actual diff)? Otherwise, how does Git split the message into the commit message, the patch, and the discussion? Thanks, Gesh

Allan McRae

4:06 p.m.

New subject: [pacman-dev] [PATCHv2] Add support for all bzr URLs in the PKGBUILD source array

On 12/04/13 01:56, Gesh wrote:

...

On 11/04/2013 03:56, Allan McRae wrote:

...
On 11/04/13 02:54, Maxime Gauduin wrote:

...
This patch is a merge of "[PATCH] More verbose bzr branching error", "[PATCH 1/2] Add support for bzr lp URLs in makepkg", "[PATCH 2/2] Accept all bzr URLs in the source array" and "[PATCH] Fix dest dir when using lp: URLs in the source array".

All of this ^ should not go in the commit message but below the "---" after the sign-off line.

Fixed and pulled to maint.

Allan

From what I can see in the Git docs, wouldn't this make the message a part of the commit (i.e. the actual diff)? Otherwise, how does Git split the message into the commit message, the patch, and the discussion?

Anything below "---" and before the start of the diff is a comment. Allan

4027

Age (days ago)

4029

Last active (days ago)

List overview

Download

9 comments

5 participants

participants (5)

Allan McRae
Dave Reisner
Gesh
Maxime GAUDUIN
Maxime Gauduin