summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2007-03-22Added some helper function(s) to parse the depot path and change number from ↵Libravatar Simon Hausmann1-12/+36
the log message Signed-off-by: Simon Hausmann <simon@lst.de>
2007-03-22Changed the default branch for imports from "master" to "p4"Libravatar Simon Hausmann2-4/+4
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-03-22Changed the format of the imported log message slightly, so that it's easier ↵Libravatar Simon Hausmann1-1/+1
to parse again. Signed-off-by: Simon Hausmann <simon@lst.de>
2007-03-22Removed the .py extension from git-p4 as it's annoying to type every time.Libravatar Simon Hausmann2-7/+7
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-21Don't show the submit template and the diff first in less but show it in ↵Libravatar Simon Hausmann1-6/+8
$editor right away Signed-off-by: Simon Hausmann <simon@lst.de>
2007-03-21Make it possible to invoke git-p4 from within subdirectories of a git ↵Libravatar Simon Hausmann1-0/+4
working tree. Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-21Made --apply-as-patch the default for git-p4 submit as it's significantly ↵Libravatar Simon Hausmann1-1/+1
faster. Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-21Fix support for deletions in git-p4 submit when using --apply-as-patch by ↵Libravatar Simon Hausmann1-1/+1
filtering out deletions in the diff-tree output. Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-21Added experimental but super-fast --apply-as-patch option to git-p4 submitLibravatar Simon Hausmann1-11/+18
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-21Documentation enhancements.Libravatar Simon Hausmann1-0/+6
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-03-20Start of the git-p4 documentation.Libravatar Simon Hausmann1-0/+74
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-20Removed p4-fast-export and p4-git-sync as they've been integrated into ↵Libravatar Simon Hausmann2-928/+0
git-p4 now. Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-20Fixed the initial version import by getting the file index correct by ↵Libravatar Simon Hausmann1-2/+3
correctly skipping deleted files. Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-20Added missing "self"s to make the script evaluate correctly.Libravatar Simon Hausmann1-9/+9
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-20Completely untested "merge" of p4-fast-export.py into git-p4.pyLibravatar Simon Hausmann1-8/+582
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-20sync-to-perforce is now called submit and fixed the gitdir check a little bitLibravatar Simon Hausmann1-2/+2
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-19Part of the code is copyright by Trolltech ASA.Libravatar Simon Hausmann1-0/+2
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-19First (untested) attempt at migrating p4-git-sync into the final git-p4 scriptLibravatar Simon Hausmann1-3/+240
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-19Provide a little bit of help description for the git-p4 "tools".Libravatar Simon Hausmann1-1/+4
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-19Start moving the git-p4 tools into one single script.Libravatar Simon Hausmann3-68/+115
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-19Pass the right number of arguments to commit, fixes single-branch imports.Libravatar Simon Hausmann1-2/+2
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-19Improved the git dir detection.Libravatar Simon Hausmann1-0/+13
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-16Default to interactive syncingLibravatar Simon Hausmann1-4/+4
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-15Use p4 revert ... instead of revert -a ... after submitting, to make sure ↵Libravatar Simon Hausmann1-3/+3
the p4 checkout is clean. Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-14Auto-detect the current git branch before submitting back to perforce.Libravatar Simon Hausmann1-4/+11
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-03-14Ignore Apple resource files when importing from perforce to git.Libravatar Simon Hausmann1-0/+4
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-03-14Be nice and use /usr/bin/env python for the git-p4 scriptsLibravatar Simon Hausmann2-2/+2
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-14Automatically operate on a temporary branch, needed for cherry-pick to work ↵Libravatar Simon Hausmann1-1/+9
when applying changes to files that are deleted in the future. Also do some Perforce cleaning Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-13Lots of bugfixes to p4-git-sync.Libravatar Simon Hausmann1-17/+73
Added interactive and dry-run mode. Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-13Fix git-dir option and allow reading log substitutions from a fileLibravatar Simon Hausmann1-2/+6
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-12First version of a new script to submit changes back to perforce from git ↵Libravatar Simon Hausmann1-0/+208
repositories. Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-10Split up the cache commandline options into (command) cache and data cache.Libravatar Simon Hausmann1-8/+12
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-10Reduce the number of false "merges" by skipping "branch from" entries in the ↵Libravatar Simon Hausmann1-1/+7
integrated output as well as by ignoring integrations of future (newer) changes. Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-10More work on branch detection by implementing changeIsBranchMerge().Libravatar Simon Hausmann1-37/+98
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-10More code cleanups and preparations for more branch detection heuristics.Libravatar Simon Hausmann1-1/+60
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-10Minor code cleanups.Libravatar Simon Hausmann1-1/+14
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-10Make the p4 data/command cache configurable through the --cache-debug ↵Libravatar Simon Hausmann1-1/+4
commandline option. Signed-off-by: Simon Hausmann <simon@lst.de>
2007-03-10Fixed p4-debug file extension.Libravatar Simon Hausmann1-0/+0
Signed-off-by: Simon Hausmann <simon@lst.de>
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 13:38:15 +0000