+1

.gitignore

··· 92 /git-name-rev 93 /git-mv 94 /git-notes 0 95 /git-pack-redundant 96 /git-pack-objects 97 /git-pack-refs

··· 92 /git-name-rev 93 /git-mv 94 /git-notes 95 + /git-p4 96 /git-pack-redundant 97 /git-pack-objects 98 /git-pack-refs

+6 -13

Documentation/git-p4.txt

··· 31 32 EXAMPLE 33 ------- 34 - * Create an alias for 'git p4', using the full path to the 'git-p4' 35 - script if needed: 36 - + 37 - ------------ 38 - $ git config --global alias.p4 '!git-p4' 39 - ------------ 40 - 41 * Clone a repository: 42 + 43 ------------ ··· 311 work properly; the submit command looks only at the variable and does 312 not have a command-line option. 313 314 - The full syntax for a p4 view is documented in 'p4 help views'. Git-p4 315 knows only a subset of the view syntax. It understands multi-line 316 mappings, overlays with '+', exclusions with '-' and double-quotes 317 - around whitespace. Of the possible wildcards, git-p4 only handles 318 - '...', and only when it is at the end of the path. Git-p4 will complain 319 if it encounters an unhandled wildcard. 320 321 Bugs in the implementation of overlap mappings exist. If multiple depot 322 paths map through overlays to the same location in the repository, 323 - git-p4 can choose the wrong one. This is hard to solve without 324 - dedicating a client spec just for git-p4. 325 326 - The name of the client can be given to git-p4 in multiple ways. The 327 variable 'git-p4.client' takes precedence if it exists. Otherwise, 328 normal p4 mechanisms of determining the client are used: environment 329 variable P4CLIENT, a file referenced by P4CONFIG, or the local host name.

··· 31 32 EXAMPLE 33 ------- 0 0 0 0 0 0 0 34 * Clone a repository: 35 + 36 ------------ ··· 304 work properly; the submit command looks only at the variable and does 305 not have a command-line option. 306 307 + The full syntax for a p4 view is documented in 'p4 help views'. 'Git p4' 308 knows only a subset of the view syntax. It understands multi-line 309 mappings, overlays with '+', exclusions with '-' and double-quotes 310 + around whitespace. Of the possible wildcards, 'git p4' only handles 311 + '...', and only when it is at the end of the path. 'Git p4' will complain 312 if it encounters an unhandled wildcard. 313 314 Bugs in the implementation of overlap mappings exist. If multiple depot 315 paths map through overlays to the same location in the repository, 316 + 'git p4' can choose the wrong one. This is hard to solve without 317 + dedicating a client spec just for 'git p4'. 318 319 + The name of the client can be given to 'git p4' in multiple ways. The 320 variable 'git-p4.client' takes precedence if it exists. Otherwise, 321 normal p4 mechanisms of determining the client are used: environment 322 variable P4CLIENT, a file referenced by P4CONFIG, or the local host name.

+3

INSTALL

··· 131 use English. Under autoconf the configure script will do this 132 automatically if it can't find libintl on the system. 133 0 0 0 134 - Some platform specific issues are dealt with Makefile rules, 135 but depending on your specific installation, you may not 136 have all the libraries/tools needed, or you may have

··· 131 use English. Under autoconf the configure script will do this 132 automatically if it can't find libintl on the system. 133 134 + - Python version 2.6 or later is needed to use the git-p4 135 + interface to Perforce. 136 + 137 - Some platform specific issues are dealt with Makefile rules, 138 but depending on your specific installation, you may not 139 have all the libraries/tools needed, or you may have

+1

Makefile

··· 440 SCRIPT_PERL += git-svn.perl 441 442 SCRIPT_PYTHON += git-remote-testgit.py 0 443 444 SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ 445 $(patsubst %.perl,%,$(SCRIPT_PERL)) \

··· 440 SCRIPT_PERL += git-svn.perl 441 442 SCRIPT_PYTHON += git-remote-testgit.py 443 + SCRIPT_PYTHON += git-p4.py 444 445 SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ 446 $(patsubst %.perl,%,$(SCRIPT_PERL)) \

+1

command-list.txt

··· 76 git-mv mainporcelain common 77 git-name-rev plumbinginterrogators 78 git-notes mainporcelain 0 79 git-pack-objects plumbingmanipulators 80 git-pack-redundant plumbinginterrogators 81 git-pack-refs ancillarymanipulators

··· 76 git-mv mainporcelain common 77 git-name-rev plumbinginterrogators 78 git-notes mainporcelain 79 + git-p4 foreignscminterface 80 git-pack-objects plumbingmanipulators 81 git-pack-redundant plumbinginterrogators 82 git-pack-refs ancillarymanipulators

contrib/fast-import/git-p4 git-p4.py

+12

contrib/fast-import/git-p4.README

··· 0 0 0 0 0 0 0 0 0 0 0 0

··· 1 + The git-p4 script moved to the top-level of the git source directory. 2 + 3 + Invoke it as any other git command, like "git p4 clone", for instance. 4 + 5 + Note that the top-level git-p4.py script is now the source. It is 6 + built using make to git-p4, which will be installed. 7 + 8 + Windows users can copy the git-p4.py source script directly, possibly 9 + invoking it through a batch file called "git-p4.bat" in the same folder. 10 + It should contain just one line: 11 + 12 + @python "%~d0%~p0git-p4.py" %*

-1

contrib/fast-import/git-p4.bat

··· 1 - @python "%~d0%~p0git-p4" %*

··· 0

+1 -1

t/lib-git-p4.sh

··· 13 test_done 14 } 15 16 - GITP4="$GIT_BUILD_DIR/contrib/fast-import/git-p4" 17 18 # Try to pick a unique port: guess a large number, then hope 19 # no more than one of each test is running.

··· 13 test_done 14 } 15 16 + GITP4="$GIT_BUILD_DIR/git-p4" 17 18 # Try to pick a unique port: guess a large number, then hope 19 # no more than one of each test is running.