[tokkee]

tokkee.org

Code

projects / git.git / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
git.git
17 years agoAdded a simple example of usage to the "documentation" :)
commit | commitdiff | tree
Simon Hausmann [Sun, 8 Apr 2007 08:21:56 +0000 (10:21 +0200)]
Added a simple example of usage to the "documentation" :)

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agofix variable usage (oops)
commit | commitdiff | tree
Simon Hausmann [Sun, 8 Apr 2007 08:15:47 +0000 (10:15 +0200)]
fix variable usage (oops)

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoFix file determination for #head imports
commit | commitdiff | tree
Simon Hausmann [Sun, 8 Apr 2007 08:13:32 +0000 (10:13 +0200)]
Fix file determination for #head imports

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoAdded git-p4 clone convenience command
commit | commitdiff | tree
Simon Hausmann [Sun, 8 Apr 2007 08:08:26 +0000 (10:08 +0200)]
Added git-p4 clone convenience command

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoHonor --silent for labels
commit | commitdiff | tree
Simon Hausmann [Sun, 8 Apr 2007 07:00:55 +0000 (09:00 +0200)]
Honor --silent for labels

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoTurn off potentially slow label detection by default
commit | commitdiff | tree
Simon Hausmann [Sat, 7 Apr 2007 22:12:02 +0000 (00:12 +0200)]
Turn off potentially slow label detection by default

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoProvide a tree summary after git-p4 rebase
commit | commitdiff | tree
Simon Hausmann [Sat, 7 Apr 2007 22:07:02 +0000 (00:07 +0200)]
Provide a tree summary after git-p4 rebase

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoAdded git-p4 rebase convenience
commit | commitdiff | tree
Simon Hausmann [Sat, 7 Apr 2007 21:46:50 +0000 (23:46 +0200)]
Added git-p4 rebase convenience

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoClean up python class names.
commit | commitdiff | tree
Simon Hausmann [Sun, 1 Apr 2007 13:40:46 +0000 (15:40 +0200)]
Clean up python class names.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoFix "compilation" :)
commit | commitdiff | tree
Simon Hausmann [Sun, 1 Apr 2007 11:39:39 +0000 (13:39 +0200)]
Fix "compilation" :)

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoFix the docs for git-p4 submit and turn git-p4 submit --master=foo into
commit | commitdiff | tree
Simon Hausmann [Thu, 29 Mar 2007 17:15:24 +0000 (19:15 +0200)]
Fix the docs for git-p4 submit and turn git-p4 submit --master=foo into
simply git-p4 submit mytopicbranch.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoFix variable usage in tag import
commit | commitdiff | tree
Simon Hausmann [Wed, 28 Mar 2007 15:05:38 +0000 (17:05 +0200)]
Fix variable usage in tag import

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoAdded support for mapping p4 labels to git tags
commit | commitdiff | tree
Simon Hausmann [Mon, 26 Mar 2007 20:34:34 +0000 (22:34 +0200)]
Added support for mapping p4 labels to git tags

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agogit-p4 debug doesn't need a git repository
commit | commitdiff | tree
Simon Hausmann [Mon, 26 Mar 2007 06:18:55 +0000 (08:18 +0200)]
git-p4 debug doesn't need a git repository

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoDon't try to parse any options with git-p4 debug but pass it straight on to p4
commit | commitdiff | tree
Simon Hausmann [Sun, 25 Mar 2007 22:13:51 +0000 (00:13 +0200)]
Don't try to parse any options with git-p4 debug but pass it straight on to p4

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoPrefer git command over git-command.
commit | commitdiff | tree
Simon Hausmann [Sat, 24 Mar 2007 15:35:05 +0000 (16:35 +0100)]
Prefer git command over git-command.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoMinor cosmetic fixlet for the git-p4 submit sync question.
commit | commitdiff | tree
Simon Hausmann [Sat, 24 Mar 2007 08:18:20 +0000 (09:18 +0100)]
Minor cosmetic fixlet for the git-p4 submit sync question.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoDifferent versions of p4 have different output for the where command ;(
commit | commitdiff | tree
Simon Hausmann [Sat, 24 Mar 2007 08:15:11 +0000 (09:15 +0100)]
Different versions of p4 have different output for the where command ;(

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoUse the new incremental import style by default
commit | commitdiff | tree
Simon Hausmann [Fri, 23 Mar 2007 08:30:41 +0000 (09:30 +0100)]
Use the new incremental import style by default

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
17 years agoMake it possible to run git-p4 submit from within the git repository
commit | commitdiff | tree
Simon Hausmann [Fri, 23 Mar 2007 08:16:07 +0000 (09:16 +0100)]
Make it possible to run git-p4 submit from within the git repository

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoBrand new smart incremental import that doesn't need tags or git repo-config :)
commit | commitdiff | tree
Simon Hausmann [Thu, 22 Mar 2007 21:17:42 +0000 (22:17 +0100)]
Brand new smart incremental import that doesn't need tags or git repo-config :)

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoSet the default branch in run, not in the constructor
commit | commitdiff | tree
Simon Hausmann [Thu, 22 Mar 2007 20:34:16 +0000 (21:34 +0100)]
Set the default branch in run, not in the constructor

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoHelper function to check the existance of a revision
commit | commitdiff | tree
Simon Hausmann [Thu, 22 Mar 2007 20:27:14 +0000 (21:27 +0100)]
Helper function to check the existance of a revision

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoAdded some helper function(s) to parse the depot path and change number from the...
commit | commitdiff | tree
Simon Hausmann [Thu, 22 Mar 2007 20:10:25 +0000 (21:10 +0100)]
Added some helper function(s) to parse the depot path and change number from the log message

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoChanged the default branch for imports from "master" to "p4"
commit | commitdiff | tree
Simon Hausmann [Thu, 22 Mar 2007 19:36:28 +0000 (20:36 +0100)]
Changed the default branch for imports from "master" to "p4"

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoChanged the format of the imported log message slightly, so that it's easier to parse...
commit | commitdiff | tree
Simon Hausmann [Thu, 22 Mar 2007 19:27:41 +0000 (20:27 +0100)]
Changed the format of the imported log message slightly, so that it's easier to parse again.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoRemoved the .py extension from git-p4 as it's annoying to type every time.
commit | commitdiff | tree
Simon Hausmann [Thu, 22 Mar 2007 08:13:01 +0000 (09:13 +0100)]
Removed the .py extension from git-p4 as it's annoying to type every time.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoDon't show the submit template and the diff first in less but show it in $editor...
commit | commitdiff | tree
Simon Hausmann [Wed, 21 Mar 2007 20:04:12 +0000 (21:04 +0100)]
Don't show the submit template and the diff first in less but show it in $editor right away

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoMake it possible to invoke git-p4 from within subdirectories of a git working tree.
commit | commitdiff | tree
Simon Hausmann [Wed, 21 Mar 2007 12:05:30 +0000 (13:05 +0100)]
Make it possible to invoke git-p4 from within subdirectories of a git working tree.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoMade --apply-as-patch the default for git-p4 submit as it's significantly faster.
commit | commitdiff | tree
Simon Hausmann [Wed, 21 Mar 2007 10:01:18 +0000 (11:01 +0100)]
Made --apply-as-patch the default for git-p4 submit as it's significantly faster.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoFix support for deletions in git-p4 submit when using --apply-as-patch by filtering...
commit | commitdiff | tree
Simon Hausmann [Wed, 21 Mar 2007 09:57:54 +0000 (10:57 +0100)]
Fix support for deletions in git-p4 submit when using --apply-as-patch by filtering out deletions in the diff-tree output.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoAdded experimental but super-fast --apply-as-patch option to git-p4 submit
commit | commitdiff | tree
Simon Hausmann [Wed, 21 Mar 2007 09:11:20 +0000 (10:11 +0100)]
Added experimental but super-fast --apply-as-patch option to git-p4 submit

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoDocumentation enhancements.
commit | commitdiff | tree
Simon Hausmann [Wed, 21 Mar 2007 07:27:33 +0000 (08:27 +0100)]
Documentation enhancements.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoStart of the git-p4 documentation.
commit | commitdiff | tree
Simon Hausmann [Tue, 20 Mar 2007 21:41:00 +0000 (22:41 +0100)]
Start of the git-p4 documentation.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoRemoved p4-fast-export and p4-git-sync as they've been integrated into git-p4 now.
commit | commitdiff | tree
Simon Hausmann [Tue, 20 Mar 2007 21:09:27 +0000 (22:09 +0100)]
Removed p4-fast-export and p4-git-sync as they've been integrated into git-p4 now.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoFixed the initial version import by getting the file index correct by correctly skipp...
commit | commitdiff | tree
Simon Hausmann [Tue, 20 Mar 2007 20:13:49 +0000 (21:13 +0100)]
Fixed the initial version import by getting the file index correct by correctly skipping deleted files.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoAdded missing "self"s to make the script evaluate correctly.
commit | commitdiff | tree
Simon Hausmann [Tue, 20 Mar 2007 19:59:30 +0000 (20:59 +0100)]
Added missing "self"s to make the script evaluate correctly.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoCompletely untested "merge" of p4-fast-export.py into git-p4.py
commit | commitdiff | tree
Simon Hausmann [Tue, 20 Mar 2007 19:54:23 +0000 (20:54 +0100)]
Completely untested "merge" of p4-fast-export.py into git-p4.py

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agosync-to-perforce is now called submit and fixed the gitdir check a little bit
commit | commitdiff | tree
Simon Hausmann [Tue, 20 Mar 2007 17:32:47 +0000 (18:32 +0100)]
sync-to-perforce is now called submit and fixed the gitdir check a little bit

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoPart of the code is copyright by Trolltech ASA.
commit | commitdiff | tree
Simon Hausmann [Mon, 19 Mar 2007 21:26:36 +0000 (22:26 +0100)]
Part of the code is copyright by Trolltech ASA.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoFirst (untested) attempt at migrating p4-git-sync into the final git-p4 script
commit | commitdiff | tree
Simon Hausmann [Mon, 19 Mar 2007 21:25:17 +0000 (22:25 +0100)]
First (untested) attempt at migrating p4-git-sync into the final git-p4 script

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoProvide a little bit of help description for the git-p4 "tools".
commit | commitdiff | tree
Simon Hausmann [Mon, 19 Mar 2007 20:02:30 +0000 (21:02 +0100)]
Provide a little bit of help description for the git-p4 "tools".

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoStart moving the git-p4 tools into one single script.
commit | commitdiff | tree
Simon Hausmann [Mon, 19 Mar 2007 19:59:12 +0000 (20:59 +0100)]
Start moving the git-p4 tools into one single script.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoPass the right number of arguments to commit, fixes single-branch imports.
commit | commitdiff | tree
Simon Hausmann [Mon, 19 Mar 2007 11:04:37 +0000 (12:04 +0100)]
Pass the right number of arguments to commit, fixes single-branch imports.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoImproved the git dir detection.
commit | commitdiff | tree
Simon Hausmann [Mon, 19 Mar 2007 10:57:07 +0000 (11:57 +0100)]
Improved the git dir detection.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoDefault to interactive syncing
commit | commitdiff | tree
Simon Hausmann [Fri, 16 Mar 2007 12:47:46 +0000 (13:47 +0100)]
Default to interactive syncing

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoUse p4 revert ... instead of revert -a ... after submitting, to make sure the p4...
commit | commitdiff | tree
Simon Hausmann [Thu, 15 Mar 2007 18:07:06 +0000 (19:07 +0100)]
Use p4 revert ... instead of revert -a ... after submitting, to make sure the p4 checkout is clean.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoAuto-detect the current git branch before submitting back to perforce.
commit | commitdiff | tree
Simon Hausmann [Wed, 14 Mar 2007 22:30:23 +0000 (23:30 +0100)]
Auto-detect the current git branch before submitting back to perforce.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoIgnore Apple resource files when importing from perforce to git.
commit | commitdiff | tree
Simon Hausmann [Wed, 14 Mar 2007 18:03:16 +0000 (19:03 +0100)]
Ignore Apple resource files when importing from perforce to git.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoBe nice and use /usr/bin/env python for the git-p4 scripts
commit | commitdiff | tree
Simon Hausmann [Wed, 14 Mar 2007 16:33:46 +0000 (17:33 +0100)]
Be nice and use /usr/bin/env python for the git-p4 scripts

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoAutomatically operate on a temporary branch, needed for cherry-pick to work when...
commit | commitdiff | tree
Simon Hausmann [Wed, 14 Mar 2007 16:29:46 +0000 (17:29 +0100)]
Automatically operate on a temporary branch, needed for cherry-pick to work when applying changes to

files that are deleted in the future.
Also do some Perforce cleaning

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoLots of bugfixes to p4-git-sync.
commit | commitdiff | tree
Simon Hausmann [Tue, 13 Mar 2007 15:36:10 +0000 (16:36 +0100)]
Lots of bugfixes to p4-git-sync.

Added interactive and dry-run mode.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoFix git-dir option and allow reading log substitutions from a file
commit | commitdiff | tree
Simon Hausmann [Tue, 13 Mar 2007 08:14:45 +0000 (09:14 +0100)]
Fix git-dir option and allow reading log substitutions from a file

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoFirst version of a new script to submit changes back to perforce from git repositories.
commit | commitdiff | tree
Simon Hausmann [Mon, 12 Mar 2007 22:00:34 +0000 (23:00 +0100)]
First version of a new script to submit changes back to perforce from git repositories.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoSplit up the cache commandline options into (command) cache and data cache.
commit | commitdiff | tree
Simon Hausmann [Sat, 10 Mar 2007 20:30:24 +0000 (21:30 +0100)]
Split up the cache commandline options into (command) cache and data cache.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoReduce the number of false "merges" by skipping "branch from" entries in the integrat...
commit | commitdiff | tree
Simon Hausmann [Sat, 10 Mar 2007 20:23:49 +0000 (21:23 +0100)]
Reduce the number of false "merges" by skipping "branch from" entries in the integrated output as well as by ignoring integrations of future (newer) changes.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoMore work on branch detection by implementing changeIsBranchMerge().
commit | commitdiff | tree
Simon Hausmann [Sat, 10 Mar 2007 16:46:49 +0000 (17:46 +0100)]
More work on branch detection by implementing changeIsBranchMerge().

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoMore code cleanups and preparations for more branch detection heuristics.
commit | commitdiff | tree
Simon Hausmann [Sat, 10 Mar 2007 10:46:26 +0000 (11:46 +0100)]
More code cleanups and preparations for more branch detection heuristics.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoMinor code cleanups.
commit | commitdiff | tree
Simon Hausmann [Sat, 10 Mar 2007 09:53:07 +0000 (10:53 +0100)]
Minor code cleanups.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoMake the p4 data/command cache configurable through the --cache-debug commandline...
commit | commitdiff | tree
Simon Hausmann [Sat, 10 Mar 2007 09:25:34 +0000 (10:25 +0100)]
Make the p4 data/command cache configurable through the --cache-debug commandline option.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoFixed p4-debug file extension.
commit | commitdiff | tree
Simon Hausmann [Sat, 10 Mar 2007 08:49:19 +0000 (09:49 +0100)]
Fixed p4-debug file extension.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoChanged --known-branches to take a file as argument instead of a comma separated...
commit | commitdiff | tree
Simon Hausmann [Thu, 8 Mar 2007 20:34:40 +0000 (21:34 +0100)]
Changed --known-branches to take a file as argument instead of a comma separated list.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoWork in progress on detecting branches.
commit | commitdiff | tree
Simon Hausmann [Thu, 8 Mar 2007 20:27:59 +0000 (21:27 +0100)]
Work in progress on detecting branches.

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>
17 years agoAdjust the output parsing of git name-rev to handle the output of the latest git...
commit | commitdiff | tree
Simon Hausmann [Wed, 7 Mar 2007 18:58:54 +0000 (19:58 +0100)]
Adjust the output parsing of git name-rev to handle the output of the latest git version.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoDon't print a plain newline at the end of the execution (avoids bogus cron error...
commit | commitdiff | tree
Simon Hausmann [Thu, 22 Feb 2007 09:20:53 +0000 (10:20 +0100)]
Don't print a plain newline at the end of the execution (avoids bogus cron error mails).

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
17 years agoMore work in --silent support.
commit | commitdiff | tree
Simon Hausmann [Thu, 22 Feb 2007 08:22:36 +0000 (09:22 +0100)]
More work in --silent support.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoAdded support for --silent so that p4-fast-export can be called from cronjobs.
commit | commitdiff | tree
Simon Hausmann [Thu, 22 Feb 2007 08:03:39 +0000 (09:03 +0100)]
Added support for --silent so that p4-fast-export can be called from cronjobs.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoAdded p4 delete behavioural emulation as todo item.
commit | commitdiff | tree
Simon Hausmann [Wed, 21 Feb 2007 16:51:07 +0000 (17:51 +0100)]
Added p4 delete behavioural emulation as todo item.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoFix single-branch imports by skipping the branch/merge detection correctly.
commit | commitdiff | tree
Simon Hausmann [Sat, 17 Feb 2007 15:18:22 +0000 (01:18 +1000)]
Fix single-branch imports by skipping the branch/merge detection correctly.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoUse sets.Set() instead of set() to run also with older versions of Python.
commit | commitdiff | tree
Simon Hausmann [Wed, 14 Feb 2007 16:16:14 +0000 (02:16 +1000)]
Use sets.Set() instead of set() to run also with older versions of Python.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoMake it possible to specify the p4 changes to import through a text file (for debuggi...
commit | commitdiff | tree
Simon Hausmann [Wed, 14 Feb 2007 16:13:17 +0000 (17:13 +0100)]
Make it possible to specify the p4 changes to import through a text file (for debugging) and made various improvements to the branch/merge heuristic detection.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoWhen trying to map p4 integrations to git merges just record it as a single merge...
commit | commitdiff | tree
Simon Hausmann [Mon, 12 Feb 2007 21:05:21 +0000 (22:05 +0100)]
When trying to map p4 integrations to git merges just record it as a single merge with the newest p4 change as secondary parent.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoSet git fast-import marks for every imported change for future use.
commit | commitdiff | tree
Simon Hausmann [Mon, 12 Feb 2007 20:56:46 +0000 (21:56 +0100)]
Set git fast-import marks for every imported change for future use.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoAfter marking a p4 branch as merged don't ever merge it in git again.
commit | commitdiff | tree
Simon Hausmann [Mon, 12 Feb 2007 20:44:02 +0000 (21:44 +0100)]
After marking a p4 branch as merged don't ever merge it in git again.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoMore fixes in heuristic p4 branch detection based on common path components.
commit | commitdiff | tree
Simon Hausmann [Mon, 12 Feb 2007 20:41:45 +0000 (21:41 +0100)]
More fixes in heuristic p4 branch detection based on common path components.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoStarted work on p4 branch detection (experimental!).
commit | commitdiff | tree
Simon Hausmann [Mon, 12 Feb 2007 20:04:59 +0000 (21:04 +0100)]
Started work on p4 branch detection (experimental!).

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoCode cleanups.
commit | commitdiff | tree
Simon Hausmann [Mon, 12 Feb 2007 19:28:58 +0000 (20:28 +0100)]
Code cleanups.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoCleanups, remove unused variable.
commit | commitdiff | tree
Simon Hausmann [Sun, 11 Feb 2007 20:35:34 +0000 (21:35 +0100)]
Cleanups, remove unused variable.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoCreate lightweight git tags (using the "reset" trick) for the incremental import...
commit | commitdiff | tree
Simon Hausmann [Sun, 11 Feb 2007 17:04:39 +0000 (18:04 +0100)]
Create lightweight git tags (using the "reset" trick) for the incremental 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>
17 years agoAdded a little helper script to remove unused tags from the perforce import.
commit | commitdiff | tree
Simon Hausmann [Sat, 10 Feb 2007 09:26:03 +0000 (10:26 +0100)]
Added a little helper script to remove unused tags from the perforce import.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
17 years agoChanged the default git import branch from "p4" to "master".
commit | commitdiff | tree
Simon Hausmann [Sat, 10 Feb 2007 09:05:51 +0000 (10:05 +0100)]
Changed the default git import branch from "p4" to "master".

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoAvoid the excessive use of git tags for every perforce change and instead just create...
commit | commitdiff | tree
Simon Hausmann [Sat, 10 Feb 2007 09:05:29 +0000 (10:05 +0100)]
Avoid the excessive use of git tags for every perforce change and instead just create one git tag for the last imported change.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoMinor code cleanups.
commit | commitdiff | tree
Simon Hausmann [Sat, 10 Feb 2007 08:25:22 +0000 (09:25 +0100)]
Minor code cleanups.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoAdded a little helper script to debug the output of the p4 python interface.
commit | commitdiff | tree
Simon Hausmann [Thu, 8 Feb 2007 22:00:19 +0000 (23:00 +0100)]
Added a little helper script to debug the output of the p4 python interface.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agoMade the name of the git branch used for the perforce import configurable through...
commit | commitdiff | tree
Simon Hausmann [Thu, 8 Feb 2007 14:53:11 +0000 (15:53 +0100)]
Made the name of the git branch used for the perforce import configurable through a new --branch=<name> commandline option.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoCatch io exceptions from git fast-import again and print the error message.
commit | commitdiff | tree
Simon Hausmann [Thu, 8 Feb 2007 14:45:16 +0000 (15:45 +0100)]
Catch io exceptions from git fast-import again and print the error message.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
17 years agoFix calculation of the newest imported revision for #head imports.
commit | commitdiff | tree
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>
17 years agoMake specifying the revision ranges more convenient.
commit | commitdiff | tree
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>
17 years agoMake incremental imports easier to use by storing the p4 depot path after an import...
commit | commitdiff | tree
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>
17 years agoFixed incremental imports by using the correct "from" command instead of "merge"...
commit | commitdiff | tree
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>
17 years agoMinor cleanups and print an error message of git fast-import if it fails.
commit | commitdiff | tree
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>
17 years agoInitial support for importing a directory from Perforce at a specified revision.
commit | commitdiff | tree
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>
17 years agoCode cleanups, move the code to create a commit with fast-import into a separate...
commit | commitdiff | tree
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>
17 years agoSimplify the incremental import by elimination the need for a temporary import branch.
commit | commitdiff | tree
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>
17 years agoStarted working on incremental imports from Perforce.
commit | commitdiff | tree
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>
17 years agoFix file permissions of p4-fast-export.py to be executable.
commit | commitdiff | tree
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>
17 years agoCreate a git tag for every changeset imported from perforce.
commit | commitdiff | tree
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>
17 years agoFixed displaying import progress by calling flush on stdout.
commit | commitdiff | tree
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>
17 years agoPermit calling p4-fast-export with a depot path that has the typical ... wildcard...
commit | commitdiff | tree
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>
17 years agoAvoid calling fstat for every imported file (slow!) and instead read the file data...
commit | commitdiff | tree
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>
next
Git - the stupid content tracker