summaryrefslogtreecommitdiff
path: root/git-p4.py
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kk/p4-client-name-encoding-fix'Junio C Hamano2022-08-011-9/+42
|\
| * git-p4: refactoring of p4CmdList()Kilian Kilger2022-07-211-11/+42
| * git-p4: fix bug with encoding of p4 client nameKilian Kilger2022-07-081-2/+4
* | Merge branch 'mb/p4-utf16-crlf'Junio C Hamano2022-07-271-1/+1
|\ \
| * | git-p4: fix CR LF handling for utf16 filesMoritz Baumann2022-07-201-1/+1
| |/
* | git-p4: fix error handling in P4Unshelve.renameBranch()Moritz Baumann2022-07-201-5/+2
* | git-p4: fix typo in P4Submit.applyCommit()Moritz Baumann2022-07-201-1/+1
|/
* Merge branch 'tk/p4-metadata-coding-strategies'Junio C Hamano2022-05-201-16/+107
|\
| * git-p4: improve encoding handling to support inconsistent encodingsTao Klerks2022-05-041-16/+107
* | Merge branch 'kf/p4-multiple-remotes'Junio C Hamano2022-05-201-1/+9
|\ \
| * | git-p4: fix issue with multiple perforce remotesKirill Frolov2022-03-211-1/+9
| |/
* | Merge branch 'tk/p4-with-explicity-sync'Junio C Hamano2022-05-201-14/+37
|\ \
| * | git-p4: support explicit sync of arbitrary existing git-p4 refsTao Klerks2022-04-061-14/+38
| |/
* | Merge branch 'tk/p4-utf8-bom'Junio C Hamano2022-05-201-0/+10
|\ \
| * | git-p4: preserve utf8 BOM when importing from p4 to gitTao Klerks2022-04-061-0/+10
| |/
* | git-p4: sort importsJoel Holdsworth2022-04-011-8/+10
* | git-p4: seperate multiple statements onto seperate linesJoel Holdsworth2022-04-011-2/+5
* | git-p4: move inline comments to line aboveJoel Holdsworth2022-04-011-3/+7
* | git-p4: only seperate code blocks by a single empty lineJoel Holdsworth2022-04-011-3/+0
* | git-p4: compare to singletons with "is" and "is not"Joel Holdsworth2022-04-011-3/+3
* | git-p4: normalize indentation of lines in conditionalsJoel Holdsworth2022-04-011-9/+7
* | git-p4: ensure there is a single space around all operatorsJoel Holdsworth2022-04-011-5/+5
* | git-p4: ensure every comment has a single #Joel Holdsworth2022-04-011-6/+6
* | git-p4: remove spaces between dictionary keys and colonsJoel Holdsworth2022-04-011-7/+7
* | git-p4: remove redundant backslash-continuations inside bracketsJoel Holdsworth2022-04-011-9/+9
* | git-p4: remove extraneous spaces before function argumentsJoel Holdsworth2022-04-011-11/+11
* | git-p4: place a single space after every commaJoel Holdsworth2022-04-011-9/+9
* | git-p4: removed brackets when assigning multiple return valuesJoel Holdsworth2022-04-011-19/+19
* | git-p4: remove spaces around default argumentsJoel Holdsworth2022-04-011-6/+6
* | git-p4: remove padding from lists, tuples and function argumentsJoel Holdsworth2022-04-011-18/+18
* | git-p4: sort and de-duplcate pylint disable listJoel Holdsworth2022-04-011-7/+22
* | git-p4: remove commented codeJoel Holdsworth2022-04-011-7/+0
* | git-p4: convert descriptive class and function comments into docstringsJoel Holdsworth2022-04-011-70/+94
* | git-p4: improve consistency of docstring formattingJoel Holdsworth2022-04-011-133/+158
* | git-p4: indent with 4-spacesJoel Holdsworth2022-04-011-9/+9
* | git-p4: remove unneeded semicolons from statementsJoel Holdsworth2022-04-011-14/+14
* | git-p4: add blank lines between functions and class definitionsJoel Holdsworth2022-04-011-0/+107
|/
* Merge branch 'ab/config-based-hooks-2'Junio C Hamano2022-02-091-64/+6
|\
| * git-p4: use 'git hook' to run hooksEmily Shaffer2022-01-071-64/+6
* | Merge branch 'jh/p4-spawning-external-commands-cleanup'Junio C Hamano2022-02-051-97/+79
|\ \
| * | git-p4: don't print shell commands as python listsJoel Holdsworth2022-01-061-8/+9
| * | git-p4: pass command arguments as lists instead of using shellJoel Holdsworth2022-01-061-62/+43
| * | git-p4: don't select shell mode using the type of the command argumentJoel Holdsworth2022-01-061-63/+63
* | | Merge branch 'jh/p4-fix-use-of-process-error-exception'Junio C Hamano2022-02-051-3/+3
|\ \ \
| * | | git-p4: fix instantiation of CalledProcessErrorJoel Holdsworth2022-01-061-3/+3
| |/ /
* | | Merge branch 'jh/p4-remove-unused'Junio C Hamano2022-01-101-76/+0
|\ \ \
| * | | git-p4: remove "rollback" verbJoel Holdsworth2021-12-221-60/+0
| * | | git-p4: remove "debug" verbJoel Holdsworth2021-12-221-16/+0
| | |/ | |/|
* | | Merge branch 'jh/p4-human-unit-numbers'Junio C Hamano2022-01-101-6/+21
|\ \ \ | |_|/ |/| |
| * | git-p4: show progress as an integerJoel Holdsworth2021-12-201-1/+2