summaryrefslogtreecommitdiff
path: root/contrib
AgeCommit message (Collapse)AuthorFilesLines
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>
2007-05-17Create the origin based import branch using git update-ref instead of git branchLibravatar Simon Hausmann1-1/+4
so that it's possible to have the import branch in refs/remotes. Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-17Removed ancient and unused code to find the last imported revision from ↵Libravatar Simon Hausmann1-17/+0
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>
2007-05-17Removed cleantags command. It doesn't have any meaning anymore.Libravatar Simon Hausmann1-39/+0
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-17Clean up code duplication for revision parsing and fix previous commit to notLibravatar Simon Hausmann1-3/+6
import into remotes/p4 (yet!). Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-17Always pass a sha1 for the initial parent so that git-fast-import doesn't thinkLibravatar Simon Hausmann1-3/+4
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>
2007-05-17Fixing syncing (gitdir discovery / cd) for bare repositoriesLibravatar Simon Hausmann1-1/+3
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-16A little todo note before I forget it :), based on a suggestion from Lars.Libravatar Simon Hausmann1-0/+2
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-16Fix calling git-p4 rebase from within a subdirectory (git rebase wants to be ↵Libravatar Simon Hausmann1-0/+2
in toplevel) Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-16Give a better hint if git-p4 submit failsLibravatar Simon Hausmann1-1/+1
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-16Added the possibility of skipping patches during git-p4 submitLibravatar Simon Hausmann1-2/+13
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-15Make git-p4 work with bare repositories.Libravatar Simon Hausmann1-3/+1
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-15Fix git-p4 clone //depot/project (head import)Libravatar Simon Hausmann1-0/+1
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-15Make the command call silentLibravatar Marius Storm-Olsen1-1/+1
Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
2007-05-15Converted to unix newlinesLibravatar Simon Hausmann1-1/+1
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-15Make submitting work on Windows.Libravatar Simon Hausmann1-5/+11
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-05-15Make sure all popen calls use binary mode (for Windows) andLibravatar Simon Hausmann1-17/+19
also make gitBranchExists work on Windows. Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-05-15Added a little .bat wrapper from MariusLibravatar Simon Hausmann1-0/+1
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-05-15Use the subprocess module instead of popen2 to make it work on Windows.Libravatar Simon Hausmann1-5/+5
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-05-07Document some implementation details, for the curious... :)Libravatar Simon Hausmann1-0/+17
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-01Cleanup, removed the old tagging codeLibravatar Simon Hausmann1-16/+0
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-01cleanup, renamed self.globalPrefix to self.depotPathLibravatar Simon Hausmann1-40/+40
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-01Micro cleanupLibravatar Simon Hausmann1-1/+1
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-01Doc cleanups.Libravatar Simon Hausmann1-6/+2
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-15Handle patch errors in git-p4 submit better.Libravatar Simon Hausmann1-6/+32
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-15A new attempt at fixing the child-fast-import-process-not-finished race ↵Libravatar Simon Hausmann1-2/+5
condition in the clone command Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-14Slightly improved formatting of the raw_input questions.Libravatar Simon Hausmann1-3/+3
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-14Removed the old patch apply code from git-p4 submit.Libravatar Simon Hausmann1-18/+1
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-14Fix the timezone formatting. Now qgit also displays (parses) it correctly.Libravatar Simon Hausmann1-4/+1
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-13Print an error message of some sort if git fast-import fails.Libravatar Simon Hausmann1-0/+1
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-09Allow for convenient rebasing after git-p4 submitLibravatar Simon Hausmann1-0/+6
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-08Added a simple example of usage to the "documentation" :)Libravatar Simon Hausmann1-0/+22
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-08fix variable usage (oops)Libravatar Simon Hausmann1-1/+1
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-08Fix file determination for #head importsLibravatar Simon Hausmann1-1/+2
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-08Added git-p4 clone convenience commandLibravatar Simon Hausmann2-3/+77
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-08Honor --silent for labelsLibravatar Simon Hausmann1-1/+1
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-08Turn off potentially slow label detection by defaultLibravatar Simon Hausmann1-2/+6
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-08Provide a tree summary after git-p4 rebaseLibravatar Simon Hausmann1-1/+3
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-07Added git-p4 rebase convenienceLibravatar Simon Hausmann2-3/+33
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-01Clean up python class names.Libravatar Simon Hausmann1-4/+4
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-04-01Fix "compilation" :)Libravatar Simon Hausmann1-2/+2
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-29Fix the docs for git-p4 submit and turn git-p4 submit --master=foo intoLibravatar Simon Hausmann2-21/+20
simply git-p4 submit mytopicbranch. Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-28Fix variable usage in tag importLibravatar Simon Hausmann1-2/+2
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-26Added support for mapping p4 labels to git tagsLibravatar Simon Hausmann1-1/+57
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-26git-p4 debug doesn't need a git repositoryLibravatar Simon Hausmann1-13/+16
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-26Don't try to parse any options with git-p4 debug but pass it straight on to p4Libravatar Simon Hausmann1-6/+10
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-03-24Prefer git command over git-command.Libravatar Simon Hausmann1-14/+14
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-03-24Minor cosmetic fixlet for the git-p4 submit sync question.Libravatar Simon Hausmann1-1/+1
Signed-off-by: Simon Hausmann <simon@lst.de>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 13:51:00 +0000