Signed-off-by: NAnand Kumria <wildfire@progsoc.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Two additional wrappers to cover 3 places where we utilise p4 in piped
form.  Found by Tor Arvid Lund.
Signed-off-by: NAnand Kumria <wildfire@progsoc.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NAnand Kumria <wildfire@progsoc.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Some repositories require authentication and access to certain
 hosts. Allow git-p4 to pull this information from the configuration
Signed-off-by: NAnand Kumria <wildfire@progsoc.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NAnand Kumria <wildfire@progsoc.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NAnand Kumria <wildfire@progsoc.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Rather than having three locations where the 'p4' command is built up,
 refactor this into the one place. This will, eventually, allow us to
 have one place where we modify the evironment or pass extra
 command-line options to the 'p4' binary.
Signed-off-by: NAnand Kumria <wildfire@progsoc.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NAnand Kumria <wildfire@progsoc.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Similiar to our 'p4_read_pipe_lines' command, we can isolate
 specific changes to the invocation method in the one location
 with this change.
Signed-off-by: NAnand Kumria <wildfire@progsoc.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Now that we have the new command, we can utilise it and then
 eventually, isolate any changes required to the one place.
Signed-off-by: NAnand Kumria <wildfire@progsoc.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

This will make it easier to isolate changes to how 'p4' is invoked
 (whether with parameters or not, etc.).
Signed-off-by: NAnand Kumria <wildfire@progsoc.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

At least, this is true in 2007.2, according to the documentation.
Signed-off-by: NDaniel Barkalow <barkalow@iabervon.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

I'm working with a perforce repo using git-p4. There are some config
files which I need to change locally according to my environment. I'm
using a 'local' git branch to park these changes. And I want to avoid
accidentally checking them into p4 just by doing "git p4 submit"
mindlessly without realizing which branch I'm actually on.

This patch adds a new git config, 'git-p4.allowSubmit', which is a
whitelist of branch names. "git p4 submit" will only allow submissions
from local branches on the list. Useful for preventing inadvertently
submitting from a strictly local branch.

For backward compatibility, if this config is not set at all,
submissions from all branches are allowed.
Signed-off-by: NJing Xue <jingxue@digizenstudio.com>
Acked-By: NSimon Hausmann <simon@lst.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

git-p4s handling of Windows style EOL was broken after the removal
of the p4 submit template handling in commit f2a6059. Fix that, and
make getP4OpenedType() more robust.
Signed-off-by: NMarius Storm-Olsen <marius@trolltech.com>
Signed-off-by: NSimon Hausmann <simon@lst.de>

Perforce allows you to set the P4EDITOR environment variable to your
preferred editor for use in perforce.  Since we are displaying a
perforce changelog to the user we should use it when it is defined.
Signed-off-by: NShawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: NSimon Hausmann <simon@lst.de>

A custom diffing utility can be specified for the 'p4 diff' command by
setting the P4DIFF environment variable.  However when using a custom
diffing utility such as 'vimdiff' passing options like -du can cause
unexpected behavior.

Since the goal is to generate a unified diff of the changes and attach
them to the bottom of the p4 submit log we should unset P4DIFF if it
has been set in order to generate the diff properly.
Signed-off-by: NShawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: NSimon Hausmann <simon@lst.de>

 Use shallow copies in loop, and join content at the end. Then do the substitution, if needed.
Signed-off-by: NMarius Storm-Olsen <marius@trolltech.com>
Signed-off-by: NSimon Hausmann <simon@lst.de>

Commit 3a70cdfa made readP4Files abort quickly
when the changeset only contains files that are marked for deletion with an empty return
value, which caused the commit to not do anything.

This commit changes readP4Files to distinguish between files that need to be passed to p4
print and files that have no content ("deleted") and merge them in the returned
list.
Signed-off-by: NSimon Hausmann <simon@lst.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

When syncing, git-p4 will only download files that are included in the active
perforce client spec. This does not change the default behaviour - it requires
that the user either supplies the command line argument --use-client-spec, or
sets the git config option p4.useclientspec to "true".
Signed-off-by: NTor Arvid Lund <torarvid@gmail.com>
Signed-off-by: NSimon Hausmann <simon@lst.de>

Removed storing the list of commits in a configuration file. We only need the list
of commits at run-time.
Signed-off-by: NSimon Hausmann <simon@lst.de>

This feature was originally meant to allow for quicker direct submits into perforce, but
it turns out that it is not actually quicker than doing a git commit and then running
git-p4 submit.
Signed-off-by: NSimon Hausmann <simon@lst.de>

Instead of trying to substitute fields in the p4 submit template we now simply
replace the description of the submit with the log message of the git commit.
Signed-off-by: NSimon Hausmann <simon@lst.de>

