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

555 commits

Author SHA1 Message Date
Rémi Vanicat
d976e65dbf Regrouping command that create new view of current git repositories. 
Signed-off-by: Rémi Vanicat <vanicat@debian.org>
 2010-04-12 14:08:11 +01:00
Rémi Vanicat
6312006a54 Moving function related to current status 
magit-reset-head is also put wherever there are commits

Signed-off-by: Rémi Vanicat <vanicat@debian.org>
 2010-04-12 14:08:11 +01:00
Rémi Vanicat
d5dd0578ba Moving function working specifically on status hunk, diff and files 
Signed-off-by: Rémi Vanicat <vanicat@debian.org>
 2010-04-12 14:08:11 +01:00
Rémi Vanicat
3eec4705bc Moving merging and branching function where there are commit and branch. 
Signed-off-by: Rémi Vanicat <vanicat@debian.org>
 2010-04-12 14:08:11 +01:00
Rémi Vanicat
6328782833 Moving apply, cherry-pick and revert function. 
They all apply to hunk, commit and diff that are in
status, stash, log, reflog, diff and wazzup buffers.

Signed-off-by: Rémi Vanicat <vanicat@debian.org>
 2010-04-12 14:08:11 +01:00
Rémi Vanicat
bca27d36bb Moving diff view function where there are commits. 
Signed-off-by: Rémi Vanicat <vanicat@debian.org>
 2010-04-12 14:08:11 +01:00
Rémi Vanicat
682809d82d Moving staging function to status buffer 
Signed-off-by: Rémi Vanicat <vanicat@debian.org>
 2010-04-12 14:08:11 +01:00
Rémi Vanicat
d2b814ad9e Moving hunk size modifier in modes where there are hunks. 
Signed-off-by: Rémi Vanicat <vanicat@debian.org>
 2010-04-12 14:08:11 +01:00
Rémi Vanicat
9105c3e557 Added minor mode for the different magit buffer. 
Signed-off-by: Rémi Vanicat <vanicat@debian.org>
 2010-04-12 14:08:11 +01:00
Moritz Bunkus
8175d6dfad Only start the server if it isn't running 
magit's interactive rebase feature tries to start the server even if
it is already running. If it is already running then Emacs asks
whether or not it should destroy existing clients. This is fatal if
the frame magit is running in was created by emacsclient
itself (e.g. Emacs is running in the background with "--daemon"), so
the user has to answer "no".

This question can be avoided if the server is only startet if it isn't
already running.
 2010-04-01 11:16:12 +01:00
