Nemcio/Fast-Export
1
0
Fork 0
mirror of https://github.com/frej/fast-export.git synced 2026-01-14 02:02:05 +01:00
Code Issues Packages Projects Releases Activity

Commit Graph

  • 6ee645441b Fixes for rollback, delete branches that did not exist at the specified p4 change Simon Hausmann 2007-05-21 23:44:24 +02:00
  • ea975442b4 Fix branch detection in multi-branch imports Simon Hausmann 2007-05-21 23:25:51 +02:00
  • b137492471 Added rollback command for debugging Simon Hausmann 2007-05-21 22:57:06 +02:00
  • 2ade241861 Make git-p4 submit --direct safer by also creating a git commit Simon Hausmann 2007-05-21 11:04:26 +02:00
  • 88916904b6 Detect with git-p4 submit --direct when there are no changes in the working directory Simon Hausmann 2007-05-21 10:08:11 +02:00
  • 0e949c32bd Fix git symbolic-ref warning on initial clone Simon Hausmann 2007-05-21 10:05:30 +02:00
  • 034f696523 Fix error detection with git-p4 submit when the requested depot path is not in the client view. Simon Hausmann 2007-05-21 09:34:56 +02:00
  • 0fc5907e67 Fix conversion from old style heads/p4 to remotes/p4/master Simon Hausmann 2007-05-21 08:44:16 +02:00
  • 10f949db6f Improved output for multi branch imports and noted another little todo item Simon Hausmann 2007-05-21 00:39:16 +02:00
  • 886f8af18a Another (potentially life-saving) idea for submit --direct Simon Hausmann 2007-05-20 23:52:51 +02:00
  • 76c02dc557 Had an idea for debugging, record it :) Simon Hausmann 2007-05-20 23:42:22 +02:00
  • 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. Simon Hausmann 2007-05-20 23:39:40 +02:00
  • 0edb3a09f1 Added support for git-p4 submit --direct (experimental) Simon Hausmann 2007-05-20 16:55:05 +02:00
  • 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. Simon Hausmann 2007-05-20 16:33:21 +02:00
  • 9578faee07 Oops, not only /set/ gitdir on clone, also set it /correctly/ :) Simon Hausmann 2007-05-20 15:24:01 +02:00
  • f1f9c98c25 Fix gitdir not being set when cloning. Needed for writing the p4 users cache. Simon Hausmann 2007-05-20 15:15:34 +02:00
  • 4b4de4f3eb Cache the output of "p4 users" for faster syncs on high latency links. Simon Hausmann 2007-05-20 10:55:54 +02:00
  • 32e8c43429 Removed unused variable, more cleanups Simon Hausmann 2007-05-19 12:05:40 +02:00
  • 9613e4cf75 More cleanups and speedups for labels and branches Simon Hausmann 2007-05-19 11:54:11 +02:00
  • d869be50bc Cleanup/speed up the branch<> file split and removed change range limitation that I added for debugging (oops). Simon Hausmann 2007-05-19 11:07:32 +02:00
  • 004e2833d9 More work on the incremental importing of multiple branches. Improved error detection by checking the exit code of git-fast-import. Simon Hausmann 2007-05-19 10:23:12 +02:00
  • 783b917797 Give branches a nice project prefix and don't bail out on clone if we failed to detect the master branch. Simon Hausmann 2007-05-18 22:13:26 +02:00
  • d23232b665 Started rewriting the branch detection, based on "p4 branches" and "p4 branch -o foo". Simon Hausmann 2007-05-18 21:45:23 +02:00
  • 4deb78ec65 Removed unused cache variables. Simon Hausmann 2007-05-18 20:39:38 +02:00
  • f9601561bd Fix branch setup after initial clone. Simon Hausmann 2007-05-18 20:32:35 +02:00
  • d956aaa9c1 Removed todo item that is implemented :) Simon Hausmann 2007-05-17 22:22:26 +02:00
  • 8a6366a83c Added support for git-p4 sync/rebase --with-origin. See git-p4.txt for details :) Simon Hausmann 2007-05-17 22:17:49 +02:00
  • 169149117e Bite the bullet and automatically convert old style refs/heads/p4 repositories to the new style refs/remotes/p4 branching. Simon Hausmann 2007-05-17 21:18:53 +02:00
  • 8ed3fceeff Changed the default p4 import branch to be refs/remotes/p4/{HEAD,master} instead of refs/heads/p4. Simon Hausmann 2007-05-17 20:57:05 +02:00
  • 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. Simon Hausmann 2007-05-17 20:26:58 +02:00
  • 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. Simon Hausmann 2007-05-17 20:15:47 +02:00
  • c120a31b12 Removed cleantags command. It doesn't have any meaning anymore. Simon Hausmann 2007-05-17 19:44:50 +02:00
  • c31188f6df Clean up code duplication for revision parsing and fix previous commit to not import into remotes/p4 (yet!). Simon Hausmann 2007-05-17 09:13:54 +02:00
  • 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 :) Simon Hausmann 2007-05-17 09:02:45 +02:00
  • 2ca4a934f7 Fixing syncing (gitdir discovery / cd) for bare repositories Simon Hausmann 2007-05-17 07:42:38 +02:00
  • 94354e394e A little todo note before I forget it :), based on a suggestion from Lars. Simon Hausmann 2007-05-16 13:15:34 +02:00
  • ba27f31bdb Fix calling git-p4 rebase from within a subdirectory (git rebase wants to be in toplevel) Simon Hausmann 2007-05-16 12:12:39 +02:00
  • f6f9683a23 Give a better hint if git-p4 submit fails Simon Hausmann 2007-05-16 09:43:13 +02:00
  • f554f77572 Added the possibility of skipping patches during git-p4 submit Simon Hausmann 2007-05-16 09:41:26 +02:00
  • 4614277491 Make git-p4 work with bare repositories. Simon Hausmann 2007-05-15 23:06:43 +02:00
  • 0187ce60bc Fix git-p4 clone //depot/project (head import) Simon Hausmann 2007-05-15 16:15:26 +02:00
  • 8eee6c1101 Make the command call silent Marius Storm-Olsen 2007-05-15 15:51:25 +02:00
  • 574a7b1cc2 Converted to unix newlines Simon Hausmann 2007-05-15 16:07:02 +02:00
  • cd33574b64 Make submitting work on Windows. Simon Hausmann 2007-05-15 15:15:39 +02:00
  • aaa19d91cb Make sure all popen calls use binary mode (for Windows) and Simon Hausmann 2007-05-15 14:57:57 +02:00
  • 7ad8d65b05 Added a little .bat wrapper from Marius Simon Hausmann 2007-05-15 14:42:56 +02:00
  • c8eff44695 Use the subprocess module instead of popen2 to make it work on Windows. Simon Hausmann 2007-05-15 14:31:06 +02:00
  • c7afe08124 Document some implementation details, for the curious... :) Simon Hausmann 2007-05-07 20:14:17 +02:00
  • 7bfbfcf1d5 Cleanup, removed the old tagging code Simon Hausmann 2007-05-01 23:26:19 +02:00
  • 0269c80c68 cleanup, renamed self.globalPrefix to self.depotPath Simon Hausmann 2007-05-01 23:23:00 +02:00
  • d2904a9358 Micro cleanup Simon Hausmann 2007-05-01 23:15:48 +02:00
  • bbe740ba2c Doc cleanups. Simon Hausmann 2007-05-01 18:28:38 +02:00
  • e3772eb1f2 Handle patch errors in git-p4 submit better. Simon Hausmann 2007-04-15 09:59:56 +02:00
  • 6c9989feec A new attempt at fixing the child-fast-import-process-not-finished race condition in the clone command Simon Hausmann 2007-04-15 09:34:15 +02:00
  • 7fd31726a9 Slightly improved formatting of the raw_input questions. Simon Hausmann 2007-04-14 16:09:43 +02:00
  • d7e877303c Removed the old patch apply code from git-p4 submit. Simon Hausmann 2007-04-14 16:05:54 +02:00
  • e8e5d6b624 Fix the timezone formatting. Now qgit also displays (parses) it correctly. Simon Hausmann 2007-04-14 11:21:50 +02:00
  • 837ec75aad Print an error message of some sort if git fast-import fails. Simon Hausmann 2007-04-13 22:21:10 +02:00
  • 3a7b8e74e5 Allow for convenient rebasing after git-p4 submit Simon Hausmann 2007-04-09 12:43:40 +02:00
  • 1164789a59 Added a simple example of usage to the "documentation" :) Simon Hausmann 2007-04-08 10:21:56 +02:00
  • a20699aaab fix variable usage (oops) Simon Hausmann 2007-04-08 10:15:47 +02:00
  • 13b8d8fd8d Fix file determination for #head imports Simon Hausmann 2007-04-08 10:13:32 +02:00
  • f82f79df67 Added git-p4 clone convenience command Simon Hausmann 2007-04-08 10:08:26 +02:00
  • 289a5e1d1f Honor --silent for labels Simon Hausmann 2007-04-08 09:00:55 +02:00
  • 916373a87c Turn off potentially slow label detection by default Simon Hausmann 2007-04-08 00:12:02 +02:00
  • 64255e2b01 Provide a tree summary after git-p4 rebase Simon Hausmann 2007-04-08 00:07:02 +02:00
  • 17360fd2c9 Added git-p4 rebase convenience Simon Hausmann 2007-04-07 23:46:50 +02:00
  • 6358992b2f Minor cleanup Simon Hausmann 2007-04-01 15:40:46 +02:00
  • 1249f67588 Fix "compilation" :) Simon Hausmann 2007-04-01 13:39:39 +02:00
  • a13c1bfdf0 Fix the docs for git-p4 submit and turn git-p4 submit --master=foo into simply git-p4 submit mytopicbranch. Simon Hausmann 2007-03-29 19:15:24 +02:00
  • 171dbab4a6 Fix variable usage in tag import Simon Hausmann 2007-03-28 17:05:38 +02:00
  • a1bdb1671a Added support for mapping p4 labels to git tags Simon Hausmann 2007-03-26 22:34:34 +02:00
  • f2ba67a06a git-p4 debug doesn't need a git repository Simon Hausmann 2007-03-26 08:18:55 +02:00
  • 6a5d0cf493 Don't try to parse any options with git-p4 debug but pass it straight on to p4 Simon Hausmann 2007-03-26 00:13:51 +02:00
  • 0befe991ab Prefer git command over git-command. Simon Hausmann 2007-03-24 16:35:05 +01:00
  • 46479794f8 Minor cosmetic fixlet ;-) Simon Hausmann 2007-03-24 09:18:20 +01:00
  • db49ff9686 Different versions of p4 have different output for the where command ;( Simon Hausmann 2007-03-24 09:15:11 +01:00
  • 368b0ef1db Use the new incremental import style by default Simon Hausmann 2007-03-23 09:30:41 +01:00
  • af6fdd432b Make it possible to run git-p4 submit from within the git repository Simon Hausmann 2007-03-23 09:16:07 +01:00
  • 7645763cfa Brand new smart incremental import that doesn't need tags or git repo-config :) Simon Hausmann 2007-03-22 22:17:42 +01:00
  • 3a17a51aaf Set the default branch in run, not in the constructor Simon Hausmann 2007-03-22 21:34:16 +01:00
  • c27a1d9593 Helper function to check the existance of a revision Simon Hausmann 2007-03-22 21:27:14 +01:00
  • 29b9fbc9ad Added some helper function(s) to parse the depot path and change number from the log message Simon Hausmann 2007-03-22 21:10:25 +01:00
  • dba0b732ae Changed the default branch for imports from "master" to "p4" Simon Hausmann 2007-03-22 20:36:28 +01:00
  • 4c2c547d88 Changed the format of the imported log message slightly, so that it's easier to parse again. Simon Hausmann 2007-03-22 20:27:41 +01:00
  • 3eb08ff474 Get rid of the ugly .py extensions - in everyday usage the .py is annoying :) Simon Hausmann 2007-03-22 09:13:01 +01:00
  • e421eb3f97 Don't show the submit template and the diff first in less but show it in $editor right away Simon Hausmann 2007-03-21 21:04:12 +01:00
  • 50f56d35d0 Allow invocations from within a git working tree Simon Hausmann 2007-03-21 13:05:30 +01:00
  • 10255c36c2 I'm feeling adventurous :), make --apply-as-patch the new default because it's sooo much faster. Simon Hausmann 2007-03-21 11:01:18 +01:00
  • f27907b793 This should make --apply-as-patch work with deletions (fingers crossed :) Simon Hausmann 2007-03-21 10:57:54 +01:00
  • c6d59cf630 Added experimental but super-fast --apply-as-patch option to git-p4 submit Simon Hausmann 2007-03-21 10:11:20 +01:00
  • 1504d0e597 Some more docs Simon Hausmann 2007-03-21 08:27:33 +01:00
  • 9df78326e6 Some docs :) Simon Hausmann 2007-03-20 22:41:00 +01:00
  • 6838cc4bcb These two scripts have been migrated into git-p4.py now Simon Hausmann 2007-03-20 22:09:27 +01:00
  • f3340699f3 Fixed the initial versioned import Simon Hausmann 2007-03-20 21:13:49 +01:00
  • 19d73797bc Fixed some obvious of missing "self"s :) Simon Hausmann 2007-03-20 20:59:30 +01:00
  • fe393f3d6a Completely untested "merge" of p4-fast-export.py into git-p4.py Simon Hausmann 2007-03-20 20:54:23 +01:00
  • a1014dbc62 sync-to-perforce is now called submit and fixed the gitdir check a little bit Simon Hausmann 2007-03-20 18:32:47 +01:00
  • 6534d511d5 Credit where credit is due. Added Trolltech ASA. Simon Hausmann 2007-03-19 22:26:36 +01:00
  • 1d6c640423 First (untested) attempt at migrating p4-git-sync into the final git-p4 script Simon Hausmann 2007-03-19 22:25:17 +01:00