git-p4: test and document --use-client-spec
The depot path is required, even with this option. Make sure git-p4 fails and exits with non-zero. Contents in the specified depot path will be rearranged according to the client spec. Test this and add a note in the docs. Leave an XXX suggesting that this is somewhat confusing behavior that might be good to fix later. Function stripRepoPath() looks at self.useClientSpec. Make sure this is set both for command-line option --use-client-spec and for configuration variable git-p4.useClientSpec. Test this. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
ae3f41f20a
commit
09fca77b9e
@ -1951,7 +1951,10 @@ class P4Sync(Command, P4UserMap):
|
||||
if not gitBranchExists(self.refPrefix + "HEAD") and self.importIntoRemotes and gitBranchExists(self.branch):
|
||||
system("git symbolic-ref %sHEAD %s" % (self.refPrefix, self.branch))
|
||||
|
||||
if self.useClientSpec or gitConfig("git-p4.useclientspec") == "true":
|
||||
if not self.useClientSpec:
|
||||
if gitConfig("git-p4.useclientspec", "--bool") == "true":
|
||||
self.useClientSpec = True
|
||||
if self.useClientSpec:
|
||||
self.getClientSpec()
|
||||
|
||||
# TODO: should always look at previous commits,
|
||||
@ -2380,6 +2383,7 @@ def main():
|
||||
|
||||
if not cmd.run(args):
|
||||
parser.print_help()
|
||||
sys.exit(2)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
Reference in New Issue
Block a user