Phil Jackson
e7a3b608e6 Fix `magit--branch-name-at-point'. 2010-04-01 01:55:56 +01:00
Phil Jackson
db44227cb0 Use fundamental-mode' rather than text-mode' 2010-04-01 01:53:35 +01:00
Phil Jackson
290d5fe70f Comments, removed old-point code which did nothing. 2010-04-01 01:51:43 +01:00
Phil Jackson
f735945848 Fix `magit--is-branch-at-point-remote' 2010-04-01 01:48:28 +01:00
Phil Jackson
bf49b72cf0 Removed "remotes" from the branch name. 2010-04-01 01:17:09 +01:00
Phil Jackson
a86fab4e97 n/p now allow the user to move about in branch-view. 2010-03-30 23:08:50 +01:00
Phil Jackson
1ae36db891 Put branch name in text properties. 2010-03-30 23:07:09 +01:00
Phil Jackson
b261669efe Have `magit--branch-name-from-line' pull out the branch name. 2010-03-30 22:45:59 +01:00
Phil Jackson
79d7f46502 Bit more output. 2010-03-30 22:45:05 +01:00
Phil Jackson
e09ef67ea6 SHA1 gets colour. 2010-03-30 22:32:43 +01:00
Moritz Bunkus
ad686c5938 Provide useful functions for the branch list 
The following functions are available from the branch list (which in
turn is made read-only):

- Checking out the branch in the current line
- Deleting the branch in the current line (prefix forces deletion even
if not merged into current branch); works on both local and remote
branches
- Manual and automatic merges of the branch in the current line into
the current branch
- Quitting the branch list

Includes updated documentation.
 2010-03-30 14:53:45 +01:00
Moritz Bunkus
920c3b3a3c Guess the remote branch name from the branch's "merge" config item 
If you have a local tracking branch, e.g. called 'test', and the
remote branch name is different than test (e.g. 'somwhere/master')
then the commands for retrieving the unpulled and unpushed commits was
calling "git log test..somwehere/test" which may or may not exist.
 2010-03-30 13:45:53 +01:00
Phil Jackson
33ea60d690 If wazzup head is detached then describe it so. 2010-03-29 21:21:09 +01:00
Rémi Vanicat
c51582ee17 Using HEAD as branch-name when this is a detached HEAD 2010-03-29 21:14:56 +01:00
Rémi Vanicat
82b8d93731 check for the current branch before switching buffer 
The wazzup buffer might already exist, so if we look at the branch
name in it, it might refer to another branch, even another repository.
 2010-03-29 20:57:27 +01:00
Rémi Vanicat
7c80c10199 Added docstring for section's function 2010-03-27 11:33:55 +00:00
Rémi Vanicat
07c3225ed6 Better documentation and error reporting. 
Corrected style error in comment, docstring, and error message, thanks to
checkdoc-minor-mode and Aspell.

Some indent and minor code style fix too
 2010-03-27 11:33:55 +00:00
Phil Jackson
27ef54451b Finished off documentation. 2010-03-26 16:36:55 +00:00
Phil Jackson
c23b334d29 Merge branch 'log-grep' 2010-03-26 16:33:50 +00:00
Phil Jackson
c7c02c2f20 Added the command `magit-log-grep' (no keybinding). 2010-03-26 16:33:32 +00:00
Phil Jackson
29395e0d46 `magit-refresh-log-buffer' can now take more than one (git commandline) argument. 2010-03-26 16:31:40 +00:00
Phil Jackson
f9283aaa0d Merge remote branch 'refs/remotes/philjackson/svn-find-rev' 2010-03-26 14:00:13 +00:00
Phil Jackson
0fc398039d Merge commit 'refs/merge-requests/11' of git://gitorious.org/magit/mainline 2010-03-20 16:24:05 +00:00
Phil Jackson
5dc924748a Merge commit 'refs/merge-requests/14' of git://gitorious.org/magit/mainline 2010-03-20 16:22:37 +00:00
Rémi Vanicat
bb74ce61af Show the graph in wazzup. 2010-03-20 13:33:31 +01:00
Rémi Vanicat
8c16b10141 Use view-mode for the *magit-process* buffer 
Now, q will bury the buffer, and several other keybindig will be
available
 2010-03-20 13:16:58 +01:00
Rémi Vanicat
ed0ad8eff7 use --pretty=format: * %H %s where needed 
The current magit-wash-log is made for commit with graph, so we must at least use
--pretty=format: * %H %s or the --graph for it to work as expected.
 2010-03-20 13:14:21 +01:00
Hannu Koivisto
ea0812f119 Add command magit-reset-head-hard. 
Intended to be bound to X instead of magit-reset-working-tree for those who
feel it is a more consistent pair for x.  Suggests HEAD and therefore works
like magit-reset-working-tree by default.  Eliminates need to use C-u x.
 2010-03-18 23:25:58 +02:00
Hannu Koivisto
8020b0396a Add command magit-toggle-file-section. 
For those who never want to toggle at hunk granularity.
 2010-03-18 23:25:58 +02:00
Hannu Koivisto
94ca78a86f Add command magit-goto-parent-section. 2010-03-18 23:25:58 +02:00
Hannu Koivisto
6a1bb4f644 Fix magit-get-top-dir from ruining paths with symlinks. 
One might argue that this also makes it work better in a case when GIT_DIR
points outside of a work tree, but because in that case any directory is a
valid "top dir" from GIT's point of view, that is debatable.  But at least
one can use Magit in that case by first making sure that default-directory
is the top dir and then executing magit-status.
 2010-03-18 23:25:58 +02:00
Hannu Koivisto
01d58d4385 Fix magit-log-edit-mode keymap definition and activation. 
Rely on the standard define-derived-mode functionality.
 2010-03-18 23:25:58 +02:00
Phil Jackson
0074a3185c Merge branch 'fancy-log-output'. 2010-03-16 13:34:44 +00:00
Phil Jackson
6f9993cbd4 Remove 'HEAD' from ref list. 2010-03-14 14:46:56 +00:00
Phil Jackson
a4cbd5ecd3 Refs matching was too greedy and causing some logs not to render. 2010-03-14 14:45:50 +00:00
Phil Jackson
d43a23b48f Merge remote branch 'refs/remotes/philjackson/fancy-log-pt1' 
Conflicts:
	magit.el
 2010-03-14 14:42:50 +00:00
Alexey Voinov
37731ad567 Replaced call-process-region with start-file-process and wait. 
call-process-region doesn't work with remote tramp
directories. Staging of diff hunks was broken.
 2010-03-12 17:43:18 +00:00
Rémi Vanicat
a291507171 In magit-ignore-file, add a new line if there wasn't one in the ignore file 2010-03-12 18:11:14 +01:00
Alexey Voinov
7ca25460fa emulate append-to-file, because it doesn't work over tramp 2010-03-12 18:11:14 +01:00
Pavel Holejsovsky
3d2321b317 Make async git invocation work on cygwin. 
Forces emacs to use pipes for communication with git subprocess.
Although default PTY method should work too, there is probably
something broken in cygwin causing that resulting process never
receives any input and hangs forever.

In any case, setting communication to 'pipe' is recommended by
start-process docs anyway for background processes, as it is usually
faster and more efficient.
 2010-03-11 14:12:30 +01:00
Phil Jackson
db53f15cb5 Merge remote branch 'refs/remotes/AlexeyVoinov/git-svn-fixes' 2010-03-11 11:18:30 +00:00
Alexey Voinov
4e59fade68 Fixed svn-ref-info for most non-standard layouts 2010-03-11 13:32:28 +03:00
Alexey Voinov
f65dfce86e magit-get-all is wrapper for git config --get-all 2010-03-11 13:20:41 +03:00
Phil Jackson
dddfe3035e Highlight only the diff markers (not the text after them). 2010-03-10 21:43:11 +00:00
Phil Jackson
f7f383bf1a Removed redundant call from `magit-get-svn-ref-info'. 2010-03-10 21:38:56 +00:00
Phil Jackson
9325431ad4 Added `magit-omit-untracked-dir-contents' to optionally stop magit listing everything in an untracked directory. 2010-03-10 21:38:04 +00:00
Phil Jackson
282303265f Merge remote branch 'refs/remotes/philjackson/git-svn-fixes-and-features' 2010-03-10 21:29:42 +00:00
Phil Jackson
10f88917ca Bug fix: Commit buffer will fill if the commit is current and the buffer dead. 2010-03-10 21:21:33 +00:00
Phil Jackson
f9f1c00c78 C-u will now keep the index when stashing. 2010-03-10 21:19:46 +00:00
Phil Jackson
a421f9f936 Merge remote branch 'refs/remotes/philjackson/squashable-merges' 2010-03-10 21:12:32 +00:00
Phil Jackson
131f9d1db3 Merge remote branch 'refs/remotes/philjackson/magit-completing-read' 2010-03-10 21:08:32 +00:00
Rémi Vanicat
dc48483ad6 Make magit ask for ssh passphrase 
Thanks to Rüdiger Sonderfeld <ruediger@c-plusplus.de>
 2010-02-23 08:00:47 +01:00
Phil Jackson
f8f6a2c103 Use `magit-present-log-line-function'. 2009-12-16 14:57:16 +00:00
Rémi Vanicat
cea34e5f8c [Tramp] Two more fix, make staging with magit on tramp dir possible 2009-11-09 11:14:44 +02:00
Rémi Vanicat
3b661f5db4 Always use magit-git-standard-options when calling git 2009-11-09 11:14:44 +02:00
Phil Jackson
dcbb449238 Box around labels. 2009-11-08 15:59:58 +00:00
Phil Jackson
5661df2222 Better label colours for lighter backgrounds. 2009-11-08 15:59:44 +00:00
Phil Jackson
02432300e1 Highlight refs according to their origin. 2009-11-08 14:54:53 +00:00
Marius Vollmer
d5b60fc53f Use --decorate=full so that it works again with Git 1.6.4. 
* magit.el (magit-configure-have-decorate):
(magit-refresh-log-buffer): Here.
 2009-11-08 13:45:20 +00:00
