gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
911 commits 1 branch 0 tags 10 MiB
Commit graph

668 commits

Author SHA1 Message Date
Phil Jackson
5aa79e249d Merge remote branch 'refs/remotes/nex3/nicer-name-rev' 2010-06-28 21:29:22 +01:00
Phil Jackson
aeb165ba3e Merge remote branch 'refs/remotes/nex3/update-remote-named-before-svn' 2010-06-28 21:24:46 +01:00
Yann Hodique
2d70b08682 minimizing extensions patch on top of upstream 2010-06-28 20:03:42 +02:00
Phil Jackson
613834919f Docstring for `magit-update-vc-modeline'. 2010-06-27 19:05:59 +01:00
Óscar Fuentes
51fffcb3a9 A better way for updating the VC modeline 
Revision 51a1b6d8 introduced a change that reverts all buffers after a
commit operation for refreshing the VC modeline info. This can be slow
(because refontification, etc) and have side effects (changes on display
settings for some modes.) Instead of reverting the buffer, we now call
`vc-find-file-hook' which is much faster and have no side effects. We
now update the VC modeline info after resetting, because that operation
may change the VC status without changing the file contents (commit a
change and then reset to HEAD^, for instance.)
 2010-06-27 18:47:31 +01:00
Nathan Weizenbaum
b8d6d5c08b Make sure magit-log-edit-toggle-field returns the right value. 2010-06-24 18:46:23 -07:00
Nathan Weizenbaum
5c5ba412b9 Add magit-wazzup-head and magit-wazzup-all-p variables for wazzup buffers. 2010-06-24 18:14:13 -07:00
Nathan Weizenbaum
cb5ca4ce40 Add a magit-reflog-head variable for reflog buffers. 2010-06-24 18:05:50 -07:00
Nathan Weizenbaum
abe8a031ff Add a magit-current-range variable for diff and log buffers. 2010-06-24 18:02:49 -07:00
Nathan Weizenbaum
120c5f8ec0 Merge branch 'master' into empty-commit 2010-06-24 17:31:48 -07:00
Nathan Weizenbaum
9542d41f89 Merge branch 'master' into guess-branch-guesses-commits 2010-06-24 17:31:14 -07:00
Nathan Weizenbaum
69499cdf45 Merge branch 'master' into ignore-file 2010-06-24 17:31:03 -07:00
Nathan Weizenbaum
cd9c46e226 Merge branch 'master' into log-edit 2010-06-24 17:30:52 -07:00
Nathan Weizenbaum
a6fa93b6cd Merge branch 'master' into nicer-name-rev 2010-06-24 17:30:38 -07:00
Nathan Weizenbaum
82f7ad57dd Merge branch 'master' into origin-default-remote 2010-06-24 17:30:15 -07:00
Nathan Weizenbaum
06c2902449 Merge branch 'master' into push-new-branch 2010-06-24 17:26:59 -07:00
Nathan Weizenbaum
51676dc866 Merge branch 'master' into rewrite-status-fix 2010-06-24 17:26:53 -07:00
Nathan Weizenbaum
c57f12976d Merge branch 'master' into slash-style-refs 2010-06-24 17:26:43 -07:00
Nathan Weizenbaum
0271bd562c Merge branch 'master' into update-remote-named-before-svn 2010-06-24 17:26:38 -07:00
Nathan Weizenbaum
a5b72daa02 When pushing a new branch, manually add merge configuration. 2010-06-24 16:56:18 -07:00
Nathan Weizenbaum
9b195b61e9 Properly handle pushing a branch without a remote. 
Before, this did "git push remote branch-name:nil".
Now it does "git push remote branch-name".
Git automatically sets up the remote.
 2010-06-24 16:40:28 -07:00
Nathan Weizenbaum
ed9cb1eafa Add an edit-log-mode toggle for allowing empty commits. 
This is useful for creating commits that are just notes, with no contents.
 2010-06-24 16:31:50 -07:00
Nathan Weizenbaum
40fca42d92 Abstract out a magit-log-edit-toggle-field function. 2010-06-24 16:20:03 -07:00
Nathan Weizenbaum
1efde9202c Filter out HEAD refs from magit-name-rev. 
HEAD refs are nasty because they're highly contingent.
Branches, tags, and remotes all require some commit to be made
in order for the ref to point to a different rev,
but HEADs just need something else to be checked out.

Also, filtering out HEADs makes the name more portable.
This is useful for Magithub, where the name may be passed on to GitHub.
 2010-06-24 15:56:54 -07:00
Nathan Weizenbaum
2ea8cb2595 Add a magit-rev-parse function. 2010-06-24 15:53:20 -07:00
Moritz Bunkus
043f4383de Remove "remotes/" prefix from remote branch names 
git cannot find a branch named "remotes/repository/branch" with
most (all?) of its commands, e.g. "git branch -d -r ..." or "git
merge".
 2010-06-20 17:32:34 +01:00
