From: "Catalin Marinas" <catalin.marinas@gmail.com>
To: "Yann Dirson" <ydirson@altern.org>
Cc: "GIT list" <git@vger.kernel.org>
Subject: Re: [PATCH 0/5] My set of stgit companion scripts.
Date: Tue, 9 Jan 2007 10:21:30 +0000 [thread overview]
Message-ID: <b0943d9e0701090221o6437fc0ana17bb190eb1eae0b@mail.gmail.com> (raw)
In-Reply-To: <20070104233934.13580.17744.stgit@gandelf.nowhere.earth>
On 04/01/07, Yann Dirson <ydirson@altern.org> wrote:
> The following series adds to contrib/ a set of bash scripts I find useful
> for my daily use of stgit. They are probably closely tied to my workflow,
> but others may find them useful as well. Some of them may be useful to
> pythonize and integrate in some form or another.
Yes, indeed. I'll try this week (now that the holidays are finished)
to add TODO and wishlist pages on the wiki so that people can extend
them.
> stg-show-old is a trivial thing, but since I often need that functionnality,
> it is much less comfortable than forging the same command-line over and over
> again. It is also used by some of the other scripts.
Since we have some kind of patch history support, I'd rather extend
the git_id() function to parse patch names appended with ^ or ~x as in
GIT. This way you can access the full history and not only the
previous version of the patch.
You can currently do 'stg show [<patch>]//top.old'
> stg-fold-files-from and stg-swallow are invaluable when shuffing changes
> between patches.
The first one is indeed useful and might not be easy to implement in a
python-only script. The latter is useful as a shortcut but I would
rather have a python command (or --swallow option to 'pick' in
addition to --fold) to automate this.
> stg-what-changed is invaluable when shuffling patches in the stack.
It's interesting to see the diff of diffs but it takes some time to
get used to it :-). There is 'stg log (--patch|--graphical)' which
shows the diff of every refresh you did on the patch. What it doesn't
show is the diff of a push since this creates a new patch version
every time. Maybe this could be extended so that for push with
conflicts, it first stores a version with conflict markers and another
version after fixing them and refreshing.
> stg-cvs is a very young script, and probably very fragile. It allows a
> lightweight way of preparing changes with stgit before committing them into
> a CVS tree.
I'm OK with this (but I won't use it much).
Thanks.
--
Catalin
next prev parent reply other threads:[~2007-01-09 10:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-04 23:39 [PATCH 0/5] My set of stgit companion scripts Yann Dirson
2007-01-04 23:46 ` [PATCH 1/5] Add contrib/stg-show-old: show old version of a patch Yann Dirson
2007-01-04 23:46 ` [PATCH 2/5] Add contrib/stg-whatchanged: look at what would be changed by refreshing Yann Dirson
2007-01-04 23:46 ` [PATCH 3/5] Add contrib/stg-fold-files-from: pick selected changes from a patch above current one Yann Dirson
2007-01-04 23:46 ` [PATCH 4/5] Add contrib/stg-swallow: completely merge an unapplied patch into " Yann Dirson
2007-01-04 23:47 ` [PATCH 5/5] Add contrib/stg-cvs: helper script to manage a mixed cvs/stgit working copy Yann Dirson
2007-01-09 10:21 ` Catalin Marinas [this message]
2007-01-09 22:26 ` [PATCH 0/5] My set of stgit companion scripts Yann Dirson
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b0943d9e0701090221o6437fc0ana17bb190eb1eae0b@mail.gmail.com \
--to=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=ydirson@altern.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.
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 NNTP newsgroup(s).