yap.git
15 years agoremove_new_file: don't assume "new-files" exists
Steven Walter [Tue, 22 Jul 2008 16:59:36 +0000 (22 12:59 -0400)]
remove_new_file: don't assume "new-files" exists

15 years agotcommit: don't die if yap's data directory already exists
Steven Walter [Tue, 22 Jul 2008 13:24:17 +0000 (22 09:24 -0400)]
tcommit: don't die if yap's data directory already exists

15 years agocmd_history: use check_commit to prepare the index
Steven Walter [Tue, 22 Jul 2008 12:27:22 +0000 (22 08:27 -0400)]
cmd_history: use check_commit to prepare the index

15 years agounstage_one: fail more logically when there are no staged changes
Steven Walter [Tue, 22 Jul 2008 00:25:48 +0000 (21 20:25 -0400)]
unstage_one: fail more logically when there are no staged changes

15 years agoUpdate README
Steven Walter [Sun, 27 Jul 2008 03:37:55 +0000 (26 23:37 -0400)]
Update README

15 years agocmd_help: fallback to the base method if the plugin provides no help
Steven Walter [Tue, 22 Jul 2008 00:18:12 +0000 (21 20:18 -0400)]
cmd_help: fallback to the base method if the plugin provides no help

15 years agosvn: do not use metadata
Steven Walter [Tue, 22 Jul 2008 00:16:02 +0000 (21 20:16 -0400)]
svn: do not use metadata

15 years agosvn: support creating svn branches
Steven Walter [Tue, 22 Jul 2008 00:13:15 +0000 (21 20:13 -0400)]
svn: support creating svn branches

15 years agoPlugins can only add to flags, not reduce them
Steven Walter [Tue, 22 Jul 2008 00:12:13 +0000 (21 20:12 -0400)]
Plugins can only add to flags, not reduce them

Previously the logic would only look at default_meth.options if
meth.options existed.  In general plugins won't provide flags of their
own, but we still want to pass through options to the base command.

15 years agoget_tracking: clean-up API
Steven Walter [Mon, 21 Jul 2008 22:43:17 +0000 (21 18:43 -0400)]
get_tracking: clean-up API

15 years agocmd_track: fix wording in error message
Steven Walter [Mon, 21 Jul 2008 22:43:03 +0000 (21 18:43 -0400)]
cmd_track: fix wording in error message

15 years agosvn: enforce a slightly non-standard git-svn layout
Steven Walter [Mon, 21 Jul 2008 17:03:14 +0000 (21 13:03 -0400)]
svn: enforce a slightly non-standard git-svn layout

15 years agocmd_fetch: fix the no-arguments usage
Steven Walter [Mon, 21 Jul 2008 16:30:08 +0000 (21 12:30 -0400)]
cmd_fetch: fix the no-arguments usage

15 years agocmd_commit: fix initial commit
Steven Walter [Mon, 21 Jul 2008 14:16:11 +0000 (21 10:16 -0400)]
cmd_commit: fix initial commit

15 years agoUpdate README
Steven Walter [Sun, 20 Jul 2008 15:08:40 +0000 (20 11:08 -0400)]
Update README

15 years agocmd_point: unwind tags more cleanly
Steven Walter [Tue, 15 Jul 2008 13:33:15 +0000 (15 09:33 -0400)]
cmd_point: unwind tags more cleanly

15 years agosvn: account for side-effects of git-svn dcommit
Steven Walter [Thu, 17 Jul 2008 14:27:51 +0000 (17 10:27 -0400)]
svn: account for side-effects of git-svn dcommit

dcommit likes to create refs/heads/master if it doesn't already exist.
creating a new branch as a side-effect of pushing in counter-intuitive,
so hide that behavior.

15 years agosvn: refactor push_svn
Steven Walter [Thu, 17 Jul 2008 14:24:45 +0000 (17 10:24 -0400)]
svn: refactor push_svn

15 years agosvn: rebase after push
Steven Walter [Thu, 17 Jul 2008 14:19:06 +0000 (17 10:19 -0400)]
svn: rebase after push

