path: root/contrib
AgeCommit message (Collapse)Author
2007-07-03Rewrite "git-frotz" to "git frotz"Junio C Hamano
This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano <>
2007-06-27Merge branch 'master' of git:// C Hamano
* 'master' of git:// Teach bash how to complete +refspec on git-push
2007-06-27git-new-workdir: Fix shell warning about operator == used with test.Simon Hausmann
Use = instead of == with test to test for equality. Signed-off-by: Simon Hausmann <> Signed-off-by: Junio C Hamano <>
2007-06-24Teach bash how to complete +refspec on git-pushShawn O. Pearce
Using `git push origin +foo` to forcefully overwrite the remote branch named foo is a common idiom, especially since + is shorter than the long option --force and can be specified on a per-branch basis. We now complete `git push origin +foo` just like we do the standard `git push origin foo`. The leading + on a branch refspec does not alter the completion. Signed-off-by: Shawn O. Pearce <>
2007-06-24new-workdir: handle rev-parse --git-dir not always giving full pathJulian Phillips
rev-parse --git-dir outputs a full path - except for the single case of when the path would be $(pwd)/.git, in which case it outputs simply .git. Check for this special case and handle it. Signed-off-by: Julian Phillips <> Signed-off-by: Junio C Hamano <>
2007-06-22Import branch 'git-p4' of git:// O. Pearce
Simon has asked that the git.git project include the git-p4 project as at least a contrib/fast-import within git.git. I think it makes a lot of sense, as git-p4 nicely complements the only other in-tree fast-import user: import-tars.perl. git-p4 is offered under the MIT license by its authors.
2007-06-22Avoid src:dst syntax as default bash completion for git pushShawn O. Pearce
Raimund Bauer just discovered that the default bash completion for a local branch name in a git-push line is not the best choice when the branch does not exist on the remote system. In the past we have always completed the local name 'test' as "test:test", indicating that the destination name is the same as the local name. But this fails when "test" does not yet exist on the remote system, as there is no "test" branch for it to match the name against. Fortunately git-push does the right thing when given just the local branch, as it assumes you want to use the same name in the destination repository. So we now offer "test" as the completion in a git-push line, and let git-push assume that is also the remote branch name. We also still support the remote branch completion after the :, but only if the user manually adds the colon before trying to get a completion. Signed-off-by: Shawn O. Pearce <>
2007-06-21Make it possible to specify the HEAD for the internal ↵Simon Hausmann
findUpstreamBranchPoint function. This isn't used right now in git-p4 but I use it in an external script that loads git-p4 as module. Signed-off-by: Simon Hausmann <>
2007-06-20Added git-p4 branches command that shows the mapping of perforce depot paths ↵Simon Hausmann
to imported git branches. Signed-off-by: Simon Hausmann <>
2007-06-17Warn about conflicting p4 branch mappings and use the first one found.Simon Hausmann
Signed-off-by: Simon Hausmann <>
2007-06-17Fix the branch mapping detection to be independent from the order of the "p4 ↵Simon Hausmann
branches" output. Collect "unknown" source branches separately and register them at the end. Also added a minor speed up to splitFilesIntoBranches by breaking out of the loop through all branches when it's safe. Signed-off-by: Simon Hausmann <>
2007-06-16git-p4 fails when cloning a p4 depo.Benjamin Sergeant
A perforce command with all the files in the repo is generated to get all the file content. Here is a patch to break it into multiple successive perforce command who uses 4K of parameter max, and collect the output for later. It works, but not for big depos, because the whole perforce depo content is stored in memory in, and it looks like mine is bigger than 2 Gigs, so I had to kill the process. [Simon: I added the bit about using SC_ARG_MAX, as suggested by Han-Wen] Signed-off-by: Benjamin Sergeant <> Signed-off-by: Simon Hausmann <>
2007-06-16Fix initial multi-branch import.Simon Hausmann
The list of existing p4 branches in git wasn't initialized. Signed-off-by: Simon Hausmann <>
2007-06-13gitview: run blame with -C -CAneesh Kumar K.V
pass -C -C option to git-blame so that blame browsing works when the data is copied over from other files. Signed-off-by: Aneesh Kumar K.V <> Signed-off-by: Junio C Hamano <>
2007-06-13gitview: Fix the blame interface.Aneesh Kumar K.V
The async reading from the pipe was skipping some of the input lines. Fix the same by making sure that we add the partial content of the previous read to the newly read data. Signed-off-by: Aneesh Kumar K.V <> Signed-off-by: Junio C Hamano <>
2007-06-12Only use double quotes on WindowsMarius Storm-Olsen
Signed-off-by: Marius Storm-Olsen <>
2007-06-12Fix git-p4 rebase to detect the correct upstream branch instead of ↵Simon Hausmann
unconditionally always rebasing on top of remotes/p4/master Signed-off-by: Simon Hausmann <>
2007-06-12Moved the code from git-p4 submit to figure out the upstream branch pointSimon Hausmann
into a separate helper method. Signed-off-by: Simon Hausmann <>
2007-06-11git-p4 submit: Fix missing quotes around p4 commands to make them work with ↵Simon Hausmann
spaces in filenames Noticed by Alex Riesen Signed-off-by: Simon Hausmann <>
2007-06-11Mention remotes/p4/master also in the documentation.Simon Hausmann
Signed-off-by: Simon Hausmann <>
2007-06-11Provide some information for single branch imports where the commits goSimon Hausmann
Signed-off-by: Simon Hausmann <>
2007-06-11git-p4: check for existence of repo dir before trying to createKevin Green
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 <>
2007-06-11Write out the options tag in the log message of imports only if we actually haveSimon Hausmann
options Signed-off-by: Simon Hausmann <>
2007-06-11Fix support for explicit disabling of syncing with the originSimon Hausmann
Signed-off-by: Simon Hausmann <>
2007-06-11Fix depot-paths encoding for multi-path imports (don't split up ↵Simon Hausmann
//depot/path/foo) Signed-off-by: Simon Hausmann <>
2007-06-11Fix project name guessingSimon Hausmann
Signed-off-by: Simon Hausmann <>
2007-06-10Fix updating/creating remotes/p4/* heads from origin/p4/*Simon Hausmann
Signed-off-by: Simon Hausmann <>
2007-06-09Fixed the check to make sure to exclude the HEAD symbolic refs when updatingSimon Hausmann
the remotes/p4 branches from origin. Signed-off-by: Simon Hausmann <>
2007-06-08also strip p4/ from local imports.Han-Wen Nienhuys
Signed-off-by: Han-Wen Nienhuys <>
2007-06-08Merge branch 'master' of git:// Nienhuys
2007-06-08print error message when p4 print fails (eg. due to permission problems)Han-Wen Nienhuys
Signed-off-by: Han-Wen Nienhuys <>
2007-06-08gitview: Define __slots__ for CommitMichael Ellerman
Define __slots__ for the Commit class. This reserves space in each Commit object for only the defined variables. On my system this reduces heap usage when viewing a kernel repo by 12% ~= 55868 KB. Signed-off-by: Michael Ellerman <> Signed-off-by: Junio C Hamano <>
2007-06-08gitview: Use new-style classesMichael Ellerman
This changes the Commit class to use new-style class, which has been available since Python 2.2 (Dec 2001). This is a necessary step in order to use __slots__[] declaration, so that we can reduce the memory footprint in the next patch. Signed-off-by: Michael Ellerman <> Signed-off-by: Junio C Hamano <>
2007-06-08Only get the expensive branch mapping from the p4 server when notSimon Hausmann
syncing with the help of an origin remote (which we instead then use to get new branches from). Signed-off-by: Simon Hausmann <>
2007-06-07Make git-p4 submit detect the correct reference (origin) branch whenSimon Hausmann
working with multi-branch imports. Signed-off-by: Simon Hausmann <>
2007-06-07Make clone behave like git clone by default again.Simon Hausmann
Signed-off-by: Simon Hausmann <>
2007-06-07Exclude the HEAD symbolic ref from the list of known branchesMarius Storm-Olsen
Signed-off-by: Marius Storm-Olsen <>
2007-06-07Fix single branch import into remotesMarius Storm-Olsen
Signed-off-by: Marius Storm-Olsen <>
2007-06-07Fix git-p4 clone (defaultDestination)Marius Storm-Olsen
Signed-off-by: Marius Storm-Olsen <>
2007-06-07Ensure that the commit message is Windows formated (CRLF) before invoking ↵Marius Storm-Olsen
the editor. (The default editor on Windows (Notepad) doesn't handle Unix line endings) Signed-off-by: Marius Storm-Olsen <>
2007-06-07Fix depot-path determination for git-p4 submitSimon Hausmann
Signed-off-by: Simon Hausmann <>
2007-06-07Fix git-p4 submitSimon Hausmann
Signed-off-by: Simon Hausmann <>
2007-06-07Fix git-p4 rebaseSimon Hausmann
Signed-off-by: Simon Hausmann <>
2007-06-07Hack to make the multi-branch import work again with self.depotPaths now thatSimon Hausmann
self.depotPath is gone Signed-off-by: Simon Hausmann <>
2007-06-07Don't attempt to set the initialParent on multi-branch imports (useless).Simon Hausmann
At some point the code paths should be unified, but for now I need a working git-p4 :) Signed-off-by: Simon Hausmann <>
2007-06-07Fix common path "calculation" from logs of multiple branches.Simon Hausmann
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 <>
2007-06-07Fix support for "depot-path" in older git-p4 importsSimon Hausmann
Signed-off-by: Simon Hausmann <>
2007-06-07War on whitespaceJunio C Hamano
This uses "git-apply --whitespace=strip" to fix whitespace errors that have crept in to our source files over time. There are a few files that need to have trailing whitespaces (most notably, test vectors). The results still passes the test, and build result in Documentation/ area is unchanged. Signed-off-by: Junio C Hamano <>
2007-06-05look for 'text' and 'binary' files.Han-Wen Nienhuys
Signed-off-by: Han-Wen Nienhuys <>
2007-05-31thinko: really ignore deleted files.Han-Wen Nienhuys
Signed-off-by: Han-Wen Nienhuys <>