Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on Aug 22, 2010
  1. Merge remote branch 'upstream/master'

    authored
    Conflicts:
    	magit.el
Commits on May 6, 2010
  1. @philjackson
  2. @philjackson

    Merge branch 'am-from-wl'

    philjackson authored
  3. @philjackson
  4. @philjackson

    Replace cl functions.

    philjackson authored
  5. @philjackson
  6. @philjackson
  7. @philjackson
  8. @philjackson
  9. @artagnon @philjackson

    Add an option to confirm reverting an item.

    artagnon authored philjackson committed
  10. @dabrahams @philjackson
Commits on May 5, 2010
  1. @vanicat @philjackson

    Added a compatibility function for start-file-process as it does not …

    vanicat authored philjackson committed
    …exist
    
    in Emacs 22.
  2. @mbunkus @philjackson

    Only call server-running-p on Emacs 23 or newer

    mbunkus authored philjackson committed
  3. @philjackson
  4. @vanicat @philjackson

    Use guess-branch and default-rev wherever we ask for a branch or a rev.

    vanicat authored philjackson committed
    Signed-off-by: Rémi Vanicat <vanicat@debian.org>
  5. @vanicat @philjackson

    When there is a guessed branch, it make a good default rev.

    vanicat authored philjackson committed
    Signed-off-by: Rémi Vanicat <vanicat@debian.org>
  6. @philjackson

    Revert buffers after committing

    Óscar Fuentes authored philjackson committed
    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.
  7. @philjackson

    Correct informative text for showing more log entries

    Óscar Fuentes authored philjackson committed
    At the end of the log, the text ``type "l" to show more logs'' is
    shown. The actual keybinding is `e', not `l'.
  8. @vanicat @philjackson

    Make the process-connection-type customizable.

    vanicat authored philjackson committed
    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.
  9. @vanicat @philjackson

    Make magit ask for password also when git is asking for an host password

    vanicat authored philjackson committed
    Previously we were asking only when there was a passphrase for ssh key.
  10. @philjackson
  11. @vanicat @philjackson

    use "e" for more log

    vanicat authored philjackson committed
    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.
Commits on May 2, 2010
  1. @leoliu @philjackson

    Fix open parentheses in doc strings

    leoliu authored philjackson committed
    The latest doc change seems to bring in a lot of opening parentheses in
    the doc strings. This patch fixes them.
Commits on Apr 28, 2010
  1. @wrog @philjackson

    remove runtime dependence on cl.el

    wrog authored philjackson committed
    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
  2. @wrog @philjackson

    *magit-FOO-log* / introduce buffer name variables

    wrog authored philjackson committed
    Introduces
    
      magit-log-buffer-name 	*magit-log*
      magit-log-edit-buffer-name	*magit-edit-log*  (was *magit-log-edit*)
      magit-log-grep-buffer-name	*magit-grep-log*  (was *magit-log-grep*)
      magit-process-buffer-name 	*magit-process*
      magit-commit-buffer-name 	*magit-commit*
      magit-stash-buffer-name	*magit-stash*
    
    Also adds C-c C-] as a binding for magit-log-edit-cancel-log-message
    since C-c C-] as the aborting counterpart to C-c C-c is at least a
    vague convention for other modes (cf. rmail, vm, query-replace...)
    
    Motives:
    
    It annoys me that, when wanting to switch to the *magit-log* buffer
    from some random place, I can't type *ma<space>-l<space> and have it
    complete properly, at least not if I've previously ever done a commit
    (because there's then a *magit-log-edit* out there stealing the
    completion).
    
    Also looks like if I ever use magit-log-grep, I will be likewise
    screwed.
    
    Finally, it disturbs my sense of aesthetics when I look at source code
    and see the same strings occuring over and over.  Usually, that's
    crying defvars/defconsts.  (And this will also makes life easier
    in the event you don't like my buffer name changes for -log-edit
    and -log-grep).
    
     - -
    
    (...This all leaves *magit-tmp* as the only remaining case of a buffer
        name string occurring multiple times, but that needs to be handled
        differently, so that'll be a different patch...)
    
    (...Note that having buffer names as variables also allows the
        eventual possibility of making them local --- or at least the
        option thereof --- so that one can be visiting several
        repositories at once and not having these buffers all clobbering
        each other.  There's a tradeoff here in that some folks may find
        it confusing/annoying to have more than one set of these buffers
        to deal with,... hence option.
    
        *If* one is going to go that route, current gut feeling is buffer
        name variables should be local to *just* the status buffer(s),
        void elsewhere, and anything needing one of the auxiliary buffers
        should dispatch through its own status buffer to get what it
        wants.  That way, we're not having to repeat/update/copy
        per-repository definitions everywhere....)
    
    The patch:
Commits on Apr 27, 2010
  1. @wrog @philjackson

    docstrings for various functions

    wrog authored philjackson committed
    Here, have some docstrings:
    
    (...it being something of a show-stopper for newbies when they want to
    find out what a given keystroke will do, they hit ^Hk [or ^Hf or ^Hv],
    and nothing useful comes out...)
Commits on Apr 25, 2010
  1. @wrog @philjackson

    Magit now compiles cleanly.Fix for appending an explicit number of ne…

    wrog authored philjackson committed
    …w log entries.
  2. @philjackson
  3. @philjackson

    Minor doc changes.

    philjackson authored
  4. @vanicat @philjackson

    Added a function to grow the number of log in the log view

    vanicat authored philjackson committed
    The log view will show an help at its end when there is more log to
    view, and the function is bound to "l" in log view.
  5. @wrog @philjackson

    magit-show-branches shows wrong repository

    wrog authored philjackson committed
    If you do
    .  magit-status on repository .../x
    .  V (magit-show-branches)
    .  magit-status on repository .../y
    .  V (magit-show-branches)
    
    you get the branch listing for repository .../x
    
    Also, as a side issue, functionality of a buffer should not be
    keyed off of the buffer name (in this case, renaming the buffer
    should not change what V or g does).
    
    The following patch deals with both of these.
Commits on Apr 12, 2010
  1. @philjackson
  2. @vanicat @philjackson

    Regrouping command that create new view of current git repositories.

    vanicat authored philjackson committed
    Signed-off-by: Rémi Vanicat <vanicat@debian.org>
  3. @vanicat @philjackson

    Moving function related to current status

    vanicat authored philjackson committed
    magit-reset-head is also put wherever there are commits
    
    Signed-off-by: Rémi Vanicat <vanicat@debian.org>
  4. @vanicat @philjackson

    Moving function working specifically on status hunk, diff and files

    vanicat authored philjackson committed
    Signed-off-by: Rémi Vanicat <vanicat@debian.org>
Something went wrong with that request. Please try again.