15 years agoExtend DEBUG mode to YapError exceptions
Steven Walter [Thu, 17 Jul 2008 14:18:56 +0000 (17 10:18 -0400)]
Extend DEBUG mode to YapError exceptions

15 years agocmd_switch: don't let stat differences prevent a switch
Steven Walter [Wed, 16 Jul 2008 13:22:01 +0000 (16 09:22 -0400)]
cmd_switch: don't let stat differences prevent a switch

Before bailing out, run update-index --refresh.  This command will exit
with a non-zero exit code if it finds any content changes.

15 years agosvn: list_remotes belongs to Yap, not SvnPlugin
Steven Walter [Tue, 15 Jul 2008 21:38:59 +0000 (15 17:38 -0400)]
svn: list_remotes belongs to Yap, not SvnPlugin

15 years agocmd_push: fix obvious typo
Steven Walter [Mon, 14 Jul 2008 20:41:01 +0000 (14 16:41 -0400)]
cmd_push: fix obvious typo

15 years agosvn: check for uncommitted changes before pushing
Steven Walter [Mon, 14 Jul 2008 20:40:22 +0000 (14 16:40 -0400)]
svn: check for uncommitted changes before pushing

15 years agocmd_help: fall back to base help if the plugin doesn't provide any
Steven Walter [Mon, 14 Jul 2008 20:37:09 +0000 (14 16:37 -0400)]
cmd_help: fall back to base help if the plugin doesn't provide any

15 years agocmd_push is not easily undone
Steven Walter [Mon, 14 Jul 2008 20:33:33 +0000 (14 16:33 -0400)]
cmd_push is not easily undone

15 years agosvn: show current branch during push
Steven Walter [Mon, 14 Jul 2008 20:32:54 +0000 (14 16:32 -0400)]
svn: show current branch during push

15 years agosvn: fetch from r1 by default
Steven Walter [Mon, 14 Jul 2008 20:32:38 +0000 (14 16:32 -0400)]
svn: fetch from r1 by default

15 years agoMerge branch 'svn'
Steven Walter [Mon, 14 Jul 2008 19:42:36 +0000 (14 15:42 -0400)]
Merge branch 'svn'

Conflicts:

yap/yap.py

15 years agofirst pass for svn plugin
Steven Walter [Mon, 14 Jul 2008 19:40:16 +0000 (14 15:40 -0400)]
first pass for svn plugin

15 years agotcommit: use the new _call_base method to avoid recursion
Steven Walter [Mon, 14 Jul 2008 19:15:10 +0000 (14 15:15 -0400)]
tcommit: use the new _call_base method to avoid recursion

15 years agoCalls to cmd_* should go through plugins
Steven Walter [Mon, 14 Jul 2008 18:55:55 +0000 (14 14:55 -0400)]
Calls to cmd_* should go through plugins

We want to use a plugin's override from any call, not just the main
entry point.

15 years agoFactor out confirm_push
Steven Walter [Mon, 14 Jul 2008 18:06:03 +0000 (14 14:06 -0400)]
Factor out confirm_push

15 years agoDon't let pre-hooks prevent the main command from running
Steven Walter [Mon, 14 Jul 2008 17:46:25 +0000 (14 13:46 -0400)]
Don't let pre-hooks prevent the main command from running

By using the same local variable name in both places, meth was getting
clobbered by the pre-hook.

15 years agocmd_switch: don't fail if the index differs only by timestamp
Steven Walter [Mon, 14 Jul 2008 17:41:01 +0000 (14 13:41 -0400)]
cmd_switch: don't fail if the index differs only by timestamp

15 years agowip
Steven Walter [Mon, 14 Jul 2008 17:29:16 +0000 (14 13:29 -0400)]
wip

15 years agoImplement cmd_plugins
Steven Walter [Mon, 14 Jul 2008 17:36:03 +0000 (14 13:36 -0400)]
Implement cmd_plugins

15 years agoyap.zsh: add some additional commands
Steven Walter [Mon, 14 Jul 2008 15:17:13 +0000 (14 11:17 -0400)]
yap.zsh: add some additional commands

