aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/fast-import
AgeCommit message (Expand)AuthorFilesLines
2007-06-11Fix project name guessingSimon Hausmann1-1/+6
2007-06-10Fix updating/creating remotes/p4/* heads from origin/p4/*Simon Hausmann1-4/+6
2007-06-10Fixed the check to make sure to exclude the HEAD symbolic refs when updatingSimon Hausmann1-1/+1
2007-06-08also strip p4/ from local imports.Han-Wen Nienhuys1-3/+3
2007-06-08Merge branch 'master' of git://repo.or.cz/fast-exportHan-Wen Nienhuys1-32/+57
2007-06-08print error message when p4 print fails (eg. due to permission problems)Han-Wen Nienhuys1-0/+5
2007-06-08Only get the expensive branch mapping from the p4 server when notSimon Hausmann1-5/+5
2007-06-07Make git-p4 submit detect the correct reference (origin) branch whenSimon Hausmann1-14/+24
2007-06-07Make clone behave like git clone by default again.Simon Hausmann1-0/+5
2007-06-07Exclude the HEAD symbolic ref from the list of known branchesMarius Storm-Olsen1-1/+1
2007-06-07Fix single branch import into remotesMarius Storm-Olsen1-2/+2
2007-06-07Fix git-p4 clone (defaultDestination)Marius Storm-Olsen1-1/+1
2007-06-07Ensure that the commit message is Windows formated (CRLF) before invoking the...Marius Storm-Olsen1-0/+5
2007-06-07Fix depot-path determination for git-p4 submitSimon Hausmann1-1/+1
2007-06-07Fix git-p4 submitSimon Hausmann1-3/+1
2007-06-07Fix git-p4 rebaseSimon Hausmann1-0/+1
2007-06-07Hack to make the multi-branch import work again with self.depotPaths now thatSimon Hausmann1-3/+4
2007-06-07Don't attempt to set the initialParent on multi-branch imports (useless).Simon Hausmann1-1/+2
2007-06-07Fix common path "calculation" from logs of multiple branches.Simon Hausmann1-2/+3
2007-06-07Fix support for "depot-path" in older git-p4 importsSimon Hausmann1-1/+4
2007-06-05look for 'text' and 'binary' files.Han-Wen Nienhuys1-2/+3
2007-05-31thinko: really ignore deleted files.Han-Wen Nienhuys1-10/+18
2007-05-31remove debug printHan-Wen Nienhuys1-1/+0
2007-05-31Cleanups & import into p4/master for local importHan-Wen Nienhuys1-22/+32
2007-05-31use p4CmdList() to get file contents in Python dicts. This is more robust.Han-Wen Nienhuys1-35/+21
2007-05-30only run p4 print if necessaryHan-Wen Nienhuys1-0/+3
2007-05-30don't p4 print deleted files.Han-Wen Nienhuys1-8/+13
2007-05-30read files before creating the commit.Han-Wen Nienhuys1-14/+21
2007-05-30thinko.Han-Wen Nienhuys1-1/+1
2007-05-30store p4 user cache in home directory.Han-Wen Nienhuys1-5/+10
2007-05-30Thinko, fix buglet.Han-Wen Nienhuys1-2/+2
2007-05-30Read p4 files in one batch.Han-Wen Nienhuys1-26/+63
2007-05-30remove global .gitdirHan-Wen Nienhuys1-29/+24
2007-05-30Merge origin.Han-Wen Nienhuys1-5/+5
2007-05-30Diverse cleanupsHan-Wen Nienhuys1-90/+134
2007-05-28Fix typo in listExistingP4Branches that broke sync.Simon Hausmann1-2/+2
2007-05-28In *_pipe print the command that failed if it fails.Simon Hausmann1-5/+5
2007-05-28Extract multiple paths concurrently.Han-Wen Nienhuys1-109/+153
2007-05-28add --verbose to all commands.Han-Wen Nienhuys1-14/+18
2007-05-28use strip() iso. slicing for removing \nHan-Wen Nienhuys1-14/+16
2007-05-28use string.strip() iso. slicing.Han-Wen Nienhuys1-4/+4
2007-05-28clone and sync --keep-path to keep perforce path to module.Han-Wen Nienhuys1-9/+12
2007-05-28minor cleanupsHan-Wen Nienhuys1-10/+20
2007-05-28cleanupHan-Wen Nienhuys1-21/+19
2007-05-28Robustness fixes for pipesHan-Wen Nienhuys1-27/+58
2007-05-28Fix my email address, this isn't really KDE related :)Simon Hausmann1-2/+2
2007-05-28rename apply() to applyCommit(); apply is a python builtinHan-Wen Nienhuys1-2/+2
2007-05-28reformatting: break long lines.Han-Wen Nienhuys1-18/+30
2007-05-28CleanupsHan-Wen Nienhuys1-22/+13
2007-05-27Fix creation of refs/remotes/p4/HEAD symbolic refSimon Hausmann1-6/+1
2007-05-25Added git-p4 submit --trust-me-like-a-fool for the adventurous users :)Simon Hausmann1-1/+5
2007-05-25Forgot to remove this TODO item when I made --with-origin the default :)Simon Hausmann1-3/+0
2007-05-25Shortcut the case where we have no origin branchSimon Hausmann1-2/+4
2007-05-25Make --with-origin the default for syncing.Simon Hausmann2-17/+13
2007-05-25Make --with-origin also work without origin :)Simon Hausmann1-2/+3
2007-05-25Make git-p4 work with packed refs (don't use os.path.exists to check for theSimon Hausmann1-2/+2
2007-05-25Avoid creating non-p4 branches in remotes/p4 off of remotes/originSimon Hausmann1-2/+6
2007-05-24Oops, fix --with-origin to /really/ also call git fetch :)Simon Hausmann1-0/+4
2007-05-24Added support for --with-origin with multi-branch importsSimon Hausmann1-30/+28
2007-05-24Forgot to remove this return statement from debuggingSimon Hausmann1-1/+0
2007-05-24Fix creating the remotes/p4 branches based on origin/* for the multi-branch i...Simon Hausmann1-9/+19
2007-05-24Replace \r\n with \n when importing from p4 on WindowsMarius Storm-Olsen1-0/+4
2007-05-24Load the user map from p4 only once at run-time.Simon Hausmann1-0/+4
2007-05-23Fix multi-branch import with --silent.Simon Hausmann1-2/+3
2007-05-23Fix p4 execution in git-p4 rollback.Simon Hausmann1-1/+1
2007-05-23Catch p4 errors in rollback early enough (before deleting refs!)Simon Hausmann1-0/+3
2007-05-23Oops, fill the /list/ correct with the p4 exit code.Simon Hausmann1-1/+3
2007-05-23Don't make len(p4Cmd("p4 changes -m 1 //foo/...")) == 0 succeed when the p4 c...Simon Hausmann1-1/+3
2007-05-23Make rollback work with locally imported branchesSimon Hausmann1-4/+14
2007-05-23Avoid calling git symbolic-ref refs/heads/p4//HEAD (double slash)Simon Hausmann1-1/+1
2007-05-23Doc updatesSimon Hausmann1-1/+8
2007-05-23Use refs/heads/* instead of refs/heads/p4/* for local importsSimon Hausmann1-5/+10
2007-05-23Added support for --max-changes=<count> to ease import debuggingSimon Hausmann1-1/+6
2007-05-23Added support for importing multiple branches into refs/heads instead of just...Simon Hausmann1-12/+25
2007-05-21Fixes for rollback, delete branches that did not exist at the specified p4 ch...Simon Hausmann1-2/+11
2007-05-21Fix branch detection in multi-branch importsSimon Hausmann1-1/+1
2007-05-21Added a rollback command for debugging. It sets back the heads of the p4 bran...Simon Hausmann1-5/+32
2007-05-21Make git-p4 submit --direct safer by also creating a git commitSimon Hausmann1-20/+14
2007-05-21Detect with git-p4 submit --direct when there are no changes in the working d...Simon Hausmann1-0/+3
2007-05-21Fix git symbolic-ref warning on initial cloneSimon Hausmann1-1/+7
2007-05-21Fix error detection with git-p4 submit when the requested depot path is not i...Simon Hausmann1-0/+2
2007-05-21Fix conversion from old style heads/p4 to remotes/p4/masterSimon Hausmann1-5/+6
2007-05-21Improved output for multi branch imports and noted another little todo itemSimon Hausmann1-6/+17
2007-05-20Another (potentially life-saving) idea for submit --directSimon Hausmann1-0/+6
2007-05-20Had an idea for debugging, record it :)Simon Hausmann1-0/+4
2007-05-20Specifying --detect-branches is now only needed for the initial clone/sync.Simon Hausmann1-0/+3
2007-05-20Added support for git-p4 submit --direct (experimental)Simon Hausmann1-14/+47
2007-05-20Use git format-patch and git apply --apply when extracting patches from git andSimon Hausmann1-5/+8
2007-05-20Oops, not only /set/ gitdir on clone, also set it /correctly/ :)Simon Hausmann1-1/+1
2007-05-20Fix gitdir not being set when cloning. Needed for writing the p4 users cache.Simon Hausmann1-0/+3
2007-05-20Cache the output of "p4 users" for faster syncs on high latency links.Simon Hausmann1-2/+21
2007-05-19Removed unused variable, more cleanupsSimon Hausmann1-5/+5
2007-05-19More cleanups and speedups for labels and branchesSimon Hausmann1-10/+29
2007-05-19Cleanup/speed up the branch<> file split and removed change range limitation ...Simon Hausmann1-17/+9
2007-05-19More work on the incremental importing of multiple branches.Simon Hausmann1-14/+76
2007-05-18Give branches a nice project prefix and don't bail out on clone if we failedSimon Hausmann1-3/+18
2007-05-18Started rewriting the branch detection, based on "p4 branches" and "p4 branch...Simon Hausmann1-242/+45
2007-05-18Removed unused cache variables.Simon Hausmann1-4/+0
2007-05-18Fix branch setup after initial clone.Simon Hausmann1-7/+2
2007-05-17Removed todo item that is implemented :)Simon Hausmann1-2/+0
2007-05-17Added support for git-p4 sync/rebase --with-origin. See git-p4.txt for detail...Simon Hausmann2-2/+41
2007-05-17Bite the bullet and automatically convert old style refs/heads/p4 repositoriesSimon Hausmann1-2/+4
2007-05-17Changed the default p4 import branch to be refs/remotes/p4/{HEAD,master}Simon Hausmann2-4/+12
2007-05-17Create the origin based import branch using git update-ref instead of git branchSimon Hausmann1-1/+4
2007-05-17Removed ancient and unused code to find the last imported revision from previ...Simon Hausmann1-17/+0
2007-05-17Removed cleantags command. It doesn't have any meaning anymore.Simon Hausmann1-39/+0
2007-05-17Clean up code duplication for revision parsing and fix previous commit to notSimon Hausmann1-3/+6
2007-05-17Always pass a sha1 for the initial parent so that git-fast-import doesn't thinkSimon Hausmann1-3/+4
2007-05-17Fixing syncing (gitdir discovery / cd) for bare repositoriesSimon Hausmann1-1/+3
2007-05-16Merge branch 'maint'Junio C Hamano1-1/+1
2007-05-16import-tars: Use the "Link indicator" to identify directoriesJohannes Schindelin1-1/+1
2007-05-16A little todo note before I forget it :), based on a suggestion from Lars.Simon Hausmann1-0/+2
2007-05-16Fix calling git-p4 rebase from within a subdirectory (git rebase wants to be ...Simon Hausmann1-0/+2
2007-05-16Give a better hint if git-p4 submit failsSimon Hausmann1-1/+1
2007-05-16Added the possibility of skipping patches during git-p4 submitSimon Hausmann1-2/+13
2007-05-15Make git-p4 work with bare repositories.Simon Hausmann1-3/+1
2007-05-15Fix git-p4 clone //depot/project (head import)Simon Hausmann1-0/+1
2007-05-15Make the command call silentMarius Storm-Olsen1-1/+1
2007-05-15Converted to unix newlinesSimon Hausmann1-1/+1
2007-05-15Make submitting work on Windows.Simon Hausmann1-5/+11
2007-05-15Make sure all popen calls use binary mode (for Windows) andSimon Hausmann1-17/+19
2007-05-15Added a little .bat wrapper from MariusSimon Hausmann1-0/+1
2007-05-15Use the subprocess module instead of popen2 to make it work on Windows.Simon Hausmann1-5/+5
2007-05-10Merge branch 'maint'Junio C Hamano1-1/+1
2007-05-07Properly handle '0' filenames in import-tarsShawn O. Pearce1-1/+1
2007-05-07Document some implementation details, for the curious... :)Simon Hausmann1-0/+17
2007-05-02Merge branch 'gfi-maint' into gfi-masterShawn O. Pearce1-0/+19
2007-05-02Teach import-tars about GNU tar's @LongLink extension.Johannes Schindelin1-0/+19
2007-05-01Cleanup, removed the old tagging codeSimon Hausmann1-16/+0
2007-05-01cleanup, renamed self.globalPrefix to self.depotPathSimon Hausmann1-40/+40
2007-05-01Micro cleanupSimon Hausmann1-1/+1
2007-05-01Doc cleanups.Simon Hausmann1-6/+2
2007-04-29Merge branch 'maint'Junio C Hamano1-0/+1
2007-04-29Fix import-tars fix.Junio C Hamano1-1/+1
2007-04-28import-tars: be nice to wrong directory modesJohannes Schindelin1-0/+1
2007-04-24fix importing of subversion tarsUwe Kleine-König1-1/+6
2007-04-15Handle patch errors in git-p4 submit better.Simon Hausmann1-6/+32
2007-04-15A new attempt at fixing the child-fast-import-process-not-finished race condi...Simon Hausmann1-2/+5
2007-04-14Slightly improved formatting of the raw_input questions.Simon Hausmann1-3/+3
2007-04-14Removed the old patch apply code from git-p4 submit.Simon Hausmann1-18/+1
2007-04-14Fix the timezone formatting. Now qgit also displays (parses) it correctly.Simon Hausmann1-4/+1
2007-04-13Print an error message of some sort if git fast-import fails.Simon Hausmann1-0/+1
2007-04-09Allow for convenient rebasing after git-p4 submitSimon Hausmann1-0/+6
2007-04-08Added a simple example of usage to the "documentation" :)Simon Hausmann1-0/+22
2007-04-08fix variable usage (oops)Simon Hausmann1-1/+1
2007-04-08Fix file determination for #head importsSimon Hausmann1-1/+2
2007-04-08Added git-p4 clone convenience commandSimon Hausmann2-3/+77
2007-04-08Honor --silent for labelsSimon Hausmann1-1/+1
2007-04-08Turn off potentially slow label detection by defaultSimon Hausmann1-2/+6
2007-04-08Provide a tree summary after git-p4 rebaseSimon Hausmann1-1/+3
2007-04-07Added git-p4 rebase convenienceSimon Hausmann2-3/+33
2007-04-01Clean up python class names.Simon Hausmann1-4/+4
2007-04-01Fix "compilation" :)Simon Hausmann1-2/+2
2007-03-29Fix the docs for git-p4 submit and turn git-p4 submit --master=foo intoSimon Hausmann2-21/+20
2007-03-28Fix variable usage in tag importSimon Hausmann1-2/+2
2007-03-26Added support for mapping p4 labels to git tagsSimon Hausmann1-1/+57
2007-03-26git-p4 debug doesn't need a git repositorySimon Hausmann1-13/+16
2007-03-26Don't try to parse any options with git-p4 debug but pass it straight on to p4Simon Hausmann1-6/+10
2007-03-24Prefer git command over git-command.Simon Hausmann1-14/+14
2007-03-24Minor cosmetic fixlet for the git-p4 submit sync question.Simon Hausmann1-1/+1
2007-03-24Different versions of p4 have different output for the where command ;(Simon Hausmann1-5/+17
2007-03-23Use the new incremental import style by defaultSimon Hausmann1-15/+16
2007-03-23Make it possible to run git-p4 submit from within the git repositorySimon Hausmann2-15/+50
2007-03-22Brand new smart incremental import that doesn't need tags or git repo-config :)Simon Hausmann2-11/+33
2007-03-22Set the default branch in run, not in the constructorSimon Hausmann1-1/+4
2007-03-22Helper function to check the existance of a revisionSimon Hausmann1-0/+3
2007-03-22Added some helper function(s) to parse the depot path and change number from ...Simon Hausmann1-12/+36
2007-03-22Changed the default branch for imports from "master" to "p4"Simon Hausmann2-4/+4
2007-03-22Changed the format of the imported log message slightly, so that it's easier ...Simon Hausmann1-1/+1
2007-03-22Removed the .py extension from git-p4 as it's annoying to type every time.Simon Hausmann2-7/+7
2007-03-21Don't show the submit template and the diff first in less but show it in $edi...Simon Hausmann1-6/+8
2007-03-21Make it possible to invoke git-p4 from within subdirectories of a git working...Simon Hausmann1-0/+4
2007-03-21Made --apply-as-patch the default for git-p4 submit as it's significantly fas...Simon Hausmann1-1/+1
2007-03-21Fix support for deletions in git-p4 submit when using --apply-as-patch by fil...Simon Hausmann1-1/+1
2007-03-21Added experimental but super-fast --apply-as-patch option to git-p4 submitSimon Hausmann1-11/+18
2007-03-21Documentation enhancements.Simon Hausmann1-0/+6
2007-03-20Start of the git-p4 documentation.Simon Hausmann1-0/+74
2007-03-20Removed p4-fast-export and p4-git-sync as they've been integrated into git-p4...Simon Hausmann2-928/+0
2007-03-20Fixed the initial version import by getting the file index correct by correct...Simon Hausmann1-2/+3
2007-03-20Added missing "self"s to make the script evaluate correctly.Simon Hausmann1-9/+9
2007-03-20Completely untested "merge" of p4-fast-export.py into git-p4.pySimon Hausmann1-8/+582
2007-03-20sync-to-perforce is now called submit and fixed the gitdir check a little bitSimon Hausmann1-2/+2
2007-03-19Part of the code is copyright by Trolltech ASA.Simon Hausmann1-0/+2
2007-03-19First (untested) attempt at migrating p4-git-sync into the final git-p4 scriptSimon Hausmann1-3/+240
2007-03-19Provide a little bit of help description for the git-p4 "tools".Simon Hausmann1-1/+4
2007-03-19Start moving the git-p4 tools into one single script.Simon Hausmann3-68/+115
2007-03-19Pass the right number of arguments to commit, fixes single-branch imports.Simon Hausmann1-2/+2
2007-03-19Improved the git dir detection.Simon Hausmann1-0/+13
2007-03-16Default to interactive syncingSimon Hausmann1-4/+4
2007-03-15Use p4 revert ... instead of revert -a ... after submitting, to make sure the...Simon Hausmann1-3/+3
2007-03-14Auto-detect the current git branch before submitting back to perforce.Simon Hausmann1-4/+11
2007-03-14Ignore Apple resource files when importing from perforce to git.Simon Hausmann1-0/+4
2007-03-14Be nice and use /usr/bin/env python for the git-p4 scriptsSimon Hausmann2-2/+2
2007-03-14Automatically operate on a temporary branch, needed for cherry-pick to work w...Simon Hausmann1-1/+9
2007-03-13Lots of bugfixes to p4-git-sync.Simon Hausmann1-17/+73
2007-03-13Fix git-dir option and allow reading log substitutions from a fileSimon Hausmann1-2/+6
2007-03-12First version of a new script to submit changes back to perforce from git rep...Simon Hausmann1-0/+208
2007-03-10Split up the cache commandline options into (command) cache and data cache.Simon Hausmann1-8/+12
2007-03-10Reduce the number of false "merges" by skipping "branch from" entries in the ...Simon Hausmann1-1/+7
2007-03-10More work on branch detection by implementing changeIsBranchMerge().Simon Hausmann1-37/+98
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-20 07:59:14 +0000