aboutsummaryrefslogtreecommitdiff
path: root/contrib
Commit message (Collapse)AuthorAge
* git.el: Take into account the core.excludesfile config option.Alexandre Julliard2007-07-31
| | | | | | | | | Also don't require .git/info/exclude to exist in order to list unknown files. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Acked-by: Karl Hasselström <kha@treskal.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git.el: Avoid using ewoc-set-data for compatibility with Emacs 21.Alexandre Julliard2007-07-31
| | | | | | Signed-off-by: Alexandre Julliard <julliard@winehq.org> Acked-by: Karl Hasselström <kha@treskal.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-p4: Fix p4 user cache population on Windows.Simon Hausmann2007-07-25
| | | | | | | | Fall back to USERPROFILE if HOME isn't set. Signed-off-by: Simon Hausmann <shausman@trolltech.com> Signed-off-by: Marius Storm-Olsen <marius@trolltech.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git.el: Pass an explicit argument to enable smerge-mode.Alexandre Julliard2007-07-25
| | | | | | | | Without argument the mode is toggled, which would do the wrong thing if the file was already open. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git.el: Support for incremental status updates.Alexandre Julliard2007-07-24
| | | | | | | | | | | | When we know which files have been modified, we can now run diff-index or ls-files with a file list to refresh only the specified files instead of the whole project. This also allows proper refreshing of files upon add/delete/resolve, instead of making assumptions about the new file state. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'master' of git://people.freedesktop.org/~hausmann/git-p4Junio C Hamano2007-07-18
|\ | | | | | | | | | | | | | | | | * 'master' of git://people.freedesktop.org/~hausmann/git-p4: git-p4: Cleanup, used common function for listing imported p4 branches git-p4: Fix upstream branch detection for submit/rebase with multiple branches. git-p4: Cleanup, make listExistingP4Branches a global function for later use. git-p4: input to "p4 files" by stdin instead of arguments git-p4: use subprocess in p4CmdList
| * git-p4: Cleanup, used common function for listing imported p4 branchesSimon Hausmann2007-07-18
| | | | | | | | Signed-off-by: Simon Hausmann <simon@lst.de>
| * git-p4: Fix upstream branch detection for submit/rebase with multiple branches.Simon Hausmann2007-07-18
| | | | | | | | | | | | | | | | Don't use git name-rev to locate the upstream git-p4 branch for rebase and submit but instead locate the branch by comparing the depot paths. name-rev may produce results like wrongbranch~12 as it uses the first match. Signed-off-by: Simon Hausmann <simon@lst.de> Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
| * git-p4: Cleanup, make listExistingP4Branches a global function for later use.Simon Hausmann2007-07-18
| | | | | | | | | | Signed-off-by: Simon Hausmann <simon@lst.de> Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
| * git-p4: input to "p4 files" by stdin instead of argumentsScott Lamb2007-07-17
| | | | | | | | | | | | | | | | | | This approach, suggested by Alex Riesen, bypasses the need for xargs-style argument list handling. The handling in question looks broken in a corner case with SC_ARG_MAX=4096 and final argument over 96 characters. Signed-off-by: Scott Lamb <slamb@slamb.org> Signed-off-by: Simon Hausmann <simon@lst.de>
| * git-p4: use subprocess in p4CmdListScott Lamb2007-07-17
| | | | | | | | | | | | | | | | This allows bidirectional piping - useful for "-x -" to avoid commandline arguments - and is a step toward bypassing the shell. Signed-off-by: Scott Lamb <slamb@slamb.org> Signed-off-by: Simon Hausmann <simon@lst.de>
* | contrib/emacs/Makefile: Also install .el files.David Kastrup2007-07-15
| | | | | | | | | | Signed-off-by: David Kastrup <dak@gnu.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Demote git-p4import to contrib status.Sean2007-07-15
|/ | | | | | | | | Move git-p4import.py and Documentation/git-p4import.txt into a contrib/p4import directory. Add a README there directing people to contrib/fast-import/git-p4 as a better alternative. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Use $(RM) in Makefiles instead of 'rm -f'Emil Medve2007-07-14
| | | | | Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'master' of git://repo.or.cz/git/fastimportJunio C Hamano2007-07-14
|\ | | | | | | | | | | | | * 'master' of git://repo.or.cz/git/fastimport: Teach fast-import to recursively copy files/directories Fix git-p4 on Windows to not use the Posix sysconf function. Correct trivial typo in fast-import documentation
| * Fix git-p4 on Windows to not use the Posix sysconf function.Marius Storm-Olsen2007-07-14
| | | | | | | | | | | | | | | | | | | | Add condition for Windows, since it doesn't support the os.sysconf module. We hardcode the commandline limit to 2K, as that should work on most Windows platforms. Signed-off-by: Marius Storm-Olsen <marius@trolltech.com> Acked-by: Simon Hausmann <simon@lst.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Add contrib/stats/mailmap.pl scriptJunio C Hamano2007-07-14
| | | | | | | | | | | | | | | | | | This script reads the existing commit log and .mailmap file, and outputs author e-mail addresses that would map to more than one names (most likely due to difference in the way they are spelled, but some are due to ancient botched commits). Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Add missing functions to contrib/emacs/vc-git.elDavid Kastrup2007-07-12
| | | | | | | | | | | | | | | | This is necessary to make several editing functions work, like C-u C-x v = Signed-off-by: David Kastrup <dak@gnu.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Correct shebang line for contrib/stats/packinfo.plBrian Downing2007-07-12
| | | | | | | | | | | | | | "/bin/perl"? What was I thinking? Signed-off-by: Brian Downing <bdowning@lavos.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | script to display a distribution of longest common hash prefixesNicolas Pitre2007-07-12
| | | | | | | | | | | | | | | | This script was originally posted on the git mailing list by Randal L. Schwartz <merlyn@stonehenge.com>. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Pack information toolBrian Downing2007-07-11
|/ | | | | | | | | | | | | This tool will print vaguely pretty information about a pack. It expects the output of "git-verify-pack -v" as input on stdin. $ git-verify-pack -v | packinfo.pl See the documentation in the script (contrib/stats/packinfo.pl) for more information. Signed-off-by: Brian Downing <bdowning@lavos.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin2007-07-06
| | | | | | | | | | | | | | | | | | | Earlier, "git rerere" was enabled by creating the directory .git/rr-cache. That is definitely not in line with most other features, which are enabled by a config variable. So, check the config variable "rerere.enabled". If it is set to "false" explicitely, do not activate rerere, even if .git/rr-cache exists. This should help when you want to disable rerere temporarily. If "rerere.enabled" is not set at all, fall back to detection of the directory .git/rr-cache. [jc: with minimum tweaks] Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-02
| | | | | | This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'master' of git://repo.or.cz/git/fastimportJunio C Hamano2007-06-26
|\ | | | | | | | | * 'master' of git://repo.or.cz/git/fastimport: Teach bash how to complete +refspec on git-push
| * Teach bash how to complete +refspec on git-pushShawn O. Pearce2007-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 <spearce@spearce.org>
* | git-new-workdir: Fix shell warning about operator == used with test.Simon Hausmann2007-06-26
|/ | | | | | | Use = instead of == with test to test for equality. Signed-off-by: Simon Hausmann <simon@lst.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* new-workdir: handle rev-parse --git-dir not always giving full pathJulian Phillips2007-06-24
| | | | | | | | | 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 <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Import branch 'git-p4' of git://repo.or.cz/fast-exportShawn O. Pearce2007-06-22
|\ | | | | | | | | | | | | | | | | 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.
| * Make it possible to specify the HEAD for the internal ↵Simon Hausmann2007-06-22
| | | | | | | | | | | | | | | | 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 <shausman@trolltech.com>
| * Added git-p4 branches command that shows the mapping of perforce depot paths ↵Simon Hausmann2007-06-20
| | | | | | | | | | | | to imported git branches. Signed-off-by: Simon Hausmann <simon@lst.de>
| * Warn about conflicting p4 branch mappings and use the first one found.Simon Hausmann2007-06-17
| | | | | | | | Signed-off-by: Simon Hausmann <simon@lst.de>
| * Fix the branch mapping detection to be independent from the order of the "p4 ↵Simon Hausmann2007-06-17
| | | | | | | | | | | | | | | | | | | | 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 <simon@lst.de>
| * git-p4 fails when cloning a p4 depo.Benjamin Sergeant2007-06-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 P4Sync.run(), 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 <bsergean@gmail.com> Signed-off-by: Simon Hausmann <simon@lst.de>
| * Fix initial multi-branch import.Simon Hausmann2007-06-16
| | | | | | | | | | | | The list of existing p4 branches in git wasn't initialized. Signed-off-by: Simon Hausmann <shausman@trolltech.com>
| * Only use double quotes on WindowsMarius Storm-Olsen2007-06-12
| | | | | | | | Signed-off-by: Marius Storm-Olsen <mstormo_git@storm-olsen.com>
| * Fix git-p4 rebase to detect the correct upstream branch instead of ↵Simon Hausmann2007-06-12
| | | | | | | | | | | | | | | | unconditionally always rebasing on top of remotes/p4/master Signed-off-by: Simon Hausmann <shausman@trolltech.com>
| * Moved the code from git-p4 submit to figure out the upstream branch pointSimon Hausmann2007-06-12
| | | | | | | | | | | | into a separate helper method. Signed-off-by: Simon Hausmann <shausman@trolltech.com>
| * git-p4 submit: Fix missing quotes around p4 commands to make them work with ↵Simon Hausmann2007-06-11
| | | | | | | | | | | | | | | | spaces in filenames Noticed by Alex Riesen Signed-off-by: Simon Hausmann <simon@lst.de>
| * Mention remotes/p4/master also in the documentation.Simon Hausmann2007-06-11
| | | | | | | | Signed-off-by: Simon Hausmann <simon@lst.de>
| * Provide some information for single branch imports where the commits goSimon Hausmann2007-06-11
| | | | | | | | Signed-off-by: Simon Hausmann <simon@lst.de>
| * git-p4: check for existence of repo dir before trying to createKevin Green2007-06-11
| | | | | | | | | | | | | | | | | | | | | | 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>
| * Write out the options tag in the log message of imports only if we actually haveSimon Hausmann2007-06-11
| | | | | | | | | | | | options Signed-off-by: Simon Hausmann <simon@lst.de>
| * Fix support for explicit disabling of syncing with the originSimon Hausmann2007-06-11
| | | | | | | | Signed-off-by: Simon Hausmann <simon@lst.de>
| * Fix depot-paths encoding for multi-path imports (don't split up ↵Simon Hausmann2007-06-11
| | | | | | | | | | | | //depot/path/foo) Signed-off-by: Simon Hausmann <simon@lst.de>
| * Fix project name guessingSimon Hausmann2007-06-11
| | | | | | | | Signed-off-by: Simon Hausmann <simon@lst.de>
| * Fix updating/creating remotes/p4/* heads from origin/p4/*Simon Hausmann2007-06-10
| | | | | | | | Signed-off-by: Simon Hausmann <simon@lst.de>
| * Fixed the check to make sure to exclude the HEAD symbolic refs when updatingSimon Hausmann2007-06-10
| | | | | | | | | | | | the remotes/p4 branches from origin. Signed-off-by: Simon Hausmann <simon@lst.de>
| * also strip p4/ from local imports.Han-Wen Nienhuys2007-06-08
| | | | | | | | Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
| * Merge branch 'master' of git://repo.or.cz/fast-exportHan-Wen Nienhuys2007-06-08
| |\
| | * Only get the expensive branch mapping from the p4 server when notSimon Hausmann2007-06-08
| | | | | | | | | | | | | | | | | | | | | 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>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 06:52:15 +0000