Bazaar Fast Import

lp:~andersk/bzr-fastimport/git-darcs

Created by Anders Kaseorg and last modified
Get this branch:
bzr branch lp:~andersk/bzr-fastimport/git-darcs
Only Anders Kaseorg can upload to this branch. If you are Anders Kaseorg please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Anders Kaseorg
Project:
Bazaar Fast Import
Status:
Merged

Recent revisions

282. By Anders Kaseorg

git-darcs: Fix exit/return confusion.

Shell functions should return instead of exiting the whole script;
they should return a nonzero status on error and a zero status on
success. Notably, “Nothing fetched” is not an error, and pull should
go ahead and do a merge or rebase even if fetch didn’t fetch anything.

281. By Anders Kaseorg

git-darcs: Import to a real ref (refs/remotes/darcs/$remote).

This allows the imported darcs branch to be seen by tools like ‘git
branch -r’ and ‘gitk --all’, and prevents the imported commits from
being garbage-collected.

280. By D Herring <email address hidden>

fix timezones in darcs-fast-export, take 2

The previous patch had a flaw; it assumed that darcs was storing the committer's timezone.
Instead, darcs always stores UTC timestamps in an ISO 8601 format.
Tools like "darcs changes" convert this into the user's local time as a convenience.

I couldn't find an authoritative spec, but here are some relevant references.
http://wiki.darcs.net/NamedPatch
http://search.cpan.org/~david/Darcs-Inventory-1.4/lib/Darcs/Inventory/Patch.pm
http://bugs.darcs.net/issue140

To resolve the issue, this patch always reports that the timezone is UTC.

279. By D Herring <email address hidden>

fix timezones in darcs-fast-export

Previously, the export was mangling timezones. There were conversion errors when the darcs TZ
did not match the conversion TZ. Also, the conversion timezone was always reported (this is
bad since two conversions may now differ).

This patch fixes both problems on my system, but it has not been extensively tested.
Can 'local_date' be used reliably? What about my TZ manipulations?
I am no expert in darcs or python. Developed with darcs 2.3.1 and Python 2.6.4.

To check for errors, I compared a darcs repo against a "git darcs fetch" into a new repo.
The following two commands were helpful.
# darcs changes | grep for dates
# git log --pretty=format:%ad REF | cat

Example -- EDT=UTC-4 and EST=UTC-5; I am processing in EDT.
darcs date:
"Fri Mar 31 10:48:00 EST 2006"
Before patch, git reported:
"Fri Mar 31 12:48:00 2006 -0400" (should be 11:48 -0400 or 10:48 -0500)
After patch, git reported:
"Fri Mar 31 10:48:00 2006 -0500"

278. By Miklos Vajna

git-darcs: add a see-also section to manpage

277. By Miklos Vajna

git-darcs: add support for {pre,post}-{fetch,push} hooks

276. By Miklos Vajna

git-darcs: don't add empty darcs-fast-export-options config entry

275. By Ian Clatworthy

Release 0.9

274. By Ian Clatworthy

Don't bail for http://path/to/repo darcs remotes

273. By Ian Clatworthy

Fallback to system configobj if none in bzrib.util

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:bzr-fastimport
This branch contains Public information 
Everyone can see this information.

Subscribers