aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/fast-import
AgeCommit message (Expand)AuthorFilesLines
2020-03-24import-tars: ignore the global PAX headerJohannes Schindelin1-0/+2
2018-05-24import-tars: read overlong names from pax extended headerPedro Alvarez Piedehierro1-2/+29
2017-11-09Replace Free Software Foundation address in license noticesTodd Zullinger1-2/+1
2016-08-03import-tars: support hard linksJohannes Schindelin1-11/+20
2014-03-31comments: fix misuses of "nor"Justin Lebar1-2/+2
2013-02-24contrib/fast-import/import-zips.py: use spaces instead of tabsDavid Aguilar1-49/+49
2013-02-24contrib/fast-import/import-zips.py: fix broken error messageDavid Aguilar1-2/+2
2013-02-24contrib/fast-import: use a lowercase "usage:" stringDavid Aguilar3-3/+3
2012-12-28Add checks to Python scripts for version dependencies.Eric S. Raymond1-1/+6
2012-04-09git-p4: move to toplevelPete Wyckoff3-2759/+12
2012-02-26Merge branch 'maint'Junio C Hamano1-33/+64
2012-02-26git-p4: fix submit regression with clientSpec and subdir clonePete Wyckoff1-32/+54
2012-02-26git-p4: set useClientSpec variable on initial clonePete Wyckoff1-1/+10
2012-02-23Merge branch 'ld/git-p4-expanded-keywords'Junio C Hamano1-10/+108
2012-02-23git-p4: add initial support for RCS keywordsLuke Diamand1-10/+108
2012-02-22git-p4: the option to specify 'host' is -H, not -hRussell Myers1-1/+1
2012-01-31Merge branch 'va/git-p4-branch'Junio C Hamano1-2/+46
2012-01-31Merge branch 'ld/git-p4-branches-and-labels'Junio C Hamano1-35/+44
2012-01-26git-p4: Change p4 command invocationPete Wyckoff1-1/+1
2012-01-26git-p4: Search for parent commit on branch creationVitor Antunes1-1/+45
2012-01-20git-p4: importing labels should cope with missing ownerLuke Diamand1-28/+35
2012-01-20git-p4: cope with labels with empty descriptionsLuke Diamand1-3/+5
2012-01-20git-p4: handle p4 branches and labels containing shell charsLuke Diamand1-4/+4
2012-01-11git-p4: clarify commentPete Wyckoff1-1/+2
2012-01-11git-p4: fix verbose comment typoPete Wyckoff1-1/+1
2012-01-11git-p4: only a single ... wildcard is supportedPete Wyckoff1-2/+2
2012-01-03git-p4: rewrite view handlingPete Wyckoff1-89/+246
2012-01-03git-p4: support single file p4 client view mapsGary Gibbons1-9/+20
2012-01-03git-p4: sort client views by reverse View numberGary Gibbons1-2/+9
2012-01-03git-p4: fix test for unsupported P4 Client ViewsGary Gibbons1-1/+4
2011-12-27git-p4: document and test submit optionsPete Wyckoff1-0/+7
2011-12-27git-p4: test and document --use-client-specPete Wyckoff1-1/+5
2011-12-27git-p4: honor --changesfile option and testPete Wyckoff1-1/+15
2011-12-27git-p4: clone does not use --git-dirPete Wyckoff1-1/+2
2011-12-27git-p4: introduce asciidoc documentationPete Wyckoff1-302/+0
2011-12-17git-p4: fix skipSubmitEdit regressionPete Wyckoff1-7/+11
2011-12-11git-p4: use absolute directory for PWD env varGary Gibbons1-2/+3
2011-12-11git-p4: ensure submit clientPath exists before chdirGary Gibbons1-0/+4
2011-12-05git-p4: introduce skipSubmitEditPete Wyckoff2-24/+54
2011-11-06Merge branch 'pw/p4-appledouble-fix'Junio C Hamano1-0/+13
2011-11-05git-p4: ignore apple filetypePete Wyckoff1-0/+13
2011-10-17git-p4: stop ignoring apple filetypePete Wyckoff1-5/+0
2011-10-17git-p4: handle files with shell metacharactersLuke Diamand1-77/+123
2011-10-17git-p4: recognize all p4 filetypesPete Wyckoff1-19/+52
2011-10-17git-p4: keyword flattening fixesPete Wyckoff1-2/+6
2011-10-17git-p4: handle utf16 filetype properlyPete Wyckoff1-0/+11
2011-08-22git-p4: Allow branch definition with git configVitor Antunes2-0/+31
2011-08-22git-p4: Allow filtering Perforce branches by userVitor Antunes2-1/+13
2011-08-22git-p4: Correct branch base depot path detectionVitor Antunes1-3/+5
2011-08-22git-p4: Process detectCopiesHarder with --boolVitor Antunes1-1/+1
2011-08-22git-p4: Add description of rename/copy detection optionsVitor Antunes1-0/+25
2011-08-22git-p4: Allow setting rename/copy detection thresholdVitor Antunes1-4/+9
2011-08-01git-p4: commit time should be most recent p4 change timePete Wyckoff1-1/+14
2011-05-13git-p4: warn if git authorship won't be retainedLuke Diamand2-2/+38
2011-05-09git-p4: small improvements to user-preservationLuke Diamand1-5/+14
2011-04-26git-p4: add option to preserve user namesLuke Diamand2-38/+170
2011-04-07git-p4: replace each tab with 8 spaces for consistencyAndrew Garber1-32/+32
2011-03-23Merge branch 'pw/p4'Junio C Hamano1-1/+3
2011-03-16git-p4: fix sync new branch regressionPete Wyckoff1-1/+3
2011-03-15git-p4: Fix error message crash in P4Sync.commit.Tor Arvid Lund1-1/+1
2011-03-15Teach git-p4 to ignore case in perforce filenames if configured.Tor Arvid Lund1-7/+20
2011-03-15git-p4: Teach gitConfig method about arguments.Tor Arvid Lund1-2/+6
2011-03-13Merge branch 'pw/p4'Junio C Hamano1-1/+1
2011-03-13git-p4: fix clone @all regressionPete Wyckoff1-1/+1
2011-03-04Merge branch 'mh/p4'Junio C Hamano1-1/+1
2011-02-27Merge branch 'va/p4'Junio C Hamano1-4/+31
2011-02-27Merge branch 'pw/p4'Junio C Hamano1-11/+49
2011-02-25git-p4 submit: prevent 'Jobs' section from being removed from p4 change logMichael Horowitz1-1/+1
2011-02-21git-p4: Add copy detection supportVitor Antunes1-0/+16
2011-02-21git-p4: Improve rename detection supportVitor Antunes1-4/+15
2011-02-21git-p4: support clone --barePete Wyckoff1-4/+13
2011-02-21git-p4: decode p4 wildcard charactersPete Wyckoff1-0/+18
2011-02-21git-p4: better message for "git-p4 sync" when not clonedPete Wyckoff1-0/+2
2011-02-21git-p4: reinterpret confusing p4 messagePete Wyckoff1-0/+4
2011-02-21git-p4: accommodate new move/delete type in p4Pete Wyckoff1-5/+7
2011-02-21git-p4: add missing newline in initial import messagePete Wyckoff1-1/+1
2011-02-21git-p4: fix key error for p4 problemPete Wyckoff1-1/+4
2011-02-14Obey p4 views when using client specIan Wienand2-4/+51
2010-11-05Merge branch 'aw/git-p4-deletion'Junio C Hamano1-1/+3
2010-10-22Fix handling of git-p4 on deleted filesAndrew Waters1-1/+3
2010-09-27perl: use "use warnings" instead of -wÆvar Arnfjörð Bjarmason1-1/+2
2010-04-03Merge branch 'rb/maint-python-path'Junio C Hamano1-1/+1
2010-03-24Correct references to /usr/bin/python which does not exist on FreeBSDR. Tyler Ballance1-1/+1
2010-03-20Fix a spelling mistake in a git-p4 console messageBenjamin C Meyer1-1/+1
2010-02-20git-p4: fix bug in symlink handlingEvan Powers1-3/+2
2010-02-03Typofixes outside documentation areaJunio C Hamano1-1/+1
2010-02-01git-p4: Fix sync errors due to new server versionPal-Kristian Engstad1-1/+1
2010-01-21fix git-p4 editor invocationNicolas Pitre1-1/+1
2009-11-13add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"Jonathan Nieder1-4/+1
2009-10-21import-tars: Add support for tarballs compressed with lzma, xzIngmar Vanhassel1-1/+4
2009-10-09import-tars: Add missing closing bracketIngmar Vanhassel1-1/+1
2009-09-13Merge branch 'pk/fast-import-tars'Junio C Hamano1-4/+46
2009-09-13Merge branch 'pk/fast-import-dirs'Junio C Hamano1-0/+416
2009-09-10git-p4: Avoid modules deprecated in Python 2.6.Reilly Grant1-7/+5
2009-09-03Add script for importing bits-and-pieces to Git.Peter Krefting1-0/+416
2009-09-03import-tars: Allow per-tar author and commit message.Peter Krefting1-4/+46
2009-08-10git-p4: stream from perforce to speed up clonesLuke Diamand1-67/+102
2009-06-18import-tars: support symlinksJohannes Schindelin1-5/+12
2009-03-29Merge branch 'maint'Junio C Hamano1-1/+2
2009-03-29Merge branch 'maint-1.6.1' into maintJunio C Hamano1-1/+2
2009-03-29Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano1-1/+2
2009-03-29import-zips: fix thinkoJohannes Schindelin1-1/+2
2009-03-20import-tars: separate author from committerGiuseppe Bilotta1-5/+11
2009-03-07git-p4: remove tabs from usermap filePete Wyckoff1-1/+1
2009-02-23git-p4: avoid syncing duplicate changesPete Wyckoff1-5/+6
2008-12-09git-p4: Fix regression in p4Where method.Tor Arvid Lund1-3/+10
2008-12-04git-p4: Fix bug in p4Where method.Tor Arvid Lund1-1/+9
2008-11-27Merge branch 'maint'Junio C Hamano1-1/+1
2008-11-27git-p4: fix keyword-expansion regexPete Wyckoff1-1/+1
2008-11-11git-p4: Cache git config for performanceJohn Chapman1-1/+4
2008-11-11git-p4: Support purged files and optimize memory usageJohn Chapman1-7/+7
2008-08-29git-p4: Fix checkout bug when using --import-local.Tor Arvid Lund1-2/+6
2008-08-27Make it possible to abort the submission of a change to PerforceSimon Hausmann1-8/+23
2008-08-24Clean up the git-p4 documentationSimon Hausmann1-31/+38
2008-08-22git-p4: Fix one-liner in p4_write_pipe function.Tor Arvid Lund1-1/+1
2008-08-17Merge branch 'ak/p4'Junio C Hamano2-28/+124
2008-08-16git-p4: chdir now properly sets PWD environment variable in msysGitRobert Blum1-4/+9
2008-08-14Utilise our new p4_read_pipe and p4_write_pipe wrappersAnand Kumria1-3/+3
2008-08-14Add p4 read_pipe and write_pipe wrappersAnand Kumria1-0/+7
2008-08-11Put in the two other configuration elements found in the sourceAnand Kumria1-0/+8
2008-08-11Put some documentation in about the parameters that have been addedAnand Kumria1-0/+32
2008-08-11Move git-p4.syncFromOrigin into a configuration parameters sectionAnand Kumria1-12/+16
2008-08-11Consistently use 'git-p4' for the configuration entriesAnand Kumria1-1/+1
2008-08-11If the user has configured various parameters, use them.Anand Kumria1-1/+23
2008-08-11Switch to using 'p4_build_cmd'Anand Kumria1-7/+3
2008-08-11If we are in verbose mode, output what we are about to run (or return)Anand Kumria1-0/+2
2008-08-11Add a single command that will be used to construct the 'p4' commandAnand Kumria1-0/+11
2008-08-11Utilise the new 'p4_system' function.Anand Kumria1-9/+9
2008-08-11Have a command that specifically invokes 'p4' (via system)Anand Kumria1-0/+7
2008-08-11Utilise the new 'p4_read_pipe_lines' commandAnand Kumria1-2/+2
2008-08-11Create a specific version of the read_pipe_lines command for p4 invocationsAnand Kumria1-0/+7
2008-07-23In perforce, RCS keywords are case-sensitiveDaniel Barkalow1-1/+1
2008-07-01Add another fast-import example, this time for .zip filesJohannes Schindelin1-0/+72
2008-06-26Add 'git-p4.allowSubmit' to git-p4Jing Xue1-0/+4
2008-03-28git-p4: Handle Windows EOLs properly after removal of p4 submit template hand...Marius Storm-Olsen1-13/+15
2008-03-13git-p4: Use P4EDITOR environment variable when setShawn Bohrer1-1/+4
2008-03-13git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'Shawn Bohrer1-0/+2
2008-03-13git-p4: Optimize the fetching of data from perforce.Marius Storm-Olsen1-8/+8
2008-03-03git-p4: Fix import of changesets with file deletionsSimon Hausmann1-20/+25
2008-02-27git-p4: Support usage of perforce client specTor Arvid Lund1-8/+42
2008-02-27git-p4: git-p4 submit cleanups.Simon Hausmann1-41/+10
2008-02-27git-p4: Removed git-p4 submit --direct.Simon Hausmann1-45/+11
2008-02-27git-p4: Clean up git-p4 submit's log message handling.Simon Hausmann1-16/+16
2008-02-27git-p4: Remove --log-substitutions feature.Simon Hausmann1-7/+0
2008-02-27git-p4: support exclude pathsTommy Thorn1-4/+22
2008-02-07git-p4: Fix indentation from tab to spacesToby Allsopp1-1/+1
2008-02-03git-p4: Fix an obvious typoTommy Thorn1-1/+1
2008-02-03git-p4: Ensure the working directory and the index are clean before "git-p4 r...Simon Hausmann1-0/+5
2008-02-03git-p4: Fix submit user-interface.Simon Hausmann1-59/+26
2008-02-03Remove $Id: ..$ $Header: ..$ etc from +ko and +k files during importJason McMullan1-3/+7
2007-11-20git-p4: Fix typo in --detect-labelsShun Kei Leung1-1/+1
2007-11-16git-p4: Fix direct import from perforce after fetching changes through git fr...Simon Hausmann1-2/+13
2007-11-02git-p4: Detect changes to executable bit and include them in p4 submit.Chris Pettitt1-0/+44
2007-11-02git-p4: Add a helper function to parse the full git diff-tree output.Chris Pettitt1-4/+45
2007-10-20git-p4 support for perforce renames.Chris Pettitt1-1/+11
2007-10-20git-p4: When skipping a patch as part of "git-p4 submit" make sure we correct...Simon Hausmann1-0/+4
2007-10-15Add 'git-p4 commit' as an alias for 'git-p4 submit'Marius Storm-Olsen1-0/+1
2007-09-23Merge branch 'maint'Junio C Hamano1-1/+9
2007-09-22Detect exec bit in more cases.David Brown1-1/+9
2007-09-18contrib/fast-import: add perl version of simple exampleJeff King1-0/+64
2007-09-18contrib/fast-import: add simple shell exampleNguyen Thai Ngoc Duy1-0/+38
2007-09-03git-p4: Added support for automatically importing newly appearing perforce br...Simon Hausmann1-2/+74
2007-09-03git-p4: Cleanup; moved the (duplicated) code for turning a branch into a git ...Simon Hausmann1-17/+11
2007-09-03git-p4: Cleanup; moved the code for the initial #head or revision import into...Simon Hausmann1-42/+45
2007-09-03git-p4: Cleanup; Turn self.revision into a function local variable (it's not ...Simon Hausmann1-9/+9
2007-09-03git-p4: Cleanup; moved the code to import a list of p4 changes using fast-imp...Simon Hausmann1-69/+71
2007-09-03git-p4: Cleanup; moved the code for getting a sorted list of p4 changes for a...Simon Hausmann1-9/+14
2007-09-03git-p4: After submission to p4 always synchronize from p4 again (into refs/re...Simon Hausmann1-2/+9
2007-09-03git-p4: Always call 'p4 sync ...' before submitting to Perforce.Simon Hausmann1-3/+2
2007-08-24git-p4: Fix warnings about non-existant refs/remotes/p4/HEAD ref when running...Simon Hausmann1-1/+1
2007-08-24git-p4: Make 'git-p4 branches' work after an initial clone with git clone fro...Simon Hausmann1-49/+55
2007-08-13git-p4: Fix the sorting of changelists when cloning a Perforce repository.Reece H. Dunn1-1/+1
2007-08-08git-p4: Fix git-p4 submit to include only changed files in the perforce submi...Simon Hausmann1-6/+30
2007-08-08git-p4: Fix support for symlinks.Simon Hausmann1-5/+9
2007-08-02Fix style nit in Python slicing.Han-Wen Nienhuys1-3/+3
2007-08-02Sort output of "p4 change" in incremental import before furtherHan-Wen Nienhuys1-1/+1
2007-07-25git-p4: Fix p4 user cache population on Windows.Simon Hausmann1-1/+2
2007-07-18git-p4: Cleanup, used common function for listing imported p4 branchesSimon Hausmann1-21/+5
2007-07-18git-p4: Fix upstream branch detection for submit/rebase with multiple branches.Simon Hausmann1-12/+17
2007-07-18git-p4: Cleanup, make listExistingP4Branches a global function for later use.Simon Hausmann1-0/+23
2007-07-17git-p4: input to "p4 files" by stdin instead of argumentsScott Lamb1-21/+7
2007-07-17git-p4: use subprocess in p4CmdListScott Lamb1-5/+18
2007-07-14Fix git-p4 on Windows to not use the Posix sysconf function.Marius Storm-Olsen1-1/+5
2007-06-22Import branch 'git-p4' of git://repo.or.cz/fast-exportShawn O. Pearce3-0/+1737
2007-06-22Make it possible to specify the HEAD for the internal findUpstreamBranchPoint...Simon Hausmann1-2/+2
2007-06-20Added git-p4 branches command that shows the mapping of perforce depot paths ...Simon Hausmann1-1/+27
2007-06-17Warn about conflicting p4 branch mappings and use the first one found.Simon Hausmann1-0/+6
2007-06-17Fix the branch mapping detection to be independent from the order of the "p4 ...Simon Hausmann1-3/+13
2007-06-16git-p4 fails when cloning a p4 depo.Benjamin Sergeant1-3/+17
2007-06-16Fix initial multi-branch import.Simon Hausmann1-0/+1
2007-06-12Only use double quotes on WindowsMarius Storm-Olsen1-1/+1
2007-06-12Fix git-p4 rebase to detect the correct upstream branch instead of unconditio...Simon Hausmann1-2/+10
2007-06-12Moved the code from git-p4 submit to figure out the upstream branch pointSimon Hausmann1-19/+26
2007-06-11git-p4 submit: Fix missing quotes around p4 commands to make them work with s...Simon Hausmann1-3/+3
2007-06-11Mention remotes/p4/master also in the documentation.Simon Hausmann1-3/+3
2007-06-11Provide some information for single branch imports where the commits goSimon Hausmann1-1/+4
2007-06-11git-p4: check for existence of repo dir before trying to createKevin Green1-1/+2
2007-06-11Write out the options tag in the log message of imports only if we actually haveSimon Hausmann1-6/+5
2007-06-11Fix support for explicit disabling of syncing with the originSimon Hausmann1-0/+2
2007-06-11Fix depot-paths encoding for multi-path imports (don't split up //depot/path/...Simon Hausmann1-1/+1