~mdw / stgit / search
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Fix "stg resolved" to work with new conflict representation
2007-12-19 Karl HasselströmFix "stg resolved" to work with new conflict representation
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-19 Karl HasselströmBetter error message if merge fails
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-19 Karl HasselströmNicer conflict markers
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-19 Karl HasselströmWrite removed fields for backwards compatibility
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-19 Karl HasselströmEmacs mode: show patches' short description
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-19 Karl HasselströmEmacs mode: Bind "G" to "stg goto"
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-19 Karl HasselströmEmacs mode: Let "P" push or pop patch at point
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-19 Karl HasselströmEmacs mode: push/pop next patch, not patch at point
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-19 Karl HasselströmEmacs mode: Makefile for building stgit.el
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-19 Karl HasselströmEmacs mode: Add an explanatory header
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-19 Karl HasselströmEmacs mode: Show keybindings when user presses "h"...
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-13 Karl HasselströmName the exit codes to improve legibility
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-13 Karl HasselströmMake generic --message/--file/--save-template flags
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-13 Karl HasselströmLet parse_patch take a string instead of a file parameter
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-11 Karl HasselströmFix typo: we require Python 2.4, not 2.5
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-08 Karl HasselströmDon't use test_expect_failure for tests that are supposed...
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-08 Karl HasselströmDiscard exitcode of subprocess in a better way
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-08 Karl HasselströmFix bashism
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-11-30 Karl HasselströmMake "stg repair" help text more helpful
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-11-25 Karl HasselströmAdd missing switch to "stg uncommit" usage line
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-11-25 Karl HasselströmPush and pop don't have --to flags anymore
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-11-11 Karl Hasselströmstg repair: Patchify non-patch commits between patches
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-11-11 Karl HasselströmRename "stg assimilate" to "stg repair"
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-11-08 Karl HasselströmLet some commands work with detached HEAD
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-11-08 Karl HasselströmCogito is deprecated, so don't point to it
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-11-08 Karl HasselströmSimple test for "stg clean"
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-09 Karl HasselströmNew test: "stg diff"
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-09 Karl HasselströmFix error message generation
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-08 Karl HasselströmDon't have a global crt_series in stgit.commans.common
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-08 Karl HasselströmRefactor crt_series creation
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-08 Karl HasselströmProperly detect that HEAD is detached
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-08 Karl HasselströmUse our nice message printout wrapping system
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-08 Karl HasselströmAllow caller to customize title of error/warning message
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-07 Karl HasselströmMake "stg refresh" subdirectory safe
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-07 Karl HasselströmNew test: try "stg refresh" in a subdirectory
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-07 Karl HasselströmMake "stg push" subdirectory safe
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-07 Karl HasselströmNew test: Try "stg push" in a subdirectory
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-07 Karl HasselströmInfrastructure for current directory handling
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-07 Karl HasselströmRemove the --force flag to "stg rebase" and "stg pull"
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-07 Karl HasselströmDiscard stderr output from git-rev-parse
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-07 Karl HasselströmSimplify debug level error checking
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-07 Karl HasselströmMake a common superclass for all StGit exceptions
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-07 Karl HasselströmDon't split long and short description in "stg edit"
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-07 Karl HasselströmFix up the help text for "stg edit"
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-07 Karl HasselströmNew test: "stg pop --keep"
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-07 Karl HasselströmAdd --ack/--sign options to "stg new"
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-07 Karl HasselströmLet "stg assimilate" handle missing patches
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-07 Karl HasselströmTest the new powers of "stg assimilate"
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-10-07 Karl HasselströmTeach "stg assimilate" to repair patch reachability
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-09-26 Karl HasselströmMake Run available in stack.py
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-09-23 Karl HasselströmNew policy: Only use test_expect_failure for broken...
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-09-23 Karl HasselströmMake sure that the output of "stg status" is sorted
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-09-23 Karl HasselströmNew test: make sure tha we can run "stg help"
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-09-22 Karl HasselströmAdd simple test for "stg branch --delete"
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-09-22 Karl HasselströmProperly remove all config for a deleted branch
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-09-22 Karl HasselströmDon't try to delete the branch twice
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-09-22 Karl HasselströmDon't special-case the "master" branch during branch...
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-09-15 Karl HasselströmIt doesn't make sense to sink below an unapplied patch
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-09-11 Karl HasselströmInclude summary of added/deleted files in diffstat
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-09-11 Karl HasselströmAdd shortlog of patch series to cover mail
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-09-11 Karl HasselströmAdd diffstat of whole patch series to cover mail
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-09-11 Karl HasselströmAdd --sign and --ack options to "stg import"
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-09-11 Karl HasselströmAdd the any() and all() utility functions from Python 2.5
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-09-11 Karl HasselströmDiscard stderr when determining if a patch is already...
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-09-04 Karl HasselströmUse the builtin set() instead of sets.Set()
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-09-04 Karl HasselströmUse subprocess.Popen to call git executables
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-09-02 Karl HasselströmTest "stg status" more thoroughly
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-09-02 Karl HasselströmAllow "stg add" when we have no stack
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-08-31 Karl HasselströmLet "stg status" ignore empty directories
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-08-31 Karl HasselströmDon't fail just because a subprocess wrote stuff to...
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-08-31 Karl HasselströmWrite warnings and errors to stderr if not on a terminal
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-08-29 Karl HasselströmAdd optional logging of subprocess execution
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-08-26 Karl HasselströmAssert that the argument to Run is a sequence of strings
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-08-26 Karl HasselströmRefactor subprocess creation
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-08-26 Karl HasselströmRefactor output handling to break circular dependency
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-08-26 Karl HasselströmCompile regexp just once
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-08-26 Karl HasselströmReplace "git repo-config" with "git config" in help...
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-08-26 Karl HasselströmDon't write None to the conf file
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-08-26 Karl HasselströmDon't use test_expect_failure when more than one thing...
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-08-23 Karl HasselströmDon't touch ref files manually
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-08-21 Karl HasselströmMake use of the get_patch() utility function
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-08-20 Karl HasselströmNew test: make sure that StGIT can handle packed refs
 commit | commitdiff | tree
2007-08-20 Karl HasselströmRename all config sections of a branch
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-08-20 Karl HasselströmTest that all branch config information is renamed
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-08-20 Karl HasselströmAdd an --smtp-server commandline option to "stg mail"
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-08-20 Karl HasselströmVerify patch status during the test
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-08-20 Karl HasselströmNew test: make sure that popping doesn't change patch...
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-08-20 Karl HasselströmTeach StGIT about core.excludesfile
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-05-21 Karl HasselströmRefactor message printing
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-05-21 Karl HasselströmAdd --binary flag to commands that generate diffs
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-05-21 Karl HasselströmTest the format version upgrade code
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-05-21 Karl HasselströmUpgrade old StGIT branches to new-format metadata
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-05-21 Karl HasselströmHave only a single command in each test_expect_failure
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-05-21 Karl HasselströmFix config caching so that get, set, get works
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-05-15 Karl HasselströmRemove obsolete files when deleting a branch
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-05-15 Karl HasselströmStore branch description in the config file
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-05-15 Karl HasselströmUncommit to a named commit
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-05-15 Karl HasselströmIf any uncommit would fail, don't uncommit anything
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-05-15 Karl HasselströmRemove an unnecessary parameter to make_patch_name
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-05-15 Karl HasselströmGenerate patch names of more uniform length
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
next
GIT patch-maintenance porcelain (local modifications)