From dbb0cf2c1d46199f8a4cc5e1b52b9a24494f794e Mon Sep 17 00:00:00 2001 From: Peter Oberndorfer Date: Mon, 24 Mar 2008 18:47:38 +0000 Subject: [PATCH] replace "git repo-config" usage by "git config" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This is necessary since "git repo-config" will be removed soon. Signed-off-by: Peter Oberndorfer Signed-off-by: Karl Hasselström --- stgit/config.py | 14 +++++++------- t/t1900-mail.sh | 2 +- t/t2100-pull-policy-fetch.sh | 4 ++-- t/t2101-pull-policy-pull.sh | 4 ++-- t/t2102-pull-policy-rebase.sh | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/stgit/config.py b/stgit/config.py index 61f91b0..8934445 100644 --- a/stgit/config.py +++ b/stgit/config.py @@ -49,7 +49,7 @@ class GitConfig: if self.__cache.has_key(name): return self.__cache[name] try: - value = Run('git', 'repo-config', '--get', name).output_one_line() + value = Run('git', 'config', '--get', name).output_one_line() except RunException: value = self.__defaults.get(name, None) self.__cache[name] = value @@ -58,7 +58,7 @@ class GitConfig: def getall(self, name): if self.__cache.has_key(name): return self.__cache[name] - values = Run('git', 'repo-config', '--get-all', name + values = Run('git', 'config', '--get-all', name ).returns([0, 1]).output_lines() self.__cache[name] = values return values @@ -73,23 +73,23 @@ class GitConfig: def rename_section(self, from_name, to_name): """Rename a section in the config file. Silently do nothing if the section doesn't exist.""" - Run('git', 'repo-config', '--rename-section', from_name, to_name + Run('git', 'config', '--rename-section', from_name, to_name ).returns([0, 1]).run() self.__cache.clear() def remove_section(self, name): """Remove a section in the config file. Silently do nothing if the section doesn't exist.""" - Run('git', 'repo-config', '--remove-section', name + Run('git', 'config', '--remove-section', name ).returns([0, 1]).discard_stderr().discard_output() self.__cache.clear() def set(self, name, value): - Run('git', 'repo-config', name, value).run() + Run('git', 'config', name, value).run() self.__cache[name] = value def unset(self, name): - Run('git', 'repo-config', '--unset', name) + Run('git', 'config', '--unset', name) self.__cache[name] = None def sections_matching(self, regexp): @@ -98,7 +98,7 @@ class GitConfig: group contents, for all variable names matching the regexp. """ result = [] - for line in Run('git', 'repo-config', '--get-regexp', '"^%s$"' % regexp + for line in Run('git', 'config', '--get-regexp', '"^%s$"' % regexp ).returns([0, 1]).output_lines(): m = re.match('^%s ' % regexp, line) if m: diff --git a/t/t1900-mail.sh b/t/t1900-mail.sh index e83b2d3..cfdc6f3 100755 --- a/t/t1900-mail.sh +++ b/t/t1900-mail.sh @@ -6,7 +6,7 @@ test_description='Test the mail command' test_expect_success \ 'Initialize the StGIT repository' \ ' - git repo-config stgit.sender "A U Thor " && + git config stgit.sender "A U Thor " && for i in 1 2 3 4 5; do touch foo.txt && echo "line $i" >> foo.txt && diff --git a/t/t2100-pull-policy-fetch.sh b/t/t2100-pull-policy-fetch.sh index 28901b1..07435f5 100755 --- a/t/t2100-pull-policy-fetch.sh +++ b/t/t2100-pull-policy-fetch.sh @@ -19,8 +19,8 @@ test_expect_success \ (cd upstream && stg init) && stg clone upstream clone && (cd clone && - git repo-config branch.master.stgit.pull-policy fetch-rebase && - git repo-config --list && + git config branch.master.stgit.pull-policy fetch-rebase && + git config --list && stg new c1 -m c1 && echo a > file && stg add file && stg refresh ) diff --git a/t/t2101-pull-policy-pull.sh b/t/t2101-pull-policy-pull.sh index 14d5adb..69b0fae 100755 --- a/t/t2101-pull-policy-pull.sh +++ b/t/t2101-pull-policy-pull.sh @@ -19,8 +19,8 @@ test_expect_success \ (cd upstream && stg init) && stg clone upstream clone && (cd clone && - git repo-config branch.master.stgit.pull-policy pull && - git repo-config --list && + git config branch.master.stgit.pull-policy pull && + git config --list && stg new c1 -m c1 && echo a > file && stg add file && stg refresh ) diff --git a/t/t2102-pull-policy-rebase.sh b/t/t2102-pull-policy-rebase.sh index ce2e32f..952ee7e 100755 --- a/t/t2102-pull-policy-rebase.sh +++ b/t/t2102-pull-policy-rebase.sh @@ -13,8 +13,8 @@ test_expect_success \ git branch -m master parent && stg init && stg branch --create stack && - git repo-config branch.stack.stgit.pull-policy rebase && - git repo-config --list && + git config branch.stack.stgit.pull-policy rebase && + git config --list && stg new c1 -m c1 && echo a > file && stg add file && stg refresh ' -- 2.11.0