aboutsummaryrefslogtreecommitdiffstats
path: root/git-p4.py
AgeCommit message (Expand)AuthorFilesLines
2020-11-11Merge branch 'js/p4-default-branch'Junio C Hamano1-1/+1
2020-11-09p4: respect init.defaultBranchJohannes Schindelin1-1/+1
2020-11-05doc: fixing two trivial typos in Documentation/Marlon Rac Cambasis1-1/+1
2020-09-19git-p4: use HEAD~$n to find parent commit for unshelveLuke Diamand1-1/+1
2020-06-02Merge branch 'bk/p4-prepare-p4-only-fix'Junio C Hamano1-4/+5
2020-05-12git-p4.py: fix --prepare-p4-only error with multiple commitsBen Keene1-4/+5
2020-05-10git-p4: recover from inconsistent perforce historyAndrew Oakley1-2/+41
2020-04-22Merge branch 'bk/p4-pre-edit-changelist'Junio C Hamano1-55/+181
2020-03-25Merge branch 'yz/p4-py3'Junio C Hamano1-95/+140
2020-02-14git-p4: add RCS keyword status messageBen Keene1-0/+4
2020-02-14git-p4: add p4 submit hooksBen Keene1-1/+34
2020-02-14git-p4: restructure code in submitBen Keene1-41/+51
2020-02-11git-p4: add --no-verify optionBen Keene1-13/+19
2020-02-11git-p4: add p4-pre-submit exit textBen Keene1-1/+9
2020-02-11git-p4: create new function run_git_hookBen Keene1-7/+69
2020-02-11git-p4: rewrite prompt to be Windows compatibleBen Keene1-1/+4
2020-01-30git-p4: avoid leak of file handle when cloningLuke Diamand1-1/+2
2020-01-30git-p4: check for access to remote host earlierLuke Diamand1-0/+2
2020-01-30git-p4: cleanup better on error exitLuke Diamand1-15/+28
2020-01-30git-p4: create helper function importRevisions()Luke Diamand1-64/+68
2020-01-30git-p4: disable some pylint warnings, to get pylint output to something manag...Luke Diamand1-0/+8
2020-01-30git-p4: add P4CommandException to report errors talking to PerforceLuke Diamand1-0/+8
2020-01-30git-p4: make closeStreams() idempotentLuke Diamand1-0/+3
2020-01-15git-p4: use python3's input() everywhereYang Zhao1-2/+12
2020-01-15git-p4: simplify regex pattern generation for parsing diff-treeYang Zhao1-7/+6
2020-01-15git-p4: use dict.items() iteration for python3 compatibilityYang Zhao1-1/+1
2020-01-15git-p4: use functools.reduce instead of reduceYang Zhao1-1/+2
2020-01-15git-p4: fix freezing while waiting for fast-import progressYang Zhao1-0/+1
2020-01-15git-p4: use marshal format version 2 when sending to p4Yang Zhao1-1/+2
2020-01-15git-p4: open .gitp4-usercache.txt in text modeYang Zhao1-2/+2
2020-01-15git-p4: convert path to unicode before processing themYang Zhao1-25/+44
2020-01-15git-p4: encode/decode communication with git for python3Yang Zhao1-4/+17
2020-01-15git-p4: encode/decode communication with p4 for python3Yang Zhao1-13/+46
2020-01-15git-p4: remove string type aliasingYang Zhao1-16/+0
2020-01-15git-p4: change the expansion test from basestring to listBen Keene1-9/+9
2020-01-15git-p4: make python2.7 the oldest supported versionYang Zhao1-18/+2
2020-01-02Merge branch 'bk/p4-misc-usability'Junio C Hamano1-32/+42
2019-12-16git-p4: show detailed help when parsing options failBen Keene1-1/+6
2019-12-16git-p4: yes/no prompts should sanitize user textBen Keene1-31/+36
2019-12-11git-p4: honor lfs.storage configuration variabler.burenkov1-2/+8
2019-10-06git-p4: auto-delete named temporary filePhilip.McGraw1-7/+6
2019-07-09Merge branch 'am/p4-branches-excludes'Junio C Hamano1-17/+27
2019-06-17Merge branch 'mm/p4-unshelve-windows-fix'Junio C Hamano1-1/+1
2019-05-28p4 unshelve: fix "Not a valid object name HEAD0" on WindowsMike Mueller1-1/+1
2019-05-28git-p4: allow unshelving of branched filesSimon Williams1-1/+1
2019-04-02git-p4: respect excluded paths when detecting branchesMazo, Andrey1-2/+1
2019-04-02git-p4: don't exclude other files with same prefixMazo, Andrey1-7/+14
2019-04-02git-p4: don't groom exclude path list on every commitMazo, Andrey1-5/+7
2019-04-02git-p4: match branches case insensitively if configuredMazo, Andrey1-2/+2
2019-04-02git-p4: detect/prevent infinite loop in gitCommitByP4Change()Mazo, Andrey1-1/+3
2019-02-05Merge branch 'ld/git-p4-shelve-update-fix'Junio C Hamano1-0/+2
2019-01-18git-p4: handle update of moved/copied files when updating a shelveLuke Diamand1-0/+2
2019-01-07git-p4: fix problem when p4 login is not necessaryPeter Osterlund1-0/+2
2018-10-16git-p4: fully support unshelving changelistsLuke Diamand1-36/+48
2018-10-16git-p4: unshelve into refs/remotes/p4-unshelved, not refs/remotes/p4/unshelvedLuke Diamand1-1/+2
2018-10-12git-p4: do not fail in verbose mode for missing 'fileSize' keyLuke Diamand1-1/+4
2018-08-01git-p4: add the `p4-pre-submit` hookChen Bin1-1/+15
2018-06-19git-p4: python3: fix octal constantsLuke Diamand1-1/+1
2018-06-19git-p4: python3: use print() functionLuke Diamand1-124/+124
2018-06-19git-p4: python3: basestring workaroundLuke Diamand1-0/+16
2018-06-19git-p4: python3: remove backticksLuke Diamand1-1/+1
2018-06-19git-p4: python3: replace dict.has_key(k) with "k in dict"Luke Diamand1-39/+39
2018-06-19git-p4: python3: replace <> with !=Luke Diamand1-1/+1
2018-06-18Merge branch 'ld/git-p4-updates'Junio C Hamano1-24/+156
2018-06-12git-p4: auto-size the blockLuke Diamand1-6/+21
2018-06-12git-p4: narrow the scope of exceptions caught when parsing an intLuke Diamand1-1/+1
2018-06-12git-p4: raise exceptions from p4CmdList based on error from p4 serverLuke Diamand1-4/+40
2018-06-12git-p4: better error reporting when p4 failsLuke Diamand1-0/+55
2018-06-12git-p4: add option to disable syncing of p4/master with p4Luke Diamand1-11/+20
2018-06-12git-p4: disable-rebase: allow setting this via configurationLuke Diamand1-1/+1
2018-06-12git-p4: add options --commit and --disable-rebaseRomain Merland1-6/+23
2018-06-01Merge branch 'ld/p4-unshelve'Junio C Hamano1-36/+177
2018-05-24git-p4: add unshelve commandLuke Diamand1-36/+177
2018-05-11git-p4: change "commitish" typo to "committish"Ævar Arnfjörð Bjarmason1-3/+3
2017-12-22git-p4: update multiple shelved change listsLuke Diamand1-15/+26
2017-08-23treewide: correct several "up-to-date" to "up to date"Martin Ågren1-1/+1
2017-07-13git-p4: filter for {'code':'info'} in p4CmdListMiguel Torroja1-3/+6
2017-07-13git-p4: parse marshal output "p4 -G" in p4 changesMiguel Torroja1-28/+57
2017-04-16git-p4: don't use name-rev to get current branchLuke Diamand1-6/+1
2017-04-16git-p4: add read_pipe_text() internal functionLuke Diamand1-3/+28
2017-02-16Merge branch 'ls/p4-path-encoding'Junio C Hamano1-10/+14
2017-02-10git-p4: fix git-p4.pathEncoding for removed filesLars Schneider1-10/+14
2017-02-02Merge branch 'gv/mingw-p4-mapuser'Junio C Hamano1-1/+1
2017-01-30git-p4: fix git-p4.mapUser on WindowsGeorge Vanburgh1-1/+1
2017-01-18Merge branch 'ls/p4-retry-thrice'Junio C Hamano1-1/+3
2017-01-17Merge branch 'gv/p4-multi-path-commit-fix' into maintJunio C Hamano1-2/+2
2017-01-17Merge branch 'ld/p4-compare-dir-vs-symlink' into maintJunio C Hamano1-6/+20
2016-12-29git-p4: do not pass '-r 0' to p4 commandsIgor Kushnir1-1/+3
2016-12-27Merge branch 'ls/p4-lfs'Junio C Hamano1-2/+2
2016-12-27Merge branch 'gv/p4-multi-path-commit-fix'Junio C Hamano1-2/+2
2016-12-27Merge branch 'ld/p4-compare-dir-vs-symlink'Junio C Hamano1-6/+20
2016-12-20git-p4: add diff/merge properties to .gitattributes for GitLFS filesLars Schneider1-2/+2
2016-12-19Merge branch 'ld/p4-worktree'Junio C Hamano1-4/+13
2016-12-19git-p4: fix multi-path changelist empty commitsGeorge Vanburgh1-2/+2
2016-12-18git-p4: avoid crash adding symlinked directoryLuke Diamand1-6/+20
2016-12-16Merge branch 'ls/p4-retry-thrice'Junio C Hamano1-0/+5
2016-12-16Merge branch 'ls/p4-empty-file-on-lfs'Junio C Hamano1-12/+17
2016-12-13git-p4: support git worktreesLuke Diamand1-4/+13
2016-12-05git-p4: fix empty file processing for large file system backend GitLFSLars Schneider1-12/+17
2016-12-05git-p4: add config to retry p4 commands; retry 3 times by defaultLars Schneider1-0/+5
2016-12-05git-p4: support updating an existing shelved changelistLuke Diamand1-4/+29
2016-11-29git-p4: allow submit to create shelved changelists.Vinicius Kursancew1-14/+22
2016-08-11Spelling fixesVille Skyttä1-1/+1
2016-07-19Merge branch 'ls/p4-tmp-refs'Junio C Hamano1-1/+1
2016-07-11Merge branch 'ao/p4-has-branch-prefix-fix' into maintJunio C Hamano1-1/+1
2016-07-08git-p4: place temporary refs used for branch import under refs/git-p4-tmpLars Schneider1-1/+1
2016-07-06Merge branch 'ao/p4-has-branch-prefix-fix'Junio C Hamano1-1/+1
2016-06-22git-p4: correct hasBranchPrefix verbose outputAndrew Oakley1-1/+1
2016-05-10Merge branch 'ls/p4-lfs'Junio C Hamano1-3/+10
2016-04-28git-p4: fix Git LFS pointer parsingLars Schneider1-3/+10
2016-04-19git-p4: add P4 jobs to git commit messageJan Durovec1-0/+12
2016-04-06Merge branch 'ls/p4-map-user'Junio C Hamano1-0/+9
2016-03-15git-p4: map a P4 user to Git author name and email addressLars Schneider1-0/+9
2016-01-13git-p4.py: add support for filetype changeRomain Picard1-2/+7
2015-12-28Merge branch 'sh/p4-multi-depot'Junio C Hamano1-25/+30
2015-12-21git-p4: reduce number of server queries for fetchesSam Hocevar1-23/+21
2015-12-21git-p4: support multiple depot paths in p4 submitSam Hocevar1-2/+9
2015-12-15Merge branch 'ls/p4-keep-empty-commits'Junio C Hamano1-17/+27
2015-12-10git-p4: add option to keep empty commitsLars Schneider1-17/+27
2015-12-01Merge branch 'maint'Jeff King1-43/+57
2015-12-01Merge branch 'eg/p4-submit-catch-failure' into maintJeff King1-34/+37
2015-12-01Merge branch 'ld/p4-detached-head' into maintJeff King1-9/+20
2015-11-24git-p4: clean up after p4 submit failureGIRARD Etienne1-34/+37
2015-11-24git-p4: work with a detached headLuke Diamand1-7/+16
2015-11-24git-p4: add option to system() to return subshell statusLuke Diamand1-2/+4
2015-11-03Merge branch 'ls/p4-translation-failure' into maintJunio C Hamano1-11/+16
2015-11-03Merge branch 'ld/p4-import-labels' into maintJunio C Hamano1-8/+17
2015-10-26Merge branch 'dk/p4-import-ctypes'Junio C Hamano1-0/+1
2015-10-20git-p4: import the ctypes moduleDennis Kaarsemaker1-0/+1
2015-10-15Merge branch 'ls/p4-lfs'Junio C Hamano1-16/+254
2015-10-15Merge branch 'ls/p4-translation-failure'Junio C Hamano1-11/+16
2015-10-07Merge branch 'ls/p4-path-encoding'Junio C Hamano1-0/+10
2015-10-05Merge branch 'ld/p4-import-labels'Junio C Hamano1-8/+17
2015-10-03git-p4: add Git LFS backend for large file systemLars Schneider1-0/+72
2015-10-03git-p4: add support for large file systemsLars Schneider1-10/+129
2015-10-03git-p4: check free space during streamingLars Schneider1-0/+18
2015-10-03git-p4: add file streaming progress in verbose modeLars Schneider1-2/+18
2015-10-03git-p4: return an empty list if a list config has no valuesLars Schneider1-0/+2
2015-10-03git-p4: add gitConfigInt readerLars Schneider1-0/+11
2015-10-03git-p4: add optional type specifier to gitConfig readerLars Schneider1-6/+6
2015-09-22git-p4: handle "Translation of file content failed"Lars Schneider1-11/+16
2015-09-21git-p4: use replacement character for non UTF-8 characters in pathsLars Schneider1-1/+1
2015-09-16git-p4: improve path encoding verbose outputLars Schneider1-10/+9
2015-09-03git-p4: add config git-p4.pathEncodingLars Schneider1-0/+11
2015-08-28git-p4: fix P4 label import for unprocessed commitsLuke Diamand1-8/+17
2015-08-28git-p4: do not terminate creating tag for unknown commitLuke Diamand1-2/+2
2015-08-28git-p4: honor core.ignorecase when using P4 client specsLars Schneider1-0/+7
2015-06-24Merge branch 'ld/p4-changes-block-size'Junio C Hamano1-22/+63
2015-06-11Merge branch 'mt/p4-depotFile-at-version'Junio C Hamano1-1/+1
2015-06-10git-p4: fixing --changes-block-size handlingLuke Diamand1-22/+63
2015-06-05Merge branch 'ld/p4-editor-multi-words'Junio C Hamano1-1/+1
2015-05-27p4: retrieve the right revision of the file in UTF-16 codepathMiguel Torroja1-1/+1
2015-05-24git-p4: fix handling of multi-word P4EDITORLuke Diamand1-1/+1
2015-05-11Merge branch 'va/p4-client-path'Junio C Hamano1-4/+9
2015-05-11Merge branch 'ls/p4-changes-block-size'Junio C Hamano1-11/+41
2015-04-23git-p4: improve client path detection when branches are usedVitor Antunes1-4/+9
2015-04-20git-p4: use -m when running p4 changesLex Spoon1-11/+41
2015-04-04git-p4: fix filetype detection on files opened exclusivelyBlair Holloway1-1/+1
2015-02-11Merge branch 'ld/p4-submit-hint'Junio C Hamano1-1/+1
2015-02-11git-p4: support excluding paths on syncLuke Diamand1-10/+10
2015-01-23git-p4: correct --prepare-p4-only instructionsLuke Diamand1-1/+1
2014-06-13git-p4: fix submit in non --prepare-p4-only modeMaxime Coste1-6/+6
2014-05-27git-p4: Do not include diff in spec file when just preparing p4Maxime Coste1-23/+26
2014-05-07Merge branch 'cl/p4-use-diff-tree'Junio C Hamano1-1/+1
2014-05-07git-p4: format-patch to diff-tree change breaks binary patchesTolga Ceylan1-1/+1
2014-04-07git-p4: explicitly specify that HEAD is a revisionVlad Dogaru1-1/+1
2014-01-22git p4: fix an error message when "p4 where" failsPete Wyckoff1-1/+1
2014-01-22git p4: handle files with wildcards when doing RCS scrubbingPete Wyckoff1-2/+2
2014-01-22git p4 test: do not pollute /tmpPete Wyckoff1-1/+1
2014-01-22git p4: work around p4 bug that causes empty symlinksPete Wyckoff1-1/+8
2013-12-12Merge branch 'cl/p4-use-diff-tree'Junio C Hamano1-1/+1
2013-11-22git p4: Use git diff-tree instead of format-patchCrestez Dan Leonard1-1/+1
2013-09-18Merge branch 'ks/p4-view-spec'Junio C Hamano1-164/+59
2013-09-03git p4: implement view spec wildcards with "p4 where"Kazuki Saitoh1-164/+59
2013-08-12git-p4: Fix occasional truncation of symlink contents.Alexandru Juncu1-2/+6
2013-07-29many small typofixesOndřej Bílka1-1/+1
2013-06-26Merge branch 'vl/typofix'Junio C Hamano1-1/+1
2013-06-19random typofixes (committed missing a 't', successful missing an 's')Veres Lajos1-1/+1
2013-03-11git p4: avoid expanding client paths in chdirMiklós Fazekas1-7/+22
2013-02-04Merge branch 'pw/git-p4-on-cygwin'Junio C Hamano1-39/+80
2013-02-01Merge branch 'bc/git-p4-for-python-2.4'Junio C Hamano1-4/+26
2013-01-26git p4: introduce gitConfigBoolPete Wyckoff1-19/+26
2013-01-26git p4: avoid shell when calling git configPete Wyckoff1-6/+9
2013-01-26git p4: avoid shell when invoking git config --get-allPete Wyckoff1-1/+2
2013-01-26git p4: avoid shell when invoking git rev-listPete Wyckoff1-2/+3
2013-01-26git p4: avoid shell when mapping usersPete Wyckoff1-1/+2
2013-01-26git p4: disable read-only attribute before deletingPete Wyckoff1-0/+10
2013-01-26git p4: scrub crlf for utf16 files on windowsPete Wyckoff1-1/+23
2013-01-26git p4: remove unreachable windows \r\n conversion codePete Wyckoff1-9/+0
2013-01-26git p4: generate better error message for bad depot pathPete Wyckoff1-0/+1
2013-01-26git p4: remove unused importsPete Wyckoff1-5/+9
2013-01-26git p4: temp branch name should use / even on windowsPete Wyckoff1-1/+1
2013-01-26git-p4.py: support Python 2.4Brandon Casey1-3/+24
2013-01-26git-p4.py: support Python 2.5Brandon Casey1-1/+2
2013-01-21Merge branch 'pw/p4-branch-fixes'Junio C Hamano1-45/+107
2013-01-15git p4: fix submit when no master branchPete Wyckoff1-1/+5
2013-01-15git p4: fix sync --branch when no master branchPete Wyckoff1-3/+11
2013-01-15git p4: fail gracefully on sync with no master branchPete Wyckoff1-2/+27
2013-01-15git p4: rearrange self.initialParent usePete Wyckoff1-3/+9
2013-01-15git p4: allow short ref names to --branchPete Wyckoff1-1/+11