Commit graph

728 commits

Author SHA1 Message Date
oscar
9c63409cc1 Filters commands and options by group 2010-05-17 21:43:20 +02:00
oscar
fe1f6016f0 Code moved to a place where it makes more sense
Also magit-submenu was renamed to magit-menu.
2010-05-17 20:20:39 +02:00
oscar
626af3b9c1 Fix showing help
Now it exits after showing the help window because the user can't
interact with it while the menu is working and on some cases the help
buffer uses the same window as the menu, hidding it.
2010-05-16 20:18:31 +02:00
oscar
903e642bf6 Pass options to log commands 2010-05-16 20:10:03 +02:00
oscar
abc459911b Removed extra parentheses 2010-05-16 19:12:03 +02:00
oscar
2f9c9b99fb Do not require the -option suffix for menu items 2010-05-16 18:43:33 +02:00
oscar
46592b4dcd Display and input options 2010-05-16 18:36:10 +02:00
oscar
b7964bb4b4 Added some log commands 2010-05-16 16:32:11 +02:00
oscar
f028c76330 Key for showing the docstring of the associated function 2010-05-16 04:34:38 +02:00
oscar
0f03b076e7 Show two menu entries per line 2010-05-16 02:11:17 +02:00
oscar
9cd7d57ed1 Removed some debug code 2010-05-16 01:15:34 +02:00
oscar
c40dfe75e5 Pass prefix argument to command 2010-05-16 01:14:34 +02:00
oscar
09f09afd34 Works without supporting prefixes 2010-05-15 20:02:40 +02:00
Phil Jackson
aa33f2f6a7 Merge branch 'log--all' 2010-05-15 12:09:12 +01:00
Phil Jackson
0a9bf3005a New function `magit-log-all' which provides --all functionality. 2010-05-14 11:57:07 +01:00
Phil Jackson
2a49110041 Updated the README with homepage information. 2010-05-13 18:12:22 +01:00
Rémi Vanicat
0c1f170e44 Use magit-git-output instead of magit-git-string in magit-interactive-resolve
closes #1: magit-git-string was responsible for trimming the last \n
2010-05-13 19:07:26 +08:00
Phil Jackson
11c14b6357 Put back magit-list-buffers' and magit-list-projects' as they might come in handy to others. 2010-05-12 23:34:04 +01:00
Phil Jackson
75941be63b Gave `magit-log-grep' a key binding (s - search). 2010-05-11 10:06:33 +01:00
Phil Jackson
6c8947a131 Missed a possible graph shape in log re. 2010-05-11 10:03:38 +01:00
Rémi Vanicat
12a4e8cbdb Add encoding declaration to magit.texi
When generating html file, makeinfo need this information to put the
correct charset.
2010-05-09 17:49:59 +01:00
Rémi Vanicat
33998d4b0c Use markdown for all of the links. 2010-05-08 10:41:38 +01:00
Phil Jackson
0ff29fe5c6 Added a link to the downloads in the README. 2010-05-07 22:10:54 +01:00
Phil Jackson
2208162840 Added mk_rel.bash to help.. mk rels. 2010-05-07 21:52:59 +01:00
Phil Jackson
387969a873 Link to README to keep automake happy. 2010-05-07 21:32:14 +01:00
Phil Jackson
ea7437137d Revert "Merge branch 'am-from-wl'"
This reverts commit 1b31c106f8.
Reverting "Added `magit-wl-pipe-to-am'."
Reverting "Replace cl functions."
Reverting "`magit-list-projects' returns full path."
Reverting "Added `magit-list-projects."
Reverting "Added `magit-list-buffers'."
2010-05-07 21:28:53 +01:00
Phil Jackson
d74beb91ee Markdown'd the README. 2010-05-07 21:00:49 +01:00
Phil Jackson
cb458d5918 Acknowledge David Abrahams. 2010-05-06 19:38:40 +01:00
Phil Jackson
dbbf2cf669 Merge branch 'am-from-wl' 2010-05-06 19:32:07 +01:00
Phil Jackson
effbbb3b13 Added `magit-wl-pipe-to-am'. 2010-05-06 19:26:51 +01:00
Phil Jackson
326fff2823 Replace cl functions. 2010-05-06 19:26:34 +01:00
Phil Jackson
f2817e7c78 `magit-list-projects' returns full path. 2010-05-06 18:18:02 +01:00
Phil Jackson
0ca04f71bb Added `magit-list-projects. 2010-05-06 17:57:08 +01:00
Phil Jackson
1b31c106f8 Added `magit-list-buffers'. 2010-05-06 17:56:59 +01:00
Phil Jackson
5c206c4bf4 Mention 'e' being the new 'l' in log view. 2010-05-06 12:38:59 +01:00
Ramkumar Ramachandra
f8e429e8de Add an option to confirm reverting an item. 2010-05-06 12:33:11 +01:00
David Abrahams
abba1a02e2 Have files saved when finished a three-way-merge with ediff. 2010-05-06 11:21:27 +01:00
Rémi Vanicat
c50fab4242 Added a compatibility function for start-file-process as it does not exist
in Emacs 22.
2010-05-06 00:48:36 +01:00
Moritz Bunkus
d4aa3ff85a Only call server-running-p on Emacs 23 or newer 2010-05-06 00:31:24 +01:00
Phil Jackson
8bf8a36db6 Use `magit-section-case' to get branch from wazzup. 2010-05-06 00:27:20 +01:00
Rémi Vanicat
179f1b9809 Use guess-branch and default-rev wherever we ask for a branch or a rev.
Signed-off-by: Rémi Vanicat <vanicat@debian.org>
2010-05-06 00:07:42 +01:00
Rémi Vanicat
b6d7f36a7d When there is a guessed branch, it make a good default rev.
Signed-off-by: Rémi Vanicat <vanicat@debian.org>
2010-05-06 00:06:11 +01:00
Óscar Fuentes
51a1b6d84c Revert buffers after committing
I find the VC status on the modeline useful (the one that shows
Git[:-]branchname) This indicates when the buffer's associated file was
changed on disk (`:' for edited, `-' for unedited.) This indicator is
not affected by a commit with magit, so it keeps signaling a file as
edited when in fact it is not. This patch reverts all buffers that are
visiting a file in the current working tree after a commit.
2010-05-05 16:36:36 +01:00
Óscar Fuentes
5f371df069 Correct informative text for showing more log entries
At the end of the log, the text ``type "l" to show more logs'' is
shown. The actual keybinding is `e', not `l'.
2010-05-05 16:31:56 +01:00
Rémi Vanicat
2acc8be623 Make the process-connection-type customizable.
We need process-connection-type to be nil on cygwin
We need process-connection-type to be t for magit to ask for password
So we now use the new variable magit-process-connection-type for this,
defaulting to nil on cygwin, and to t on others platform.
2010-05-05 15:19:49 +01:00
Rémi Vanicat
c256a726d4 Make magit ask for password also when git is asking for an host password
Previously we were asking only when there was a passphrase for ssh key.
2010-05-05 15:04:25 +01:00
Phil Jackson
3d1faa122e Added some missing contributor names. 2010-05-05 13:48:56 +01:00
Rémi Vanicat
ed904c7a00 use "e" for more log
Then we can use "l" to show short-log from long log an reflog.
At the same time we add the different keybinding to see the different
kind of logs from the others logs.
2010-05-05 10:17:49 +01:00
Leo
975536e966 Fix open parentheses in doc strings
The latest doc change seems to bring in a lot of opening parentheses in
the doc strings. This patch fixes them.
2010-05-02 10:29:07 +01:00
Roger Crew
26712041ec remove runtime dependence on cl.el
This patch removes the runtime dependences on the cl package.
Luckily, there weren't too many of these.

