60 Commits

Author	SHA1	Message	Date
Simon Hausmann	004e2833d9	More work on the incremental importing of multiple branches. ... Improved error detection by checking the exit code of git-fast-import.	2007-05-19 10:23:12 +02:00
Simon Hausmann	783b917797	Give branches a nice project prefix and don't bail out on clone if we failed ... to detect the master branch.	2007-05-18 22:13:26 +02:00
Simon Hausmann	d23232b665	Started rewriting the branch detection, based on "p4 branches" and "p4 branch -o foo".	2007-05-18 21:45:23 +02:00
Simon Hausmann	4deb78ec65	Removed unused cache variables.	2007-05-18 20:39:38 +02:00
Simon Hausmann	f9601561bd	Fix branch setup after initial clone.	2007-05-18 20:32:35 +02:00
Simon Hausmann	d956aaa9c1	Removed todo item that is implemented :)	2007-05-17 22:22:26 +02:00
Simon Hausmann	8a6366a83c	Added support for git-p4 sync/rebase --with-origin. See git-p4.txt for details :)	2007-05-17 22:17:49 +02:00
Simon Hausmann	169149117e	Bite the bullet and automatically convert old style refs/heads/p4 repositories ... to the new style refs/remotes/p4 branching.	2007-05-17 21:18:53 +02:00
Simon Hausmann	8ed3fceeff	Changed the default p4 import branch to be refs/remotes/p4/{HEAD,master} ... instead of refs/heads/p4.	2007-05-17 20:57:05 +02:00
Simon Hausmann	b37f7fbb93	Create the origin based import branch using git update-ref instead of git branch ... so that it's possible to have the import branch in refs/remotes.	2007-05-17 20:26:58 +02:00
Simon Hausmann	ce62ec57aa	Removed ancient and unused code to find the last imported revision from previous imports ... to use for the current import by looking at the p4 tags. The current approach of using the log message works better.	2007-05-17 20:15:47 +02:00
Simon Hausmann	c120a31b12	Removed cleantags command. It doesn't have any meaning anymore.	2007-05-17 19:44:50 +02:00
Simon Hausmann	c31188f6df	Clean up code duplication for revision parsing and fix previous commit to not ... import into remotes/p4 (yet!).	2007-05-17 09:13:54 +02:00
Simon Hausmann	cb07cfd15e	Always pass a sha1 for the initial parent so that git-fast-import doesn't think ... it's creating a new branch from itself. It's a sensible error in general but in the case of incremental imports we have to apply force :)	2007-05-17 09:09:05 +02:00
Simon Hausmann	2ca4a934f7	Fixing syncing (gitdir discovery / cd) for bare repositories	2007-05-17 07:42:38 +02:00
Simon Hausmann	94354e394e	A little todo note before I forget it :), based on a suggestion from Lars.	2007-05-16 13:15:34 +02:00
Simon Hausmann	ba27f31bdb	Fix calling git-p4 rebase from within a subdirectory (git rebase wants to be in toplevel)	2007-05-16 12:12:39 +02:00
Simon Hausmann	f6f9683a23	Give a better hint if git-p4 submit fails	2007-05-16 09:43:13 +02:00
Simon Hausmann	f554f77572	Added the possibility of skipping patches during git-p4 submit	2007-05-16 09:41:46 +02:00
Simon Hausmann	4614277491	Make git-p4 work with bare repositories.	2007-05-15 23:06:43 +02:00
Simon Hausmann	0187ce60bc	Fix git-p4 clone //depot/project (head import)	2007-05-15 16:15:26 +02:00
Simon Hausmann	cd33574b64	Make submitting work on Windows.	2007-05-15 15:15:07 +02:00
Simon Hausmann	aaa19d91cb	Make sure all popen calls use binary mode (for Windows) and ... also make gitBranchExists work on Windows.	2007-05-15 15:15:07 +02:00
Simon Hausmann	c8eff44695	Use the subprocess module instead of popen2 to make it work on Windows.	2007-05-15 14:27:56 +02:00
Simon Hausmann	7bfbfcf1d5	Cleanup, removed the old tagging code	2007-05-01 23:26:19 +02:00
Simon Hausmann	0269c80c68	cleanup, renamed self.globalPrefix to self.depotPath	2007-05-01 23:23:00 +02:00
Simon Hausmann	d2904a9358	Micro cleanup	2007-05-01 23:15:48 +02:00
Simon Hausmann	e3772eb1f2	Handle patch errors in git-p4 submit better.	2007-04-15 09:59:56 +02:00
Simon Hausmann	6c9989feec	A new attempt at fixing the child-fast-import-process-not-finished race condition ... in the clone command	2007-04-15 09:34:15 +02:00
Simon Hausmann	7fd31726a9	Slightly improved formatting of the raw_input questions.	2007-04-14 16:09:43 +02:00
Simon Hausmann	d7e877303c	Removed the old patch apply code from git-p4 submit.	2007-04-14 16:05:54 +02:00
Simon Hausmann	e8e5d6b624	Fix the timezone formatting. Now qgit also displays (parses) it correctly.	2007-04-14 11:21:50 +02:00
Simon Hausmann	837ec75aad	Print an error message of some sort if git fast-import fails.	2007-04-13 22:21:10 +02:00
Simon Hausmann	3a7b8e74e5	Allow for convenient rebasing after git-p4 submit	2007-04-09 12:43:40 +02:00
Simon Hausmann	a20699aaab	fix variable usage (oops)	2007-04-08 10:15:47 +02:00
Simon Hausmann	13b8d8fd8d	Fix file determination for #head imports	2007-04-08 10:13:32 +02:00
Simon Hausmann	f82f79df67	Added git-p4 clone convenience command	2007-04-08 10:08:26 +02:00
Simon Hausmann	289a5e1d1f	Honor --silent for labels	2007-04-08 09:00:55 +02:00
Simon Hausmann	916373a87c	Turn off potentially slow label detection by default	2007-04-08 00:12:02 +02:00
Simon Hausmann	64255e2b01	Provide a tree summary after git-p4 rebase	2007-04-08 00:07:02 +02:00
Simon Hausmann	17360fd2c9	Added git-p4 rebase convenience	2007-04-07 23:46:50 +02:00
Simon Hausmann	6358992b2f	Minor cleanup	2007-04-01 15:40:46 +02:00
Simon Hausmann	1249f67588	Fix "compilation" :)	2007-04-01 13:39:39 +02:00
Simon Hausmann	a13c1bfdf0	Fix the docs for git-p4 submit and turn git-p4 submit --master=foo into ... simply git-p4 submit mytopicbranch.	2007-03-29 19:15:24 +02:00
Simon Hausmann	171dbab4a6	Fix variable usage in tag import	2007-03-28 17:05:38 +02:00
Simon Hausmann	a1bdb1671a	Added support for mapping p4 labels to git tags	2007-03-26 22:34:34 +02:00
Simon Hausmann	f2ba67a06a	git-p4 debug doesn't need a git repository	2007-03-26 08:18:55 +02:00
Simon Hausmann	6a5d0cf493	Don't try to parse any options with git-p4 debug but pass it straight on to p4	2007-03-26 00:13:51 +02:00
Simon Hausmann	0befe991ab	Prefer git command over git-command.	2007-03-24 16:35:05 +01:00
Simon Hausmann	46479794f8	Minor cosmetic fixlet ;-)	2007-03-24 09:18:20 +01:00