Commit Graph

55 Commits

Author SHA1 Message Date
Simon Hausmann
39fa67264e Ignore weird apple files :) 2007-03-14 19:03:16 +01:00
Simon Hausmann
2b756cf156 Be nice and use /usr/bin/env python for the git-p4 scripts 2007-03-14 17:33:46 +01:00
Simon Hausmann
e15f1d8964 Make the caching official, sort of :) 2007-03-10 21:30:24 +01:00
Simon Hausmann
8be48137ae less false integrations 2007-03-10 21:23:49 +01:00
Simon Hausmann
c78fd1b668 More work on merge detection 2007-03-10 17:46:49 +01:00
Simon Hausmann
1dcff16b12 Cleanups and preparations for true branch merge detection 2007-03-10 11:46:26 +01:00
Simon Hausmann
cd02317d67 Cleanups 2007-03-10 10:53:07 +01:00
Simon Hausmann
1e602ee4d9 make the debug cache configurable 2007-03-10 10:25:34 +01:00
Simon Hausmann
aa04b48cab fix --known-branches support 2007-03-08 21:34:40 +01:00
Simon Hausmann
f2c445efed unstable work in progress for better main branch detection 2007-03-08 21:27:59 +01:00
Simon Hausmann
3ac8ff6810 silent for real this time 2007-02-22 10:20:53 +01:00
Simon Hausmann
6fd3a6b6a2 Another silent fix 2007-02-22 09:22:36 +01:00
Simon Hausmann
21dc7ef85d blind: added support for --silent 2007-02-22 09:03:39 +01:00
Simon Hausmann
7b6a30fe2a another todo item 2007-02-21 17:51:07 +01:00
Simon Hausmann
8d2196e3e9 hotfix for branchless imports 2007-02-18 01:18:22 +10:00
Simon Hausmann
751eb34307 Run also with older versions of Python 2007-02-15 02:16:14 +10:00
Simon Hausmann
e8a7be339b this is very much in progress, but at least the branch importing works a little bit
better now
2007-02-14 17:13:17 +01:00
Simon Hausmann
116ea75937 try merging based on p4 changes 2007-02-12 22:05:21 +01:00
Simon Hausmann
72259d882f set marks for fast-import 2007-02-12 21:56:46 +01:00
Simon Hausmann
c79b8b7d0b don't write out too many merges 2007-02-12 21:44:02 +01:00
Simon Hausmann
cfc3ed814a more work on branch import. my testcase works at least :) 2007-02-12 21:41:45 +01:00
Simon Hausmann
e85e16c72e start experimental work on branch detection 2007-02-12 21:04:59 +01:00
Simon Hausmann
70629bc031 cleanups 2007-02-12 20:28:58 +01:00
Simon Hausmann
d6aa805bc8 get rid of unused variable 2007-02-11 21:35:34 +01:00
Simon Hausmann
00f20aa0e5 create lightweight tags instead of full tag objects for the incremental import 2007-02-11 18:04:39 +01:00
Simon Hausmann
fbb9544c5f changed the default branch to master 2007-02-10 10:05:51 +01:00
Simon Hausmann
fcbd332684 avoid the excessive use of tags and just keep one p4 tag around 2007-02-10 10:05:29 +01:00
Simon Hausmann
2dfd5ddde5 cleanups 2007-02-10 09:25:22 +01:00
Simon Hausmann
6304b259c3 make the branch configurable 2007-02-08 15:53:11 +01:00
Simon Hausmann
852b914302 slightly better error handling 2007-02-08 15:45:16 +01:00
Simon Hausmann
2c3e57d5f5 fix calculation of newest revision for initial import 2007-02-07 23:51:51 +01:00
Simon Hausmann
e7afd87799 yumm, more convenience 2007-02-07 23:37:54 +01:00
Simon Hausmann
a9d0ae966b use git-repo-config for more convenience 2007-02-07 23:25:56 +01:00
Simon Hausmann
136507baba fix incremental imports 2007-02-07 23:09:49 +01:00
Simon Hausmann
88df3ee39c cleanups and work with the latest git-fast-import 2007-02-07 22:57:01 +01:00
Simon Hausmann
8ca775d2e2 some work on single revision imports 2007-02-01 18:19:55 +01:00
Simon Hausmann
0b7d9a98a3 small cleanup 2007-02-01 17:42:23 +01:00
Simon Hausmann
bd69d30f27 turns out there is no need for a temporary import branch and rebasing 2007-02-01 08:23:39 +01:00
Simon Hausmann
b8eb0ce284 very experimental incremental import support :) 2007-02-01 00:08:51 +01:00
Simon Hausmann
5933f5eee8 fix permissions 2007-01-31 23:09:24 +01:00
Simon Hausmann
60053b01f0 write tags for each changeset 2007-01-31 23:03:01 +01:00
Simon Hausmann
7263558fda display progress again (forgot to flush) 2007-01-31 22:47:53 +01:00
Simon Hausmann
dba2db9822 be a bit more permissive on the accepted depot paths 2007-01-31 22:41:08 +01:00
Simon Hausmann
555a9dd9d9 avoid fstat for every file 2007-01-31 22:38:07 +01:00
Simon Hausmann
6a5b413aae ported the remaining bits over to -G 2007-01-31 22:31:28 +01:00
Simon Hausmann
465f852151 port p4 users to -G 2007-01-31 22:19:18 +01:00
Simon Hausmann
e3435cd0ea cleanups, migrated towards using p4 -G 2007-01-31 22:13:17 +01:00
Simon Hausmann
4cdcf7837b write to git-fast-import directly instead of to stdout 2007-01-31 21:54:56 +01:00
Simon Hausmann
c13e8e8440 cleanups 2007-01-31 20:48:39 +01:00
Simon Hausmann
48450e1e04 speed up the import and try to get the permissions working 2007-01-31 20:16:26 +01:00