diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-08-08 14:59:30 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-08-14 16:26:31 +0000 |
| commit | b2e6814127f12fee3ce9bc5a9f40d20148353c2e (patch) | |
| tree | 81df6e58979c43909746dd76d787b6b340aeb60c | |
| parent | 2d11c3d82fb869197da5ffa12635e125a380e48f (diff) | |
| download | definitions-b2e6814127f12fee3ce9bc5a9f40d20148353c2e.tar.gz | |
Remove unused argument from SystemBranchDirectory.clone_cached_repo
For some reason, there was an unused argument in the method. Remove it
from the definition and all call sites.
| -rw-r--r-- | morphlib/plugins/branch_and_merge_new_plugin.py | 5 | ||||
| -rw-r--r-- | morphlib/sysbranchdir.py | 2 | ||||
| -rw-r--r-- | morphlib/sysbranchdir_tests.py | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/morphlib/plugins/branch_and_merge_new_plugin.py b/morphlib/plugins/branch_and_merge_new_plugin.py index e09417d2..9594d224 100644 --- a/morphlib/plugins/branch_and_merge_new_plugin.py +++ b/morphlib/plugins/branch_and_merge_new_plugin.py @@ -137,8 +137,7 @@ class SimpleBranchAndMergePlugin(cliapp.Plugin): sb = morphlib.sysbranchdir.create( root_dir, root_url, system_branch) - gd = sb.clone_cached_repo( - cached_repo, system_branch, system_branch) + gd = sb.clone_cached_repo(cached_repo, system_branch) if not self._checkout_has_systems(gd): raise BranchRootHasNoSystemsError(root_url, system_branch) @@ -211,7 +210,7 @@ class SimpleBranchAndMergePlugin(cliapp.Plugin): sb = morphlib.sysbranchdir.create( root_dir, root_url, system_branch) - gd = sb.clone_cached_repo(cached_repo, system_branch, base_ref) + gd = sb.clone_cached_repo(cached_repo, base_ref) gd.branch(system_branch, base_ref) gd.checkout(system_branch) diff --git a/morphlib/sysbranchdir.py b/morphlib/sysbranchdir.py index e4af53cf..7e278dce 100644 --- a/morphlib/sysbranchdir.py +++ b/morphlib/sysbranchdir.py @@ -100,7 +100,7 @@ class SystemBranchDirectory(object): return os.path.join(self.root_directory, relative) - def clone_cached_repo(self, cached_repo, git_branch_name, checkout_ref): + def clone_cached_repo(self, cached_repo, checkout_ref): '''Clone a cached git repository into the system branch directory. The cloned repository will NOT have the system branch's git branch diff --git a/morphlib/sysbranchdir_tests.py b/morphlib/sysbranchdir_tests.py index 8e62791f..e75122cc 100644 --- a/morphlib/sysbranchdir_tests.py +++ b/morphlib/sysbranchdir_tests.py @@ -181,8 +181,7 @@ class SystemBranchDirectoryTests(unittest.TestCase): self.system_branch_name) cached_repo = self.create_fake_cached_repo() - gd = sb.clone_cached_repo( - cached_repo, self.system_branch_name, 'master') + gd = sb.clone_cached_repo(cached_repo, 'master') self.assertEqual( gd.dirname, @@ -203,7 +202,7 @@ class SystemBranchDirectoryTests(unittest.TestCase): sb._git_clone = fake_git_clone cached_repo = self.create_fake_cached_repo() - sb.clone_cached_repo(cached_repo, 'branch1', 'master') + sb.clone_cached_repo(cached_repo, 'master') gd_list = sb.list_git_directories() self.assertEqual(len(gd_list), 1) |