This turns out to be rarely useful and is already covered by git's commit.template configuration variable.
Signed-off-by: NSimon Hausmann <simon@lst.de>

Teach git-p4 about the -/ option which adds depot paths to the exclude
list, used when cloning. The option is chosen such that the natural
Perforce syntax works, eg:

  git p4 clone //branch/path/... -//branch/path/{large,old}/...

Trailing ... on exclude paths are optional.

This is a generalization of a change by Dmitry Kakurin (thanks).
Signed-off-by: NTommy Thorn <tommy-git@thorn.ws>
Signed-off-by: NSimon Hausmann <simon@lst.de>

Signed-off-by: NToby Allsopp <toby.allsopp@navman.co.nz>

The regexp "$," can't match anything. Clearly not intended.

This was introduced in ce6f33c8 which is quite a while ago.
Signed-off-by: NTommy Thorn <tommy-git@thorn.ws>
Acked-by: NSimon Hausmann <simon@lst.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NSimon Hausmann <simon@lst.de>

Don't ask any questions when submitting, behave similar to git-svn dcommit.
Signed-off-by: NSimon Hausmann <simon@lst.de>

This patch removes the '$Keyword: ...$' '...' data, so that files
don't have spurious megre conflicts between branches.

Handles both +ko and +k styles, and leaves the '$Foo$' in
the original file.
Signed-off-by: NSimon Hausmann <simon@lst.de>

Signed-off-by: NKevin Leung <kevinlsk@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

When using an existing git repository to cache the perforce import we don't
fetch the branch mapping from perforce as that is a slow operation. However
the origin repository may not be fully up-to-date and therefore it may be
necessary to import more changes directly from Perforce.

Such a direct import needs self.knownBranches to be set up though, so
initialize it from the existing p4/* git branches.
Signed-off-by: NSimon Hausmann <simon@lst.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

This changeset takes advantage of the new parseDiffTreeEntry(...) function to
detect changes to the execute bit in the git repository.  During submit, git-p4
now looks for changes to the executable bit and if it finds them it "reopens"
the file in perforce, which allows it to change the file type.

The logic for adding the executable bit in perforce is straightforward: the +x
modifier can be used. Removing the executable bit in perforce requires that the
entire filetype be redefined (there is no way to join remove the bit with a -x
modifier, for example). This changeset includes logic to remove the executable
bit from the full file type while preserving the base file type and other
modifiers.
Signed-off-by: NChris Pettitt <cpettitt@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NChris Pettitt <cpettitt@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

The current git-p4 implementation does support file renames. However, because
it does not use the "p4 integrate" command, the history for the renamed file is
not linked to the new file.

This changeset adds support for perforce renames with the integrate command.
Currently this feature is only enabled when calling git-p4 submit with the -M
option. This is intended to look and behave similar to the "detect renames"
feature of other git commands.

The following sequence is used for renamed files:

    p4 integrate -Dt x x'
    p4 edit x'
    rm x'
    git apply
    p4 delete x

By default, perforce will not allow an integration with a target file that has
been deleted. That is, if x' in the example above is the name of a previously
deleted file then perforce will fail the integrate. The -Dt option tells
perforce to allow the target of integrate to be a previously deleted file.
Signed-off-by: NChris Pettitt <cpettitt@gmail.com>
Signed-off-by: NSimon Hausmann <simon@lst.de>

git-p4: When skipping a patch as part of "git-p4 submit" make sure we correctly revert to the previous state of the files using "p4 revert".
Signed-off-by: NSimon Hausmann <simon@lst.de>

Given that git uses 'commit', git-p4's 'sumbit' was a bit confusing at times;
often making me do 'git submit' and 'git-p4 commit' instead.
Signed-off-by: NMarius Storm-Olsen <marius@trolltech.com>
Acked-By: NSimon Hausmann <simon@lst.de>
Signed-off-by: NLars Hjemli <hjemli@gmail.com>
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>

git-p4 was missing the execute bit setting if the file had other attribute
bits set.
Acked-By: NSimon Hausmann <simon@lst.de>

If a change in a p4 "branch" appears that hasn't seen any previous commit and
that has a known branch mapping we now try to import it properly. First we
find the p4 change of the source branch that the new p4 branch is based on. Then
we using git rev-list --bisect to locate the corresponding git commit to that change.
Finally we import all changes in the new p4 branch up to the current change and resume
with the regular import.
Signed-off-by: NSimon Hausmann <simon@lst.de>

git-p4: Cleanup; moved the (duplicated) code for turning a branch into a git ref (for example foo -> refs/remotes/p4/<project>/foo) into a separate method.
Signed-off-by: NSimon Hausmann <simon@lst.de>

git-p4: Cleanup; moved the code for the initial #head or revision import into a separate function, out of P4Sync.run.
Signed-off-by: NSimon Hausmann <simon@lst.de>