| 1 |
commit: b11562b9e5f8e26a44cb99baf31860ae2e379053 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 7 18:50:21 2016 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 7 21:21:35 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b11562b9 |
| 7 |
|
| 8 |
repoman: Add repo_settings to VCSSettings class and the Changes classes |
| 9 |
|
| 10 |
Needed for more code migration from atcions.py to the vcs modules. |
| 11 |
|
| 12 |
pym/repoman/main.py | 4 ++++ |
| 13 |
pym/repoman/modules/vcs/None/changes.py | 4 ++-- |
| 14 |
pym/repoman/modules/vcs/bzr/changes.py | 4 ++-- |
| 15 |
pym/repoman/modules/vcs/changes.py | 4 +++- |
| 16 |
pym/repoman/modules/vcs/cvs/changes.py | 4 ++-- |
| 17 |
pym/repoman/modules/vcs/git/changes.py | 4 ++-- |
| 18 |
pym/repoman/modules/vcs/hg/changes.py | 4 ++-- |
| 19 |
pym/repoman/modules/vcs/svn/changes.py | 4 ++-- |
| 20 |
8 files changed, 19 insertions(+), 13 deletions(-) |
| 21 |
|
| 22 |
diff --git a/pym/repoman/main.py b/pym/repoman/main.py |
| 23 |
index 6921005..337e638 100755 |
| 24 |
--- a/pym/repoman/main.py |
| 25 |
+++ b/pym/repoman/main.py |
| 26 |
@@ -84,6 +84,7 @@ def repoman_main(argv): |
| 27 |
myreporoot = os.path.basename(portdir_overlay) |
| 28 |
myreporoot += mydir[len(portdir_overlay):] |
| 29 |
|
| 30 |
+ # avoid a circular parameter repo_settings |
| 31 |
vcs_settings = VCSSettings(options, repoman_settings) |
| 32 |
|
| 33 |
repo_settings = RepoSettings( |
| 34 |
@@ -91,6 +92,9 @@ def repoman_main(argv): |
| 35 |
repoman_settings, vcs_settings, options, qawarnings) |
| 36 |
repoman_settings = repo_settings.repoman_settings |
| 37 |
|
| 38 |
+ # Now set repo_settings |
| 39 |
+ vcs_settings.repo_settings = repo_settings |
| 40 |
+ |
| 41 |
if 'digest' in repoman_settings.features and options.digest != 'n': |
| 42 |
options.digest = 'y' |
| 43 |
|
| 44 |
|
| 45 |
diff --git a/pym/repoman/modules/vcs/None/changes.py b/pym/repoman/modules/vcs/None/changes.py |
| 46 |
index 759b554..37693ad 100644 |
| 47 |
--- a/pym/repoman/modules/vcs/None/changes.py |
| 48 |
+++ b/pym/repoman/modules/vcs/None/changes.py |
| 49 |
@@ -12,12 +12,12 @@ class Changes(ChangesBase): |
| 50 |
|
| 51 |
vcs = 'None' |
| 52 |
|
| 53 |
- def __init__(self, options): |
| 54 |
+ def __init__(self, options, repo_settings): |
| 55 |
'''Class init |
| 56 |
|
| 57 |
@param options: commandline options |
| 58 |
''' |
| 59 |
- super(Changes, self).__init__(options) |
| 60 |
+ super(Changes, self).__init__(options, repo_settings) |
| 61 |
|
| 62 |
def scan(self): |
| 63 |
'''VCS type scan function, looks for all detectable changes''' |
| 64 |
|
| 65 |
diff --git a/pym/repoman/modules/vcs/bzr/changes.py b/pym/repoman/modules/vcs/bzr/changes.py |
| 66 |
index 519d311..9bd0646 100644 |
| 67 |
--- a/pym/repoman/modules/vcs/bzr/changes.py |
| 68 |
+++ b/pym/repoman/modules/vcs/bzr/changes.py |
| 69 |
@@ -13,12 +13,12 @@ class Changes(ChangesBase): |
| 70 |
|
| 71 |
vcs = 'bzr' |
| 72 |
|
| 73 |
- def __init__(self, options): |
| 74 |
+ def __init__(self, options, repo_settings): |
| 75 |
'''Class init |
| 76 |
|
| 77 |
@param options: commandline options |
| 78 |
''' |
| 79 |
- super(Changes, self).__init__(options) |
| 80 |
+ super(Changes, self).__init__(options, repo_settings) |
| 81 |
|
| 82 |
def _scan(self): |
| 83 |
'''VCS type scan function, looks for all detectable changes''' |
| 84 |
|
| 85 |
diff --git a/pym/repoman/modules/vcs/changes.py b/pym/repoman/modules/vcs/changes.py |
| 86 |
index 1745a65..921e9b5 100644 |
| 87 |
--- a/pym/repoman/modules/vcs/changes.py |
| 88 |
+++ b/pym/repoman/modules/vcs/changes.py |
| 89 |
@@ -13,8 +13,10 @@ class ChangesBase(object): |
| 90 |
|
| 91 |
vcs = 'None' |
| 92 |
|
| 93 |
- def __init__(self, options): |
| 94 |
+ def __init__(self, options, repo_settings): |
| 95 |
self.options = options |
| 96 |
+ self.repo_settings = repo_settings |
| 97 |
+ self.repoman_settings = repo_settings.repoman_settings |
| 98 |
self._reset() |
| 99 |
|
| 100 |
def _reset(self): |
| 101 |
|
| 102 |
diff --git a/pym/repoman/modules/vcs/cvs/changes.py b/pym/repoman/modules/vcs/cvs/changes.py |
| 103 |
index 061486f..5fc9642 100644 |
| 104 |
--- a/pym/repoman/modules/vcs/cvs/changes.py |
| 105 |
+++ b/pym/repoman/modules/vcs/cvs/changes.py |
| 106 |
@@ -16,12 +16,12 @@ class Changes(ChangesBase): |
| 107 |
|
| 108 |
vcs = 'cvs' |
| 109 |
|
| 110 |
- def __init__(self, options): |
| 111 |
+ def __init__(self, options, repo_settings): |
| 112 |
'''Class init |
| 113 |
|
| 114 |
@param options: commandline options |
| 115 |
''' |
| 116 |
- super(Changes, self).__init__(options) |
| 117 |
+ super(Changes, self).__init__(options, repo_settings) |
| 118 |
self._tree = None |
| 119 |
|
| 120 |
def _scan(self): |
| 121 |
|
| 122 |
diff --git a/pym/repoman/modules/vcs/git/changes.py b/pym/repoman/modules/vcs/git/changes.py |
| 123 |
index d0b6acd..f159298 100644 |
| 124 |
--- a/pym/repoman/modules/vcs/git/changes.py |
| 125 |
+++ b/pym/repoman/modules/vcs/git/changes.py |
| 126 |
@@ -13,12 +13,12 @@ class Changes(ChangesBase): |
| 127 |
|
| 128 |
vcs = 'git' |
| 129 |
|
| 130 |
- def __init__(self, options): |
| 131 |
+ def __init__(self, options, repo_settings): |
| 132 |
'''Class init |
| 133 |
|
| 134 |
@param options: commandline options |
| 135 |
''' |
| 136 |
- super(Changes, self).__init__(options) |
| 137 |
+ super(Changes, self).__init__(options, repo_settings) |
| 138 |
|
| 139 |
def _scan(self): |
| 140 |
'''VCS type scan function, looks for all detectable changes''' |
| 141 |
|
| 142 |
diff --git a/pym/repoman/modules/vcs/hg/changes.py b/pym/repoman/modules/vcs/hg/changes.py |
| 143 |
index 9729085..311ca12 100644 |
| 144 |
--- a/pym/repoman/modules/vcs/hg/changes.py |
| 145 |
+++ b/pym/repoman/modules/vcs/hg/changes.py |
| 146 |
@@ -13,12 +13,12 @@ class Changes(ChangesBase): |
| 147 |
|
| 148 |
vcs = 'hg' |
| 149 |
|
| 150 |
- def __init__(self, options): |
| 151 |
+ def __init__(self, options, repo_settings): |
| 152 |
'''Class init |
| 153 |
|
| 154 |
@param options: commandline options |
| 155 |
''' |
| 156 |
- super(Changes, self).__init__(options) |
| 157 |
+ super(Changes, self).__init__(options, repo_settings) |
| 158 |
|
| 159 |
def _scan(self): |
| 160 |
'''VCS type scan function, looks for all detectable changes''' |
| 161 |
|
| 162 |
diff --git a/pym/repoman/modules/vcs/svn/changes.py b/pym/repoman/modules/vcs/svn/changes.py |
| 163 |
index 6b25a21..ffe19c1 100644 |
| 164 |
--- a/pym/repoman/modules/vcs/svn/changes.py |
| 165 |
+++ b/pym/repoman/modules/vcs/svn/changes.py |
| 166 |
@@ -13,12 +13,12 @@ class Changes(ChangesBase): |
| 167 |
|
| 168 |
vcs = 'svn' |
| 169 |
|
| 170 |
- def __init__(self, options): |
| 171 |
+ def __init__(self, options, repo_settings): |
| 172 |
'''Class init |
| 173 |
|
| 174 |
@param options: commandline options |
| 175 |
''' |
| 176 |
- super(Changes, self).__init__(options) |
| 177 |
+ super(Changes, self).__init__(options, repo_settings) |
| 178 |
|
| 179 |
def _scan(self): |
| 180 |
'''VCS type scan function, looks for all detectable changes''' |
Archives