summaryrefslogtreecommitdiff
path: root/contrib/fast-import/git-p4
AgeCommit message (Collapse)AuthorFilesLines
2007-06-11git-p4 submit: Fix missing quotes around p4 commands to make them work with ↵Libravatar Simon Hausmann1-3/+3
spaces in filenames Noticed by Alex Riesen Signed-off-by: Simon Hausmann <simon@lst.de>
2007-06-11Provide some information for single branch imports where the commits goLibravatar Simon Hausmann1-1/+4
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-06-11git-p4: check for existence of repo dir before trying to createLibravatar Kevin Green1-1/+2
When using git-p4 in this manner: git-p4 clone //depot/path/project myproject If "myproject" already exists as a dir, but not a valid git repo, it fails to create the directory. Signed-off-by: Kevin Green <Kevin.Green@morganstanley.com>
2007-06-11Write out the options tag in the log message of imports only if we actually haveLibravatar Simon Hausmann1-6/+5
options Signed-off-by: Simon Hausmann <simon@lst.de>
2007-06-11Fix support for explicit disabling of syncing with the originLibravatar Simon Hausmann1-0/+2
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-06-11Fix depot-paths encoding for multi-path imports (don't split up ↵Libravatar Simon Hausmann1-1/+1
//depot/path/foo) Signed-off-by: Simon Hausmann <simon@lst.de>
2007-06-11Fix project name guessingLibravatar Simon Hausmann1-1/+6
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-06-10Fix updating/creating remotes/p4/* heads from origin/p4/*Libravatar Simon Hausmann1-4/+6
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-06-10Fixed the check to make sure to exclude the HEAD symbolic refs when updatingLibravatar Simon Hausmann1-1/+1
the remotes/p4 branches from origin. Signed-off-by: Simon Hausmann <simon@lst.de>
2007-06-08also strip p4/ from local imports.Libravatar Han-Wen Nienhuys1-3/+3
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-06-08Merge branch 'master' of git://repo.or.cz/fast-exportLibravatar Han-Wen Nienhuys1-32/+57
2007-06-08print error message when p4 print fails (eg. due to permission problems)Libravatar Han-Wen Nienhuys1-0/+5
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-06-08Only get the expensive branch mapping from the p4 server when notLibravatar Simon Hausmann1-5/+5
syncing with the help of an origin remote (which we instead then use to get new branches from). Signed-off-by: Simon Hausmann <simon@lst.de>
2007-06-07Make git-p4 submit detect the correct reference (origin) branch whenLibravatar Simon Hausmann1-14/+24
working with multi-branch imports. Signed-off-by: Simon Hausmann <simon@lst.de>
2007-06-07Make clone behave like git clone by default again.Libravatar Simon Hausmann1-0/+5
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-06-07Exclude the HEAD symbolic ref from the list of known branchesLibravatar Marius Storm-Olsen1-1/+1
Signed-off-by: Marius Storm-Olsen <mstormo_git@storm-olsen.com>
2007-06-07Fix single branch import into remotesLibravatar Marius Storm-Olsen1-2/+2
Signed-off-by: Marius Storm-Olsen <mstormo_git@storm-olsen.com>
2007-06-07Fix git-p4 clone (defaultDestination)Libravatar Marius Storm-Olsen1-1/+1
Signed-off-by: Marius Storm-Olsen <mstormo_git@storm-olsen.com>
2007-06-07Ensure that the commit message is Windows formated (CRLF) before invoking ↵Libravatar Marius Storm-Olsen1-0/+5
the editor. (The default editor on Windows (Notepad) doesn't handle Unix line endings) Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
2007-06-07Fix depot-path determination for git-p4 submitLibravatar Simon Hausmann1-1/+1
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-06-07Fix git-p4 submitLibravatar Simon Hausmann1-3/+1
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-06-07Fix git-p4 rebaseLibravatar Simon Hausmann1-0/+1
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-06-07Hack to make the multi-branch import work again with self.depotPaths now thatLibravatar Simon Hausmann1-3/+4
self.depotPath is gone Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-06-07Don't attempt to set the initialParent on multi-branch imports (useless).Libravatar Simon Hausmann1-1/+2
At some point the code paths should be unified, but for now I need a working git-p4 :) Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-06-07Fix common path "calculation" from logs of multiple branches.Libravatar Simon Hausmann1-2/+3
Need to use min instead of max for prev/cur to avoid out-of-bounds string access. Also treat "i" as index of the last match instead of a length because in case of a complete match of the two strings i was off by one. Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-06-07Fix support for "depot-path" in older git-p4 importsLibravatar Simon Hausmann1-1/+4
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-06-05look for 'text' and 'binary' files.Libravatar Han-Wen Nienhuys1-2/+3
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-31thinko: really ignore deleted files.Libravatar Han-Wen Nienhuys1-10/+18
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-31remove debug printLibravatar Han-Wen Nienhuys1-1/+0
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-31Cleanups & import into p4/master for local importLibravatar Han-Wen Nienhuys1-22/+32
- import into master/local if --import-local is set - use Die() for exiting - if --verbose is set, raise Exception() - use joined strings iso. `list` for progress printing Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-31use p4CmdList() to get file contents in Python dicts. This is more robust.Libravatar Han-Wen Nienhuys1-35/+21
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-30only run p4 print if necessaryLibravatar Han-Wen Nienhuys1-0/+3
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-30don't p4 print deleted files.Libravatar Han-Wen Nienhuys1-8/+13
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-30read files before creating the commit.Libravatar Han-Wen Nienhuys1-14/+21
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-30thinko.Libravatar Han-Wen Nienhuys1-1/+1
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-30store p4 user cache in home directory.Libravatar Han-Wen Nienhuys1-5/+10
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-30Thinko, fix buglet.Libravatar Han-Wen Nienhuys1-2/+2
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-30Read p4 files in one batch.Libravatar Han-Wen Nienhuys1-26/+63
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-30remove global .gitdirLibravatar Han-Wen Nienhuys1-29/+24
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-30Merge origin.Libravatar Han-Wen Nienhuys1-5/+5
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-28Fix typo in listExistingP4Branches that broke sync.Libravatar Simon Hausmann1-2/+2
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-28In *_pipe print the command that failed if it fails.Libravatar Simon Hausmann1-5/+5
Fixed old calls to mypopen. Signed-off-by: Simon Hausmann <simon@lst.de>
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 11:16:08 +0000