205 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Abderrahim Kitouni	f6dc1c3540	revert the changes made in 1eaf107ee0e5 and cbd9deb7c675 ... Merges can be done in either git or hg, so we should not add information in the git log.	2009-06-29 23:20:37 +01:00
Abderrahim Kitouni	9ac82c76e6	trying to fix some of the broken tests	2009-06-29 15:28:25 +01:00
Abderrahim Kitouni	096b5a94df	update tests to also push to git (not only clone)	2009-06-28 22:48:16 +01:00
Abderrahim Kitouni	d633cf5716	added a test for merge (fails actually)	2009-06-28 22:00:46 +01:00
Abderrahim Kitouni	02ac29b2b1	README: minor fixes	2009-06-28 21:49:44 +01:00
Abderrahim Kitouni	ab962c94d7	add test for octopus merge conversion	2009-06-25 16:24:36 +01:00
Abderrahim Kitouni	50d63c7775	merge documentation update from ArneBab	2009-06-24 15:18:42 +01:00
Abderrahim Kitouni	a1de5951ce	Reorganize push for more symmetry with fetch	2009-06-23 19:22:49 +01:00
Abderrahim Kitouni	921c19cd03	Drop importbranch/exportbranch options (exportbranch was really broken)	2009-06-23 19:20:15 +01:00
Arne Babenhauserheide	6b95636508	README: Added information about the git+ssh:// url format.	2009-06-22 11:24:48 +02:00
Abderrahim Kitouni	ecf252e1c5	Do not depend on the cache git repository for reference pushing	2009-06-21 22:44:41 +01:00
Abderrahim Kitouni	37024e14e4	merge documentation update from ArneBab	2009-06-21 17:21:36 +01:00
Abderrahim Kitouni	19087a251b	Better reporting of the number of commits to convert	2009-06-21 11:07:44 +01:00
Abderrahim Kitouni	7d41639e2e	Add expected output for test-encoding (forgotten in face52a81d48)	2009-06-21 17:18:16 +01:00
Abderrahim Kitouni	77d27b7dd5	Use mercurial.node.bin instead of dulwich.objects.hex_to_sha	2009-06-19 16:53:39 +01:00
Abderrahim Kitouni	eb4e36cb7d	Store git tags in .hg/git-tags and let localtags be *local*	2009-06-18 22:38:09 +01:00
Arne Babenhauserheide	ca1c0302d5	Updated the readme some more...	2009-06-18 21:16:49 +02:00
Arne Babenhauserheide	67d3cb54f1	Updated the readme to include the usage of [paths].	2009-06-18 21:14:42 +02:00
Abderrahim Kitouni	a69df41353	Handle git repositories with legacy encodings.	2009-06-18 16:49:13 +01:00
Abderrahim Kitouni	cca46fab28	Update tests	2009-06-16 18:58:03 +01:00
Abderrahim Kitouni	758c750a8f	Fix remote branch hadling to use the hgrc [paths] section	2009-06-16 14:44:19 +01:00
Abderrahim Kitouni	1b70cc7849	Reorder methods by their functionality.	2009-06-16 13:39:11 +01:00
Abderrahim Kitouni	0cb689bef6	Remove remotes support (use the paths section in hgrc instead)	2009-06-08 19:15:58 +01:00
Abderrahim Kitouni	da195f1c47	Various cleanups (mostly whitespace and imports)	2009-06-05 11:56:22 +01:00
Abderrahim Kitouni	98730fbd8c	Make it possible to clone/pull from bundle repositories	2009-06-04 18:07:05 +01:00
Abderrahim Kitouni	c79771a1f7	Initial clone/pull/push support for git repositories	2009-06-03 21:15:43 +01:00
Abderrahim Kitouni	fec33923ec	make sure commit_import_ctx works with latest hg	2009-06-03 19:29:44 +01:00
Scott Chacon	2a605eba4a	only look for renames if the file has changed	2009-06-03 16:32:03 -07:00
Scott Chacon	38acb03ef6	fix to previously written tree hash calculation	2009-06-03 13:45:32 -07:00
Scott Chacon	65f9ead2ec	remove profiling code and cache all trees more effectively	2009-06-03 13:29:28 -07:00
Scott Chacon	b797c4f3e8	profiling push - fixed tree caching issue, 15% impr	2009-06-03 11:45:17 -07:00
Scott Chacon	fcfc65e702	removed profiling and debugging code	2009-06-03 10:01:03 -07:00
Scott Chacon	5a97599d3e	not trying to write the same tree twice	2009-06-03 09:55:45 -07:00
Scott Chacon	5c914f6dfa	fixed serious speed issue with rename detection	2009-06-03 09:22:27 -07:00
Scott Chacon	400dff1d96	profiling the push	2009-06-02 21:27:19 -07:00
Scott Chacon	d92e94dad8	fix message stripping and malformed user info	2009-06-02 19:33:48 -07:00
Scott Chacon	3a40638749	added empty changelog handling	2009-06-01 20:17:11 -07:00
Scott Chacon	a956124cda	nicer and more descriptive comment	2009-06-01 15:15:43 -07:00
Scott Chacon	89fbc37467	remove rename detection, add explicit changelog recording on merges	2009-06-01 15:10:01 -07:00
Scott Chacon	feffe70422	almost got everything working	2009-06-01 14:57:19 -07:00
Scott Chacon	f254446497	author and extra data fixes	2009-05-29 13:13:04 -07:00
Scott Chacon	f972b470ff	got octomerges working	2009-05-27 17:28:01 -07:00
Scott Chacon	4a831bd653	moved file rename code back to proper indent	2009-05-27 17:27:23 -07:00
Scott Chacon	4ec3f5c66b	Merge branch 'octo' with octo merge code ... Conflicts: git_handler.py	2009-05-27 17:19:11 -07:00
Scott Chacon	107a30708a	applied patch removing unused methods from dimichxp	2009-05-27 17:15:08 -07:00
Scott Chacon	be2171ab72	applied octopatch from dimichxp	2009-05-27 17:14:41 -07:00
Scott Chacon	39dbc4e40d	layout changes to todo file	2009-05-27 17:10:42 -07:00
Scott Chacon	f85f597d17	Merge commit 'sr/master'	2009-05-27 16:33:05 -07:00
Scott Chacon	83af2e9ca3	Merge commit 'origin/master'	2009-05-27 16:29:07 -07:00
Scott Chacon	940bc65ee2	dont export funky tags we import for convenience, dont push tags already on the server	2009-05-27 16:28:53 -07:00