From the GNU emacs lisp manual (Appendix D.1 coding conventions)

   * Please don't require the `cl' package of Common Lisp extensions
     at run time.  Use of this package is optional, and it is not part
     of the standard Emacs namespace.  If your package loads `cl' at
     run time, that could cause name clashes for users who don't use
     that package.

     However, there is no problem with using the `cl' package at
     compile time, with `(eval-when-compile (require 'cl))'.  That's
     sufficient for using the macros in the `cl' package, because the
     compiler expands them before generating the byte-code.

There's also the small matter that many of the function implementations
in cl, striving for the full generality of Common Lisp (much of which
is completely useless in Emacs), turn out to be horrible.

E.g., for a fun time, dig down through

      (find-if pred list :from-end t),

and look at what it ACTUALLY does when you finish macroexpanding
everything.  It tests *every* element of the list against the
predicate, not just the rightmost ones stopping when it finds the
first match.  Once it determines the rightmost match, it then retains
NOT the element itself, but its *ordinal* position N, which then gets
used in (elt list N), meaning ANOTHER listwalk, just to get the
element back in order to return it.  Nor is the byte-compiler anywhere
near smart enough to optimize this away (I'm not sure *any* compiler
would be...)

I'll grant cl has some useful macros in it, but it comes bundled with a
lot of crap and you need to be really careful about what you use.  For
many things, you're better off rolling your own functionality using
the standard routines available (e.g., while, mapcar, and reverse are
all written directly in C).

And you most definitely do NOT want to be foisting the crap on
everybody else, hence the need to keep it out of the runtime.

Meanwhile, here's The Patch:

	Modified magit.el
2010-04-28 12:21:49 +01:00