Moritz Bunkus
8bcbcb369e Set 'remote branch' text property in branch view 
This only works with git versions that prefix remote branches with
"remotes/" in the output of "git branch -va". git 1.7 and 1.6.3 do,
git 1.5.6.5 does not.
 2010-06-20 17:32:34 +01:00
Phil Jackson
110e9063a3 Merge remote branch 'refs/remotes/nex3/read-rev-history' 2010-06-17 22:11:54 +01:00
Alex Ott
449bebe757 get true name for directories, that specified by symlinks 2010-06-17 13:08:17 +02:00
Nathan Weizenbaum
8cc37dcb99 Fix ref ambiguity detection. 2010-06-17 01:57:28 -07:00
Nathan Weizenbaum
daa3ab8987 Remove tags/ and remotes/ in name-rev when that doesn't create ambiguity. 2010-06-17 00:10:35 -07:00
Nathan Weizenbaum
c337dcc07c Make magit-name-rev a little cleaner. 
The main thing is using --no-undefined to eliminate an extra check.
 2010-06-16 23:55:51 -07:00
Nathan Weizenbaum
8a37b3c4ab Add history for magit-read-rev. 2010-06-16 22:08:15 -07:00
Nathan Weizenbaum
5017a85447 Allow magit-guess-branch to guess commits as well. 2010-06-16 22:08:06 -07:00
Nathan Weizenbaum
c2516ed37e Have magit-push use magit-get-remote. 2010-06-16 22:07:38 -07:00
Nathan Weizenbaum
db32004209 Have magit-get-current-remote default to "origin", like Git does. 2010-06-16 22:07:25 -07:00
Nathan Weizenbaum
7ef0b9e9cb Make magit-update-remote respect a named remote above SVN. 2010-06-16 22:06:50 -07:00
Nathan Weizenbaum
f846afe850 Add an option to use "remote/name" style refs rather than "name (remote)". 2010-06-16 22:05:45 -07:00
Nathan Weizenbaum
25b4bf7e6e Make magit-ignore-file work even if .gitignore doesn't exist. 2010-06-16 22:03:41 -07:00
Nathan Weizenbaum
f0c05ea93d Don't add info to the edit log when a commit is successfully applied. 
Previously, if a commit was successfully applied and committed,
its information was still added to the edit log. This wasn't useful.
Now the information is only added if the commit wasn't committed (e.g. with a)
or if it was committed (with A) but the commit failed.
 2010-06-16 22:03:26 -07:00
Nathan Weizenbaum
6e0de30947 Make sure magit-log-edit-set-fields works properly when there are no headers. 
Before, if there were no headers but there was a header line,
an extra header line was added.
 2010-06-16 22:03:24 -07:00
Nathan Weizenbaum
60780379f7 Make sure the status buffer is updated after a rebase. 2010-06-16 22:02:40 -07:00
Sean Bryant
5744d3ec98 Make magit explicitly tell the branch where to push. 
Closes #23.
 2010-06-16 23:06:42 +01:00
Phil Jackson
82d9943643 Stop diffless commits tricking magit into an infinite loop. 2010-06-15 13:36:16 +01:00
Rémi Vanicat
ba0705cf9f We don't need the magit-tmp buffer to stay between its used. 
This first rename the buffer to a hidden buffer, and also remove it
after it have been used.
 2010-06-13 15:18:56 +02:00
Nathan Weizenbaum
29a1b34947 Make magit-run-git-async print out the command it's executing. 
This gives the user some immediate feedback when running a potentially long command,
such as "git fetch" or "git push".
 2010-06-11 23:15:48 +01:00
Phil Jackson
600ffa4097 Elpa compatibility. 2010-06-11 16:15:10 +01:00
Phil Jackson
cff8d04ef1 Release 0.8.1. 2010-06-10 17:35:25 +01:00
Nathan Weizenbaum
fe7656731b Add a prefix arg to magit-remote-update to prompt for a remote. 2010-06-10 13:06:51 +01:00
Phil Jackson
fce3ef1fd0 User now asked for the name of a local tracking branch. Sensible default given. [R] 2010-06-09 22:50:20 +01:00
Phil Jackson
78867ac94d `magit-maybe-create-local-tracking-branch' allows for no "refs/" string. 2010-06-09 21:57:10 +01:00
Phil Jackson
b59f493863 Remote tag back in the buffer list. 2010-06-08 11:48:48 +01:00
Phil Jackson
1dc342aad8 Added script to print authors and their copyright info, used it to fill header. 2010-06-07 23:45:39 +01:00
Phil Jackson
4896e19399 Slightly modified prompt for `magit-git-command'. 2010-06-07 10:46:58 +01:00
Phil Jackson
3b31bee10c Merge remote branch 'refs/remotes/nex3/master' 2010-06-07 10:45:26 +01:00
Nathan Weizenbaum
3096eafb8a Bind : to run Git commands directly. 
I chose : as the binding for similarity with M-:.
 2010-06-06 16:13:02 -07:00
