Mercurial > hg-git
comparison hggit/git_handler.py @ 287:e08a22250fa9
Don't import git submodule files (we don't support them .. yet).
author | jeremy avnet <brainsik@saucelabs.com> |
---|---|
date | Tue, 23 Feb 2010 16:23:09 -0500 |
parents | 0661d5721ad7 |
children | efe9e6a9235f |
comparison
equal
deleted
inserted
replaced
286:0661d5721ad7 | 287:e08a22250fa9 |
---|---|
769 btree = self.git[commit.parents[0]].tree | 769 btree = self.git[commit.parents[0]].tree |
770 | 770 |
771 changes = self.git.object_store.tree_changes(btree, tree) | 771 changes = self.git.object_store.tree_changes(btree, tree) |
772 files = {} | 772 files = {} |
773 for (oldfile, newfile), (oldmode, newmode), (oldsha, newsha) in changes: | 773 for (oldfile, newfile), (oldmode, newmode), (oldsha, newsha) in changes: |
774 # don't create new submodules | |
775 if newmode == 0160000: | |
776 if oldfile: | |
777 # become a regular delete | |
778 newfile, newmode = None, None | |
779 else: | |
780 continue | |
781 # so old submodules shoudn't exist | |
782 if oldmode == 0160000: | |
783 if newfile: | |
784 # become a regular add | |
785 oldfile, oldmode = None, None | |
786 else: | |
787 continue | |
788 | |
774 if newfile is None: | 789 if newfile is None: |
775 file = oldfile | 790 file = oldfile |
776 delete = True | 791 delete = True |
777 else: | 792 else: |
778 file = newfile | 793 file = newfile |