aboutsummaryrefslogtreecommitdiffstats
path: root/git-p4.py
AgeCommit message (Expand)AuthorFilesLines
2024-02-06Merge branch 'jt/p4-spell-re-with-raw-string'Junio C Hamano1-13/+13
2024-01-29git-p4: use raw string literals for regular expressionsJames Touton1-13/+13
2024-01-11git-p4: stop reaching into the refdbPatrick Steinhardt1-1/+2
2023-10-19git-p4 shouldn't attempt to store symlinks in LFSMatthew McClain1-0/+4
2022-08-01Merge branch 'kk/p4-client-name-encoding-fix'Junio C Hamano1-9/+42
2022-07-27Merge branch 'mb/p4-utf16-crlf'Junio C Hamano1-1/+1
2022-07-21git-p4: refactoring of p4CmdList()Kilian Kilger1-11/+42
2022-07-20git-p4: fix error handling in P4Unshelve.renameBranch()Moritz Baumann1-5/+2
2022-07-20git-p4: fix typo in P4Submit.applyCommit()Moritz Baumann1-1/+1
2022-07-20git-p4: fix CR LF handling for utf16 filesMoritz Baumann1-1/+1
2022-07-08git-p4: fix bug with encoding of p4 client nameKilian Kilger1-2/+4
2022-05-20Merge branch 'tk/p4-metadata-coding-strategies'Junio C Hamano1-16/+107
2022-05-20Merge branch 'kf/p4-multiple-remotes'Junio C Hamano1-1/+9
2022-05-20Merge branch 'tk/p4-with-explicity-sync'Junio C Hamano1-14/+37
2022-05-20Merge branch 'tk/p4-utf8-bom'Junio C Hamano1-0/+10
2022-05-04git-p4: improve encoding handling to support inconsistent encodingsTao Klerks1-16/+107
2022-04-06git-p4: preserve utf8 BOM when importing from p4 to gitTao Klerks1-0/+10
2022-04-06git-p4: support explicit sync of arbitrary existing git-p4 refsTao Klerks1-14/+38
2022-04-01git-p4: sort importsJoel Holdsworth1-8/+10
2022-04-01git-p4: seperate multiple statements onto seperate linesJoel Holdsworth1-2/+5
2022-04-01git-p4: move inline comments to line aboveJoel Holdsworth1-3/+7
2022-04-01git-p4: only seperate code blocks by a single empty lineJoel Holdsworth1-3/+0
2022-04-01git-p4: compare to singletons with "is" and "is not"Joel Holdsworth1-3/+3
2022-04-01git-p4: normalize indentation of lines in conditionalsJoel Holdsworth1-9/+7
2022-04-01git-p4: ensure there is a single space around all operatorsJoel Holdsworth1-5/+5
2022-04-01git-p4: ensure every comment has a single #Joel Holdsworth1-6/+6
2022-04-01git-p4: remove spaces between dictionary keys and colonsJoel Holdsworth1-7/+7
2022-04-01git-p4: remove redundant backslash-continuations inside bracketsJoel Holdsworth1-9/+9
2022-04-01git-p4: remove extraneous spaces before function argumentsJoel Holdsworth1-11/+11
2022-04-01git-p4: place a single space after every commaJoel Holdsworth1-9/+9
2022-04-01git-p4: removed brackets when assigning multiple return valuesJoel Holdsworth1-19/+19
2022-04-01git-p4: remove spaces around default argumentsJoel Holdsworth1-6/+6
2022-04-01git-p4: remove padding from lists, tuples and function argumentsJoel Holdsworth1-18/+18
2022-04-01git-p4: sort and de-duplcate pylint disable listJoel Holdsworth1-7/+22
2022-04-01git-p4: remove commented codeJoel Holdsworth1-7/+0
2022-04-01git-p4: convert descriptive class and function comments into docstringsJoel Holdsworth1-70/+94
2022-04-01git-p4: improve consistency of docstring formattingJoel Holdsworth1-133/+158
2022-04-01git-p4: indent with 4-spacesJoel Holdsworth1-9/+9
2022-04-01git-p4: remove unneeded semicolons from statementsJoel Holdsworth1-14/+14
2022-04-01git-p4: add blank lines between functions and class definitionsJoel Holdsworth1-0/+107
2022-03-21git-p4: fix issue with multiple perforce remotesKirill Frolov1-1/+9
2022-02-09Merge branch 'ab/config-based-hooks-2'Junio C Hamano1-64/+6
2022-02-05Merge branch 'jh/p4-spawning-external-commands-cleanup'Junio C Hamano1-97/+79
2022-02-05Merge branch 'jh/p4-fix-use-of-process-error-exception'Junio C Hamano1-3/+3
2022-01-10Merge branch 'jh/p4-remove-unused'Junio C Hamano1-76/+0
2022-01-10Merge branch 'jh/p4-human-unit-numbers'Junio C Hamano1-6/+21
2022-01-07git-p4: use 'git hook' to run hooksEmily Shaffer1-64/+6
2022-01-06git-p4: fix instantiation of CalledProcessErrorJoel Holdsworth1-3/+3
2022-01-06git-p4: don't print shell commands as python listsJoel Holdsworth1-8/+9
2022-01-06git-p4: pass command arguments as lists instead of using shellJoel Holdsworth1-62/+43
2022-01-06git-p4: don't select shell mode using the type of the command argumentJoel Holdsworth1-63/+63
2021-12-22git-p4: remove "rollback" verbJoel Holdsworth1-60/+0
2021-12-22git-p4: remove "debug" verbJoel Holdsworth1-16/+0
2021-12-20git-p4: show progress as an integerJoel Holdsworth1-1/+2
2021-12-20git-p4: print size values in appropriate unitsJoel Holdsworth1-5/+19
2021-12-16git-p4: resolve RCS keywords in bytes not utf-8Joel Holdsworth1-7/+8
2021-12-16git-p4: open temporary patch file for write onlyJoel Holdsworth1-1/+1
2021-12-16git-p4: add raw option to read_pipelinesJoel Holdsworth1-3/+5
2021-12-16git-p4: pre-compile RCS keyword regexesJoel Holdsworth1-30/+18
2021-12-16git-p4: use with statements to close files after use in patchRCSKeywordsJoel Holdsworth1-8/+5
2021-06-28git-p4: fix failed submit by skip non-text data filesdorgon.chang1-2/+5
2021-05-06git-p4: speed up search for branch parentJoachim Kuebart1-11/+10
2021-01-15Merge branch 'dl/p4-encode-after-kw-expansion'Junio C Hamano1-1/+1
2020-12-23git-p4: fix syncing file types with patternDaniel Levin1-1/+1
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