From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Arik Mitschang <arik.mitschang@gmail.com>
Cc: emacs-devel@gnu.org
Subject: Re: pcvs branch and merge functions
Date: Mon, 02 Aug 2010 15:19:20 +0200 [thread overview]
Message-ID: <jwvwrs92mpb.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <AANLkTimU79vO4Dfw5kxpG1tZpv0vrd9Gohr3YyxnZ25M@mail.gmail.com> (Arik Mitschang's message of "Sun, 11 Jul 2010 13:45:13 -0400")
> I propose adding the branch and merge functionality that I have added
> to pcvs, which can be viewed with 'bzr branch
> lp:~akwm/emacs/pcvs-branch-and-merge'. It simplifies creating a branch
For this kind of size, it's good to include the diff directly in the
email so that we can review it without needing an internet connection
and a bunch of commands.
> Any thoughts?
Here are some comments on your code:
- please try and follow the coding style used in the rest of the code.
Most obviously: don't put close-parens on their own lines, and avoid
breaking the 80-columns barrier.
- why cvs-branch-tag-branch-postfix? I mean if I name the branch "foo",
I don't want Emacs to rename it to "foo-BRANCH", do I?
- ("\C-m" . cvs-mode-merge) binds it to RET (since it's the same as
^M), which is already used for something else.
- don't use a global var like cvs-branch-name to pass an argument
from the `interactive' spec to the function's body. Use an
actual argument instead.
- I wouldn't bother supporting the case where
cvs-branch-tag-base-postfix is nil.
- cvs-mode-merge should provide completion of branch names.
Otherwise you might as well use C-u M-x cvs-mode-update and type
the -j yourself.
- I think
(if (and (not (equal branch-tag merge-tag))
(not (null cvs-branch-tag-merge-postfix)))
(cvs-mode-run "update" (list "-j" branch-tag) fis)
(cvs-mode-run "update" (list "-j" branch-tag) fis))
is equivalent to
(cvs-mode-run "update" (list "-j" branch-tag) fis))
BTW. Maybe an even better option would be to provide completion after
"-j" and "-r" when you do c-x M-x cvs-mode-update.
- You might be able to move the -MERGE tag automatically by creating
(at the end of cvs-mode-merge) a special file in the CVS admin dir
which would hold some info about the result of the merge, and then in
cvs-mode-commit you can check this file to see if the commit is
committing the result of the merge or something else. Maybe the
simplest way is an empty file, and upon commit you simply ask the user
(if the file is present) if he's committing that merge.
-- Stefan
next prev parent reply other threads:[~2010-08-02 13:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-11 17:45 pcvs branch and merge functions Arik Mitschang
2010-08-02 13:19 ` Stefan Monnier [this message]
2010-08-02 20:46 ` Arik Mitschang
[not found] ` <jwv7hk81wq5.fsf-monnier+emacs@gnu.org>
2010-08-03 19:26 ` Arik Mitschang
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=jwvwrs92mpb.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=arik.mitschang@gmail.com \
--cc=emacs-devel@gnu.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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.