summaryrefslogtreecommitdiff
path: root/contrib/fast-import
AgeCommit message (Collapse)AuthorFilesLines
2007-03-08Changed --known-branches to take a file as argument instead of a comma ↵Libravatar Simon Hausmann1-2/+2
separated list. Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-08Work in progress on detecting branches.Libravatar Simon Hausmann1-57/+103
Added a disk-cache p4 output so debugging imports is faster. Added --known-branches commandline option for pre-defining branches. Various other fixes... Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-07Adjust the output parsing of git name-rev to handle the output of the latest ↵Libravatar Simon Hausmann1-1/+4
git version. Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-02-22Don't print a plain newline at the end of the execution (avoids bogus cron ↵Libravatar Simon Hausmann1-2/+0
error mails). Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-02-22More work in --silent support.Libravatar Simon Hausmann1-1/+2
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-02-22Added support for --silent so that p4-fast-export can be called from cronjobs.Libravatar Simon Hausmann1-7/+15
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-02-21Added p4 delete behavioural emulation as todo item.Libravatar Simon Hausmann1-0/+2
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-02-18Fix single-branch imports by skipping the branch/merge detection correctly.Libravatar Simon Hausmann1-1/+1
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-02-15Use sets.Set() instead of set() to run also with older versions of Python.Libravatar Simon Hausmann1-6/+7
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-02-14Make it possible to specify the p4 changes to import through a text file ↵Libravatar Simon Hausmann1-38/+90
(for debugging) and made various improvements to the branch/merge heuristic detection. Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-02-12When trying to map p4 integrations to git merges just record it as a single ↵Libravatar Simon Hausmann1-7/+23
merge with the newest p4 change as secondary parent. Signed-off-by: Simon Hausmann <simon@lst.de>
2007-02-12Set git fast-import marks for every imported change for future use.Libravatar Simon Hausmann1-0/+1
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-02-12After marking a p4 branch as merged don't ever merge it in git again.Libravatar Simon Hausmann1-1/+4
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-02-12More fixes in heuristic p4 branch detection based on common path components.Libravatar Simon Hausmann1-34/+74
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-02-12Started work on p4 branch detection (experimental!).Libravatar Simon Hausmann1-9/+50
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-02-12Code cleanups.Libravatar Simon Hausmann1-12/+21
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-02-11Cleanups, remove unused variable.Libravatar Simon Hausmann1-3/+0
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-02-11Create lightweight git tags (using the "reset" trick) for the incremental ↵Libravatar Simon Hausmann1-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-10Added a little helper script to remove unused tags from the perforce import.Libravatar Simon Hausmann1-0/+40
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-02-10Changed the default git import branch from "p4" to "master".Libravatar Simon Hausmann1-1/+1
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-02-10Avoid the excessive use of git tags for every perforce change and instead ↵Libravatar Simon Hausmann1-5/+15
just create one git tag for the last imported change. Signed-off-by: Simon Hausmann <simon@lst.de>
2007-02-10Minor code cleanups.Libravatar Simon Hausmann1-10/+6
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-02-08Added a little helper script to debug the output of the p4 python interface.Libravatar Simon Hausmann1-0/+25
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-02-08Made the name of the git branch used for the perforce import configurable ↵Libravatar Simon Hausmann1-6/+16
through a new --branch=<name> commandline option. Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-02-08Catch io exceptions from git fast-import again and print the error message.Libravatar Simon Hausmann1-1/+6
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-02-07Fix calculation of the newest imported revision for #head imports.Libravatar Simon Hausmann1-1/+1
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-02-07Make specifying the revision ranges more convenient.Libravatar Simon Hausmann1-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-07Make incremental imports easier to use by storing the p4 depot path after an ↵Libravatar Simon Hausmann1-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-07Fixed incremental imports by using the correct "from" command instead of ↵Libravatar Simon Hausmann1-1/+1
"merge" with git fast-import. Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-02-07Minor cleanups and print an error message of git fast-import if it fails.Libravatar Simon Hausmann1-5/+12
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-02-01Initial support for importing a directory from Perforce at a specified revision.Libravatar Simon Hausmann1-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-01Code cleanups, move the code to create a commit with fast-import into a ↵Libravatar Simon Hausmann1-59/+67
separate function out of the main loop. Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-02-01Simplify the incremental import by elimination the need for a temporary ↵Libravatar Simon Hausmann1-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-01Started working on incremental imports from Perforce.Libravatar Simon Hausmann1-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-31Fix file permissions of p4-fast-export.py to be executable.Libravatar Simon Hausmann1-0/+0
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-01-31Create a git tag for every changeset imported from perforce.Libravatar Simon Hausmann1-2/+13
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-01-31Fixed displaying import progress by calling flush on stdout.Libravatar Simon Hausmann1-0/+1
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-01-31Permit calling p4-fast-export with a depot path that has the typical ... ↵Libravatar Simon Hausmann1-0/+3
wildcard at the end. Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-01-31Avoid calling fstat for every imported file (slow!) and instead read the ↵Libravatar Simon Hausmann1-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-31Ported the remaining functions that parsed p4 shell output over to the p4 ↵Libravatar Simon Hausmann1-58/+31
python interface. Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-01-31Instead of parsing the output of "p4 users" use the python objects of "p4 -G ↵Libravatar Simon Hausmann1-14/+14
users". Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-01-31Minor code cleanups and ported some p4 interfacing code over to the p4 ↵Libravatar Simon Hausmann1-39/+14
python mode. Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-01-31Changed the import mechanism to write to git fast-import through a pipe ↵Libravatar Simon Hausmann1-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-31Removed unused p4cat function and added helper function for the perforce ↵Libravatar Simon Hausmann1-3/+13
python interface (p4Cmd). Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-01-31Speed up the import of individual files from Perforce into git by passing ↵Libravatar Simon Hausmann1-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-31Some fixes to the timezone conversion between the date of a perforce change ↵Libravatar Simon Hausmann1-3/+5
and the git commit. Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-01-31Implemented basic support for converting the date of the perforce change to ↵Libravatar Simon Hausmann1-11/+15
the git format. The timezone isn't correctly set up yet though. Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-01-31Slightly improved help usage output and made specifying the trailing slash ↵Libravatar Simon Hausmann1-2/+7
for the depot path optional. Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-01-31Added basic support for specifying the depot path to import from as well as ↵Libravatar Simon Hausmann1-3/+15
the range of perforce changes. Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-01-31Initial import of a python script to import changesets from Perforce into git.Libravatar Simon Hausmann1-0/+150
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 12:52:07 +0000