delta/git.git - github.com: git/git.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	git p4: move verbose to base class	Luke Diamand	2012-04-24	1	-21/+10
\| \| \| \| \| \| \| \| \|	The verbose flag is common to all classes, or at least should be. Make it a member of the base Command class, rather than reimplementing for each class. Make option parsing mirror this. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	git p4: Ignore P4EDITOR if it is empty	Luke Diamand	2012-04-24	1	-1/+1
\| \| \| \| \| \| \| \|	p4 itself treats an empty value for P4EDITOR as the same as having P4EDITOR unset. Do the same for "git p4". Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	git p4: fix-up "import/export of labels to/from p4"	Luke Diamand	2012-04-24	1	-13/+11
\| \| \| \| \| \| \| \| \| \| \|	The previous one is already in 'next' but was somewhat lacking. The configuration "git-p4.validLabelRegexp" is now called "labelExportRegexp", and its default covers lowercase alphabets as well. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	git p4: import/export of labels to/from p4	Luke Diamand	2012-04-11	1	-34/+228
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The existing label import code looks at each commit being imported, and then checks for labels at that commit. This doesn't work in the real world though because it will drop labels applied on changelists that have already been imported, a common pattern. This change adds a new --import-labels option. With this option, at the end of the sync, git p4 gets sets of labels in p4 and git, and then creates a git tag for each missing p4 label. This means that tags created on older changelists are still imported. Tags that could not be imported are added to an ignore list. The same sets of git and p4 tags and labels can also be used to derive a list of git tags to export to p4. This is enabled with --export-labels in 'git p4 submit'. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	git p4: update name in script	Pete Wyckoff	2012-04-09	1	-7/+7
\| \| \| \| \| \| \|	In messages to the user and comments, change "git-p4" to "git p4". Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	git-p4: move to toplevel	Pete Wyckoff	2012-04-09	1	-0/+2758
	Move git-p4 out of contrib/fast-import into the main code base, aside other foreign SCM tools. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>