mirror of
https://gerrit.googlesource.com/git-repo
synced 2026-11-14 16:27:13 +00:00
style: use from subcmds import sync everywhere
Align with Google style guides and `from subcmds import sync` as a module rather than import symbols out of it. Change-Id: Iac4ae43fc8f43304b6ffe381cf290378423cd133 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/655847 Tested-by: Mike Frysinger <vapier@google.com> Reviewed-by: Brian Gan <brgan@google.com> Commit-Queue: Mike Frysinger <vapier@google.com>
This commit is contained in:
1 parent
d519ee40a9
commit
f6523426b9
4 files changed
+9
-12
No files matched your search
@@ -12,8 +12,6 @@ per-file-ignores =
|
||||
manifest_xml.py: IMR241,
|
||||
subcmds/gc.py: IMR241,
|
||||
subcmds/rebase.py: IMR241,
|
||||
subcmds/selfupdate.py: IMR241,
|
||||
subcmds/smartsync.py: IMR241,
|
||||
subcmds/sync.py: IMR241,
|
||||
subcmds/upload.py: IMR241,
|
||||
subcmds/wipe.py: IMR241,
|
||||
|
||||
@@ -17,8 +17,7 @@ import optparse
|
||||
import command
|
||||
import error
|
||||
import repo_logging
|
||||
from subcmds.sync import _PostRepoFetch
|
||||
from subcmds.sync import _PostRepoUpgrade
|
||||
from subcmds import sync
|
||||
|
||||
|
||||
logger = repo_logging.RepoLogger(__file__)
|
||||
@@ -62,7 +61,7 @@ need to be performed by an end-user.
|
||||
rp.PreSync()
|
||||
|
||||
if opt.repo_upgraded:
|
||||
_PostRepoUpgrade(self.manifest)
|
||||
sync._PostRepoUpgrade(self.manifest)
|
||||
|
||||
else:
|
||||
result = rp.Sync_NetworkHalf()
|
||||
@@ -71,4 +70,4 @@ need to be performed by an end-user.
|
||||
raise SelfupdateError(aggregate_errors=[result.error])
|
||||
|
||||
rp.bare_git.gc("--auto")
|
||||
_PostRepoFetch(rp, repo_verify=opt.repo_verify, verbose=True)
|
||||
sync._PostRepoFetch(rp, repo_verify=opt.repo_verify, verbose=True)
|
||||
@@ -12,10 +12,10 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from subcmds.sync import Sync
|
||||
from subcmds import sync
|
||||
|
||||
|
||||
class Smartsync(Sync):
|
||||
class Smartsync(sync.Sync):
|
||||
COMMON = True
|
||||
helpSummary = "Update working tree to the latest known good revision"
|
||||
helpUsage = """
|
||||
@@ -26,8 +26,8 @@ The '%prog' command is a shortcut for sync -s.
|
||||
"""
|
||||
|
||||
def _Options(self, p):
|
||||
Sync._Options(self, p, show_smart=False)
|
||||
sync.Sync._Options(self, p, show_smart=False)
|
||||
|
||||
def Execute(self, opt, args):
|
||||
opt.smart_sync = True
|
||||
Sync.Execute(self, opt, args)
|
||||
sync.Sync.Execute(self, opt, args)
|
||||
+2
-2
@@ -27,7 +27,7 @@ import git_superproject
|
||||
import hooks
|
||||
from project import ReviewableBranch
|
||||
import repo_logging
|
||||
from subcmds.sync import LocalSyncState
|
||||
from subcmds import sync
|
||||
|
||||
|
||||
_DEFAULT_UNUSUAL_COMMIT_THRESHOLD = 5
|
||||
@@ -836,7 +836,7 @@ Gerrit Code Review: https://www.gerritcodereview.com/
|
||||
if not hook.Run(
|
||||
project_list=pending_proj_names, worktree_list=pending_worktrees
|
||||
):
|
||||
if LocalSyncState(manifest).IsPartiallySynced():
|
||||
if sync.LocalSyncState(manifest).IsPartiallySynced():
|
||||
logger.info(
|
||||
"Tip: A partially synced tree was detected. "
|
||||
"If this failure involves cross-project dependencies, "
|
||||
|
||||
Reference in new issue
Block a user