From: Sam Vilain <sam@vilain.net>
To: Shawn Pearce <spearce@spearce.org>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [ANNOUNCE] pg - A patch porcelain for GIT
Date: Mon, 13 Feb 2006 17:40:22 +1300 [thread overview]
Message-ID: <43F00DB6.4040306@vilain.net> (raw)
In-Reply-To: <20060213032903.GA32121@spearce.org>
Shawn Pearce wrote:
>>>I just posted the first public version of pg, a GIT porcelain for
>>>managing patches. Think StGIT, but better in some ways:
>>>Feature Summary:
>>>- Maximum compatibility with other GIT porcelains.
>>>- Simplified command line user interface.
>>How do I edit the description of an existing patch using pg? Perhaps an
>>option to pg-push ?
> There isn't any description associated with a patch beyond its name
> (which can be changed with pg-rename). Unlike StGIT pg currently
> doesn't store a description with each patch.
> This is partly because I want pg to extract the comments given to
> pg-ci to make the description of the patch during an export with
> pg-export - but I haven't written the code to walk back along the
> related commits and extract each comment. On the other hand this
> might not be the best description for a patch. :-)
ok. Well, perhaps a nice solution might be just to aggregate the
comments as each new commit is made. ie, the previous comment is
prepended to the new comment unless you use the editor or a special
-M (or whatever) option that replaces the running comment.
I tried importing a patchset into pg, and made some changes to it to see
the patch revisioning going on. However, I can't see this happening.
Can you perhaps include this information in your tutorial?
As far as other, more general critiques of the software goes: What
about merging? stgit has a very nice way of merging; I specify how to
merge using a config file, and when I rebase my patches with "stg pull",
it fires up my custom editor. All I really want is a way to specify how
to handle merges, with the ancestor/left/right files on hand. I want to
use something as simple as this script:
#!/bin/sh
branch1="$1"
branch2="$2"
ancestor="$3"
output="$4"
echo "Merging:"
echo
echo " $branch1"
echo " - $ancestor"
echo
echo " with:"
echo
echo " $branch2"
echo " - $ancestor"
echo
echo " to: $output"
echo ""
echo -n "Trying diff3..."
if diff3 -L local -L older -L remote -m -E "$branch1" "$ancestor" \
"$branch2" > "$output"
then
echo "OK"
else
echo "failed"
echo "falling back to ediff-merge"
emacs --eval "(ediff-merge-files-with-ancestor \"${branch1}\"
\"${branch2}\" \"${ancestor}\" nil \"${output}\")"
fi
Those commands I got from the default .stgitrc config.
That's all the features I'm really after.
Sam.
next prev parent reply other threads:[~2006-02-13 4:41 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-10 19:59 [ANNOUNCE] pg - A patch porcelain for GIT Shawn Pearce
2006-02-10 20:41 ` Greg KH
2006-02-10 21:04 ` Shawn Pearce
2006-02-10 23:20 ` Greg KH
2006-02-10 21:17 ` Petr Baudis
2006-02-10 21:38 ` Shawn Pearce
2006-02-10 21:47 ` Petr Baudis
2006-02-10 22:07 ` Junio C Hamano
2006-02-13 21:00 ` Petr Baudis
2006-02-14 9:26 ` Catalin Marinas
2006-02-14 10:08 ` Karl Hasselström
2006-02-14 15:22 ` Chuck Lever
2006-02-14 16:07 ` Karl Hasselström
2006-02-14 20:58 ` Chuck Lever
2006-02-14 22:29 ` Petr Baudis
2006-02-15 0:22 ` Sam Vilain
2006-02-15 0:35 ` Shawn Pearce
2006-02-15 1:14 ` Petr Baudis
2006-02-15 4:11 ` J. Bruce Fields
2006-02-15 6:54 ` Shawn Pearce
2006-02-15 19:45 ` J. Bruce Fields
2006-02-16 10:24 ` Junio C Hamano
2006-02-16 10:33 ` Catalin Marinas
2006-02-16 10:42 ` Fernando J. Pereda
2006-02-16 10:52 ` Junio C Hamano
2006-02-16 11:10 ` Catalin Marinas
2006-02-15 17:25 ` Catalin Marinas
2006-02-16 7:54 ` Karl Hasselström
2006-02-17 4:27 ` [PATCH 0/2] stg uncommit Karl Hasselström
2006-02-17 4:31 ` [PATCH 1/2] Update .git/refs/heads/base after patch deletion Karl Hasselström
2006-02-17 4:31 ` [PATCH 2/2] Add 'stg uncommit' command Karl Hasselström
2006-02-19 10:51 ` Catalin Marinas
2006-02-19 13:45 ` Karl Hasselström
2006-02-19 14:47 ` Karl Hasselström
2006-02-19 21:15 ` Sam Vilain
2006-02-20 17:20 ` Catalin Marinas
2006-02-20 17:30 ` Karl Hasselström
2006-02-20 22:49 ` Catalin Marinas
2006-02-21 7:55 ` Karl Hasselström
2006-02-15 10:11 ` [ANNOUNCE] pg - A patch porcelain for GIT Karl Hasselström
2006-02-15 10:42 ` Andreas Ericsson
2006-02-15 11:25 ` Karl Hasselström
2006-02-15 11:27 ` Karl Hasselström
2006-02-17 21:57 ` Catalin Marinas
2006-02-13 2:49 ` Sam Vilain
2006-02-13 3:29 ` Shawn Pearce
2006-02-13 4:40 ` Sam Vilain [this message]
2006-02-13 6:03 ` Shawn Pearce
2006-02-13 14:40 ` Catalin Marinas
2006-02-14 4:56 ` Shawn Pearce
2006-02-14 6:14 ` Shawn Pearce
2006-02-15 17:20 ` Catalin Marinas
2006-02-15 17:12 ` Catalin Marinas
2006-02-15 17:55 ` Shawn Pearce
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=43F00DB6.4040306@vilain.net \
--to=sam@vilain.net \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).