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

  • 258f03a9ba Fix shell substitution typo Rocco Rutte 2007-10-22 08:28:41 +00:00
  • 82dccb0ea0 hg-reset.py: Use mangle_key() for load_cache() as hg-fast-export.py does Rocco Rutte 2007-10-22 08:28:18 +00:00
  • ee510bb022 hg-fast-export.py: Rewrite merge logic Rocco Rutte 2007-10-22 10:06:58 +02:00
  • 8551771d2b hg2git.py: Allow consumers to modify keys of dicts returned by load_cache() Rocco Rutte 2007-10-22 09:50:52 +02:00
  • 3d1f111d30 hg2git.py: Use git-rev-parse to get SHA1s instead of reading files below refs/ directly Rocco Rutte 2007-10-22 09:48:48 +02:00
  • fb5cd150a6 hg2git.py: Map 'HEAD', 'default' and '' hg branches to 'master' in git Rocco Rutte 2007-10-22 09:44:12 +02:00
  • 4cc1d7cf17 Allow for $PYTHON environment variable specifying python binary to use Rocco Rutte 2007-10-22 09:34:40 +02:00
  • e1aa392c39 This prevents invalid command errors caused by bytes not being flushed to git-fastimport in the same order as they were written to the buffer. Scott Lamb 2007-07-16 01:31:00 -07:00
  • 9f234284a7 Removed git-p4 from fast-export. It has been moved to git.git:contrib/fast-import. Simon Hausmann 2007-06-25 10:34:20 +02:00
  • ee45a2dc49 Make it possible to specify the HEAD for the internal findUpstreamBranchPoint function. Simon Hausmann 2007-06-22 00:01:57 +02:00
  • 01f691145c Added git-p4 branches command that shows the mapping of perforce depot paths to imported git branches. Simon Hausmann 2007-06-20 23:10:28 +02:00
  • 82f6aacdb7 Warn about conflicting p4 branch mappings and use the first one found. Simon Hausmann 2007-06-17 15:10:24 +02:00
  • 81313edcc0 Fix the branch mapping detection to be independent from the order of the "p4 branches" output. Simon Hausmann 2007-06-17 11:25:34 +02:00
  • 6e1d41035f git-p4 fails when cloning a p4 depo. Benjamin Sergeant 2007-06-08 11:13:55 -07:00
  • 5339c58a25 Fix initial multi-branch import. Simon Hausmann 2007-06-16 13:09:21 +02:00
  • b6abe2d89a Only use double quotes on Windows Marius Storm-Olsen 2007-06-12 15:27:52 +02:00
  • 46cfe91e74 Fix git-p4 rebase to detect the correct upstream branch instead of unconditionally always rebasing on top of remotes/p4/master Simon Hausmann 2007-06-12 14:34:46 +02:00
  • 3f7d065721 Moved the code from git-p4 submit to figure out the upstream branch point into a separate helper method. Simon Hausmann 2007-06-12 14:31:59 +02:00
  • f04a1d52e9 git-p4 submit: Fix missing quotes around p4 commands to make them work with spaces in filenames Simon Hausmann 2007-06-11 23:40:25 +02:00
  • b595271340 Mention remotes/p4/master also in the documentation. Simon Hausmann 2007-06-11 23:30:23 +02:00
  • 1f1d1fd37d Provide some information for single branch imports where the commits go Simon Hausmann 2007-06-11 23:28:03 +02:00
  • 58739b4166 git-p4: check for existence of repo dir before trying to create Kevin Green 2007-06-11 16:48:07 -04:00
  • 62d7323e48 Write out the options tag in the log message of imports only if we actually have options Simon Hausmann 2007-06-11 10:01:58 +02:00
  • d0b4b5c1ad Fix support for explicit disabling of syncing with the origin Simon Hausmann 2007-06-11 09:59:27 +02:00
  • 883791be16 Fix depot-paths encoding for multi-path imports (don't split up //depot/path/foo) Simon Hausmann 2007-06-11 08:54:45 +02:00
  • 753e5e80a0 Fix project name guessing Simon Hausmann 2007-06-11 08:50:57 +02:00
  • 1bc0c678f0 Fix updating/creating remotes/p4/* heads from origin/p4/* Simon Hausmann 2007-06-10 10:57:40 +02:00
  • 9689743e30 Fixed the check to make sure to exclude the HEAD symbolic refs when updating the remotes/p4 branches from origin. Simon Hausmann 2007-06-10 00:22:30 +02:00
  • 9003c6a1e6 also strip p4/ from local imports. Han-Wen Nienhuys 2007-05-23 18:49:35 -03:00
  • 2710e51e06 Merge branch 'master' of git://repo.or.cz/fast-export Han-Wen Nienhuys 2007-06-08 18:19:23 -03:00
  • 8e26f9c2bb print error message when p4 print fails (eg. due to permission problems) Han-Wen Nienhuys 2007-05-23 18:49:35 -03:00
  • f4b5d09a6a Only get the expensive branch mapping from the p4 server when not syncing with the help of an origin remote (which we instead then use to get new branches from). Simon Hausmann 2007-06-08 08:49:22 +02:00
  • 59a2926517 Make git-p4 submit detect the correct reference (origin) branch when working with multi-branch imports. Simon Hausmann 2007-06-07 22:54:32 +02:00
  • 7f182ef1b0 Make clone behave like git clone by default again. Simon Hausmann 2007-06-07 21:12:25 +02:00
  • 853e41475e Exclude the HEAD symbolic ref from the list of known branches Marius Storm-Olsen 2007-06-07 15:28:04 +02:00
  • 275f02aadc Fix single branch import into remotes Marius Storm-Olsen 2007-06-07 15:13:59 +02:00
  • 553b6a4a99 Fix git-p4 clone (defaultDestination) Marius Storm-Olsen 2007-06-07 15:08:33 +02:00
  • b7bf365514 Ensure that the commit message is Windows formated (CRLF) before invoking the editor. Marius Storm-Olsen 2007-06-07 14:07:01 +02:00
  • 6ce8e50925 Fix depot-path determination for git-p4 submit Simon Hausmann 2007-06-07 13:10:20 +02:00
  • a72cdbe18d Fix git-p4 submit Simon Hausmann 2007-06-07 13:09:14 +02:00
  • bf109db2b2 Fix git-p4 rebase Simon Hausmann 2007-06-07 12:51:03 +02:00
  • 94d5e2bc84 Hack to make the multi-branch import work again with self.depotPaths now that self.depotPath is gone Simon Hausmann 2007-06-07 09:41:53 +02:00
  • afd960f59b Don't attempt to set the initialParent on multi-branch imports (useless). At some point the code paths should be unified, but for now I need a working git-p4 :) Simon Hausmann 2007-06-07 09:39:51 +02:00
  • 74b0014a7a Fix common path "calculation" from logs of multiple branches. Need to use min instead of max for prev/cur to avoid out-of-bounds string access. Also treat "i" as index of the last match instead of a length because in case of a complete match of the two strings i was off by one. Simon Hausmann 2007-06-07 09:37:13 +02:00
  • 51944c93af Fix support for "depot-path" in older git-p4 imports Simon Hausmann 2007-06-07 09:19:34 +02:00
  • eb4a85cc97 look for 'text' and 'binary' files. Han-Wen Nienhuys 2007-05-23 18:49:35 -03:00
  • 97dabfacd8 thinko: really ignore deleted files. Han-Wen Nienhuys 2007-05-23 18:49:35 -03:00
  • a196ae17a6 remove debug print Han-Wen Nienhuys 2007-05-23 18:49:35 -03:00
  • f1d3db44f5 Cleanups & import into p4/master for local import Han-Wen Nienhuys 2007-05-23 18:49:35 -03:00
  • 449242bc4c use p4CmdList() to get file contents in Python dicts. This is more robust. Han-Wen Nienhuys 2007-05-23 18:49:35 -03:00
  • 6b6e82375b only run p4 print if necessary Han-Wen Nienhuys 2007-05-23 18:49:35 -03:00
  • 9261cdfd99 don't p4 print deleted files. Han-Wen Nienhuys 2007-05-23 18:49:35 -03:00
  • afdbaf0593 read files before creating the commit. Han-Wen Nienhuys 2007-05-23 18:49:35 -03:00
  • 0be300b90e thinko. Han-Wen Nienhuys 2007-05-23 18:49:35 -03:00
  • 3c1c54742c store p4 user cache in home directory. Han-Wen Nienhuys 2007-05-23 18:49:35 -03:00
  • 5016361592 Thinko, fix buglet. Han-Wen Nienhuys 2007-05-23 18:49:35 -03:00
  • 6460cf12df Read p4 files in one batch. Han-Wen Nienhuys 2007-05-23 18:49:35 -03:00
  • c246e21090 remove global .gitdir Han-Wen Nienhuys 2007-05-23 18:49:35 -03:00
  • ae38e155d0 Merge origin. Han-Wen Nienhuys 2007-05-23 18:49:35 -03:00
  • 49ae8869e7 Diverse cleanups Han-Wen Nienhuys 2007-05-23 18:49:35 -03:00
  • 458e0545cb Fix typo in listExistingP4Branches that broke sync. Simon Hausmann 2007-05-28 19:24:57 +02:00
  • e49c494d27 In *_pipe print the command that failed if it fails. Fixed old calls to mypopen. Simon Hausmann 2007-05-28 19:23:19 +02:00
  • e274d94177 Extract multiple paths concurrently. Han-Wen Nienhuys 2007-05-23 18:49:35 -03:00
  • aba960de59 add --verbose to all commands. Han-Wen Nienhuys 2007-05-23 18:49:35 -03:00
  • 79904ad286 use strip() iso. slicing for removing \n Han-Wen Nienhuys 2007-05-23 18:49:35 -03:00
  • 0e303e401d use string.strip() iso. slicing. Han-Wen Nienhuys 2007-05-23 18:29:34 -03:00
  • b1c7b0866f clone and sync --keep-path to keep perforce path to module. Han-Wen Nienhuys 2007-05-23 18:20:53 -03:00
  • 7c32565090 minor cleanups Han-Wen Nienhuys 2007-05-23 17:41:50 -03:00
  • 829dde7184 cleanup Han-Wen Nienhuys 2007-05-23 17:14:33 -03:00
  • 3c81f33f48 Robustness fixes for pipes Han-Wen Nienhuys 2007-05-23 17:10:46 -03:00
  • 73a8a9786e add .dotest to .gitignore Han-Wen Nienhuys 2007-05-23 17:10:46 -03:00
  • 481694a31a Fix my email address, this isn't really KDE related :) Simon Hausmann 2007-05-28 14:43:25 +02:00
  • e22b86f010 rename apply() to applyCommit(); apply is a python builtin Han-Wen Nienhuys 2007-05-23 16:55:48 -03:00
  • bd609cfd0f reformatting: break long lines. Han-Wen Nienhuys 2007-05-23 16:53:11 -03:00
  • a05b21cd97 Cleanups Han-Wen Nienhuys 2007-05-23 16:46:29 -03:00
  • 175ea59305 Fix creation of refs/remotes/p4/HEAD symbolic ref Simon Hausmann 2007-05-27 15:48:01 +02:00
  • 741db7fa74 Added git-p4 submit --trust-me-like-a-fool for the adventurous users :) Simon Hausmann 2007-05-25 22:34:30 +02:00
  • f5af3efa26 Forgot to remove this TODO item when I made --with-origin the default :) Simon Hausmann 2007-05-25 19:43:38 +02:00
  • 7116f99151 Shortcut the case where we have no origin branch Simon Hausmann 2007-05-25 11:36:42 +02:00
  • 5cacfb60f5 Make --with-origin the default for syncing. Simon Hausmann 2007-05-25 10:36:10 +02:00
  • c083b834af Make --with-origin also work without origin :) Simon Hausmann 2007-05-25 10:28:46 +02:00
  • 7c2db22e2d Make git-p4 work with packed refs (don't use os.path.exists to check for the existance of a ref) Simon Hausmann 2007-05-25 08:49:18 +02:00
  • 2ccb8d4a2d Avoid creating non-p4 branches in remotes/p4 off of remotes/origin Simon Hausmann 2007-05-25 08:44:41 +02:00
  • 78eb61f487 Oops, fix --with-origin to /really/ also call git fetch :) Simon Hausmann 2007-05-24 22:28:28 +02:00
  • 228b25f2dc Added support for --with-origin with multi-branch imports Simon Hausmann 2007-05-24 22:25:36 +02:00
  • 0dedbed800 Forgot to remove this return statement from debugging Simon Hausmann 2007-05-24 22:10:40 +02:00
  • 7a9bd9a760 Fix creating the remotes/p4 branches based on origin/* for the multi-branch import Simon Hausmann 2007-05-24 21:23:04 +02:00
  • e7d3ee6b59 Replace with when importing from p4 on Windows Marius Storm-Olsen 2007-05-24 14:07:55 +02:00
  • 87e8a542af Load the user map from p4 only once at run-time. Simon Hausmann 2007-05-24 00:24:52 +02:00
  • dcce87a4bf Fix multi-branch import with --silent. Simon Hausmann 2007-05-23 23:53:14 +02:00
  • 25a59c6c42 p4 p4 is not a valid p4 command :) Simon Hausmann 2007-05-23 23:44:19 +02:00
  • 244b953db5 Catch p4 errors in rollback early enough (before deleting refs!) Simon Hausmann 2007-05-23 23:40:48 +02:00
  • d1edf40a27 Oops, fill the /list/ correct with the p4 exit code. Simon Hausmann 2007-05-23 23:32:32 +02:00
  • 409a4ab6ea Don't make len(p4Cmd("p4 changes -m 1 //foo/...")) == 0 succeed when the p4 command itself failed. Simon Hausmann 2007-05-23 23:27:31 +02:00
  • 8796865166 Make rollback work with locally imported branches Simon Hausmann 2007-05-23 20:07:57 +02:00
  • bcdf34c777 Avoid calling git symbolic-ref refs/heads/p4//HEAD (double slash) Simon Hausmann 2007-05-23 16:41:46 +02:00
  • 5a403c2cce Doc updates Simon Hausmann 2007-05-23 00:33:34 +02:00
  • 985366f0e8 Use refs/heads/* instead of refs/heads/p4/* for local imports Simon Hausmann 2007-05-23 00:15:50 +02:00
  • d8db890ea2 Added support for --max-changes=<count> to ease import debugging Simon Hausmann 2007-05-23 00:07:35 +02:00
  • 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. Simon Hausmann 2007-05-23 00:03:08 +02:00