Marius Vollmer
78c098361c Use --decorate=full so that it works again with Git 1.6.4. 
* magit.el (magit-configure-have-decorate):
(magit-refresh-log-buffer): Here.
 2009-11-07 20:37:43 +02:00
Phil Jackson
83992a9ec2 `magit-svn-find-rev' now supports the prefix arg. 
* magit.el (magit-svn-find-rev): Prefix support for branch name.
* magit.texi: Documenting magit-svn-find-rev.
 2009-11-06 14:52:33 +00:00
Phil Jackson
869c6059b6 Basic functionality, only asking for revision. 2009-11-04 21:46:06 +00:00
Phil Jackson
c90f134a74 Moved graph to the second column. 2009-11-02 10:34:25 +00:00
Phil Jackson
2ec5ee71f1 Highlighting of sha and graph in log buffer. 2009-11-02 10:24:21 +00:00
Phil Jackson
e3a37dbc39 Set the remote string to the svn url and revision when in a git-svn repo. 2009-10-28 20:41:43 +00:00
Phil Jackson
8ea39540d9 A simple caching mechanism to ease the `magit-get-svn-ref-info' pain. 
* magit.el: Every call to `magit-get-svn-ref-info', post the first, retrieves a cached list.
 2009-10-28 20:37:35 +00:00
Phil Jackson
3bfe230051 More detailed and structured information from git-svn. 
* magit.el (magit-svn-enabled): alist of git-svn information returned.
 2009-10-28 20:33:35 +00:00
Phil Jackson
c368295a32 completing-read-configuration: Great with anything-completing-read' or perhaps ido-completing-read'. 
* magit.el: Added `magit-completing-read' variable, replaced `completing-read' references.
 2009-10-28 20:19:02 +00:00
