hg-git: hggit/hg2git.py annotate

annotate hggit/hg2git.py @ 649:53423381c540

hg2git: call _handle_subrepos when .hgsubstate is removed Now that _handle_subrepos can handle .hgsubstate being removed, we should use it for that. The test changes make sure that the SHAs roundtrip.

author	Siddharth Agarwal <sid0@fb.com>
date	Wed, 12 Feb 2014 22:55:16 -0800
parents	bd63cdfbc1de
children	71fb5dd678bc

rev	line source
596 d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1 # This file contains code dealing specifically with converting Mercurial
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	2 # repositories to Git repositories. Code in this file is meant to be a generic
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	3 # library and should be usable outside the context of hg-git or an hg command.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	4
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	5 import os
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	6 import stat
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	7
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	8 import dulwich.objects as dulobjs
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	9 import mercurial.node
637 23d7caeed05a hg2git: store ctx instead of rev Siddharth Agarwal <sid0@fb.com> parents: 636 diff changeset	10 import mercurial.context
596 d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	11
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	12 import util
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	13
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	14 class IncrementalChangesetExporter(object):
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	15 """Incrementally export Mercurial changesets to Git trees.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	16
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	17 The purpose of this class is to facilitate Git tree export that is more
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	18 optimal than brute force.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	19
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	20 A "dumb" implementations of Mercurial to Git export would iterate over
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	21 every file present in a Mercurial changeset and would convert each to
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	22 a Git blob and then conditionally add it to a Git repository if it didn't
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	23 yet exist. This is suboptimal because the overhead associated with
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	24 obtaining every file's raw content and converting it to a Git blob is
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	25 not trivial!
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	26
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	27 This class works around the suboptimality of brute force export by
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	28 leveraging the information stored in Mercurial - the knowledge of what
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	29 changed between changesets - to only export Git objects corresponding to
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	30 changes in Mercurial. In the context of converting Mercurial repositories
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	31 to Git repositories, we only export objects Git (possibly) hasn't seen yet.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	32 This prevents a lot of redundant work and is thus faster.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	33
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	34 Callers instantiate an instance of this class against a mercurial.localrepo
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	35 instance. They then associate it with a specific changesets by calling
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	36 update_changeset(). On each call to update_changeset(), the instance
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	37 computes the difference between the current and new changesets and emits
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	38 Git objects that haven't yet been encountered during the lifetime of the
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	39 class instance. In other words, it expresses Mercurial changeset deltas in
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	40 terms of Git objects. Callers then (usually) take this set of Git objects
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	41 and add them to the Git repository.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	42
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	43 This class only emits Git blobs and trees, not commits.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	44
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	45 The tree calculation part of this class is essentially a reimplementation
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	46 of dulwich.index.commit_tree. However, since our implementation reuses
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	47 Tree instances and only recalculates SHA-1 when things change, we are
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	48 more efficient.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	49 """
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	50
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	51 def __init__(self, hg_repo):
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	52 """Create an instance against a mercurial.localrepo."""
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	53 self._hg = hg_repo
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	54
637 23d7caeed05a hg2git: store ctx instead of rev Siddharth Agarwal <sid0@fb.com> parents: 636 diff changeset	55 # Our current revision's context.
23d7caeed05a hg2git: store ctx instead of rev Siddharth Agarwal <sid0@fb.com> parents: 636 diff changeset	56 self._ctx = mercurial.context.changectx(hg_repo, 'null')
596 d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	57
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	58 # Path to dulwich.objects.Tree.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	59 self._dirs = {}
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	60
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	61 # Mercurial file nodeid to Git blob SHA-1. Used to prevent redundant
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	62 # blob calculation.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	63 self._blob_cache = {}
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	64
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	65 @property
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	66 def root_tree_sha(self):
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	67 """The SHA-1 of the root Git tree.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	68
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	69 This is needed to construct a Git commit object.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	70 """
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	71 return self._dirs[''].id
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	72
636 0ab89bd32c8e hg2git: rename ctx to newctx in update_changeset Siddharth Agarwal <sid0@fb.com> parents: 598 diff changeset	73 def update_changeset(self, newctx):
596 d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	74 """Set the tree to track a new Mercurial changeset.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	75
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	76 This is a generator of 2-tuples. The first item in each tuple is a
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	77 dulwich object, either a Blob or a Tree. The second item is the
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	78 corresponding Mercurial nodeid for the item, if any. Only blobs will
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	79 have nodeids. Trees do not correspond to a specific nodeid, so it does
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	80 not make sense to emit a nodeid for them.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	81
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	82 When exporting trees from Mercurial, callers typically write the
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	83 returned dulwich object to the Git repo via the store's add_object().
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	84
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	85 Some emitted objects may already exist in the Git repository. This
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	86 class does not know about the Git repository, so it's up to the caller
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	87 to conditionally add the object, etc.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	88
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	89 Emitted objects are those that have changed since the last call to
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	90 update_changeset. If this is the first call to update_chanageset, all
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	91 objects in the tree are emitted.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	92 """
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	93 # Our general strategy is to accumulate dulwich.objects.Blob and
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	94 # dulwich.objects.Tree instances for the current Mercurial changeset.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	95 # We do this incremental by iterating over the Mercurial-reported
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	96 # changeset delta. We rely on the behavior of Mercurial to lazy
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	97 # calculate a Tree's SHA-1 when we modify it. This is critical to
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	98 # performance.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	99
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	100 # In theory we should be able to look at changectx.files(). This is
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	101 # much faster. However, it may not be accurate, especially with older
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	102 # repositories, which may not record things like deleted files
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	103 # explicitly in the manifest (which is where files() gets its data).
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	104 # The only reliable way to get the full set of changes is by looking at
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	105 # the full manifest. And, the easy way to compare two manifests is
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	106 # localrepo.status().
638 f828d82c35dc hg2git: call status on newctx, not newctx.rev() Siddharth Agarwal <sid0@fb.com> parents: 637 diff changeset	107 modified, added, removed = self._hg.status(self._ctx, newctx)[0:3]
596 d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	108
598 792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	109 # We track which directories/trees have modified in this update and we
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	110 # only export those.
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	111 dirty_trees = set()
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	112
596 d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	113 # We first process file removals so we can prune dead trees.
598 792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	114 for path in removed:
649 53423381c540 hg2git: call _handle_subrepos when .hgsubstate is removed Siddharth Agarwal <sid0@fb.com> parents: 648 diff changeset	115 if path == '.hgsubstate':
53423381c540 hg2git: call _handle_subrepos when .hgsubstate is removed Siddharth Agarwal <sid0@fb.com> parents: 648 diff changeset	116 self._handle_subrepos(newctx, dirty_trees)
53423381c540 hg2git: call _handle_subrepos when .hgsubstate is removed Siddharth Agarwal <sid0@fb.com> parents: 648 diff changeset	117 continue
53423381c540 hg2git: call _handle_subrepos when .hgsubstate is removed Siddharth Agarwal <sid0@fb.com> parents: 648 diff changeset	118
53423381c540 hg2git: call _handle_subrepos when .hgsubstate is removed Siddharth Agarwal <sid0@fb.com> parents: 648 diff changeset	119 if path == '.hgsub':
53423381c540 hg2git: call _handle_subrepos when .hgsubstate is removed Siddharth Agarwal <sid0@fb.com> parents: 648 diff changeset	120 continue
53423381c540 hg2git: call _handle_subrepos when .hgsubstate is removed Siddharth Agarwal <sid0@fb.com> parents: 648 diff changeset	121
645 104f536be5c7 hg2git: factor out remove path logic into a separate function Siddharth Agarwal <sid0@fb.com> parents: 638 diff changeset	122 self._remove_path(path, dirty_trees)
596 d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	123
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	124 # For every file that changed or was added, we need to calculate the
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	125 # corresponding Git blob and its tree entry. We emit the blob
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	126 # immediately and update trees to be aware of its presence.
598 792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	127 for path in set(modified) \| set(added):
596 d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	128 # Handle special Mercurial paths.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	129 if path == '.hgsubstate':
636 0ab89bd32c8e hg2git: rename ctx to newctx in update_changeset Siddharth Agarwal <sid0@fb.com> parents: 598 diff changeset	130 self._handle_subrepos(newctx, dirty_trees)
596 d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	131 continue
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	132
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	133 if path == '.hgsub':
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	134 continue
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	135
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	136 d = os.path.dirname(path)
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	137 tree = self._dirs.setdefault(d, dulobjs.Tree())
598 792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	138 dirty_trees.add(d)
596 d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	139
636 0ab89bd32c8e hg2git: rename ctx to newctx in update_changeset Siddharth Agarwal <sid0@fb.com> parents: 598 diff changeset	140 fctx = newctx[path]
596 d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	141
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	142 entry, blob = IncrementalChangesetExporter.tree_entry(fctx,
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	143 self._blob_cache)
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	144 if blob is not None:
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	145 yield (blob, fctx.filenode())
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	146
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	147 tree.add(*entry)
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	148
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	149 # Now that all the trees represent the current changeset, recalculate
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	150 # the tree IDs and emit them. Note that we wait until now to calculate
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	151 # tree SHA-1s. This is an important difference between us and
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	152 # dulwich.index.commit_tree(), which builds new Tree instances for each
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	153 # series of blobs.
598 792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	154 for obj in self._populate_tree_entries(dirty_trees):
596 d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	155 yield (obj, None)
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	156
637 23d7caeed05a hg2git: store ctx instead of rev Siddharth Agarwal <sid0@fb.com> parents: 636 diff changeset	157 self._ctx = newctx
596 d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	158
645 104f536be5c7 hg2git: factor out remove path logic into a separate function Siddharth Agarwal <sid0@fb.com> parents: 638 diff changeset	159 def _remove_path(self, path, dirty_trees):
104f536be5c7 hg2git: factor out remove path logic into a separate function Siddharth Agarwal <sid0@fb.com> parents: 638 diff changeset	160 """Remove a path (file or git link) from the current changeset.
104f536be5c7 hg2git: factor out remove path logic into a separate function Siddharth Agarwal <sid0@fb.com> parents: 638 diff changeset	161
104f536be5c7 hg2git: factor out remove path logic into a separate function Siddharth Agarwal <sid0@fb.com> parents: 638 diff changeset	162 If the tree containing this path is empty, it might be removed."""
104f536be5c7 hg2git: factor out remove path logic into a separate function Siddharth Agarwal <sid0@fb.com> parents: 638 diff changeset	163 d = os.path.dirname(path)
104f536be5c7 hg2git: factor out remove path logic into a separate function Siddharth Agarwal <sid0@fb.com> parents: 638 diff changeset	164 tree = self._dirs.get(d, dulobjs.Tree())
104f536be5c7 hg2git: factor out remove path logic into a separate function Siddharth Agarwal <sid0@fb.com> parents: 638 diff changeset	165
104f536be5c7 hg2git: factor out remove path logic into a separate function Siddharth Agarwal <sid0@fb.com> parents: 638 diff changeset	166 del tree[os.path.basename(path)]
104f536be5c7 hg2git: factor out remove path logic into a separate function Siddharth Agarwal <sid0@fb.com> parents: 638 diff changeset	167 dirty_trees.add(d)
104f536be5c7 hg2git: factor out remove path logic into a separate function Siddharth Agarwal <sid0@fb.com> parents: 638 diff changeset	168
104f536be5c7 hg2git: factor out remove path logic into a separate function Siddharth Agarwal <sid0@fb.com> parents: 638 diff changeset	169 # If removing this file made the tree empty, we should delete this
104f536be5c7 hg2git: factor out remove path logic into a separate function Siddharth Agarwal <sid0@fb.com> parents: 638 diff changeset	170 # tree. This could result in parent trees losing their only child
104f536be5c7 hg2git: factor out remove path logic into a separate function Siddharth Agarwal <sid0@fb.com> parents: 638 diff changeset	171 # and so on.
104f536be5c7 hg2git: factor out remove path logic into a separate function Siddharth Agarwal <sid0@fb.com> parents: 638 diff changeset	172 if not len(tree):
104f536be5c7 hg2git: factor out remove path logic into a separate function Siddharth Agarwal <sid0@fb.com> parents: 638 diff changeset	173 self._remove_tree(d)
104f536be5c7 hg2git: factor out remove path logic into a separate function Siddharth Agarwal <sid0@fb.com> parents: 638 diff changeset	174 else:
104f536be5c7 hg2git: factor out remove path logic into a separate function Siddharth Agarwal <sid0@fb.com> parents: 638 diff changeset	175 self._dirs[d] = tree
104f536be5c7 hg2git: factor out remove path logic into a separate function Siddharth Agarwal <sid0@fb.com> parents: 638 diff changeset	176
596 d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	177 def _remove_tree(self, path):
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	178 """Remove a (presumably empty) tree from the current changeset.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	179
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	180 A now-empty tree may be the only child of its parent. So, we traverse
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	181 up the chain to the root tree, deleting any empty trees along the way.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	182 """
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	183 try:
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	184 del self._dirs[path]
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	185 except KeyError:
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	186 return
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	187
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	188 # Now we traverse up to the parent and delete any references.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	189 if path == '':
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	190 return
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	191
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	192 basename = os.path.basename(path)
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	193 parent = os.path.dirname(path)
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	194 while True:
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	195 tree = self._dirs.get(parent, None)
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	196
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	197 # No parent entry. Nothing to remove or update.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	198 if tree is None:
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	199 return
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	200
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	201 try:
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	202 del tree[basename]
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	203 except KeyError:
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	204 return
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	205
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	206 if len(tree):
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	207 return
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	208
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	209 # The parent tree is empty. Se, we can delete it.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	210 del self._dirs[parent]
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	211
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	212 if parent == '':
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	213 return
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	214
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	215 basename = os.path.basename(parent)
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	216 parent = os.path.dirname(parent)
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	217
598 792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	218 def _populate_tree_entries(self, dirty_trees):
596 d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	219 self._dirs.setdefault('', dulobjs.Tree())
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	220
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	221 # Fill in missing directories.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	222 for path in self._dirs.keys():
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	223 parent = os.path.dirname(path)
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	224
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	225 while parent != '':
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	226 parent_tree = self._dirs.get(parent, None)
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	227
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	228 if parent_tree is not None:
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	229 break
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	230
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	231 self._dirs[parent] = dulobjs.Tree()
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	232 parent = os.path.dirname(parent)
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	233
598 792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	234 for dirty in list(dirty_trees):
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	235 parent = os.path.dirname(dirty)
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	236
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	237 while parent != '':
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	238 if parent in dirty_trees:
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	239 break
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	240
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	241 dirty_trees.add(parent)
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	242 parent = os.path.dirname(parent)
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	243
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	244 # The root tree is always dirty but doesn't always get updated.
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	245 dirty_trees.add('')
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	246
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	247 # We only need to recalculate and export dirty trees.
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	248 for d in sorted(dirty_trees, key=len, reverse=True):
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	249 # Only happens for deleted directories.
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	250 try:
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	251 tree = self._dirs[d]
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	252 except KeyError:
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	253 continue
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	254
596 d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	255 yield tree
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	256
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	257 if d == '':
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	258 continue
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	259
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	260 parent_tree = self._dirs[os.path.dirname(d)]
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	261
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	262 # Accessing the tree's ID is what triggers SHA-1 calculation and is
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	263 # the expensive part (at least if the tree has been modified since
598 792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	264 # the last time we retrieved its ID). Also, assigning an entry to a
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	265 # tree (even if it already exists) invalidates the existing tree
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	266 # and incurs SHA-1 recalculation. So, it's in our interest to avoid
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	267 # invalidating trees. Since we only update the entries of dirty
792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	268 # trees, this should hold true.
596 d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	269 parent_tree[os.path.basename(d)] = (stat.S_IFDIR, tree.id)
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	270
647 3ceacdd23abe hg2git: add 'new' prefix to _handle_subrepos variables Siddharth Agarwal <sid0@fb.com> parents: 646 diff changeset	271 def _handle_subrepos(self, newctx, dirty_trees):
646 ab2be1d994e6 hg2git: factor out subrepo parsing into a separate function Siddharth Agarwal <sid0@fb.com> parents: 645 diff changeset	272 def parse_subrepos(ctx):
ab2be1d994e6 hg2git: factor out subrepo parsing into a separate function Siddharth Agarwal <sid0@fb.com> parents: 645 diff changeset	273 sub = util.OrderedDict()
ab2be1d994e6 hg2git: factor out subrepo parsing into a separate function Siddharth Agarwal <sid0@fb.com> parents: 645 diff changeset	274 if '.hgsub' in ctx:
ab2be1d994e6 hg2git: factor out subrepo parsing into a separate function Siddharth Agarwal <sid0@fb.com> parents: 645 diff changeset	275 sub = util.parse_hgsub(ctx['.hgsub'].data().splitlines())
ab2be1d994e6 hg2git: factor out subrepo parsing into a separate function Siddharth Agarwal <sid0@fb.com> parents: 645 diff changeset	276 substate = util.OrderedDict()
ab2be1d994e6 hg2git: factor out subrepo parsing into a separate function Siddharth Agarwal <sid0@fb.com> parents: 645 diff changeset	277 if '.hgsubstate' in ctx:
ab2be1d994e6 hg2git: factor out subrepo parsing into a separate function Siddharth Agarwal <sid0@fb.com> parents: 645 diff changeset	278 substate = util.parse_hgsubstate(
ab2be1d994e6 hg2git: factor out subrepo parsing into a separate function Siddharth Agarwal <sid0@fb.com> parents: 645 diff changeset	279 ctx['.hgsubstate'].data().splitlines())
ab2be1d994e6 hg2git: factor out subrepo parsing into a separate function Siddharth Agarwal <sid0@fb.com> parents: 645 diff changeset	280 return sub, substate
596 d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	281
648 bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	282 sub, substate = parse_subrepos(self._ctx)
647 3ceacdd23abe hg2git: add 'new' prefix to _handle_subrepos variables Siddharth Agarwal <sid0@fb.com> parents: 646 diff changeset	283 newsub, newsubstate = parse_subrepos(newctx)
596 d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	284
648 bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	285 # For each path, the logic is described by the following table. 'no'
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	286 # stands for 'the subrepo doesn't exist', 'git' stands for 'git
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	287 # subrepo', and 'hg' stands for 'hg or other subrepo'.
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	288 #
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	289 # old new \| action
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	290 # * git \| link (1)
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	291 # git hg \| delete (2)
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	292 # git no \| delete (3)
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	293 #
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	294 # All other combinations are 'do nothing'.
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	295 #
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	296 # git links without corresponding submodule paths are stored as subrepos
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	297 # with a substate but without an entry in .hgsub.
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	298
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	299 def isgit(sub, path):
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	300 return path not in sub or sub[path].startswith('[git]')
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	301
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	302 for path, sha in substate.iteritems():
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	303 if not isgit(sub, path):
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	304 # old = hg -- will be handled in next loop
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	305 continue
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	306 # old = git
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	307 if path not in newsubstate or not isgit(newsub, path):
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	308 # new = hg or no, case (2) or (3)
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	309 self._remove_path(path, dirty_trees)
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	310
647 3ceacdd23abe hg2git: add 'new' prefix to _handle_subrepos variables Siddharth Agarwal <sid0@fb.com> parents: 646 diff changeset	311 for path, sha in newsubstate.iteritems():
648 bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	312 if not isgit(newsub, path):
bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	313 # new = hg or no; the only cases we care about are handled above
596 d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	314 continue
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	315
648 bd63cdfbc1de hg2git: make _handle_subrepos worked in the removed case Siddharth Agarwal <sid0@fb.com> parents: 647 diff changeset	316 # case (1)
596 d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	317 d = os.path.dirname(path)
598 792955be68dd Only export modified Git trees Gregory Szorc <gregory.szorc@gmail.com> parents: 596 diff changeset	318 dirty_trees.add(d)
596 d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	319 tree = self._dirs.setdefault(d, dulobjs.Tree())
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	320 tree.add(os.path.basename(path), dulobjs.S_IFGITLINK, sha)
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	321
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	322 @staticmethod
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	323 def tree_entry(fctx, blob_cache):
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	324 """Compute a dulwich TreeEntry from a filectx.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	325
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	326 A side effect is the TreeEntry is stored in the passed cache.
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	327
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	328 Returns a 2-tuple of (dulwich.objects.TreeEntry, dulwich.objects.Blob).
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	329 """
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	330 blob_id = blob_cache.get(fctx.filenode(), None)
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	331 blob = None
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	332
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	333 if blob_id is None:
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	334 blob = dulobjs.Blob.from_string(fctx.data())
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	335 blob_id = blob.id
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	336 blob_cache[fctx.filenode()] = blob_id
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	337
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	338 flags = fctx.flags()
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	339
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	340 if 'l' in flags:
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	341 mode = 0120000
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	342 elif 'x' in flags:
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	343 mode = 0100755
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	344 else:
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	345 mode = 0100644
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	346
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	347 return (dulobjs.TreeEntry(os.path.basename(fctx.path()), mode, blob_id),
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	348 blob)
d6b9c30a3e0f Export Git objects from incremental Mercurial changes Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	349

Mercurial > hg-git

annotate hggit/hg2git.py @ 649:53423381c540