Commit Graph

12 Commits

Author SHA1 Message Date
Rocco Rutte
af3810ae2f Only attempt to verify heads hg has, too
In the git repo there may be any number branches that are not hg
imported branches, so it doesn't make sense to print warnings when a
non-hg head isn't at what it was last time.

Now we get a list of branchtags hg has and only verify these.

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-10 14:28:45 +00:00
Rocco Rutte
796fa5f4cb hg2git.py: Add support for extracting authorship from Signed-off-by lines
Unfortunately, it's not configurable yet (read: cannot be disabled) as
it may take some time to match against regex all the time (especially
from some initial import).

This also enables cleaning up usernames by stripping silly leading and
trailing chars like '"' (which is the only one supported ATM).

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-09 12:07:08 +00:00
Rocco Rutte
3198560016 hg2git.py: Add support for user-defined hg author -> git author mapping
The mapping is a python dictionary given to the hg2git() function. This
isn't extremely useful as there's no option passing from hg2git.sh to
hg2git.py (yet).

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-09 11:09:57 +00:00
Rocco Rutte
85f0d9c881 hg2git.py: Refactor main code into hg2git() function
Now this can even be used as a module from other python scripts by
simply calling the hg2git() function.

Except some config values nobody really ever wants to change, it's even
save to run several hg2git() functions in parallel as no global vars or
the like are used by intention (but it makes the code uglier).

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-08 11:21:21 +00:00
Rocco Rutte
dbac8741df Don't use checkpoint
As git-fast-import already generates at least one pack per run, don't
even further split these up on a (default) 1k changeset boundary. Also
rework the documentation on that one a little.

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-08 09:37:23 +00:00
Rocco Rutte
c002051c82 Distinct between added, changed and removed files for UI output
To git-fast-import(1) we feed in changed and added files completely, so
thers's no real difference except UI output (potentially for debugging).

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-07 11:38:56 +00:00
Rocco Rutte
799a4d8682 Only attempt to export tags in our input range
This prints much less noise and potentially makes git-fast-import(1)
less confused.

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-07 11:33:03 +00:00
Rocco Rutte
2b319f9de4 Don't restore checkpoint count from cache
It doesn't make sense as each run of git-fast-import starts a new pack
anyways.

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-07 11:06:34 +00:00
Rocco Rutte
8d433b85c2 Speedup: Use manifest and compare checksums to detect changes
Instead of feeding in everything or only something and getting merges
wrong, build up a list of changed (incl. added) and deleted files by

  1) comparing manifest (deleted, added)
  2) comparing checksums if file is present in parent and child (change)

The hg-crew and mutt imports now go in <15 minutes and md5 sums match.

Thanks to Theodore Tso for the hint.

While at it, fix a regression that upon incremental import start we
always merged a branch plus initializing it. A single test showed that
the new detection get starting off from a merge commit right, too.

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-07 01:52:58 +00:00
Rocco Rutte
9ebd965f72 Link and not merge first branch of incremental import 2007-03-06 22:11:10 +00:00
Rocco Rutte
b702707afc Provide two versions of getting changes per manifest
As suggested on #mercurial, filectxs() may be faster
than calling filectx() per file.
2007-03-06 19:51:36 +00:00
Rocco Rutte
9832035614 Initial import
This is the initial import of 'hg2git' being a converter which feeds a
hg repository into git-fast-import(1).
2007-03-06 17:00:25 +00:00