15 years agoDon't let plugins needlessly override usage strings
Steven Walter [Mon, 14 Jul 2008 15:16:55 +0000 (14 11:16 -0400)]
Don't let plugins needlessly override usage strings

15 years agocmd_log: use --follow by default
Steven Walter [Mon, 14 Jul 2008 14:43:52 +0000 (14 10:43 -0400)]
cmd_log: use --follow by default

15 years agoEnsure that there is a runnable copy of git in $PATH
Steven Walter [Fri, 11 Jul 2008 19:49:41 +0000 (11 15:49 -0400)]
Ensure that there is a runnable copy of git in $PATH

15 years agoDon't crash when run from outside a git repository
Steven Walter [Fri, 11 Jul 2008 19:47:30 +0000 (11 15:47 -0400)]
Don't crash when run from outside a git repository

15 years agoMake sure we don't allow commands that don't make sense during rebase
Steven Walter [Fri, 11 Jul 2008 19:43:51 +0000 (11 15:43 -0400)]
Make sure we don't allow commands that don't make sense during rebase

15 years agoWrite long_help for the new commands
Steven Walter [Fri, 11 Jul 2008 19:39:37 +0000 (11 15:39 -0400)]
Write long_help for the new commands

15 years agocmd_switch: show failure message from read-tree
Steven Walter [Fri, 11 Jul 2008 18:03:05 +0000 (11 14:03 -0400)]
cmd_switch: show failure message from read-tree

If read-tree fails the user will need to see the failure message in
order to take corrective action.

15 years agoHandle being on a detached HEAD better
Steven Walter [Fri, 11 Jul 2008 15:35:38 +0000 (11 11:35 -0400)]
Handle being on a detached HEAD better

15 years agocmd_log: accept -p to show patches
Steven Walter [Fri, 11 Jul 2008 18:31:10 +0000 (11 14:31 -0400)]
cmd_log: accept -p to show patches

15 years agoFix "usage" error message
Steven Walter [Fri, 11 Jul 2008 15:29:37 +0000 (11 11:29 -0400)]
Fix "usage" error message

15 years agoUpdate README
Steven Walter [Fri, 11 Jul 2008 13:26:37 +0000 (11 09:26 -0400)]
Update README

15 years agocmd_point: fallback to non-merging read-tree
Steven Walter [Fri, 11 Jul 2008 13:18:32 +0000 (11 09:18 -0400)]
cmd_point: fallback to non-merging read-tree

15 years agocmd_history: don't lose changes if the stash fails
Steven Walter [Fri, 11 Jul 2008 13:30:49 +0000 (11 09:30 -0400)]
cmd_history: don't lose changes if the stash fails

15 years agocmd_push: be interactive
Steven Walter [Fri, 11 Jul 2008 02:10:10 +0000 (10 22:10 -0400)]
cmd_push: be interactive

15 years agocmd_fetch: allow default for repository
Steven Walter [Fri, 11 Jul 2008 02:07:02 +0000 (10 22:07 -0400)]
cmd_fetch: allow default for repository

15 years agocmd_push: ensure push is a fast-forward merge
Steven Walter [Fri, 11 Jul 2008 03:53:41 +0000 (10 23:53 -0400)]
cmd_push: ensure push is a fast-forward merge

15 years agocmd_push: allow default for destination repo
Steven Walter [Fri, 11 Jul 2008 01:59:27 +0000 (10 21:59 -0400)]
cmd_push: allow default for destination repo

15 years agocmd_push: allow to specify remote branch
Steven Walter [Fri, 11 Jul 2008 01:55:06 +0000 (10 21:55 -0400)]
cmd_push: allow to specify remote branch

15 years agocmd_update: fix resolvemsg
Steven Walter [Thu, 10 Jul 2008 21:21:28 +0000 (10 17:21 -0400)]
cmd_update: fix resolvemsg

15 years agostage_one: refuse to stage an unmerged file
Steven Walter [Fri, 11 Jul 2008 03:51:49 +0000 (10 23:51 -0400)]
stage_one: refuse to stage an unmerged file

15 years agoImplement cmd_resolved
Steven Walter [Fri, 11 Jul 2008 03:48:33 +0000 (10 23:48 -0400)]
Implement cmd_resolved