Phil Jackson
333e7d0cb7 Squashable, manual merges. 
* magit.el (magit-manual-merge): Given a prefix arg, add --squash and remove --no-ff.
* magit.texi: Docs for the above.
 2009-10-28 20:13:28 +00:00
Phil Jackson
ee01adf1f3 `magit-get-svn-ref' now emulates the git-svn way of remote fetching. 
* magit.el (magit-get-svn-ref): Parse log output for the remote svn url.
 2009-10-28 19:54:11 +00:00
Marius Vollmer
e38987412d Produce cleaner status buffer for unmerged files. 
By ignoring duplicate entries for the unmerged files.
 2009-09-06 20:27:18 +03:00
Marius Vollmer
2a8bb03a6f Towards 0.8. 2009-09-06 18:06:47 +03:00
Marius Vollmer
fb7b135220 Don't use the heavy machinery to run "git update-index". 
And ignore exit code.
 2009-08-18 11:46:38 +03:00
Marius Vollmer
c8c6e01a15 Refresh the index before constructing the status buffer. 
This should get rid of files that are spuriously listed as modified,
while they in fact aren't.
 2009-08-17 20:10:08 +03:00
Marius Vollmer
60ae735a10 Speed up washing of untracked files a bit. 2009-08-17 20:07:09 +03:00
Marius Vollmer
6838ae135c Hide diffs by default again. 
* magit.el (magit-wash-raw-diff): Here.
 2009-07-28 21:58:12 +03:00
Marius Vollmer
843814ac25 Make sure current-prefix-arg is a cons before caring it. 2009-07-28 02:32:19 +03:00
Marius Vollmer
ea6105fbbf Support for magit-repo-dirs and nice completion based on it. 
Thanks to Travis B. Hartwell for the initial implementation!
 2009-07-28 02:25:44 +03:00
Marius Vollmer
31b8be948a Only revert buffers that belong to the current repo. 2009-07-28 00:21:34 +03:00
Marius Vollmer
3731a18b49 Reinitialize modes when reverting file contents. 
* magit.el (magit-revert-buffers): Here, by passing nil for
preserve-modes in the call to revert-buffer.
 2009-07-28 00:05:07 +03:00
Marius Vollmer
9dfd604cd8 Optionally stage also untracked files in magit-stage-all. 2009-07-27 23:47:21 +03:00
Marius Vollmer
aec91c216f Stage all untracked files when on "Untracked files" title. 
* magit.el (magit-stage-item): Here.
 2009-07-27 23:15:56 +03:00
Marius Vollmer
6e33fdf6c7 Use diff-index and diff-files for the status buffer. 
Instead of a --numstat diff.  This gives more information.

* magit.el (magit-insert-diff-title): Factored out of
magit-wash-diff-section.  Don't handle mode changes separately from
content changes.
(magit-wash-raw-diffs, magit-wash-raw-diff): New.
(magit-wash-numstat-diffs, magit-wash-numstat-diff): Removed.
(magit-insert-unstaged-changes): Use git diff-files.
(magit-insert-staged-changes): Use git diff-index.
 2009-07-27 23:02:02 +03:00
Marius Vollmer
3e77accab9 Document why empty diff sections are no problem. 
Remove debug output for numstat diffs.
 2009-07-27 22:03:35 +03:00
Marius Vollmer
d5caf3c15a Do not run Git via the shell, ever. 2009-07-15 02:15:54 +03:00
Marius Vollmer
06675c5b7d Fix "resolge" type in error message. 2009-07-15 00:48:26 +03:00
Marius Vollmer
bd8fca2fb7 Make 'a' and 'v' work with whole diffs. 
* magit.el (magit-apply-diff-item): Actually use *magit-tmp* as input
when running the command, instead of ignoring it.  D'oh.
 2009-07-15 00:42:33 +03:00
Marius Vollmer
ad04fba40a Fix -U for diffs in the status buffer. 2009-06-21 22:13:21 +03:00
Marius Vollmer
aac73da95d Fix display of unmerged paths. 
* magit.el (magit-wash-diff-section): Pick out 'file' from match data.
 2009-06-21 22:09:35 +03:00
Marius Vollmer
46b462bc24 Hide status diffs by default again. 
* magit.el (magit-wash-diff): By binding magit-section-hidden-default
appropriately here...
(magit-wash-numstat-diff): ...and here.
 2009-06-08 21:37:16 +03:00