Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc15a6e1

Browse files
committed
Submodule.remove() now seems to work properly, nearly all tests are back.
This also means that now we seem to be able to properly handle .git files in submodulesRelated togitpython-developers#233
1 parentae2b596 commitc15a6e1

File tree

3 files changed

+35
-24
lines changed

3 files changed

+35
-24
lines changed

‎git/objects/submodule/base.py‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -572,14 +572,14 @@ def move(self, module_path, configuration=True, module=True):
572572
the repository at our current path, changing the configuration, as well as
573573
adjusting our index entry accordingly.
574574
575-
:param module_path: the path to which to move our module in the parent repostory's working tree,
575+
:param module_path: the path to which to move our module in the parent repostory's working tree,
576576
given as repository-relative or absolute path. Intermediate directories will be created
577577
accordingly. If the path already exists, it must be empty.
578578
Trailing (back)slashes are removed automatically
579579
:param configuration: if True, the configuration will be adjusted to let
580580
the submodule point to the given path.
581581
:param module: if True, the repository managed by this submodule
582-
will be moved as well. If False, we don't move the submodule's checkout, which may leave
582+
will be moved as well. If False, we don't move the submodule's checkout, which may leave
583583
the parent repository in an inconsistent state.
584584
:return: self
585585
:raise ValueError: if the module path existed and was not empty, or was a file
@@ -672,7 +672,7 @@ def move(self, module_path, configuration=True, module=True):
672672
returnself
673673