15 years agocmd_status: show unstaged files, if any
Steven Walter [Thu, 10 Jul 2008 19:31:52 +0000 (10 15:31 -0400)]
cmd_status: show unstaged files, if any

15 years agoget_unstaged_files: start handling this special case
Steven Walter [Thu, 10 Jul 2008 19:31:39 +0000 (10 15:31 -0400)]
get_unstaged_files: start handling this special case

15 years agoAdd short_help to new commands
Steven Walter [Thu, 10 Jul 2008 18:19:32 +0000 (10 14:19 -0400)]
Add short_help to new commands

15 years agocmd_switch: require confirmation before switching with changes
Steven Walter [Thu, 10 Jul 2008 18:21:32 +0000 (10 14:21 -0400)]
cmd_switch: require confirmation before switching with changes

15 years agocmd_switch: support merging uncommitted changes
Steven Walter [Thu, 10 Jul 2008 17:16:56 +0000 (10 13:16 -0400)]
cmd_switch: support merging uncommitted changes

15 years agoUpdate usage
Steven Walter [Thu, 10 Jul 2008 13:39:49 +0000 (10 09:39 -0400)]
Update usage

15 years agocmd_history: more fixes
Steven Walter [Thu, 10 Jul 2008 13:09:33 +0000 (10 09:09 -0400)]
cmd_history: more fixes

15 years agocmd_clone: fix corner cases
Steven Walter [Thu, 10 Jul 2008 03:28:34 +0000 (9 23:28 -0400)]
cmd_clone: fix corner cases

15 years agoUpdate README
Steven Walter [Thu, 10 Jul 2008 03:30:50 +0000 (9 23:30 -0400)]
Update README

15 years agoImplement cmd_track
Steven Walter [Thu, 10 Jul 2008 02:10:51 +0000 (9 22:10 -0400)]
Implement cmd_track

15 years agoFactor out get_tracking()
Steven Walter [Thu, 10 Jul 2008 02:10:12 +0000 (9 22:10 -0400)]
Factor out get_tracking()

15 years agoImplement cmd_update
Steven Walter [Thu, 10 Jul 2008 13:09:57 +0000 (10 09:09 -0400)]
Implement cmd_update

15 years agotcommit: create the yap data dir if it doesn't exist already
Steven Walter [Wed, 9 Jul 2008 20:54:22 +0000 (9 16:54 -0400)]
tcommit: create the yap data dir if it doesn't exist already

15 years agoUpdate README
Steven Walter [Wed, 9 Jul 2008 20:21:19 +0000 (9 16:21 -0400)]
Update README

15 years agocmd_revert: use unstage_all to fix the index for us
Steven Walter [Wed, 9 Jul 2008 18:01:32 +0000 (9 14:01 -0400)]
cmd_revert: use unstage_all to fix the index for us

15 years agoFactor unstage_all into a seperate function
Steven Walter [Wed, 9 Jul 2008 18:01:11 +0000 (9 14:01 -0400)]
Factor unstage_all into a seperate function

15 years agocmd_commit: forbid empty commit messages
Steven Walter [Wed, 9 Jul 2008 18:10:22 +0000 (9 14:10 -0400)]
cmd_commit: forbid empty commit messages

15 years agoOnly allow one plugin to override a given command
Steven Walter [Wed, 9 Jul 2008 01:21:15 +0000 (8 21:21 -0400)]
Only allow one plugin to override a given command

15 years agoRe-implement clone in terms of native yap commands
Steven Walter [Tue, 8 Jul 2008 23:37:01 +0000 (8 19:37 -0400)]
Re-implement clone in terms of native yap commands

15 years agoFixes for cmd_push
Steven Walter [Tue, 8 Jul 2008 23:18:24 +0000 (8 19:18 -0400)]
Fixes for cmd_push

15 years agoFix broken users of list_remotes
Steven Walter [Tue, 8 Jul 2008 19:46:28 +0000 (8 15:46 -0400)]
Fix broken users of list_remotes

