Nemcio/Fast-Export
1
0
Fork 0
mirror of https://github.com/frej/fast-export.git synced 2025-11-14 06:35:41 +01:00
Code Issues Packages Projects Releases Activity
236 Commits 1 Branch 21 Tags
6e9ee62062e7f9ef8b09a034750a7e3bcf8849f8
Commit Graph

81 Commits

Author SHA1 Message Date
Simon Hausmann
6e9ee62062 Added support for importing multiple branches into refs/heads instead of just refs/remotes 
using --import-local. Needs some further microfix but seems to work otherwise.
 2007-05-23 00:03:08 +02:00
Simon Hausmann
6ee645441b Fixes for rollback, delete branches that did not exist at the specified p4 change 2007-05-21 23:44:24 +02:00
Simon Hausmann
ea975442b4 Fix branch detection in multi-branch imports 2007-05-21 23:25:51 +02:00
Simon Hausmann
b137492471 Added rollback command for debugging 2007-05-21 22:57:06 +02:00
Simon Hausmann
2ade241861 Make git-p4 submit --direct safer by also creating a git commit 2007-05-21 11:04:26 +02:00
Simon Hausmann
88916904b6 Detect with git-p4 submit --direct when there are no changes in the working directory 2007-05-21 10:08:11 +02:00
Simon Hausmann
0e949c32bd Fix git symbolic-ref warning on initial clone 2007-05-21 10:05:30 +02:00
Simon Hausmann
034f696523 Fix error detection with git-p4 submit when the requested depot path is not in the client view. 2007-05-21 09:34:56 +02:00
Simon Hausmann
0fc5907e67 Fix conversion from old style heads/p4 to remotes/p4/master 2007-05-21 08:44:16 +02:00
Simon Hausmann
10f949db6f Improved output for multi branch imports and noted another little todo item 2007-05-21 00:39:16 +02:00
Simon Hausmann
886f8af18a Another (potentially life-saving) idea for submit --direct 2007-05-20 23:52:51 +02:00
Simon Hausmann
76c02dc557 Had an idea for debugging, record it :) 2007-05-20 23:42:22 +02:00
Simon Hausmann
da9bc65324 Specifying --detect-branches is now only needed for the initial clone/sync. 
Afterwards it's turned on implicitly if more p4 branches than remotes/p4/master
are found.
 2007-05-20 23:39:40 +02:00
Simon Hausmann
0edb3a09f1 Added support for git-p4 submit --direct (experimental) 2007-05-20 16:55:05 +02:00
Simon Hausmann
7d0d5927bf Use git format-patch and git apply --apply when extracting patches from git and 
applying them to a Perforce checkout. This should make it possible to apply git
commits with binary files that cannot be handled by path.
 2007-05-20 16:33:21 +02:00
Simon Hausmann
9578faee07 Oops, not only /set/ gitdir on clone, also set it /correctly/ :) 2007-05-20 15:24:01 +02:00
Simon Hausmann
f1f9c98c25 Fix gitdir not being set when cloning. Needed for writing the p4 users cache. 2007-05-20 15:15:34 +02:00
Simon Hausmann
4b4de4f3eb Cache the output of "p4 users" for faster syncs on high latency links. 2007-05-20 10:55:54 +02:00
Simon Hausmann
32e8c43429 Removed unused variable, more cleanups 2007-05-19 12:05:40 +02:00
Simon Hausmann
9613e4cf75 More cleanups and speedups for labels and branches 2007-05-19 11:54:11 +02:00
Simon Hausmann
d869be50bc Cleanup/speed up the branch<> file split and removed change range limitation that I added 
for debugging (oops).
 2007-05-19 11:07:32 +02:00
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