freshlybakedca.ke
Git fork
git-p4: move to toplevel
Move git-p4 out of contrib/fast-import into the main code base,
aside other foreign SCM tools.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
authored by
Pete Wyckoff
and committed by
Junio C Hamano
b6f93057
e8dde3e5
+1
.gitignore
+1
.gitignore
+6
-13
Documentation/git-p4.txt
+6
-13
Documentation/git-p4.txt
···
31
31
32
32
EXAMPLE
33
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
34
* Clone a repository:
42
35
+
43
36
------------
···
311
304
work properly; the submit command looks only at the variable and does
312
305
not have a command-line option.
313
306
314
-
The full syntax for a p4 view is documented in 'p4 help views'. Git-p4
307
+
The full syntax for a p4 view is documented in 'p4 help views'. 'Git p4'
315
308
knows only a subset of the view syntax. It understands multi-line
316
309
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
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
319
312
if it encounters an unhandled wildcard.
320
313
321
314
Bugs in the implementation of overlap mappings exist. If multiple depot
322
315
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.
316
+
'git p4' can choose the wrong one. This is hard to solve without
317
+
dedicating a client spec just for 'git p4'.
325
318
326
-
The name of the client can be given to git-p4 in multiple ways. The
319
+
The name of the client can be given to 'git p4' in multiple ways. The
327
320
variable 'git-p4.client' takes precedence if it exists. Otherwise,
328
321
normal p4 mechanisms of determining the client are used: environment
329
322
variable P4CLIENT, a file referenced by P4CONFIG, or the local host name.
+3
INSTALL
+3
INSTALL
···
131
131
use English. Under autoconf the configure script will do this
132
132
automatically if it can't find libintl on the system.
133
133
134
+
- Python version 2.6 or later is needed to use the git-p4
135
+
interface to Perforce.
136
+
134
137
- Some platform specific issues are dealt with Makefile rules,
135
138
but depending on your specific installation, you may not
136
139
have all the libraries/tools needed, or you may have
+1
Makefile
+1
Makefile
+1
command-list.txt
+1
command-list.txt
contrib/fast-import/git-p4
git-p4.py
contrib/fast-import/git-p4
git-p4.py
+12
contrib/fast-import/git-p4.README
+12
contrib/fast-import/git-p4.README
···
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
contrib/fast-import/git-p4.bat
···
1
-
@python "%~d0%~p0git-p4" %*