mirrors/jgit - jgit - source @ dussan.org

Tree: 6bca46e168

Author	SHA1	Message	Date
Mathias Kinzler	6bca46e168	Implement rebase --continue and --skip For --continue, the Rebase command asserts that there are no unmerged paths in the current repository. Then it checks if a commit is needed. If yes, the commit message and author are taken from the author_script and message files, respectively, and a commit is performed before the next step is applied. For --skip, the workspace is reset to the current HEAD before applying the next step. Includes some tests and a refactoring that extracts Strings in the code into constants. Change-Id: I72d9968535727046e737ec20e23239fe79976179 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>	13 years ago
Mathias Kinzler	59e62ba7e1	Rebase Interoperability second part: fix "pop steps" If the CLI stops a rebase upon conflict, the current step is already popped from the git-rebase-todo and appended to the "done" file. The current implementation wrongly pops the step only after successful cherry-pick. Change-Id: I8640dda0cbb2a5271ecf75fcbad69410122eeab6 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>	13 years ago
Mathias Kinzler	7aa1b85821	Rebase Interoperability first part: write "interactive" file The Repository is then in state "Rebase interactive". Change-Id: I5d2de57f8670e1d4c71ed22509ab17f04e2561b5 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>	13 years ago
Stefan Lay	91958b7045	Do some more tests for rebase --abort Check for deletion of temporary files in .git folder. Check for deletion and creation of files. Change-Id: I60b0b2975724f2e3582e8674d9f876dcbf62b350 Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>	13 years ago
Christian Halstrick	7e298c9ed5	Add more tests for rebase and externalized missing Strings Coverage tests showed that we are missing to test certain areas in the rebase command. Add the missing tests. Change-Id: Ia4a272d26cde7e1861dac30496e4b6799fc8187a Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>	13 years ago
Mathias Kinzler	e5b96a7848	Initial implementation of a Rebase command This is a first iteration to implement Rebase. At the moment, this does not implement --continue and --skip, so if the first conflict is found, the only option is to --abort the command. Bug: 328217 Change-Id: I24d60c0214e71e5572955f8261e10a42e9e95298 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>	13 years ago

6 Commits (6bca46e1683a07f18f00f6ad552eab79ab50bb88)