Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Unified Diff: git_rebase_update.py

Issue 2075603002: Refactor git_common config and die (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Fix unintended change Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « git_map.py ('k') | git_upstream_diff.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: git_rebase_update.py
diff --git a/git_rebase_update.py b/git_rebase_update.py
index 1126c94660b89a28bc6f7e9aca85168c12fe6755..5963f03f1e4554aabf85976a25d9d83ca850351e 100755
--- a/git_rebase_update.py
+++ b/git_rebase_update.py
@@ -31,8 +31,8 @@ def find_return_branch_workdir():
These values may persist across multiple invocations of rebase-update, if
rebase-update runs into a conflict mid-way.
"""
- return_branch = git.config(STARTING_BRANCH_KEY)
- workdir = git.config(STARTING_WORKDIR_KEY)
+ return_branch = git.get_config(STARTING_BRANCH_KEY)
+ workdir = git.get_config(STARTING_WORKDIR_KEY)
if not return_branch:
workdir = os.getcwd()
git.set_config(STARTING_WORKDIR_KEY, workdir)
@@ -49,7 +49,7 @@ def fetch_remotes(branch_tree):
remotes = set()
tag_set = git.tags()
fetchspec_map = {}
- all_fetchspec_configs = git.config_regexp(r'^remote\..*\.fetch')
+ all_fetchspec_configs = git.get_config_regexp(r'^remote\..*\.fetch')
for fetchspec_config in all_fetchspec_configs:
key, _, fetchspec = fetchspec_config.partition(' ')
dest_spec = fetchspec.partition(':')[2]
« no previous file with comments | « git_map.py ('k') | git_upstream_diff.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698