Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2007-02-12 | After marking a p4 branch as merged don't ever merge it in git again. | Simon Hausmann | 1 | -1/+4 | |
Signed-off-by: Simon Hausmann <simon@lst.de> | |||||
2007-02-12 | More fixes in heuristic p4 branch detection based on common path components. | Simon Hausmann | 1 | -34/+74 | |
Signed-off-by: Simon Hausmann <simon@lst.de> | |||||
2007-02-12 | Started work on p4 branch detection (experimental!). | Simon Hausmann | 1 | -9/+50 | |
Signed-off-by: Simon Hausmann <simon@lst.de> | |||||
2007-02-12 | Code cleanups. | Simon Hausmann | 1 | -12/+21 | |
Signed-off-by: Simon Hausmann <simon@lst.de> | |||||
2007-02-11 | Cleanups, remove unused variable. | Simon Hausmann | 1 | -3/+0 | |
Signed-off-by: Simon Hausmann <simon@lst.de> | |||||
2007-02-11 | Create lightweight git tags (using the "reset" trick) for the incremental ↵ | Simon Hausmann | 1 | -6/+10 | |
import instead of full-blown ones. Also fix parsing the output of git name-rev for figuring out the last imported p4 change number. Signed-off-by: Simon Hausmann <simon@lst.de> | |||||
2007-02-10 | Changed the default git import branch from "p4" to "master". | Simon Hausmann | 1 | -1/+1 | |
Signed-off-by: Simon Hausmann <simon@lst.de> | |||||
2007-02-10 | Avoid the excessive use of git tags for every perforce change and instead ↵ | Simon Hausmann | 1 | -5/+15 | |
just create one git tag for the last imported change. Signed-off-by: Simon Hausmann <simon@lst.de> | |||||
2007-02-10 | Minor code cleanups. | Simon Hausmann | 1 | -10/+6 | |
Signed-off-by: Simon Hausmann <simon@lst.de> | |||||
2007-02-08 | Made the name of the git branch used for the perforce import configurable ↵ | Simon Hausmann | 1 | -6/+16 | |
through a new --branch=<name> commandline option. Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-02-08 | Catch io exceptions from git fast-import again and print the error message. | Simon Hausmann | 1 | -1/+6 | |
Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-02-07 | Fix calculation of the newest imported revision for #head imports. | Simon Hausmann | 1 | -1/+1 | |
Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-02-07 | Make specifying the revision ranges more convenient. | Simon Hausmann | 1 | -3/+8 | |
Added support for @all as revision range specifier to import all changes to a given depot path. Also default to an import of #head if no revrange is specified. Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-02-07 | Make incremental imports easier to use by storing the p4 depot path after an ↵ | Simon Hausmann | 1 | -3/+16 | |
import in .git/config and re-using it when we're invoked again later. Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-02-07 | Fixed incremental imports by using the correct "from" command instead of ↵ | Simon Hausmann | 1 | -1/+1 | |
"merge" with git fast-import. Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-02-07 | Minor cleanups and print an error message of git fast-import if it fails. | Simon Hausmann | 1 | -5/+12 | |
Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-02-01 | Initial support for importing a directory from Perforce at a specified revision. | Simon Hausmann | 1 | -29/+65 | |
Use p4 files //depot/path/...@revision to determine the state of the project and create a "fake" git commit from it. Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-02-01 | Code cleanups, move the code to create a commit with fast-import into a ↵ | Simon Hausmann | 1 | -59/+67 | |
separate function out of the main loop. Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-02-01 | Simplify the incremental import by elimination the need for a temporary ↵ | Simon Hausmann | 1 | -18/+3 | |
import branch. It turns out that git fast-import can "resume" from an existing branch just fine. Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-02-01 | Started working on incremental imports from Perforce. | Simon Hausmann | 1 | -2/+35 | |
Try to find the last imported p4 change number from the git tags and try to pass the right parent for commits to git fast-import. Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-01-31 | Fix file permissions of p4-fast-export.py to be executable. | Simon Hausmann | 1 | -0/+0 | |
Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-01-31 | Create a git tag for every changeset imported from perforce. | Simon Hausmann | 1 | -2/+13 | |
Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-01-31 | Fixed displaying import progress by calling flush on stdout. | Simon Hausmann | 1 | -0/+1 | |
Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-01-31 | Permit calling p4-fast-export with a depot path that has the typical ... ↵ | Simon Hausmann | 1 | -0/+3 | |
wildcard at the end. Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-01-31 | Avoid calling fstat for every imported file (slow!) and instead read the ↵ | Simon Hausmann | 1 | -6/+4 | |
file data first into the python process and use the length of the bytes read for the size field of git fast-import. Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-01-31 | Ported the remaining functions that parsed p4 shell output over to the p4 ↵ | Simon Hausmann | 1 | -58/+31 | |
python interface. Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-01-31 | Instead of parsing the output of "p4 users" use the python objects of "p4 -G ↵ | Simon Hausmann | 1 | -14/+14 | |
users". Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-01-31 | Minor code cleanups and ported some p4 interfacing code over to the p4 ↵ | Simon Hausmann | 1 | -39/+14 | |
python mode. Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-01-31 | Changed the import mechanism to write to git fast-import through a pipe ↵ | Simon Hausmann | 1 | -25/+27 | |
instead of having p4-fast-export write to stdout and let the caller connect it to git fast-import. Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-01-31 | Removed unused p4cat function and added helper function for the perforce ↵ | Simon Hausmann | 1 | -3/+13 | |
python interface (p4Cmd). Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-01-31 | Speed up the import of individual files from Perforce into git by passing ↵ | Simon Hausmann | 1 | -11/+20 | |
the output of "p4 print" directly to git fast-import. Also try to set the mode of the file in git correctly based on file type heuristics. Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-01-31 | Some fixes to the timezone conversion between the date of a perforce change ↵ | Simon Hausmann | 1 | -3/+5 | |
and the git commit. Signed-off-by: Simon Hausmann <hausmann@kde.org> | |||||
2007-01-31 | Implemented basic support for converting the date of the perforce change to ↵ | Simon Hausmann | 1 | -11/+15 | |
the git format. The timezone isn't correctly set up yet though. Signed-off-by: Simon Hausmann <shausman@trolltech.com> | |||||
2007-01-31 | Slightly improved help usage output and made specifying the trailing slash ↵ | Simon Hausmann | 1 | -2/+7 | |
for the depot path optional. Signed-off-by: Simon Hausmann <shausman@trolltech.com> | |||||
2007-01-31 | Added basic support for specifying the depot path to import from as well as ↵ | Simon Hausmann | 1 | -3/+15 | |
the range of perforce changes. Signed-off-by: Simon Hausmann <shausman@trolltech.com> | |||||
2007-01-31 | Initial import of a python script to import changesets from Perforce into git. | Simon Hausmann | 1 | -0/+150 | |
Signed-off-by: Simon Hausmann <shausman@trolltech.com> |