summaryrefslogtreecommitdiff
path: root/contrib
AgeCommit message (Collapse)AuthorFilesLines
2007-05-25Make --with-origin the default for syncing.Libravatar Simon Hausmann2-17/+13
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-25Make --with-origin also work without origin :)Libravatar Simon Hausmann1-2/+3
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-25Make git-p4 work with packed refs (don't use os.path.exists to check for theLibravatar Simon Hausmann1-2/+2
existance of a ref) Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-25Avoid creating non-p4 branches in remotes/p4 off of remotes/originLibravatar Simon Hausmann1-2/+6
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-24Oops, fix --with-origin to /really/ also call git fetch :)Libravatar Simon Hausmann1-0/+4
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-24Added support for --with-origin with multi-branch importsLibravatar Simon Hausmann1-30/+28
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-24Forgot to remove this return statement from debuggingLibravatar Simon Hausmann1-1/+0
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-24Fix creating the remotes/p4 branches based on origin/* for the multi-branch ↵Libravatar Simon Hausmann1-9/+19
import Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-24Replace \r\n with \n when importing from p4 on WindowsLibravatar Marius Storm-Olsen1-0/+4
Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
2007-05-24Load the user map from p4 only once at run-time.Libravatar Simon Hausmann1-0/+4
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-23Fix multi-branch import with --silent.Libravatar Simon Hausmann1-2/+3
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-23Fix p4 execution in git-p4 rollback.Libravatar Simon Hausmann1-1/+1
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-23Catch p4 errors in rollback early enough (before deleting refs!)Libravatar Simon Hausmann1-0/+3
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-23Oops, fill the /list/ correct with the p4 exit code.Libravatar Simon Hausmann1-1/+3
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-23Don't make len(p4Cmd("p4 changes -m 1 //foo/...")) == 0 succeed when the p4 ↵Libravatar Simon Hausmann1-1/+3
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>
2007-05-23Make rollback work with locally imported branchesLibravatar Simon Hausmann1-4/+14
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-23Avoid calling git symbolic-ref refs/heads/p4//HEAD (double slash)Libravatar Simon Hausmann1-1/+1
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-23Doc updatesLibravatar Simon Hausmann1-1/+8
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-23Use refs/heads/* instead of refs/heads/p4/* for local importsLibravatar Simon Hausmann1-5/+10
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-23Added support for --max-changes=<count> to ease import debuggingLibravatar Simon Hausmann1-1/+6
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-23Added support for importing multiple branches into refs/heads instead of ↵Libravatar Simon Hausmann1-12/+25
just refs/remotes using --import-local. Needs some further microfix but seems to work otherwise. Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-21Fixes for rollback, delete branches that did not exist at the specified p4 ↵Libravatar Simon Hausmann1-2/+11
change Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-21Fix branch detection in multi-branch importsLibravatar Simon Hausmann1-1/+1
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-21Added a rollback command for debugging. It sets back the heads of the p4 ↵Libravatar Simon Hausmann1-5/+32
branches to the specified p4 change number or earlier. Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-21Make git-p4 submit --direct safer by also creating a git commitLibravatar Simon Hausmann1-20/+14
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-21Detect with git-p4 submit --direct when there are no changes in the working ↵Libravatar Simon Hausmann1-0/+3
directory Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-21Fix git symbolic-ref warning on initial cloneLibravatar Simon Hausmann1-1/+7
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-21Fix error detection with git-p4 submit when the requested depot path is not ↵Libravatar Simon Hausmann1-0/+2
in the client view. Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-21Fix conversion from old style heads/p4 to remotes/p4/masterLibravatar Simon Hausmann1-5/+6
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-21Improved output for multi branch imports and noted another little todo itemLibravatar Simon Hausmann1-6/+17
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-20Another (potentially life-saving) idea for submit --directLibravatar Simon Hausmann1-0/+6
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-20Had an idea for debugging, record it :)Libravatar Simon Hausmann1-0/+4
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-20Specifying --detect-branches is now only needed for the initial clone/sync.Libravatar Simon Hausmann1-0/+3
Afterwards it's turned on implicitly if more p4 branches than remotes/p4/master are found. Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-20Added support for git-p4 submit --direct (experimental)Libravatar Simon Hausmann1-14/+47
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-20Use git format-patch and git apply --apply when extracting patches from git andLibravatar Simon Hausmann1-5/+8
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>
2007-05-20Oops, not only /set/ gitdir on clone, also set it /correctly/ :)Libravatar Simon Hausmann1-1/+1
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-20Fix gitdir not being set when cloning. Needed for writing the p4 users cache.Libravatar Simon Hausmann1-0/+3
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-20Cache the output of "p4 users" for faster syncs on high latency links.Libravatar Simon Hausmann1-2/+21
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-19Removed unused variable, more cleanupsLibravatar Simon Hausmann1-5/+5
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-19More cleanups and speedups for labels and branchesLibravatar Simon Hausmann1-10/+29
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-19Cleanup/speed up the branch<> file split and removed change range limitation ↵Libravatar Simon Hausmann1-17/+9
that I added for debugging (oops). Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-19More work on the incremental importing of multiple branches.Libravatar Simon Hausmann1-14/+76
Improved error detection by checking the exit code of git-fast-import. Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-18Give branches a nice project prefix and don't bail out on clone if we failedLibravatar Simon Hausmann1-3/+18
to detect the master branch. Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-18Started rewriting the branch detection, based on "p4 branches" and "p4 ↵Libravatar Simon Hausmann1-242/+45
branch -o foo". Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-18Removed unused cache variables.Libravatar Simon Hausmann1-4/+0
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-18Fix branch setup after initial clone.Libravatar Simon Hausmann1-7/+2
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-17Removed todo item that is implemented :)Libravatar Simon Hausmann1-2/+0
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-17Added support for git-p4 sync/rebase --with-origin. See git-p4.txt for ↵Libravatar Simon Hausmann2-2/+41
details :) Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-17Bite the bullet and automatically convert old style refs/heads/p4 repositoriesLibravatar Simon Hausmann1-2/+4
to the new style refs/remotes/p4 branching. Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-17Changed the default p4 import branch to be refs/remotes/p4/{HEAD,master}Libravatar Simon Hausmann2-4/+12
instead of refs/heads/p4. Signed-off-by: Simon Hausmann <simon@lst.de>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-29 14:24:05 +0000