summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2007-05-30Diverse cleanupsLibravatar Han-Wen Nienhuys1-90/+134
- print commands with \n - extractDepotPathsAndChangeFromGitLog -> extractSettings, returning dict. - store keepRepoPath in [git-p4: ] line - create a main() function, so git-p4 can be pychecked - use --destination for clone destination. This simplifies logic for --keep-path Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-28Extract multiple paths concurrently.Libravatar Han-Wen Nienhuys1-109/+153
This enables importing just the interesting bits of large repositories. Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-28add --verbose to all commands.Libravatar Han-Wen Nienhuys1-14/+18
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-28use strip() iso. slicing for removing \nLibravatar Han-Wen Nienhuys1-14/+16
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-28use string.strip() iso. slicing.Libravatar Han-Wen Nienhuys1-4/+4
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-28clone and sync --keep-path to keep perforce path to module.Libravatar Han-Wen Nienhuys1-9/+12
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-28minor cleanupsLibravatar Han-Wen Nienhuys1-10/+20
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-28cleanupLibravatar Han-Wen Nienhuys1-21/+19
- use re.sub() iso. if for stripping ... - spacing nits Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-28Robustness fixes for pipesLibravatar Han-Wen Nienhuys1-27/+58
- add read_pipe(), read_pipe_lines(), write_pipe(), which check pipe.close() - use throughout Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-28add .dotest to .gitignoreLibravatar Han-Wen Nienhuys0-0/+0
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-28Fix my email address, this isn't really KDE related :)Libravatar Simon Hausmann1-2/+2
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-28rename apply() to applyCommit(); apply is a python builtinLibravatar Han-Wen Nienhuys1-2/+2
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-28reformatting: break long lines.Libravatar Han-Wen Nienhuys1-18/+30
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-28CleanupsLibravatar Han-Wen Nienhuys1-22/+13
- don't use dir (python builtin) - use re for munging depotPath into destination Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-27Fix creation of refs/remotes/p4/HEAD symbolic refLibravatar Simon Hausmann1-6/+1
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-25Added git-p4 submit --trust-me-like-a-fool for the adventurous users :)Libravatar Simon Hausmann1-1/+5
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-25Forgot to remove this TODO item when I made --with-origin the default :)Libravatar Simon Hausmann1-3/+0
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-25Shortcut the case where we have no origin branchLibravatar Simon Hausmann1-2/+4
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 16:42:23 +0000