summary refs log tree commit diff stats
path: root/ranger
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'vcs'hut2013-02-2416-82/+1648
|\ | | | | | | | | Conflicts: ranger/gui/widgets/__init__.py
| * Merge branch 'master' into vcshut2013-02-2258-96/+120
| |\ | | | | | | | | | | | | Conflicts: ranger/gui/widgets/browsercolumn.py
| * \ Merge branch 'master' into vcshut2013-02-194-5/+31
| |\ \
| * \ \ Merge branch 'master' into vcshut2013-02-186-61/+61
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/ranger.1
| * \ \ \ Merge branch 'master' into vcshut2013-02-165-11/+56
| |\ \ \ \
| * | | | | ext.vcs.vcs: typo s/true/Truehut2013-02-161-1/+1
| | | | | |
| * | | | | config/rc.conf: typo in "set vcs_backend_hg disabled"hut2013-02-161-1/+1
| | | | | |
| * | | | | replace vcs_backends setting by vcs_backend_git, etc.Abdo Roig-Maranges2013-02-163-26/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variables vcs_backend_git, vcs_backend_hg and vcs_backend_bzr have three possible values: disabled, local (only local info) and enabled (local and remote info).
| * | | | | config/rc.conf: Use only "git" vcs_backend by defaulthut2013-02-161-1/+2
| | | | | |
| * | | | | move ranger/vcs/* to ranger/ext/vcs/*hut2013-02-168-6/+6
| | | | | |
| * | | | | Merge branch 'master' into vcshut2013-02-167-19/+106
| |\ \ \ \ \
| * | | | | | Handle VcsError when scanning dir. Don't raiseAbdo Roig-Maranges2013-02-151-3/+8
| | | | | | |
| * | | | | | Added 'unknown' remote vcs statusAbdo Roig-Maranges2013-02-152-2/+4
| | | | | | |
| * | | | | | fix vcs log errors on empty reposAbdo Roig-Maranges2013-02-153-3/+40
| | | | | | |
| * | | | | | vcs.vcs: remove __init__ from VcsError(Exception)hut2013-02-131-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This breaks in python2. Leaving out __init__ in subclasses of Exceptions is usually fine.
| * | | | | | vcs.hg: fix python2 ImportError when importing configparserhut2013-02-131-1/+4
| | | | | | |
| * | | | | | Added version control system related commandsAbdo Roig-Maranges2013-02-121-0/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds commands to stage, unstage changes, and to display diffs and logs using the embedded pager.
| * | | | | | Adds config settings and documentation for the vcs featureAbdo Roig-Maranges2013-02-122-0/+7
| | | | | | |
| * | | | | | Displays version control data on the status barAbdó Roig-Maranges2013-02-121-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Data displayed: branch, repo status and summary of last commit.
| * | | | | | Displays version control data on browser columnAbdo Roig-Maranges2013-02-124-80/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * I have restructured BrowserColumn._draw_directory. Hopefully it is easier mantain now. Simplified horizontal space computations, etc. * Displays two symbols on the right of every entry, showing local status, and status regarding the remote vcs repo. * Added the necessary context to be able to change colors for individual symbols from the colorscheme.
| * | | | | | Support for extracting metadata from version control systemsAbdo Roig-Maranges2013-02-123-1/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Makes fsobject aware of vcs. * Makes directory get vcs status data when loading content. * Adds a config option to enable/disable the vcs info feature.
| * | | | | | Merged code to manipulate version control systemsAbdo Roig-Maranges2013-02-125-0/+1209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Supports git, hg and bzr.
* | | | | | | Change name back to "ranger-master" in --version outputhut2013-02-241-1/+1
| | | | | | |
* | | | | | | Fire in the Hole! v1.6.0hut2013-02-221-2/+2
| | | | | | |
* | | | | | | Fix docstrings to comply with the PEP8hut2013-02-2243-298/+189
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | http://www.python.org/dev/peps/pep-0008/#documentation-strings
* | | | | | ext.rifle: remove -S from shebang line to allow site importshut2013-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this enables rifle to find the default rilfe.conf when installed via a package manager and when the user did not --copy-config=rifle.
* | | | | | use 4-space-indents in files that had 2-space-indentshut2013-02-221-10/+10
| | | | | |
* | | | | | core.main: added RANGER_LOAD_DEFAULT_RC environment variablehut2013-02-222-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this fixes the problem that examples/plugin_skip_default_rc doesn't work, because plugins are loaded after the rc.conf.
* | | | | | ext.rifle: better searching for configuration filehut2013-02-221-0/+15
| | | | | |
* | | | | | updated copyright noticeshut2013-02-2257-57/+57
| | | | | |
* | | | | | update email address (romanz@lavabit.com -> hut@lavabit.com)hut2013-02-2257-58/+58
| | | | | |
* | | | | | core.actions: fix a rare, silent exceptionhut2013-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | There was some code assuming that fm.thisfile is not None.
* | | | | | config/rc.conf: change untag keybinding from "T" to "ut"hut2013-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it more consistent with other key bindings like v/uv, V/uV, dd/ud, yy/uy, q/uq, mX/umX and makes "u" a more universal undo-hotkey
* | | | | | config/commands: fix ":find .."hut2013-02-211-1/+4
| | | | | |
* | | | | | widgets.browserview: fix border drawing in all corner caseshut2013-02-211-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Border drawing depends on many things: - is the preview column collapsed? - is padding_right on? - is preview_files on? - is preview_directories on? - is the pager opened? ("i" key) - does the current file have a preview? This commit should fix border drawing in all of the mentioned cases.
* | | | | | config/rc.conf: update comment of "shorten_title" settinghut2013-02-211-1/+1
| | | | | |
* | | | | | widgets.statusbar: remove superfluous spacehut2013-02-211-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When display_size_in_status_bar is turned off, there was an extra space where the size would usually be.
* | | | | | config/rc.conf: typohut2013-02-211-1/+1
| | | | | |
* | | | | | config/rc.conf: update comment of "colorscheme" settinghut2013-02-211-2/+1
| | | | | |
* | | | | | config/rc.conf: added comment to "preview_images" settinghut2013-02-211-0/+2
| | | | | |
* | | | | | core.shared: silence "missing preview script" message @ starthut2013-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug caused an error message to appear on every start of ranger, if the user has no scope.sh, because "use_preview_script" is set to true but "preview_script" is None. The expected behaviour would be to silently ignore it, to stop annoying people who don't want scope.sh.
* | | | | | widgets/pager: simpler Pager.destroy()hut2013-02-191-2/+1
| | | | | |
* | | | | | widgets.pager: fix crash when not using img_displayhut2013-02-191-1/+1
| |_|_|_|/ |/| | | |
* | | | | gui.ui: clear image when opening taskview/pagerhut2013-02-191-0/+2
| | | | |
* | | | | widgets.browserview: clear image when drawing bookmarks etchut2013-02-191-0/+3
| | | | |
* | | | | widgets.browserview: shorter implementation of f4e5ce0hut2013-02-192-5/+4
| | | | |
* | | | | core.loader: handle race condition when process quits unexpectedlyhut2013-02-191-2/+10
| | | | |
* | | | | widgets.browserview: clear image when (un)collapsing previewhut2013-02-191-0/+5
| | | | |
* | | | | widgets.pager: fix redrawing when scrollinghut2013-02-181-0/+2
| | | | |
* | | | | widgets.pager: clear image on exithut2013-02-181-0/+7
| | | | |