674674
@unbare_repo
675-
defremove(self,module=True,force=False,configuration=True,dry_run=False,_is_recursive=False):
675+
defremove(self,module=True,force=False,configuration=True,dry_run=False):
676676
"""Remove this submodule from the repository. This will remove our entry
677677
from the .gitmodules file and the entry in the .git/config file.
678678
@@ -695,7 +695,7 @@ def remove(self, module=True, force=False, configuration=True, dry_run=False, _i
695695
we would usually throw
696696
:return: self
697697
:note: doesn't work in bare repositories
698-
:note: doesn't work atomically, as failure to remove any part of the submodule will leave
698+
:note: doesn't work atomically, as failure to remove any part of the submodule will leave
699699
an inconsistent state
700700
:raise InvalidGitRepositoryError: thrown if the repository cannot be deleted
701701
:raise OSError: if directories or files could not be removed"""
@@ -704,10 +704,17 @@ def remove(self, module=True, force=False, configuration=True, dry_run=False, _i
704704
# END handle parameters
705705

706706
# Recursively remove children of this submodule
707+
nc=0
707708
forcsminself.children():
708-
csm.remove(module,force,configuration,dry_run,_is_recursive=True)
709+
nc+=1
710+
csm.remove(module,force,configuration,dry_run)
709711
del(csm)
710-
# end
712+
# end
713+
ifnc>0:
714+
# Assure we don't leave the parent repository in a dirty state, and commit our changes
715+
# It's important for recursive, unforced, deletions to work as expected
716+
self.module().index.commit("Removed submodule '%s'"%self.name)
717+
# end handle recursion
711718

712719
# DELETE REPOSITORY WORKING TREE
713720
################################
@@ -733,7 +740,7 @@ def remove(self, module=True, force=False, configuration=True, dry_run=False, _i
733740
# END apply deletion method
734741
else:
735742
# verify we may delete our module
736-
ifmod.is_dirty(untracked_files=True):
743+
ifmod.is_dirty(index=True,working_tree=True,untracked_files=True):
737744
raiseInvalidGitRepositoryError(
738745
"Cannot delete module at %s with any modifications, unless force is specified"
739746
%mod.working_tree_dir)
@@ -743,7 +750,7 @@ def remove(self, module=True, force=False, configuration=True, dry_run=False, _i
743750
# NOTE: If the user pulled all the time, the remote heads might
744751
# not have been updated, so commits coming from the remote look
745752
# as if they come from us. But we stay strictly read-only and
746-
# don't fetchbeforhand.
753+
# don't fetchbeforehand.
747754
forremoteinmod.remotes:
748755
num_branches_with_new_commits=0
749756
rrefs=remote.refs
@@ -794,15 +801,10 @@ def remove(self, module=True, force=False, configuration=True, dry_run=False, _i
794801
writer=self.repo.config_writer()
795802
writer.remove_section(sm_section(self.name))
796803
writer.release()
804+
797805
writer=self.config_writer()
798806
writer.remove_section()
799807
writer.release()
800-
801-
# Assure we don't leave the parent repository in a dirty state, and commit our changes
802-
# It's important for recursive, unforced, deletions to work as expected
803-
if_is_recursive:
804-
self.module().index.commit("Removed submodule '%s'"%self.name)
805-
# end
806808
# END delete configuration
807809

808810
# void our data not to delay invalid access
@@ -875,16 +877,16 @@ def module(self):
875877
:raise InvalidGitRepositoryError: if a repository was not available. This could
876878
also mean that it was not yet initialized"""
877879
# late import to workaround circular dependencies
878-
module_path=self.abspath
880+
module_checkout_abspath=self.abspath
879881
try:
880-
repo=git.Repo(module_path)
882+
repo=git.Repo(module_checkout_abspath)
881883
ifrepo!=self.repo:
882884
returnrepo
883885
# END handle repo uninitialized
884886
except (InvalidGitRepositoryError,NoSuchPathError):
885-
raiseInvalidGitRepositoryError("No valid repository at %s"%self.path)
887+
raiseInvalidGitRepositoryError("No valid repository at %s"%module_checkout_abspath)
886888
else:
887-
raiseInvalidGitRepositoryError("Repository at %r was not yet checked out"%module_path)
889+
raiseInvalidGitRepositoryError("Repository at %r was not yet checked out"%module_checkout_abspath)
888890
# END handle exceptions
889891

890892
defmodule_exists(self):

‎git/repo/base.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ def __init__(self, path=None, odbt=DefaultDBType, search_parent_directories=Fals
132132
# walk up the path to find the .git dir
133133
whilecurpath:
134134
# ABOUT os.path.NORMPATH
135-
# It's important to normalize the paths, as submodules will otherwise initialize their
136-
# repo instances with paths that depend on path-portions that will not exist after being
135+
# It's important to normalize the paths, as submodules will otherwise initialize their
136+
# repo instances with paths that depend on path-portions that will not exist after being
137137
# removed. It's just cleaner.
138138
ifis_git_dir(curpath):
139139
self.git_dir=os.path.normpath(curpath)

‎git/test/test_submodule.py‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,11 @@ def test_root_module(self, rwrepo):
508508
rm.update(recursive=False,dry_run=True)
509509
assertos.path.isdir(smp)
510510

511-
rm.update(recursive=False)
511+
# when removing submodules, we may get new commits as nested submodules are auto-committing changes
512+
# to allow deletions without force, as the index would be dirty otherwise.
513+
# QUESTION: Why does this seem to work in test_git_submodule_compatibility() ?
514+
self.failUnlessRaises(InvalidGitRepositoryError,rm.update,recursive=False,force_remove=False)
515+
rm.update(recursive=False,force_remove=True)
512516
assertnotos.path.isdir(smp)
513517

514518
# change url
@@ -664,14 +668,19 @@ def test_git_submodule_compatibility(self, rwdir):
664668
assertsm.exists()
665669
assertsm.module_exists()
666670

671+
# Add additional submodule level
672+
sm.module().create_submodule('nested-submodule','nested-submodule/working-tree',
673+
url=self._submodule_url())
674+
sm.module().index.commit("added nested submodule")
675+
# Fails because there are new commits, compared to the remote we cloned from
676+
self.failUnlessRaises(InvalidGitRepositoryError,sm.remove,dry_run=True)
677+
667678
# remove
668679
sm_module_path=sm.module().git_dir
669680

670681
fordry_runin (True,False):
671-
sm.remove(dry_run=dry_run)
682+
sm.remove(dry_run=dry_run,force=True)
672683
assertsm.exists()==dry_run
673684
assertsm.module_exists()==dry_run
674685
assertos.path.isdir(sm_module_path)==dry_run
675686
# end for each dry-run mode
676-
677-

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp