summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Simon Hausmann [Wed, 7 Feb 2007 22:51:51 +0000 (23:51 +0100)]
Fix calculation of the newest imported revision for #head imports.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Simon Hausmann [Wed, 7 Feb 2007 22:37:54 +0000 (23:37 +0100)]
Make specifying the revision ranges more convenient.
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>
Simon Hausmann [Wed, 7 Feb 2007 22:25:56 +0000 (23:25 +0100)]
Make incremental imports easier to use by storing the p4 depot path after an import in .git/config and re-using it when we're invoked again later.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Simon Hausmann [Wed, 7 Feb 2007 22:09:49 +0000 (23:09 +0100)]
Fixed incremental imports by using the correct "from" command instead of "merge" with git fast-import.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Simon Hausmann [Wed, 7 Feb 2007 21:57:01 +0000 (22:57 +0100)]
Minor cleanups and print an error message of git fast-import if it fails.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Simon Hausmann [Thu, 1 Feb 2007 17:19:55 +0000 (18:19 +0100)]
Initial support for importing a directory from Perforce at a specified revision.
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>
Simon Hausmann [Thu, 1 Feb 2007 16:42:23 +0000 (17:42 +0100)]
Code cleanups, move the code to create a commit with fast-import into a separate function out of the main loop.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Simon Hausmann [Thu, 1 Feb 2007 07:23:39 +0000 (08:23 +0100)]
Simplify the incremental import by elimination the need for a temporary 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>
Simon Hausmann [Wed, 31 Jan 2007 23:08:51 +0000 (00:08 +0100)]
Started working on incremental imports from Perforce.
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>
Simon Hausmann [Wed, 31 Jan 2007 22:09:24 +0000 (23:09 +0100)]
Fix file permissions of p4-fast-export.py to be executable.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Simon Hausmann [Wed, 31 Jan 2007 22:03:01 +0000 (23:03 +0100)]
Create a git tag for every changeset imported from perforce.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Simon Hausmann [Wed, 31 Jan 2007 21:47:53 +0000 (22:47 +0100)]
Fixed displaying import progress by calling flush on stdout.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Simon Hausmann [Wed, 31 Jan 2007 21:41:08 +0000 (22:41 +0100)]
Permit calling p4-fast-export with a depot path that has the typical ... wildcard at the end.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Simon Hausmann [Wed, 31 Jan 2007 21:38:07 +0000 (22:38 +0100)]
Avoid calling fstat for every imported file (slow!) and instead read the 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>
Simon Hausmann [Wed, 31 Jan 2007 21:31:28 +0000 (22:31 +0100)]
Ported the remaining functions that parsed p4 shell output over to the p4 python interface.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Simon Hausmann [Wed, 31 Jan 2007 21:19:18 +0000 (22:19 +0100)]
Instead of parsing the output of "p4 users" use the python objects of "p4 -G users".
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Simon Hausmann [Wed, 31 Jan 2007 21:13:17 +0000 (22:13 +0100)]
Minor code cleanups and ported some p4 interfacing code over to the p4 python mode.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Simon Hausmann [Wed, 31 Jan 2007 20:54:56 +0000 (21:54 +0100)]
Changed the import mechanism to write to git fast-import through a pipe 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>
Simon Hausmann [Wed, 31 Jan 2007 19:48:39 +0000 (20:48 +0100)]
Removed unused p4cat function and added helper function for the perforce python interface (p4Cmd).
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Simon Hausmann [Wed, 31 Jan 2007 19:16:26 +0000 (20:16 +0100)]
Speed up the import of individual files from Perforce into git by passing 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>
Simon Hausmann [Wed, 31 Jan 2007 18:43:16 +0000 (19:43 +0100)]
Some fixes to the timezone conversion between the date of a perforce change and the git commit.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Simon Hausmann [Wed, 31 Jan 2007 15:39:46 +0000 (16:39 +0100)]
Implemented basic support for converting the date of the perforce change to the git format. The timezone isn't correctly set up yet though.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
Simon Hausmann [Wed, 31 Jan 2007 08:49:41 +0000 (09:49 +0100)]
Slightly improved help usage output and made specifying the trailing slash for the depot path optional.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
Simon Hausmann [Wed, 31 Jan 2007 08:39:20 +0000 (09:39 +0100)]
Added basic support for specifying the depot path to import from as well as the range of perforce changes.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
Simon Hausmann [Tue, 30 Jan 2007 23:16:59 +0000 (00:16 +0100)]
Initial import of a python script to import changesets from Perforce into git.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
projects / git.git / log