15 years agoImplement cmd_fetch
Steven Walter [Tue, 8 Jul 2008 19:35:57 +0000 (8 15:35 -0400)]
Implement cmd_fetch

15 years agocmd_unstage: work even when there are unstaged changes
Steven Walter [Tue, 8 Jul 2008 19:42:01 +0000 (8 15:42 -0400)]
cmd_unstage: work even when there are unstaged changes

15 years agoImplement push
Steven Walter [Tue, 8 Jul 2008 19:36:45 +0000 (8 15:36 -0400)]
Implement push

15 years agoBe stricter in globbing remote repositories
Steven Walter [Tue, 8 Jul 2008 19:25:24 +0000 (8 15:25 -0400)]
Be stricter in globbing remote repositories

15 years agoFix broken merge of cmd_history
Steven Walter [Tue, 8 Jul 2008 18:52:20 +0000 (8 14:52 -0400)]
Fix broken merge of cmd_history

15 years agoInitial pass at ZSH completions
Steven Walter [Tue, 8 Jul 2008 18:42:46 +0000 (8 14:42 -0400)]
Initial pass at ZSH completions

15 years agoDon't fail if there are no unstaged changes to stage
Steven Walter [Tue, 8 Jul 2008 18:37:40 +0000 (8 14:37 -0400)]
Don't fail if there are no unstaged changes to stage

15 years agoUse read-tree -u when appropriate
Steven Walter [Tue, 8 Jul 2008 17:00:53 +0000 (8 13:00 -0400)]
Use read-tree -u when appropriate

The -u flag ensures that files that used to exist but no longer do get
removed from the working tree.

15 years agoFix ShellError
Steven Walter [Tue, 8 Jul 2008 16:50:53 +0000 (8 12:50 -0400)]
Fix ShellError

15 years agoMiscellaneous doc fixups
Steven Walter [Tue, 8 Jul 2008 16:43:08 +0000 (8 12:43 -0400)]
Miscellaneous doc fixups

15 years agorun_safely: relocate to util
Steven Walter [Tue, 8 Jul 2008 16:41:44 +0000 (8 12:41 -0400)]
run_safely: relocate to util

15 years agoMerge branch 'plugins'
Steven Walter [Tue, 8 Jul 2008 16:40:36 +0000 (8 12:40 -0400)]
Merge branch 'plugins'

Conflicts:

README
yap/yap.py

15 years agoThe "temp commit" plugin
Steven Walter [Tue, 8 Jul 2008 02:04:31 +0000 (7 22:04 -0400)]
The "temp commit" plugin

This plugin gives commit the "-t" flag, which means to create a
temporary commit.  When the user switches back to the current branch,
the temporary commit will be automatically uncommitted.

15 years agoFactor utility functions into a seperate module
Steven Walter [Tue, 8 Jul 2008 01:59:44 +0000 (7 21:59 -0400)]
Factor utility functions into a seperate module

15 years agoAdd copyright information
Steven Walter [Tue, 8 Jul 2008 01:55:49 +0000 (7 21:55 -0400)]
Add copyright information

15 years agocmd_commit: accept a commit message with the -m flag
Steven Walter [Tue, 8 Jul 2008 01:40:09 +0000 (7 21:40 -0400)]
cmd_commit: accept a commit message with the -m flag

15 years agocmd_history: don't trash uncommitted changes
Steven Walter [Tue, 8 Jul 2008 01:49:09 +0000 (7 21:49 -0400)]
cmd_history: don't trash uncommitted changes

In cases where we bail out due to an error, be sure to re-apply the
stashed changes.

15 years agoA simple backup plugin
Steven Walter [Tue, 8 Jul 2008 01:40:51 +0000 (7 21:40 -0400)]
A simple backup plugin

This plugin registers a pre-hook on revert and creates backup files for
files that have uncommitted changes in them.

15 years agoImplement plugin pre/post-hooks
Steven Walter [Tue, 8 Jul 2008 01:03:49 +0000 (7 21:03 -0400)]
Implement plugin pre/post-hooks

15 years agoImplement plugin command override
Steven Walter [Tue, 8 Jul 2008 01:35:07 +0000 (7 21:35 -0400)]
Implement plugin command override