Nathan Weizenbaum
00569b85f2 Fix a bunch of checkdoc warnings. 
This only fixes the easy warnings. Harder stuff like documenting
undocumented functions or making sure all the arguments of each
function are documented is not done.
 2010-06-06 16:00:51 -07:00
Nathan Weizenbaum
448ef5cf64 Add an error message for magit-display-process. 
This message is more descriptive than the default
when Magit hasn't run a Git command.
 2010-06-06 15:59:37 -07:00
Phil Jackson
4b23df61f5 Added a little documentation to the log functions. 2010-06-01 16:46:53 +01:00
Phil Jackson
961e8c94c0 Added `magit-log-first-parent' command. 2010-06-01 16:40:21 +01:00
Ævar Arnfjörð Bjarmason
40dc79f33b Use (magit-read-rev) for "Interactively rebase to:" message 
Now it has tab completion like the switch branch command and others
which use (magit-read-rev).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
 2010-05-31 17:06:52 +00:00
Ramkumar Ramachandra
9813ac8859 Replace save-excursion, set-buffer with with-current-buffer 
When byte-compiling magit.el, Emacs throws several warnings saying
`save-excursion' defeated by `set-buffer'. Eliminate these warnings by
replacing calls to save-excursion followed by set-buffer with
with-current-buffer.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 2010-05-30 15:58:15 +01:00
Ramkumar Ramachandra
c33f87fe71 Replace goto-line 
Replace goto-line with a more suitable combination of goto-char and
forward-line.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 2010-05-30 15:58:12 +01:00
Moritz Bunkus
dc8cc4cb95 Forward port server-running-p' from Emacs 23 as magit-server-running-p' for Emacs < 22 and calls `server-running-p' on >= 23. 2010-05-29 13:24:56 +01:00
Rémi Vanicat
19cb16c32d Remove decency on parse-time. 2010-05-26 21:41:59 +01:00
Phil Jackson
87e196ed10 Highlight the sha1 at the top of a diff buffer. 2010-05-26 18:50:08 +01:00
Rémi Vanicat
7d4c2f6fc8 In magit-insert-section, do not presume that CMD is git 
Removing the magit-git-standard-options from magit-insert-section
because:

- the only use of magit-insert-section is inside magit-git-section
  that already add the magit-git-standard-options, we do not need to add
  them twice
- as wrote, magit-insert-section could be used for calling any cmd,
  that may not understand the option in magit-git-standard-options.
 2010-05-26 18:45:03 +01:00
Rémi Vanicat
ab90bdf159 [magit-status] Use generate-new-buffer for creating a new buffer 
Closes #13: We used to use get-buffer-create, but it will reuse a
buffer with the same name, when we want to create a new one with an
unique name.
 2010-05-26 17:15:50 +02:00
Rémi Vanicat
0bb2e4c86f Removing a duplicate switch-to-buffer 
We don't need to change buffer twice when we use a new buffer
 2010-05-26 17:09:35 +02:00
Phil Jackson
3bdaf275db Added Mark Hepburn to the contributors list. 2010-05-21 09:45:02 +01:00
Mark Hepburn
98d87b1288 magit-interactive-rebase: use locate-file and exec-path to find emacsclient, instead of hard-coding to exec-directory 2010-05-21 09:45:00 +01:00
Phil Jackson
017828d250 Nicer colours for the tag indicators. 2010-05-20 00:22:14 +01:00
Phil Jackson
b0b65a2434 Nicer colours for the bisect refs. 2010-05-20 00:15:14 +01:00
Phil Jackson
9878186262 Log buffer knows about tagging again. 
Closes #5.
 2010-05-19 23:23:25 +01:00
Phil Jackson
dc9c1178fd `magit-tag' now knows about revisions. 2010-05-19 23:22:03 +01:00
Phil Jackson
0241232622 Added a couple of faces for good/bad bisect refs. 2010-05-19 22:58:57 +01:00
Phil Jackson
420c976f85 Closes #4. Added some bindings for commit-mode. 2010-05-18 10:34:57 +01:00
Ævar Arnfjörð Bjarmason
35dfceb3b5 Add a hook for magit-log-edit-mode 2010-05-17 22:51:08 +08:00
Ævar Arnfjörð Bjarmason
50ac04d222 Give magit-mode-hook a docstring 2010-05-17 22:51:08 +08:00
Ævar Arnfjörð Bjarmason
d2d1bd87fd Say "New annotated tag name" not "New tag name" on T 
This distinguishes t from T. Sometimes you press one and aren't sure
if you got it right.
 2010-05-17 22:49:55 +08:00
Phil Jackson
0a9bf3005a New function `magit-log-all' which provides --all functionality. 2010-05-14 11:57:07 +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
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
cb458d5918 Acknowledge David Abrahams. 2010-05-06 19:38:40 +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
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