From: Yann Dirson <ydirson@altern.org>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: GIT list <git@vger.kernel.org>
Subject: Re: Collection of stgit issues and wishes
Date: Mon, 18 Dec 2006 00:15:40 +0100 [thread overview]
Message-ID: <20061217231540.GB16838@nan92-1-81-57-214-146.fbx.proxad.net> (raw)
In-Reply-To: <b0943d9e0612100825h3ef2fa77kd5d9fd5022cbb3f9@mail.gmail.com>
On Sun, Dec 10, 2006 at 04:25:52PM +0000, Catalin Marinas wrote:
> Since this list gets changed pretty often, I would rather add TODO
> Bugs wiki pages on http://wiki.procode.org/cgi-bin/wiki.cgi/StGIT
Great idea.
> (maybe I should create a page on one of the open-source hosting sites
> and get some bug-tracking support).
If you're only looking for bugtracking, I wonder whether
bugzilla.kernel.org could be used (as well as for core git and other
git-related tools). Or maybe a new git-specialized bugzilla could be
setup somewhere ?
BTW, and a bit off-topic, one thing that would be great to have would be
git-bugzilla coupling (mainly, recording into bugzilla when a commit
addressing an issue gets pushed to an official tree).
Scmbug already provides a framework for such couplings, and already has
bugilla/mantis/RT support on the BTS side.
> I keep the TODO file mainly for
> what I plan to implement and, while I agree with many of the issues
> you point below, I don't guarantee I have time to fix/implement.
I tend do that myself too - in fact, a number of the issues I reported
are candidates for future patches from me :)
> >- "stg import" leaves empty patch on the stack after failed patch
> >application
>
> That's a feature in the sense that it creates the empty patch with the
> description and author information. It also leaves a
> .stgit-failed.patch which you can manually apply.
I was not aware of this. It would be useful to tell the user when such
a failed patch is left behind (that would have saved me some timing
already ;).
> >- "patches -d" may be confused by files added then removed (below,
> >file added to platform-v0, removed in rm-junk, problem encountered on
> >2006-08-14, probably on 0.10):
>
> Is this still the case now? I fixed a similar issue a few months ago
> (commit a57bd72016d3cf3ee8e8fd7ae2c12e047999b602; GIT considers a file
> name to be revision name if the file isn't found on disk; easily
> fixable by adding the "--" separator).
I should check.
> >- "stg show" should catch inexistant patch instead of saying "Unknown
> >revision: that-patch^{commit}"
>
> This command works for commit ids as well as patches. If the patch
> isn't found, it considers the name to be a commit id.
OK. Then some message like "No patch or commit id found matching
$commit" could be more informative.
> >- "clean" should give enough info for the user to locate any problem
> >(eg. conflict with files removed from revision control), eg. with a
> >"popping to ..." message
>
> Clean only removes empty patches and there shouldn't be any conflicts
> caused by this operation (unless there is a bug).
I have already described the problem in a previous thread. There is a
conflict when a generated file gets committed by error, and then a stgit
patch removes it. If one tries to pop that patch when the generated
file exists, there is a conflict.
> >- "sink" or "burry" as opposite to "float" (possibly with a target
> >patch)
>
> But how deep to burry it?
I'd think to bottom of stack by default (mostly to get a sane default),
but with an option to specify the position.
Or maybe as "stg bury-below <target> <patches-to-bury>".
> >- lacks "pick --patch=XXX" to pick by name
>
> I don't understand this.
Hm, I must have been confused, just ignore.
> >- interactive merge tools could only be called automatically after
> >failed merge, instead of requiring not-so-intuitive "resolved -i"
>
> You can set the stgit.merger config option for this (diff3 followed by
> xxdiff or emacs). I even have a .py file for doing this, I can add it
> to the contrib dir.
What about automatically triggering stgit.imerger when stgit.merger
failed ?
> >- needs a config example to call ediff via gnuserv (possibly sending
> >several merges at a time, making use of the session registry)
>
> Don't know how to do it.
That's one of the TODO items directed at myself (unless some good soul
takes care of that first ;)
> >- "stg fold" should allow to run a merge (insert conflict markers, or
> >even just output a .rej patch somewhere)
>
> It just calls git-apply. If this can do it, StGIT would use it.
I still have to invest some time into the available merge algorithms.
If nothing is available yet for this, we shall find out how to do it :)
> >- support for atomicity of complex transactions (stg begin/snapshot,
> >rollback, commit/finish - possibly with a transaction name so nesting would
> >just work)
>
> Would be nice but probably not that easy.
Full logging of series file would help, I think. Once we have full
logging of the stack, we get cheap transactions as well as arbitrary
undo depth, and the "stg undo" command to replace all those --undo
flags. But right, it still requires some work :)
> >- "stg patches" should be able to report on unapplied patches
>
> It invokes GIT to find out the commits modifying the give file. An
> unapplied patch doesn't modify any local file.
Right, but I think we could invoke GIT to report on each of the unapplied
patches that form a head, and restrict the output to those commits that
are stgit patches.
Best regards,
--
next prev parent reply other threads:[~2006-12-17 23:16 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-08 22:17 Collection of stgit issues and wishes Yann Dirson
2006-12-08 22:27 ` Jakub Narebski
2006-12-10 8:55 ` Jakub Narebski
2006-12-10 11:06 ` Jakub Narebski
[not found] ` <b0943d9e0612100831t7b79d4b1p436de5dbb813e51a@mail.gmail.com>
2006-12-10 17:01 ` Jakub Narebski
2006-12-10 22:26 ` Catalin Marinas
2006-12-10 23:02 ` Jakub Narebski
2006-12-10 23:24 ` Catalin Marinas
2006-12-10 23:37 ` Jakub Narebski
2006-12-11 12:59 ` Catalin Marinas
2006-12-21 11:39 ` Jakub Narebski
2006-12-11 18:41 ` Yann Dirson
2006-12-13 22:14 ` Catalin Marinas
2006-12-21 23:48 ` Jakub Narebski
2006-12-10 16:25 ` Catalin Marinas
2006-12-17 23:15 ` Yann Dirson [this message]
2006-12-12 9:43 ` Catalin Marinas
2006-12-12 10:02 ` Jakub Narebski
2006-12-13 7:22 ` David Kågedal
2006-12-13 10:20 ` Andreas Ericsson
2006-12-13 11:03 ` Karl Hasselström
2006-12-17 23:21 ` 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
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=20061217231540.GB16838@nan92-1-81-57-214-146.fbx.proxad.net \
--to=ydirson@altern.org \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.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).