summaryrefslogtreecommitdiff
path: root/git-p4.py
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bk/p4-prepare-p4-only-fix'Junio C Hamano2020-06-021-4/+5
|\
| * git-p4.py: fix --prepare-p4-only error with multiple commitsBen Keene2020-05-121-4/+5
* | git-p4: recover from inconsistent perforce historyAndrew Oakley2020-05-101-2/+41
|/
* Merge branch 'bk/p4-pre-edit-changelist'Junio C Hamano2020-04-221-55/+181
|\
| * git-p4: add RCS keyword status messageBen Keene2020-02-141-0/+4
| * git-p4: add p4 submit hooksBen Keene2020-02-141-1/+34
| * git-p4: restructure code in submitBen Keene2020-02-141-41/+51
| * git-p4: add --no-verify optionBen Keene2020-02-111-13/+19
| * git-p4: add p4-pre-submit exit textBen Keene2020-02-111-1/+9
| * git-p4: create new function run_git_hookBen Keene2020-02-111-7/+69
| * git-p4: rewrite prompt to be Windows compatibleBen Keene2020-02-111-1/+4
* | Merge branch 'yz/p4-py3'Junio C Hamano2020-03-251-95/+140
|\ \
| * | git-p4: use python3's input() everywhereYang Zhao2020-01-151-2/+12
| * | git-p4: simplify regex pattern generation for parsing diff-treeYang Zhao2020-01-151-7/+6
| * | git-p4: use dict.items() iteration for python3 compatibilityYang Zhao2020-01-151-1/+1
| * | git-p4: use functools.reduce instead of reduceYang Zhao2020-01-151-1/+2
| * | git-p4: fix freezing while waiting for fast-import progressYang Zhao2020-01-151-0/+1
| * | git-p4: use marshal format version 2 when sending to p4Yang Zhao2020-01-151-1/+2
| * | git-p4: open .gitp4-usercache.txt in text modeYang Zhao2020-01-151-2/+2
| * | git-p4: convert path to unicode before processing themYang Zhao2020-01-151-25/+44
| * | git-p4: encode/decode communication with git for python3Yang Zhao2020-01-151-4/+17
| * | git-p4: encode/decode communication with p4 for python3Yang Zhao2020-01-151-13/+46
| * | git-p4: remove string type aliasingYang Zhao2020-01-151-16/+0
| * | git-p4: change the expansion test from basestring to listBen Keene2020-01-151-9/+9
| * | git-p4: make python2.7 the oldest supported versionYang Zhao2020-01-151-18/+2
* | | git-p4: avoid leak of file handle when cloningLuke Diamand2020-01-301-1/+2
* | | git-p4: check for access to remote host earlierLuke Diamand2020-01-301-0/+2
* | | git-p4: cleanup better on error exitLuke Diamand2020-01-301-15/+28
* | | git-p4: create helper function importRevisions()Luke Diamand2020-01-301-64/+68
* | | git-p4: disable some pylint warnings, to get pylint output to something manag...Luke Diamand2020-01-301-0/+8
* | | git-p4: add P4CommandException to report errors talking to PerforceLuke Diamand2020-01-301-0/+8
* | | git-p4: make closeStreams() idempotentLuke Diamand2020-01-301-0/+3
| |/ |/|
* | Merge branch 'bk/p4-misc-usability'Junio C Hamano2020-01-021-32/+42
|\ \
| * | git-p4: show detailed help when parsing options failBen Keene2019-12-161-1/+6
| * | git-p4: yes/no prompts should sanitize user textBen Keene2019-12-161-31/+36
| |/
* | git-p4: honor lfs.storage configuration variabler.burenkov2019-12-111-2/+8
|/
* git-p4: auto-delete named temporary filePhilip.McGraw2019-10-061-7/+6
* Merge branch 'am/p4-branches-excludes'Junio C Hamano2019-07-091-17/+27
|\
| * git-p4: respect excluded paths when detecting branchesMazo, Andrey2019-04-021-2/+1
| * git-p4: don't exclude other files with same prefixMazo, Andrey2019-04-021-7/+14
| * git-p4: don't groom exclude path list on every commitMazo, Andrey2019-04-021-5/+7
| * git-p4: match branches case insensitively if configuredMazo, Andrey2019-04-021-2/+2
| * git-p4: detect/prevent infinite loop in gitCommitByP4Change()Mazo, Andrey2019-04-021-1/+3
* | Merge branch 'mm/p4-unshelve-windows-fix'Junio C Hamano2019-06-171-1/+1
|\ \
| * | p4 unshelve: fix "Not a valid object name HEAD0" on WindowsMike Mueller2019-05-281-1/+1
| |/
* | git-p4: allow unshelving of branched filesSimon Williams2019-05-281-1/+1
|/
* Merge branch 'ld/git-p4-shelve-update-fix'Junio C Hamano2019-02-051-0/+2
|\
| * git-p4: handle update of moved/copied files when updating a shelveLuke Diamand2019-01-181-0/+2
* | git-p4: fix problem when p4 login is not necessaryPeter Osterlund2019-01-071-0/+2
|/
* git-p4: fully support unshelving changelistsLuke Diamand2018-10-161-36/+48
View Lorry Controller Status