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>
Pete Wyckoff committed
Apr 8, 2012 at 20:18 UTC
b6f930576469052af87e96b549c37630b56aab93
9 files changed
+25
-15
.gitignore
+1
@@ -92,6 +92,7 @@
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
Documentation/git-p4.txt
+6
-13
@@ -31,13 +31,6 @@ the updated p4 remote branch.
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
-
34
* Clone a repository:
35
+
36
------------
@@ -311,19 +304,19 @@ configuration file. This allows future 'git p4 submit' commands to
304
work properly; the submit command looks only at the variable and does
305
not have a command-line option.
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'
308
knows only a subset of the view syntax. It understands multi-line
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
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,
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'.
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
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.
INSTALL
+3
@@ -131,6 +131,9 @@ Issues of note:
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
Makefile
+1
@@ -440,6 +440,7 @@ SCRIPT_PERL += git-send-email.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)) \
command-list.txt
+1
@@ -76,6 +76,7 @@ git-mktree plumbingmanipulators
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.README
new
+12
@@ -0,0 +1,12 @@
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" %*
contrib/fast-import/git-p4.bat
deleted
-1
@@ -1 +0,0 @@
1
-@python "%~d0%~p0git-p4" %*
git-p4.py
renamed
t/lib-git-p4.sh
+1
-1
@@ -13,7 +13,7 @@ fi
13
test_done
14
}
15
16
-GITP4="$GIT_BUILD_DIR/contrib/fast-import/git-p4"
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.