Nemcio/Fast-Export
1
0
Fork 0
mirror of https://github.com/frej/fast-export.git synced 2026-01-15 02:32:05 +01:00
Code Issues Packages Projects Releases Activity
265 Commits 1 Branch 21 Tags
73a8a9786edda26c62c697cabc6ddcf792e76d89
Commit Graph

265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Han-Wen Nienhuys
73a8a9786e add .dotest to .gitignore 2007-05-28 11:08:19 -03:00
Simon Hausmann
481694a31a Fix my email address, this isn't really KDE related :) 2007-05-28 14:43:25 +02:00
Han-Wen Nienhuys
e22b86f010 rename apply() to applyCommit(); apply is a python builtin 2007-05-28 14:29:11 +02:00
Han-Wen Nienhuys
bd609cfd0f reformatting: break long lines. 2007-05-28 14:28:58 +02:00
Han-Wen Nienhuys
a05b21cd97 Cleanups 
- don't use dir (python builtin)
- use re for munging depotPath into destination
 2007-05-28 14:22:53 +02:00
Simon Hausmann
175ea59305 Fix creation of refs/remotes/p4/HEAD symbolic ref 2007-05-27 15:48:01 +02:00
Simon Hausmann
741db7fa74 Added git-p4 submit --trust-me-like-a-fool for the adventurous users :) 2007-05-25 22:34:30 +02:00
Simon Hausmann
f5af3efa26 Forgot to remove this TODO item when I made --with-origin the default :) 2007-05-25 19:43:38 +02:00
Simon Hausmann
7116f99151 Shortcut the case where we have no origin branch 2007-05-25 11:36:42 +02:00
Simon Hausmann
5cacfb60f5 Make --with-origin the default for syncing. 2007-05-25 10:36:10 +02:00
Simon Hausmann
c083b834af Make --with-origin also work without origin :) 2007-05-25 10:28:46 +02:00
Simon Hausmann
7c2db22e2d Make git-p4 work with packed refs (don't use os.path.exists to check for the 
existance of a ref)
 2007-05-25 08:49:18 +02:00
Simon Hausmann
2ccb8d4a2d Avoid creating non-p4 branches in remotes/p4 off of remotes/origin 2007-05-25 08:44:41 +02:00
Simon Hausmann
78eb61f487 Oops, fix --with-origin to /really/ also call git fetch :) 2007-05-24 22:28:28 +02:00
Simon Hausmann
228b25f2dc Added support for --with-origin with multi-branch imports 2007-05-24 22:25:36 +02:00
Simon Hausmann
0dedbed800 Forgot to remove this return statement from debugging 2007-05-24 22:10:40 +02:00
Simon Hausmann
7a9bd9a760 Fix creating the remotes/p4 branches based on origin/* for the multi-branch import 2007-05-24 21:23:04 +02:00
Marius Storm-Olsen
e7d3ee6b59 Replace 
with 
 when importing from p4 on Windows
 2007-05-24 14:17:29 +02:00
Simon Hausmann
87e8a542af Load the user map from p4 only once at run-time. 2007-05-24 00:24:52 +02:00
Simon Hausmann
dcce87a4bf Fix multi-branch import with --silent. 2007-05-23 23:53:14 +02:00
Simon Hausmann
25a59c6c42 p4 p4 is not a valid p4 command :) 2007-05-23 23:44:19 +02:00
Simon Hausmann
244b953db5 Catch p4 errors in rollback early enough (before deleting refs!) 2007-05-23 23:40:48 +02:00
Simon Hausmann
d1edf40a27 Oops, fill the /list/ correct with the p4 exit code. 2007-05-23 23:32:32 +02:00
Simon Hausmann
409a4ab6ea Don't make len(p4Cmd("p4 changes -m 1 //foo/...")) == 0 succeed when the p4 command itself failed. 
When the p4 command failed write out the exit code in the returned dict.
 2007-05-23 23:29:01 +02:00
Simon Hausmann
8796865166 Make rollback work with locally imported branches 2007-05-23 20:07:57 +02:00
Simon Hausmann
bcdf34c777 Avoid calling git symbolic-ref refs/heads/p4//HEAD (double slash) 2007-05-23 16:41:46 +02:00
Simon Hausmann
5a403c2cce Doc updates 2007-05-23 00:33:34 +02:00
Simon Hausmann
985366f0e8 Use refs/heads/* instead of refs/heads/p4/* for local imports 2007-05-23 00:15:50 +02:00
Simon Hausmann
d8db890ea2 Added support for --max-changes=<count> to ease import debugging 2007-05-23 00:07:35 +02:00
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