Miklos Vajna [Fri, 17 Oct 2008 19:45:15 +0000 (17 21:45 +0200)]
Force encoding author names in UTF-8 for fast-import.
This is necessary as other encodings are not permitted (according to
gfi's documentation).
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Miklos Vajna [Fri, 17 Oct 2008 19:40:19 +0000 (17 21:40 +0200)]
DarcsPatch.get_darcs_patches(): respect non-utf8 encoding
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Miklos Vajna [Fri, 17 Oct 2008 19:36:02 +0000 (17 21:36 +0200)]
Don't escape accents in the darcs output.
This way we don't get different ids when reading the darcs output and
the darcs files directly.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Miklos Vajna [Fri, 17 Oct 2008 19:30:28 +0000 (17 21:30 +0200)]
Allow specifying a non-utf8 encoding.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Miklos Vajna [Fri, 17 Oct 2008 15:14:07 +0000 (17 17:14 +0200)]
Replace 'git-fast-import' with 'git fast-import'.
The previous is no longer in PATH as of git-1.6.0.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
John Goerzen [Mon, 3 Mar 2008 03:22:12 +0000 (2 21:22 -0600)]
Fix for repo with local changes prior to obliterate
When attempting to convert the OfflineIMAP darcs repo to git, the
conversion process crashed approximately 500 revisions into the
process. Darcs was complaining of uncommitted local changes prior to
an obliterate.
Adding some darcs revert commands fixed that. Next, though, it was
complaining of EOF on input with the obliterate prompt. Changing the
call from echo ay to yes | darcs obliterate -a fixed that.
Han-Wen Nienhuys [Mon, 5 Nov 2007 21:46:22 +0000 (5 19:46 -0200)]
Add utf8 testcase
Han-Wen Nienhuys [Mon, 5 Nov 2007 21:10:18 +0000 (5 19:10 -0200)]
Include name in short_id; fixes multiple patches with same time stamp.
Add unicode fixes
Han-Wen Nienhuys [Sun, 19 Aug 2007 17:31:45 +0000 (19 14:31 -0300)]
test_conversion thinkos.
- do diff before removing git checkout.
- only show 1k of the diff.
Daniel Neri [Thu, 22 Mar 2007 12:51:38 +0000 (22 13:51 +0100)]
don't import gdbm (never used)
Han-Wen Nienhuys [Fri, 25 May 2007 02:39:17 +0000 (24 23:39 -0300)]
Revert "Implemented timezone migration"
This reverts commit
8cf91cca3d054835c1a21f91d913ae66b05b59f0.
breaks on fedora 7t4
Han-Wen Nienhuys [Fri, 25 May 2007 02:38:54 +0000 (24 23:38 -0300)]
Breaks on FC7t4
Revert "Fixed a time conversion issue. git-fast-import was receiving a localtime and timezone where it expected a UTC time and local timezone."
This reverts commit
94de2fc9fd447ffb32189e043109ed2aebcf25e0.
Han-Wen Nienhuys [Fri, 25 May 2007 02:33:26 +0000 (24 23:33 -0300)]
Merge git://repo.or.cz/darcs2git
Conflicts:
darcs2git.py
Han-Wen Nienhuys [Fri, 25 May 2007 02:32:51 +0000 (24 23:32 -0300)]
minor fixes.
Simo Leone [Fri, 16 Mar 2007 01:37:49 +0000 (15 20:37 -0500)]
Fixed a time conversion issue. git-fast-import was receiving a localtime and timezone where it expected a UTC time and local timezone.
Hey again, I noticed that the times it was putting out were local time
where they should have been UTC. This fixes it.
Cheers,
Simo
Simo Leone [Tue, 13 Mar 2007 07:33:35 +0000 (13 02:33 -0500)]
Implemented timezone migration
This patch implements timezone conversion. It's a bit of an abuse
of the email.utils module but it seems to work fine.
Han-Wen Nienhuys [Tue, 13 Mar 2007 07:33:35 +0000 (13 02:33 -0500)]
shuffle imports
Han-Wen Nienhuys [Tue, 13 Mar 2007 13:42:47 +0000 (13 10:42 -0300)]
Fix thinkos. Patch courtesy Matej Cepl <mcepl@redhat.com>
Matej Cepl [Tue, 27 Feb 2007 15:05:40 +0000 (27 16:05 +0100)]
Some safety precautions:
- check that version of git is at least 1.5.0
- we don't work on remote DARCS repos.
Han-Wen Nienhuys [Tue, 13 Feb 2007 21:32:49 +0000 (13 22:32 +0100)]
fix short_id() for inverted patches too.
Han-Wen Nienhuys [Tue, 13 Feb 2007 19:39:04 +0000 (13 20:39 +0100)]
show target
Han-Wen Nienhuys [Tue, 13 Feb 2007 19:36:51 +0000 (13 20:36 +0100)]
go forward/backward using pull/unpull.
Han-Wen Nienhuys [Tue, 13 Feb 2007 19:01:42 +0000 (13 20:01 +0100)]
Use obliterate for going to subsets. Use pull for small forward seeks.
Han-Wen Nienhuys [Tue, 13 Feb 2007 17:55:09 +0000 (13 18:55 +0100)]
better help text.
Han-Wen Nienhuys [Tue, 13 Feb 2007 17:53:00 +0000 (13 18:53 +0100)]
documentation.
Han-Wen Nienhuys [Tue, 13 Feb 2007 17:28:15 +0000 (13 18:28 +0100)]
don't use shell for rm'ing tmp branches.
Han-Wen Nienhuys [Tue, 13 Feb 2007 17:25:18 +0000 (13 18:25 +0100)]
ignorance
Han-Wen Nienhuys [Tue, 13 Feb 2007 17:25:07 +0000 (13 18:25 +0100)]
rename tests.
Han-Wen Nienhuys [Tue, 13 Feb 2007 17:19:23 +0000 (13 18:19 +0100)]
thinkos.
Han-Wen Nienhuys [Tue, 13 Feb 2007 17:01:35 +0000 (13 18:01 +0100)]
cache inventory, saving on lookup time.
Han-Wen Nienhuys [Tue, 13 Feb 2007 10:32:58 +0000 (13 11:32 +0100)]
fix thinko in short_id()
Han-Wen Nienhuys [Tue, 13 Feb 2007 00:20:05 +0000 (13 01:20 +0100)]
robustness fixes, show current number of repo
Han-Wen Nienhuys [Tue, 13 Feb 2007 00:18:35 +0000 (13 01:18 +0100)]
ignorance
Han-Wen Nienhuys [Mon, 12 Feb 2007 22:57:15 +0000 (12 23:57 +0100)]
add --history-window option
Han-Wen Nienhuys [Mon, 12 Feb 2007 22:34:53 +0000 (12 23:34 +0100)]
update TODO.
Han-Wen Nienhuys [Mon, 12 Feb 2007 22:25:41 +0000 (12 23:25 +0100)]
Use common ancestor for start point
- cleanups
- allow pull to fail everywhere (merger stuff?)
- don't use non-tip From commit if we merge tip commits in
Han-Wen Nienhuys [Mon, 12 Feb 2007 22:22:41 +0000 (12 23:22 +0100)]
ignorance
Han-Wen Nienhuys [Mon, 12 Feb 2007 20:31:57 +0000 (12 21:31 +0100)]
move diffing into darcs2git.py
use rewind / pull, with strict is_valid() check
Han-Wen Nienhuys [Mon, 12 Feb 2007 20:31:15 +0000 (12 21:31 +0100)]
linear log commit test
Han-Wen Nienhuys [Mon, 12 Feb 2007 19:03:55 +0000 (12 20:03 +0100)]
ignorance.
Han-Wen Nienhuys [Mon, 12 Feb 2007 19:03:40 +0000 (12 20:03 +0100)]
new test for conflicts.
Han-Wen Nienhuys [Mon, 12 Feb 2007 19:02:08 +0000 (12 20:02 +0100)]
Change --numbered in --debug. Keep trace of shell commands for
debugging problems. Reuse previous conv_repo if available and at
correct patch.
Han-Wen Nienhuys [Mon, 12 Feb 2007 17:46:00 +0000 (12 18:46 +0100)]
--numbered option (for debugging)
Han-Wen Nienhuys [Mon, 12 Feb 2007 17:40:36 +0000 (12 18:40 +0100)]
Use branch tips as predecessor candidates. --checkpoint-frequency
Han-Wen Nienhuys [Mon, 12 Feb 2007 00:22:38 +0000 (12 01:22 +0100)]
docs, (c) header, switch off reflogs.
Han-Wen Nienhuys [Sun, 11 Feb 2007 23:41:46 +0000 (12 00:41 +0100)]
robustness, and keep working without mail to name map.
Han-Wen Nienhuys [Sun, 11 Feb 2007 23:41:28 +0000 (12 00:41 +0100)]
add Makefile for tests
Han-Wen Nienhuys [Sun, 11 Feb 2007 23:23:28 +0000 (12 00:23 +0100)]
cleanup, documentation.
Han-Wen Nienhuys [Sun, 11 Feb 2007 21:45:43 +0000 (11 22:45 +0100)]
handle multiline msgs correctly.
Han-Wen Nienhuys [Sun, 11 Feb 2007 21:44:09 +0000 (11 22:44 +0100)]
add multiline test
Han-Wen Nienhuys [Sun, 11 Feb 2007 21:43:38 +0000 (11 22:43 +0100)]
add gitignore.
Han-Wen Nienhuys [Sun, 11 Feb 2007 04:24:21 +0000 (11 05:24 +0100)]
initial commit