Added support for --with-origin with multi-branch imports

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

Forgot to remove this return statement from debugging

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

Fix creating the remotes/p4 branches based on origin/* for the multi-branch import

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

Replace \r\n with \n when importing from p4 on Windows

Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>

Load the user map from p4 only once at run-time.

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

Fix multi-branch import with --silent.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Fix p4 execution in git-p4 rollback.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Catch p4 errors in rollback early enough (before deleting refs!)

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Oops, fill the /list/ correct with the p4 exit code.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Don't make len(p4Cmd("p4 changes -m 1 //foo/...")) == 0 succeed when the p4 command itself failed.

When the p4 command failed write out the exit code in the returned dict.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Make rollback work with locally imported branches

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Avoid calling git symbolic-ref refs/heads/p4//HEAD (double slash)

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Doc updates

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

Use refs/heads/* instead of refs/heads/p4/* for local imports

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Added support for --max-changes=<count> to ease import debugging

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Added support for importing multiple branches into refs/heads instead of just refs/remotes
using --import-local. Needs some further microfix but seems to work otherwise.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Fixes for rollback, delete branches that did not exist at the specified p4 change

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Fix branch detection in multi-branch imports

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Added a rollback command for debugging. It sets back the heads of the p4 branches to the specified p4 change number or earlier.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Make git-p4 submit --direct safer by also creating a git commit

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Detect with git-p4 submit --direct when there are no changes in the working directory

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Fix git symbolic-ref warning on initial clone

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Fix error detection with git-p4 submit when the requested depot path is not in the client view.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Fix conversion from old style heads/p4 to remotes/p4/master

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

Improved output for multi branch imports and noted another little todo item

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Another (potentially life-saving) idea for submit --direct

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

Had an idea for debugging, record it :)

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

Specifying --detect-branches is now only needed for the initial clone/sync.
Afterwards it's turned on implicitly if more p4 branches than remotes/p4/master
are found.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Added support for git-p4 submit --direct (experimental)

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

Use git format-patch and git apply --apply when extracting patches from git and
applying them to a Perforce checkout. This should make it possible to apply git
commits with binary files that cannot be handled by path.

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

Oops, not only /set/ gitdir on clone, also set it /correctly/ :)

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

Fix gitdir not being set when cloning. Needed for writing the p4 users cache.

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

Cache the output of "p4 users" for faster syncs on high latency links.

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

Removed unused variable, more cleanups

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

More cleanups and speedups for labels and branches

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Cleanup/speed up the branch<> file split and removed change range limitation that I added
for debugging (oops).

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

More work on the incremental importing of multiple branches.
Improved error detection by checking the exit code of git-fast-import.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Give branches a nice project prefix and don't bail out on clone if we failed
to detect the master branch.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Started rewriting the branch detection, based on "p4 branches" and "p4 branch -o foo".

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Removed unused cache variables.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Fix branch setup after initial clone.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Removed todo item that is implemented :)

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

Added support for git-p4 sync/rebase --with-origin. See git-p4.txt for details :)

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

Bite the bullet and automatically convert old style refs/heads/p4 repositories
to the new style refs/remotes/p4 branching.

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

Changed the default p4 import branch to be refs/remotes/p4/{HEAD,master}
instead of refs/heads/p4.

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

Create the origin based import branch using git update-ref instead of git branch
so that it's possible to have the import branch in refs/remotes.

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

Removed ancient and unused code to find the last imported revision from previous imports
to use for the current import by looking at the p4 tags. The current approach of using
the log message works better.

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

Removed cleantags command. It doesn't have any meaning anymore.

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

Clean up code duplication for revision parsing and fix previous commit to not
import into remotes/p4 (yet!).

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

Always pass a sha1 for the initial parent so that git-fast-import doesn't think
it's creating a new branch from itself. It's a sensible error in general but
in the case of incremental imports we have to apply force :)

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

Fixing syncing (gitdir discovery / cd) for bare repositories

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

A little todo note before I forget it :), based on a suggestion from Lars.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Fix calling git-p4 rebase from within a subdirectory (git rebase wants to be in toplevel)

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Give a better hint if git-p4 submit fails

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Added the possibility of skipping patches during git-p4 submit

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Make git-p4 work with bare repositories.

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

Fix git-p4 clone //depot/project (head import)

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Make the command call silent

Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>

Converted to unix newlines

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Make submitting work on Windows.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

Make sure all popen calls use binary mode (for Windows) and

also make gitBranchExists work on Windows.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

Added a little .bat wrapper from Marius

Signed-off-by: Simon Hausmann <hausmann@kde.org>

Use the subprocess module instead of popen2 to make it work on Windows.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

Document some implementation details, for the curious... :)

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

Cleanup, removed the old tagging code

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

cleanup, renamed self.globalPrefix to self.depotPath

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

Micro cleanup

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

Doc cleanups.

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

Handle patch errors in git-p4 submit better.

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

A new attempt at fixing the child-fast-import-process-not-finished race condition
in the clone command

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

Slightly improved formatting of the raw_input questions.

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

Removed the old patch apply code from git-p4 submit.

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

Fix the timezone formatting. Now qgit also displays (parses) it correctly.

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

Print an error message of some sort if git fast-import fails.

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

Allow for convenient rebasing after git-p4 submit

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

Added a simple example of usage to the "documentation" :)

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

fix variable usage (oops)

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

Fix file determination for #head imports

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

Added git-p4 clone convenience command

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

Honor --silent for labels

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

Turn off potentially slow label detection by default

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

Provide a tree summary after git-p4 rebase

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

Added git-p4 rebase convenience

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

Clean up python class names.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

Fix "compilation" :)

Signed-off-by: Simon Hausmann <hausmann@kde.org>

Fix the docs for git-p4 submit and turn git-p4 submit --master=foo into
simply git-p4 submit mytopicbranch.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

Fix variable usage in tag import

Signed-off-by: Simon Hausmann <hausmann@kde.org>

Added support for mapping p4 labels to git tags

Signed-off-by: Simon Hausmann <hausmann@kde.org>

git-p4 debug doesn't need a git repository

Signed-off-by: Simon Hausmann <hausmann@kde.org>

Don't try to parse any options with git-p4 debug but pass it straight on to p4

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

Prefer git command over git-command.

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

Minor cosmetic fixlet for the git-p4 submit sync question.

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

Different versions of p4 have different output for the where command ;(

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

Use the new incremental import style by default

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Make it possible to run git-p4 submit from within the git repository

Signed-off-by: Simon Hausmann <hausmann@kde.org>

Brand new smart incremental import that doesn't need tags or git repo-config :)

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

Set the default branch in run, not in the constructor

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

Helper function to check the existance of a revision

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

Added some helper function(s) to parse the depot path and change number from the log message

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

Changed the default branch for imports from "master" to "p4"

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