Merge "repo: use explicit Python executable to run main.py"
diff --git a/.gitignore b/.gitignore
index cef6b78..59d7b62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
*.pyc
.repopickle_*
+/repoc
diff --git a/.project b/.project
index 67e4a0f..3aefb86 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>repo</name>
+ <name>git-repo</name>
<comment></comment>
<projects>
</projects>
diff --git a/.pydevproject b/.pydevproject
index 880abd6..27c2485 100644
--- a/.pydevproject
+++ b/.pydevproject
@@ -3,7 +3,7 @@
<pydev_project>
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/repo</path>
+<path>/git-repo</path>
</pydev_pathproperty>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
diff --git a/.pylintrc b/.pylintrc
index 9e8882e..2ed0940 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -53,7 +53,7 @@
enable=RP0004
# Disable the message(s) with the given id(s).
-disable=R0903,R0912,R0913,R0914,R0915,W0141,C0111,C0103,W0603,W0703,R0911,C0301,C0302,R0902,R0904,W0142,W0212,E1101,E1103,R0201,W0201,W0122,W0232,RP0001,RP0003,RP0101,RP0002,RP0401,RP0701,RP0801
+disable=R0903,R0912,R0913,R0914,R0915,W0141,C0111,C0103,W0603,W0703,R0911,C0301,C0302,R0902,R0904,W0142,W0212,E1101,E1103,R0201,W0201,W0122,W0232,RP0001,RP0003,RP0101,RP0002,RP0401,RP0701,RP0801,F0401,E0611,R0801,I0011
[REPORTS]
diff --git a/command.py b/command.py
index 96d7848..287f4d3 100644
--- a/command.py
+++ b/command.py
@@ -136,11 +136,11 @@
groups = mp.config.GetString('manifest.groups')
if not groups:
- groups = 'all,-notdefault,platform-' + platform.system().lower()
+ groups = 'default,platform-' + platform.system().lower()
groups = [x for x in re.split(r'[,\s]+', groups) if x]
if not args:
- all_projects_list = all_projects.values()
+ all_projects_list = list(all_projects.values())
derived_projects = {}
for project in all_projects_list:
if submodules_ok or project.sync_s:
@@ -186,6 +186,17 @@
result.sort(key=_getpath)
return result
+ def FindProjects(self, args):
+ result = []
+ patterns = [re.compile(r'%s' % a, re.IGNORECASE) for a in args]
+ for project in self.GetProjects(''):
+ for pattern in patterns:
+ if pattern.search(project.name) or pattern.search(project.relpath):
+ result.append(project)
+ break
+ result.sort(key=lambda project: project.relpath)
+ return result
+
# pylint: disable=W0223
# Pylint warns that the `InteractiveCommand` and `PagedCommand` classes do not
# override method `Execute` which is abstract in `Command`. Since that method
diff --git a/docs/manifest-format.txt b/docs/manifest-format.txt
index 0bf09f6..dcc90d0 100644
--- a/docs/manifest-format.txt
+++ b/docs/manifest-format.txt
@@ -37,25 +37,29 @@
<!ATTLIST remote review CDATA #IMPLIED>
<!ELEMENT default (EMPTY)>
- <!ATTLIST default remote IDREF #IMPLIED>
- <!ATTLIST default revision CDATA #IMPLIED>
- <!ATTLIST default sync-j CDATA #IMPLIED>
- <!ATTLIST default sync-c CDATA #IMPLIED>
- <!ATTLIST default sync-s CDATA #IMPLIED>
+ <!ATTLIST default remote IDREF #IMPLIED>
+ <!ATTLIST default revision CDATA #IMPLIED>
+ <!ATTLIST default dest-branch CDATA #IMPLIED>
+ <!ATTLIST default sync-j CDATA #IMPLIED>
+ <!ATTLIST default sync-c CDATA #IMPLIED>
+ <!ATTLIST default sync-s CDATA #IMPLIED>
<!ELEMENT manifest-server (EMPTY)>
<!ATTLIST url CDATA #REQUIRED>
<!ELEMENT project (annotation?,
project*)>
- <!ATTLIST project name CDATA #REQUIRED>
- <!ATTLIST project path CDATA #IMPLIED>
- <!ATTLIST project remote IDREF #IMPLIED>
- <!ATTLIST project revision CDATA #IMPLIED>
- <!ATTLIST project groups CDATA #IMPLIED>
- <!ATTLIST project sync-c CDATA #IMPLIED>
- <!ATTLIST project sync-s CDATA #IMPLIED>
+ <!ATTLIST project name CDATA #REQUIRED>
+ <!ATTLIST project path CDATA #IMPLIED>
+ <!ATTLIST project remote IDREF #IMPLIED>
+ <!ATTLIST project revision CDATA #IMPLIED>
+ <!ATTLIST project dest-branch CDATA #IMPLIED>
+ <!ATTLIST project groups CDATA #IMPLIED>
+ <!ATTLIST project sync-c CDATA #IMPLIED>
+ <!ATTLIST project sync-s CDATA #IMPLIED>
<!ATTLIST project upstream CDATA #IMPLIED>
+ <!ATTLIST project clone-depth CDATA #IMPLIED>
+ <!ATTLIST project force-path CDATA #IMPLIED>
<!ELEMENT annotation (EMPTY)>
<!ATTLIST annotation name CDATA #REQUIRED>
@@ -123,6 +127,11 @@
`refs/heads/master`). Project elements lacking their own
revision attribute will use this revision.
+Attribute `dest-branch`: Name of a Git branch (e.g. `master`).
+Project elements not setting their own `dest-branch` will inherit
+this value. If this value is not set, projects will use `revision`
+by default instead.
+
Attribute `sync_j`: Number of parallel jobs to use when synching.
Attribute `sync_c`: Set to true to only sync the given Git
@@ -201,6 +210,11 @@
been extensively tested. If not supplied the revision given by
the default element is used.
+Attribute `dest-branch`: Name of a Git branch (e.g. `master`).
+When using `repo upload`, changes will be submitted for code
+review on this branch. If unspecified both here and in the
+default element, `revision` is used instead.
+
Attribute `groups`: List of groups to which this project belongs,
whitespace or comma separated. All projects belong to the group
"all", and each project automatically belongs to a group of
@@ -222,6 +236,16 @@
can be found. Used when syncing a revision locked manifest in
-c mode to avoid having to sync the entire ref space.
+Attribute `clone-depth`: Set the depth to use when fetching this
+project. If specified, this value will override any value given
+to repo init with the --depth option on the command line.
+
+Attribute `force-path`: Set to true to force this project to create the
+local mirror repository according to its `path` attribute (if supplied)
+rather than the `name` attribute. This attribute only applies to the
+local mirrors syncing, it will be ignored when syncing the projects in a
+client working directory.
+
Element annotation
------------------
diff --git a/git_config.py b/git_config.py
index 56cc6a2..a294a0b 100644
--- a/git_config.py
+++ b/git_config.py
@@ -14,8 +14,9 @@
# limitations under the License.
from __future__ import print_function
-import cPickle
+
import os
+import pickle
import re
import subprocess
import sys
@@ -24,14 +25,13 @@
except ImportError:
import dummy_threading as _threading
import time
-try:
- import urllib2
-except ImportError:
- # For python3
+
+from pyversion import is_python3
+if is_python3():
import urllib.request
import urllib.error
else:
- # For python2
+ import urllib2
import imp
urllib = imp.new_module('urllib')
urllib.request = urllib2
@@ -40,6 +40,10 @@
from signal import SIGTERM
from error import GitError, UploadError
from trace import Trace
+if is_python3():
+ from http.client import HTTPException
+else:
+ from httplib import HTTPException
from git_command import GitCommand
from git_command import ssh_sock
@@ -262,7 +266,7 @@
Trace(': unpickle %s', self.file)
fd = open(self._pickle, 'rb')
try:
- return cPickle.load(fd)
+ return pickle.load(fd)
finally:
fd.close()
except EOFError:
@@ -271,7 +275,7 @@
except IOError:
os.remove(self._pickle)
return None
- except cPickle.PickleError:
+ except pickle.PickleError:
os.remove(self._pickle)
return None
@@ -279,13 +283,13 @@
try:
fd = open(self._pickle, 'wb')
try:
- cPickle.dump(cache, fd, cPickle.HIGHEST_PROTOCOL)
+ pickle.dump(cache, fd, pickle.HIGHEST_PROTOCOL)
finally:
fd.close()
except IOError:
if os.path.exists(self._pickle):
os.remove(self._pickle)
- except cPickle.PickleError:
+ except pickle.PickleError:
if os.path.exists(self._pickle):
os.remove(self._pickle)
@@ -537,8 +541,8 @@
self.url = self._Get('url')
self.review = self._Get('review')
self.projectname = self._Get('projectname')
- self.fetch = map(RefSpec.FromString,
- self._Get('fetch', all_keys=True))
+ self.fetch = list(map(RefSpec.FromString,
+ self._Get('fetch', all_keys=True)))
self._review_url = None
def _InsteadOf(self):
@@ -592,14 +596,11 @@
try:
info_url = u + 'ssh_info'
info = urllib.request.urlopen(info_url).read()
- if '<' in info:
- # Assume the server gave us some sort of HTML
- # response back, like maybe a login page.
+ if info == 'NOT_AVAILABLE' or '<' in info:
+ # If `info` contains '<', we assume the server gave us some sort
+ # of HTML response back, like maybe a login page.
#
- raise UploadError('%s: Cannot parse response' % info_url)
-
- if info == 'NOT_AVAILABLE':
- # Assume HTTP if SSH is not enabled.
+ # Assume HTTP if SSH is not enabled or ssh_info doesn't look right.
self._review_url = http_url + 'p/'
else:
host, port = info.split()
@@ -608,6 +609,8 @@
raise UploadError('%s: %s' % (self.review, str(e)))
except urllib.error.URLError as e:
raise UploadError('%s: %s' % (self.review, str(e)))
+ except HTTPException as e:
+ raise UploadError('%s: %s' % (self.review, e.__class__.__name__))
REVIEW_CACHE[u] = self._review_url
return self._review_url + self.projectname
@@ -657,7 +660,7 @@
self._Set('url', self.url)
self._Set('review', self.review)
self._Set('projectname', self.projectname)
- self._Set('fetch', map(str, self.fetch))
+ self._Set('fetch', list(map(str, self.fetch)))
def _Set(self, key, value):
key = 'remote.%s.%s' % (self.name, key)
diff --git a/git_refs.py b/git_refs.py
index cfeffba..4dd6876 100644
--- a/git_refs.py
+++ b/git_refs.py
@@ -66,7 +66,7 @@
def _NeedUpdate(self):
Trace(': scan refs %s', self._gitdir)
- for name, mtime in self._mtime.iteritems():
+ for name, mtime in self._mtime.items():
try:
if mtime != os.path.getmtime(os.path.join(self._gitdir, name)):
return True
@@ -89,7 +89,7 @@
attempts = 0
while scan and attempts < 5:
scan_next = {}
- for name, dest in scan.iteritems():
+ for name, dest in scan.items():
if dest in self._phyref:
self._phyref[name] = self._phyref[dest]
else:
@@ -108,6 +108,7 @@
return
try:
for line in fd:
+ line = str(line)
if line[0] == '#':
continue
if line[0] == '^':
@@ -150,6 +151,10 @@
finally:
fd.close()
+ try:
+ ref_id = ref_id.decode()
+ except AttributeError:
+ pass
if not ref_id:
return
ref_id = ref_id[:-1]
diff --git a/main.py b/main.py
index 9cc2639..e4cdeb0 100755
--- a/main.py
+++ b/main.py
@@ -22,13 +22,12 @@
import os
import sys
import time
-try:
- import urllib2
-except ImportError:
- # For python3
+
+from pyversion import is_python3
+if is_python3():
import urllib.request
else:
- # For python2
+ import urllib2
urllib = imp.new_module('urllib')
urllib.request = urllib2
@@ -50,6 +49,11 @@
from subcmds import all_commands
+if not is_python3():
+ # pylint:disable=W0622
+ input = raw_input
+ # pylint:enable=W0622
+
global_options = optparse.OptionParser(
usage="repo [-p|--paginate|--no-pager] COMMAND [ARGS]"
)
@@ -286,7 +290,7 @@
if user is None:
print(msg)
try:
- user = raw_input('User: ')
+ user = input('User: ')
password = getpass.getpass()
except KeyboardInterrupt:
return
diff --git a/manifest_xml.py b/manifest_xml.py
index 07f0c66..bdbb1d4 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -18,9 +18,17 @@
import os
import re
import sys
-import urlparse
import xml.dom.minidom
+from pyversion import is_python3
+if is_python3():
+ import urllib.parse
+else:
+ import imp
+ import urlparse
+ urllib = imp.new_module('urllib')
+ urllib.parse = urlparse
+
from git_config import GitConfig
from git_refs import R_HEADS, HEAD
from project import RemoteSpec, Project, MetaProject
@@ -30,13 +38,14 @@
LOCAL_MANIFEST_NAME = 'local_manifest.xml'
LOCAL_MANIFESTS_DIR_NAME = 'local_manifests'
-urlparse.uses_relative.extend(['ssh', 'git'])
-urlparse.uses_netloc.extend(['ssh', 'git'])
+urllib.parse.uses_relative.extend(['ssh', 'git'])
+urllib.parse.uses_netloc.extend(['ssh', 'git'])
class _Default(object):
"""Project defaults within the manifest."""
revisionExpr = None
+ destBranchExpr = None
remote = None
sync_j = 1
sync_c = False
@@ -73,7 +82,7 @@
# ie, if manifestUrl is of the form <hostname:port>
if manifestUrl.find(':') != manifestUrl.find('/') - 1:
manifestUrl = 'gopher://' + manifestUrl
- url = urlparse.urljoin(manifestUrl, url)
+ url = urllib.parse.urljoin(manifestUrl, url)
url = re.sub(r'^gopher://', '', url)
if p:
url = 'persistent-' + url
@@ -83,7 +92,7 @@
url = self.resolvedFetchUrl.rstrip('/') + '/' + projectName
remoteName = self.name
if self.remoteAlias:
- remoteName = self.remoteAlias
+ remoteName = self.remoteAlias
return RemoteSpec(remoteName, url, self.reviewUrl)
class XmlManifest(object):
@@ -94,6 +103,7 @@
self.topdir = os.path.dirname(self.repodir)
self.manifestFile = os.path.join(self.repodir, MANIFEST_FILE_NAME)
self.globalConfig = GitConfig.ForUser()
+ self.localManifestWarning = False
self.repoProject = MetaProject(self, 'repo',
gitdir = os.path.join(repodir, 'repo/.git'),
@@ -137,6 +147,8 @@
root.appendChild(e)
e.setAttribute('name', r.name)
e.setAttribute('fetch', r.fetchUrl)
+ if r.remoteAlias is not None:
+ e.setAttribute('alias', r.remoteAlias)
if r.reviewUrl is not None:
e.setAttribute('review', r.reviewUrl)
@@ -163,10 +175,8 @@
notice_element.appendChild(doc.createTextNode(indented_notice))
d = self.default
- sort_remotes = list(self.remotes.keys())
- sort_remotes.sort()
- for r in sort_remotes:
+ for r in sorted(self.remotes):
self._RemoteToXml(self.remotes[r], doc, root)
if self.remotes:
root.appendChild(doc.createTextNode(''))
@@ -217,7 +227,8 @@
e.setAttribute('name', name)
if relpath != name:
e.setAttribute('path', relpath)
- if not d.remote or p.remote.name != d.remote.name:
+ remoteName = d.remote.remoteAlias or d.remote.name
+ if not d.remote or p.remote.name != remoteName:
e.setAttribute('remote', p.remote.name)
if peg_rev:
if self.IsMirror:
@@ -258,12 +269,11 @@
e.setAttribute('sync-s', 'true')
if p.subprojects:
- sort_projects = [subp.name for subp in p.subprojects]
- sort_projects.sort()
+ sort_projects = list(sorted([subp.name for subp in p.subprojects]))
output_projects(p, e, sort_projects)
- sort_projects = [key for key in self.projects.keys()
- if not self.projects[key].parent]
+ sort_projects = list(sorted([key for key, value in self.projects.items()
+ if not value.parent]))
sort_projects.sort()
output_projects(None, root, sort_projects)
@@ -335,9 +345,11 @@
local = os.path.join(self.repodir, LOCAL_MANIFEST_NAME)
if os.path.exists(local):
- print('warning: %s is deprecated; put local manifests in `%s` instead'
- % (LOCAL_MANIFEST_NAME, os.path.join(self.repodir, LOCAL_MANIFESTS_DIR_NAME)),
- file=sys.stderr)
+ if not self.localManifestWarning:
+ self.localManifestWarning = True
+ print('warning: %s is deprecated; put local manifests in `%s` instead'
+ % (LOCAL_MANIFEST_NAME, os.path.join(self.repodir, LOCAL_MANIFESTS_DIR_NAME)),
+ file=sys.stderr)
nodes.append(self._ParseManifestXml(local, self.repodir))
local_dir = os.path.abspath(os.path.join(self.repodir, LOCAL_MANIFESTS_DIR_NAME))
@@ -385,9 +397,8 @@
name = self._reqatt(node, 'name')
fp = os.path.join(include_root, name)
if not os.path.isfile(fp):
- raise ManifestParseError, \
- "include %s doesn't exist or isn't a file" % \
- (name,)
+ raise ManifestParseError("include %s doesn't exist or isn't a file"
+ % (name,))
try:
nodes.extend(self._ParseManifestXml(fp, include_root))
# should isolate this to the exact exception, but that's
@@ -493,7 +504,7 @@
name = None
m_url = m.GetRemote(m.remote.name).url
if m_url.endswith('/.git'):
- raise ManifestParseError, 'refusing to mirror %s' % m_url
+ raise ManifestParseError('refusing to mirror %s' % m_url)
if self._default and self._default.remote:
url = self._default.remote.resolvedFetchUrl
@@ -550,6 +561,8 @@
if d.revisionExpr == '':
d.revisionExpr = None
+ d.destBranchExpr = node.getAttribute('dest-branch') or None
+
sync_j = node.getAttribute('sync-j')
if sync_j == '' or sync_j is None:
d.sync_j = 1
@@ -587,7 +600,7 @@
# Figure out minimum indentation, skipping the first line (the same line
# as the <notice> tag)...
- minIndent = sys.maxint
+ minIndent = sys.maxsize
lines = notice.splitlines()
for line in lines[1:]:
lstrippedLine = line.lstrip()
@@ -626,25 +639,22 @@
if remote is None:
remote = self._default.remote
if remote is None:
- raise ManifestParseError, \
- "no remote for project %s within %s" % \
- (name, self.manifestFile)
+ raise ManifestParseError("no remote for project %s within %s" %
+ (name, self.manifestFile))
revisionExpr = node.getAttribute('revision')
if not revisionExpr:
revisionExpr = self._default.revisionExpr
if not revisionExpr:
- raise ManifestParseError, \
- "no revision for project %s within %s" % \
- (name, self.manifestFile)
+ raise ManifestParseError("no revision for project %s within %s" %
+ (name, self.manifestFile))
path = node.getAttribute('path')
if not path:
path = name
if path.startswith('/'):
- raise ManifestParseError, \
- "project %s path cannot be absolute in %s" % \
- (name, self.manifestFile)
+ raise ManifestParseError("project %s path cannot be absolute in %s" %
+ (name, self.manifestFile))
rebase = node.getAttribute('rebase')
if not rebase:
@@ -664,6 +674,18 @@
else:
sync_s = sync_s.lower() in ("yes", "true", "1")
+ clone_depth = node.getAttribute('clone-depth')
+ if clone_depth:
+ try:
+ clone_depth = int(clone_depth)
+ if clone_depth <= 0:
+ raise ValueError()
+ except ValueError:
+ raise ManifestParseError('invalid clone-depth %s in %s' %
+ (clone_depth, self.manifestFile))
+
+ dest_branch = node.getAttribute('dest-branch') or self._default.destBranchExpr
+
upstream = node.getAttribute('upstream')
groups = ''
@@ -679,6 +701,10 @@
default_groups = ['all', 'name:%s' % name, 'path:%s' % relpath]
groups.extend(set(default_groups).difference(groups))
+ if self.IsMirror and node.hasAttribute('force-path'):
+ if node.getAttribute('force-path').lower() in ("yes", "true", "1"):
+ gitdir = os.path.join(self.topdir, '%s.git' % path)
+
project = Project(manifest = self,
name = name,
remote = remote.ToRemoteSpec(name),
@@ -691,8 +717,10 @@
groups = groups,
sync_c = sync_c,
sync_s = sync_s,
+ clone_depth = clone_depth,
upstream = upstream,
- parent = parent)
+ parent = parent,
+ dest_branch = dest_branch)
for n in node.childNodes:
if n.nodeName == 'copyfile':
@@ -748,7 +776,8 @@
except ManifestParseError:
keep = "true"
if keep != "true" and keep != "false":
- raise ManifestParseError, "optional \"keep\" attribute must be \"true\" or \"false\""
+ raise ManifestParseError('optional "keep" attribute must be '
+ '"true" or "false"')
project.AddAnnotation(name, value, keep)
def _get_remote(self, node):
@@ -758,9 +787,8 @@
v = self._remotes.get(name)
if not v:
- raise ManifestParseError, \
- "remote %s not defined in %s" % \
- (name, self.manifestFile)
+ raise ManifestParseError("remote %s not defined in %s" %
+ (name, self.manifestFile))
return v
def _reqatt(self, node, attname):
@@ -769,7 +797,6 @@
"""
v = node.getAttribute(attname)
if not v:
- raise ManifestParseError, \
- "no %s in <%s> within %s" % \
- (attname, node.nodeName, self.manifestFile)
+ raise ManifestParseError("no %s in <%s> within %s" %
+ (attname, node.nodeName, self.manifestFile))
return v
diff --git a/project.py b/project.py
index 22e4a5d..dec21ab 100644
--- a/project.py
+++ b/project.py
@@ -36,6 +36,12 @@
from git_refs import GitRefs, HEAD, R_HEADS, R_TAGS, R_PUB, R_M
+from pyversion import is_python3
+if not is_python3():
+ # pylint:disable=W0622
+ input = raw_input
+ # pylint:enable=W0622
+
def _lwrite(path, content):
lock = '%s.lock' % path
@@ -78,7 +84,7 @@
if _project_hook_list is None:
d = os.path.abspath(os.path.dirname(__file__))
d = os.path.join(d , 'hooks')
- _project_hook_list = map(lambda x: os.path.join(d, x), os.listdir(d))
+ _project_hook_list = [os.path.join(d, x) for x in os.listdir(d)]
return _project_hook_list
@@ -151,11 +157,12 @@
R_HEADS + self.name,
'--')
- def UploadForReview(self, people, auto_topic=False, draft=False):
+ def UploadForReview(self, people, auto_topic=False, draft=False, dest_branch=None):
self.project.UploadForReview(self.name,
people,
auto_topic=auto_topic,
- draft=draft)
+ draft=draft,
+ dest_branch=dest_branch)
def GetPublishedRefs(self):
refs = {}
@@ -361,7 +368,7 @@
'Do you want to allow this script to run '
'(yes/yes-never-ask-again/NO)? ') % (
self._GetMustVerb(), self._script_fullpath)
- response = raw_input(prompt).lower()
+ response = input(prompt).lower()
print()
# User is doing a one-time approval.
@@ -488,9 +495,11 @@
groups = None,
sync_c = False,
sync_s = False,
+ clone_depth = None,
upstream = None,
parent = None,
- is_derived = False):
+ is_derived = False,
+ dest_branch = None):
"""Init a Project object.
Args:
@@ -510,6 +519,7 @@
parent: The parent Project object.
is_derived: False if the project was explicitly defined in the manifest;
True if the project is a discovered submodule.
+ dest_branch: The branch to which to push changes for review by default.
"""
self.manifest = manifest
self.name = name
@@ -533,6 +543,7 @@
self.groups = groups
self.sync_c = sync_c
self.sync_s = sync_s
+ self.clone_depth = clone_depth
self.upstream = upstream
self.parent = parent
self.is_derived = is_derived
@@ -551,6 +562,7 @@
self.work_git = None
self.bare_git = self._GitGetByExec(self, bare=True)
self.bare_ref = GitRefs(gitdir)
+ self.dest_branch = dest_branch
# This will be filled in if a project is later identified to be the
# project containing repo hooks.
@@ -644,7 +656,7 @@
all_refs = self._allrefs
heads = {}
- for name, ref_id in all_refs.iteritems():
+ for name, ref_id in all_refs.items():
if name.startswith(R_HEADS):
name = name[len(R_HEADS):]
b = self.GetBranch(name)
@@ -653,7 +665,7 @@
b.revision = ref_id
heads[name] = b
- for name, ref_id in all_refs.iteritems():
+ for name, ref_id in all_refs.items():
if name.startswith(R_PUB):
name = name[len(R_PUB):]
b = heads.get(name)
@@ -672,9 +684,14 @@
project_groups: "all,group1,group2"
manifest_groups: "-group1,group2"
the project will be matched.
+
+ The special manifest group "default" will match any project that
+ does not have the special project group "notdefault"
"""
- expanded_manifest_groups = manifest_groups or ['all', '-notdefault']
+ expanded_manifest_groups = manifest_groups or ['default']
expanded_project_groups = ['all'] + (self.groups or [])
+ if not 'notdefault' in expanded_project_groups:
+ expanded_project_groups += ['default']
matched = False
for group in expanded_manifest_groups:
@@ -754,10 +771,7 @@
paths.extend(df.keys())
paths.extend(do)
- paths = list(set(paths))
- paths.sort()
-
- for p in paths:
+ for p in sorted(set(paths)):
try:
i = di[p]
except KeyError:
@@ -849,13 +863,13 @@
all_refs = self._allrefs
heads = set()
canrm = {}
- for name, ref_id in all_refs.iteritems():
+ for name, ref_id in all_refs.items():
if name.startswith(R_HEADS):
heads.add(name)
elif name.startswith(R_PUB):
canrm[name] = ref_id
- for name, ref_id in canrm.iteritems():
+ for name, ref_id in canrm.items():
n = name[len(R_PUB):]
if R_HEADS + n not in heads:
self.bare_git.DeleteRef(name, ref_id)
@@ -866,14 +880,14 @@
heads = {}
pubed = {}
- for name, ref_id in self._allrefs.iteritems():
+ for name, ref_id in self._allrefs.items():
if name.startswith(R_HEADS):
heads[name[len(R_HEADS):]] = ref_id
elif name.startswith(R_PUB):
pubed[name[len(R_PUB):]] = ref_id
ready = []
- for branch, ref_id in heads.iteritems():
+ for branch, ref_id in heads.items():
if branch in pubed and pubed[branch] == ref_id:
continue
if selected_branch and branch != selected_branch:
@@ -898,7 +912,8 @@
def UploadForReview(self, branch=None,
people=([],[]),
auto_topic=False,
- draft=False):
+ draft=False,
+ dest_branch=None):
"""Uploads the named branch for code review.
"""
if branch is None:
@@ -912,7 +927,10 @@
if not branch.remote.review:
raise GitError('remote %s has no review url' % branch.remote.name)
- dest_branch = branch.merge
+ if dest_branch is None:
+ dest_branch = self.dest_branch
+ if dest_branch is None:
+ dest_branch = branch.merge
if not dest_branch.startswith(R_HEADS):
dest_branch = R_HEADS + dest_branch
@@ -977,6 +995,8 @@
is_new = not self.Exists
if is_new:
self._InitGitDir()
+ else:
+ self._UpdateHooks()
self._InitRemote()
if is_new:
@@ -1216,7 +1236,6 @@
cmd = ['fetch', remote.name]
cmd.append('refs/changes/%2.2d/%d/%d' \
% (change_id % 100, change_id, patch_id))
- cmd.extend(map(str, remote.fetch))
if GitCommand(self, cmd, bare=True).Wait() != 0:
return None
return DownloadedChange(self,
@@ -1605,7 +1624,7 @@
ids = set(all_refs.values())
tmp = set()
- for r, ref_id in GitRefs(ref_dir).all.iteritems():
+ for r, ref_id in GitRefs(ref_dir).all.items():
if r not in all_refs:
if r.startswith(R_TAGS) or remote.WritesTo(r):
all_refs[r] = ref_id
@@ -1620,13 +1639,10 @@
ids.add(ref_id)
tmp.add(r)
- ref_names = list(all_refs.keys())
- ref_names.sort()
-
tmp_packed = ''
old_packed = ''
- for r in ref_names:
+ for r in sorted(all_refs):
line = '%s %s\n' % (all_refs[r], r)
tmp_packed += line
if r not in tmp:
@@ -1640,7 +1656,10 @@
# The --depth option only affects the initial fetch; after that we'll do
# full fetches of changes.
- depth = self.manifest.manifestProject.config.GetString('repo.depth')
+ if self.clone_depth:
+ depth = self.clone_depth
+ else:
+ depth = self.manifest.manifestProject.config.GetString('repo.depth')
if depth and initial:
cmd.append('--depth=%s' % depth)
@@ -1652,11 +1671,13 @@
if not current_branch_only:
# Fetch whole repo
- if no_tags:
+ # If using depth then we should not get all the tags since they may
+ # be outside of the depth.
+ if no_tags or depth:
cmd.append('--no-tags')
else:
cmd.append('--tags')
- cmd.append((u'+refs/heads/*:') + remote.ToLocal('refs/heads/*'))
+ cmd.append(str((u'+refs/heads/*:') + remote.ToLocal('refs/heads/*')))
elif tag_name is not None:
cmd.append('tag')
cmd.append(tag_name)
@@ -1666,7 +1687,7 @@
branch = self.upstream
if branch.startswith(R_HEADS):
branch = branch[len(R_HEADS):]
- cmd.append((u'+refs/heads/%s:' % branch) + remote.ToLocal('refs/heads/%s' % branch))
+ cmd.append(str((u'+refs/heads/%s:' % branch) + remote.ToLocal('refs/heads/%s' % branch)))
ok = False
for _i in range(2):
@@ -1700,15 +1721,14 @@
return ok
def _ApplyCloneBundle(self, initial=False, quiet=False):
- if initial and self.manifest.manifestProject.config.GetString('repo.depth'):
+ if initial and (self.manifest.manifestProject.config.GetString('repo.depth') or self.clone_depth):
return False
remote = self.GetRemote(self.remote.name)
bundle_url = remote.url + '/clone.bundle'
bundle_url = GitConfig.ForUser().UrlInsteadOf(bundle_url)
- if GetSchemeFromUrl(bundle_url) in ('persistent-http', 'persistent-https'):
- bundle_url = bundle_url[len('persistent-'):]
- if GetSchemeFromUrl(bundle_url) not in ('http', 'https'):
+ if GetSchemeFromUrl(bundle_url) not in (
+ 'http', 'https', 'persistent-http', 'persistent-https'):
return False
bundle_dst = os.path.join(self.gitdir, 'clone.bundle')
@@ -1757,9 +1777,11 @@
os.remove(tmpPath)
if 'http_proxy' in os.environ and 'darwin' == sys.platform:
cmd += ['--proxy', os.environ['http_proxy']]
- cookiefile = GitConfig.ForUser().GetString('http.cookiefile')
+ cookiefile = self._GetBundleCookieFile(srcUrl)
if cookiefile:
cmd += ['--cookie', cookiefile]
+ if srcUrl.startswith('persistent-'):
+ srcUrl = srcUrl[len('persistent-'):]
cmd += [srcUrl]
if IsTrace():
@@ -1782,7 +1804,7 @@
return False
if os.path.exists(tmpPath):
- if curlret == 0 and os.stat(tmpPath).st_size > 16:
+ if curlret == 0 and self._IsValidBundle(tmpPath):
os.rename(tmpPath, dstPath)
return True
else:
@@ -1791,6 +1813,46 @@
else:
return False
+ def _IsValidBundle(self, path):
+ try:
+ with open(path) as f:
+ if f.read(16) == '# v2 git bundle\n':
+ return True
+ else:
+ print("Invalid clone.bundle file; ignoring.", file=sys.stderr)
+ return False
+ except OSError:
+ return False
+
+ def _GetBundleCookieFile(self, url):
+ if url.startswith('persistent-'):
+ try:
+ p = subprocess.Popen(
+ ['git-remote-persistent-https', '-print_config', url],
+ stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE)
+ p.stdin.close() # Tell subprocess it's ok to close.
+ prefix = 'http.cookiefile='
+ cookiefile = None
+ for line in p.stdout:
+ line = line.strip()
+ if line.startswith(prefix):
+ cookiefile = line[len(prefix):]
+ break
+ if p.wait():
+ line = iter(p.stderr).next()
+ if ' -print_config' in line:
+ pass # Persistent proxy doesn't support -print_config.
+ else:
+ print(line + p.stderr.read(), file=sys.stderr)
+ if cookiefile:
+ return cookiefile
+ except OSError as e:
+ if e.errno == errno.ENOENT:
+ pass # No persistent proxy.
+ raise
+ return GitConfig.ForUser().GetString('http.cookiefile')
+
def _Checkout(self, rev, quiet=False):
cmd = ['checkout']
if quiet:
@@ -1841,16 +1903,17 @@
if GitCommand(self, cmd).Wait() != 0:
raise GitError('%s merge %s ' % (self.name, head))
- def _InitGitDir(self):
+ def _InitGitDir(self, mirror_git=None):
if not os.path.exists(self.gitdir):
os.makedirs(self.gitdir)
self.bare_git.init()
mp = self.manifest.manifestProject
- ref_dir = mp.config.GetString('repo.reference')
+ ref_dir = mp.config.GetString('repo.reference') or ''
- if ref_dir:
- mirror_git = os.path.join(ref_dir, self.name + '.git')
+ if ref_dir or mirror_git:
+ if not mirror_git:
+ mirror_git = os.path.join(ref_dir, self.name + '.git')
repo_git = os.path.join(ref_dir, '.repo', 'projects',
self.relpath + '.git')
@@ -1867,11 +1930,21 @@
_lwrite(os.path.join(self.gitdir, 'objects/info/alternates'),
os.path.join(ref_dir, 'objects') + '\n')
+ self._UpdateHooks()
+
+ m = self.manifest.manifestProject.config
+ for key in ['user.name', 'user.email']:
+ if m.Has(key, include_defaults = False):
+ self.config.SetString(key, m.GetString(key))
if self.manifest.IsMirror:
self.config.SetString('core.bare', 'true')
else:
self.config.SetString('core.bare', None)
+ def _UpdateHooks(self):
+ if os.path.exists(self.gitdir):
+ # Always recreate hooks since they can have been changed
+ # since the latest update.
hooks = self._gitdir_path('hooks')
try:
to_rm = os.listdir(hooks)
@@ -1881,11 +1954,6 @@
os.remove(os.path.join(hooks, old_hook))
self._InitHooks()
- m = self.manifest.manifestProject.config
- for key in ['user.name', 'user.email']:
- if m.Has(key, include_defaults = False):
- self.config.SetString(key, m.GetString(key))
-
def _InitHooks(self):
hooks = self._gitdir_path('hooks')
if not os.path.exists(hooks):
@@ -2092,6 +2160,10 @@
line = fd.read()
finally:
fd.close()
+ try:
+ line = line.decode()
+ except AttributeError:
+ pass
if line.startswith('ref: '):
return line[5:-1]
return line[:-1]
@@ -2185,7 +2257,7 @@
if not git_require((1, 7, 2)):
raise ValueError('cannot set config on command line for %s()'
% name)
- for k, v in config.iteritems():
+ for k, v in config.items():
cmdv.append('-c')
cmdv.append('%s=%s' % (k, v))
cmdv.append(name)
@@ -2201,6 +2273,10 @@
name,
p.stderr))
r = p.stdout
+ try:
+ r = r.decode('utf-8')
+ except AttributeError:
+ pass
if r.endswith('\n') and r.index('\n') == len(r) - 1:
return r[:-1]
return r
diff --git a/pyversion.py b/pyversion.py
new file mode 100644
index 0000000..5b348d9
--- /dev/null
+++ b/pyversion.py
@@ -0,0 +1,19 @@
+#
+# Copyright (C) 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import sys
+
+def is_python3():
+ return sys.version_info[0] == 3
diff --git a/repo b/repo
index 602cf0c..62e6ea5 100755
--- a/repo
+++ b/repo
@@ -2,7 +2,6 @@
## repo default configuration
##
-from __future__ import print_function
REPO_URL = 'https://gerrit.googlesource.com/git-repo'
REPO_REV = 'stable'
@@ -21,10 +20,10 @@
# limitations under the License.
# increment this whenever we make important changes to this script
-VERSION = (1, 19)
+VERSION = (1, 20)
# increment this if the MAINTAINER_KEYS block is modified
-KEYRING_VERSION = (1, 1)
+KEYRING_VERSION = (1, 2)
MAINTAINER_KEYS = """
Repo Maintainer <repo@android.kernel.org>
@@ -73,32 +72,32 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.11 (GNU/Linux)
-mQENBFBiLPwBCACvISTASOgFXwADw2GYRH2I2z9RvYkYoZ6ThTTNlMXbbYYKO2Wo
-a9LQDNW0TbCEekg5UKk0FD13XOdWaqUt4Gtuvq9c43GRSjMO6NXH+0BjcQ8vUtY2
-/W4CYUevwdo4nQ1+1zsOCu1XYe/CReXq0fdugv3hgmRmh3sz1soo37Q44W2frxxg
-U7Rz3Da4FjgAL0RQ8qndD+LwRHXTY7H7wYM8V/3cYFZV7pSodd75q3MAXYQLf0ZV
-QR1XATu5l1QnXrxgHvz7MmDwb1D+jX3YPKnZveaukigQ6hDHdiVcePBiGXmk8LZC
-2jQkdXeF7Su1ZYpr2nnEHLJ6vOLcCpPGb8gDABEBAAG0H0NvbmxleSBPd2VucyA8
-Y2NvM0BhbmRyb2lkLmNvbT6JATgEEwECACIFAlBiLPwCGwMGCwkIBwMCBhUIAgkK
-CwQWAgMBAh4BAheAAAoJEBkmlFUziHGkHVkH/2Hks2Cif5i2xPtv2IFZcjL42joU
-T7lO5XFqUYS9ZNHpGa/V0eiPt7rHoO16glR83NZtwlrq2cSN89i9HfOhMYV/qLu8
-fLCHcV2muw+yCB5s5bxnI5UkToiNZyBNqFkcOt/Kbj9Hpy68A1kmc6myVEaUYebq
-2Chx/f3xuEthan099t746v1K+/6SvQGDNctHuaMr9cWdxZtHjdRf31SQRc99Phe5
-w+ZGR/ebxNDKRK9mKgZT8wVFHlXerJsRqWIqtx1fsW1UgLgbpcpe2MChm6B5wTu0
-s1ltzox3l4q71FyRRPUJxXyvGkDLZWpK7EpiHSCOYq/KP3HkKeXU3xqHpcG5AQ0E
-UGIs/AEIAKzO/7lO9cB6dshmZYo8Vy/b7aGicThE+ChcDSfhvyOXVdEM2GKAjsR+
-rlBWbTFX3It301p2HwZPFEi9nEvJxVlqqBiW0bPmNMkDRR55l2vbWg35wwkg6RyE
-Bc5/TQjhXI2w8IvlimoGoUff4t3JmMOnWrnKSvL+5iuRj12p9WmanCHzw3Ee7ztf
-/aU/q+FTpr3DLerb6S8xbv86ySgnJT6o5CyL2DCWRtnYQyGVi0ZmLzEouAYiO0hs
-z0AAu28Mj+12g2WwePRz6gfM9rHtI37ylYW3oT/9M9mO9ei/Bc/1D7Dz6qNV+0vg
-uSVJxM2Bl6GalHPZLhHntFEdIA6EdoUAEQEAAYkBHwQYAQIACQUCUGIs/AIbDAAK
-CRAZJpRVM4hxpNfkB/0W/hP5WK/NETXBlWXXW7JPaWO2c5kGwD0lnj5RRmridyo1
-vbm5PdM91jOsDQYqRu6YOoYBnDnEhB2wL2bPh34HWwwrA+LwB8hlcAV2z1bdwyfl
-3R823fReKN3QcvLHzmvZPrF4Rk97M9UIyKS0RtnfTWykRgDWHIsrtQPoNwsXrWoT
-9LrM2v+1+9mp3vuXnE473/NHxmiWEQH9Ez+O/mOxQ7rSOlqGRiKq/IBZCfioJOtV
-fTQeIu/yASZnsLBqr6SJEGwYBoWcyjG++k4fyw8ocOAo4uGDYbxgN7yYfNQ0OH7o
-V6pfUgqKLWa/aK7/N1ZHnPdFLD8Xt0Dmy4BPwrKC
-=O7am
+mQENBFHRvc8BCADFg45Xx/y6QDC+T7Y/gGc7vx0ww7qfOwIKlAZ9xG3qKunMxo+S
+hPCnzEl3cq+6I1Ww/ndop/HB3N3toPXRCoN8Vs4/Hc7by+SnaLFnacrm+tV5/OgT
+V37Lzt8lhay1Kl+YfpFwHYYpIEBLFV9knyfRXS/428W2qhdzYfvB15/AasRmwmor
+py4NIzSs8UD/SPr1ihqNCdZM76+MQyN5HMYXW/ALZXUFG0pwluHFA7hrfPG74i8C
+zMiP7qvMWIl/r/jtzHioH1dRKgbod+LZsrDJ8mBaqsZaDmNJMhss9g76XvfMyLra
+9DI9/iFuBpGzeqBv0hwOGQspLRrEoyTeR6n1ABEBAAG0H0NvbmxleSBPd2VucyA8
+Y2NvM0BhbmRyb2lkLmNvbT6JATgEEwECACIFAlHRvc8CGwMGCwkIBwMCBhUIAgkK
+CwQWAgMBAh4BAheAAAoJEGe35EhpKzgsP6AIAJKJmNtn4l7hkYHKHFSo3egb6RjQ
+zEIP3MFTcu8HFX1kF1ZFbrp7xqurLaE53kEkKuAAvjJDAgI8mcZHP1JyplubqjQA
+xvv84gK+OGP3Xk+QK1ZjUQSbjOpjEiSZpRhWcHci3dgOUH4blJfByHw25hlgHowd
+a/2PrNKZVcJ92YienaxxGjcXEUcd0uYEG2+rwllQigFcnMFDhr9B71MfalRHjFKE
+fmdoypqLrri61YBc59P88Rw2/WUpTQjgNubSqa3A2+CKdaRyaRw+2fdF4TdR0h8W
+zbg+lbaPtJHsV+3mJC7fq26MiJDRJa5ZztpMn8su20gbLgi2ShBOaHAYDDi5AQ0E
+UdG9zwEIAMoOBq+QLNozAhxOOl5GL3StTStGRgPRXINfmViTsihrqGCWBBUfXlUE
+OytC0mYcrDUQev/8ToVoyqw+iGSwDkcSXkrEUCKFtHV/GECWtk1keyHgR10YKI1R
+mquSXoubWGqPeG1PAI74XWaRx8UrL8uCXUtmD8Q5J7mDjKR5NpxaXrwlA0bKsf2E
+Gp9tu1kKauuToZhWHMRMqYSOGikQJwWSFYKT1KdNcOXLQF6+bfoJ6sjVYdwfmNQL
+Ixn8QVhoTDedcqClSWB17VDEFDFa7MmqXZz2qtM3X1R/MUMHqPtegQzBGNhRdnI2
+V45+1Nnx/uuCxDbeI4RbHzujnxDiq70AEQEAAYkBHwQYAQIACQUCUdG9zwIbDAAK
+CRBnt+RIaSs4LNVeB/0Y2pZ8I7gAAcEM0Xw8drr4omg2fUoK1J33ozlA/RxeA/lJ
+I3KnyCDTpXuIeBKPGkdL8uMATC9Z8DnBBajRlftNDVZS3Hz4G09G9QpMojvJkFJV
+By+01Flw/X+eeN8NpqSuLV4W+AjEO8at/VvgKr1AFvBRdZ7GkpI1o6DgPe7ZqX+1
+dzQZt3e13W0rVBb/bUgx9iSLoeWP3aq/k+/GRGOR+S6F6BBSl0SQ2EF2+dIywb1x
+JuinEP+AwLAUZ1Bsx9ISC0Agpk2VeHXPL3FGhroEmoMvBzO0kTFGyoeT7PR/BfKv
++H/g3HsL2LOB9uoIm8/5p2TTU5ttYCXMHhQZ81AY
+=AUp4
-----END PGP PUBLIC KEY BLOCK-----
"""
@@ -108,6 +107,7 @@
S_repo = 'repo' # special repo repository
S_manifests = 'manifests' # special manifest repository
REPO_MAIN = S_repo + '/main.py' # main script
+MIN_PYTHON_VERSION = (2, 6) # minimum supported python version
import optparse
@@ -116,19 +116,38 @@
import stat
import subprocess
import sys
-try:
- import urllib2
-except ImportError:
- # For python3
+
+if sys.version_info[0] == 3:
import urllib.request
import urllib.error
else:
- # For python2
import imp
+ import urllib2
urllib = imp.new_module('urllib')
urllib.request = urllib2
urllib.error = urllib2
+
+def _print(*objects, **kwargs):
+ sep = kwargs.get('sep', ' ')
+ end = kwargs.get('end', '\n')
+ out = kwargs.get('file', sys.stdout)
+ out.write(sep.join(objects) + end)
+
+
+# Python version check
+ver = sys.version_info
+if ver[0] == 3:
+ _print('error: Python 3 support is not fully implemented in repo yet.\n'
+ 'Please use Python 2.6 - 2.7 instead.',
+ file=sys.stderr)
+ sys.exit(1)
+if (ver[0], ver[1]) < MIN_PYTHON_VERSION:
+ _print('error: Python version %s unsupported.\n'
+ 'Please use Python 2.6 - 2.7 instead.'
+ % sys.version.split(' ')[0], file=sys.stderr)
+ sys.exit(1)
+
home_dot_repo = os.path.expanduser('~/.repoconfig')
gpg_dir = os.path.join(home_dot_repo, 'gnupg')
@@ -164,7 +183,8 @@
help='create a shallow clone with given depth; see git clone')
group.add_option('-g', '--groups',
dest='groups', default='default',
- help='restrict manifest projects to ones with a specified group',
+ help='restrict manifest projects to ones with specified '
+ 'group(s) [default|all|G1,G2,G3|G4,-G5,-G6]',
metavar='GROUP')
group.add_option('-p', '--platform',
dest='platform', default="auto",
@@ -217,15 +237,15 @@
if branch.startswith('refs/heads/'):
branch = branch[len('refs/heads/'):]
if branch.startswith('refs/'):
- print("fatal: invalid branch name '%s'" % branch, file=sys.stderr)
+ _print("fatal: invalid branch name '%s'" % branch, file=sys.stderr)
raise CloneFailure()
if not os.path.isdir(repodir):
try:
os.mkdir(repodir)
except OSError as e:
- print('fatal: cannot make %s directory: %s'
- % (repodir, e.strerror), file=sys.stderr)
+ _print('fatal: cannot make %s directory: %s'
+ % (repodir, e.strerror), file=sys.stderr)
# Don't raise CloneFailure; that would delete the
# name. Instead exit immediately.
#
@@ -249,8 +269,8 @@
_Checkout(dst, branch, rev, opt.quiet)
except CloneFailure:
if opt.quiet:
- print('fatal: repo init failed; run without --quiet to see why',
- file=sys.stderr)
+ _print('fatal: repo init failed; run without --quiet to see why',
+ file=sys.stderr)
raise
@@ -259,12 +279,12 @@
try:
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE)
except OSError as e:
- print(file=sys.stderr)
- print("fatal: '%s' is not available" % GIT, file=sys.stderr)
- print('fatal: %s' % e, file=sys.stderr)
- print(file=sys.stderr)
- print('Please make sure %s is installed and in your path.' % GIT,
- file=sys.stderr)
+ _print(file=sys.stderr)
+ _print("fatal: '%s' is not available" % GIT, file=sys.stderr)
+ _print('fatal: %s' % e, file=sys.stderr)
+ _print(file=sys.stderr)
+ _print('Please make sure %s is installed and in your path.' % GIT,
+ file=sys.stderr)
raise CloneFailure()
ver_str = proc.stdout.read().strip()
@@ -272,14 +292,14 @@
proc.wait()
if not ver_str.startswith('git version '):
- print('error: "%s" unsupported' % ver_str, file=sys.stderr)
+ _print('error: "%s" unsupported' % ver_str, file=sys.stderr)
raise CloneFailure()
ver_str = ver_str[len('git version '):].strip()
ver_act = tuple(map(int, ver_str.split('.')[0:3]))
if ver_act < MIN_GIT_VERSION:
need = '.'.join(map(str, MIN_GIT_VERSION))
- print('fatal: git %s or later required' % need, file=sys.stderr)
+ _print('fatal: git %s or later required' % need, file=sys.stderr)
raise CloneFailure()
@@ -306,16 +326,16 @@
try:
os.mkdir(home_dot_repo)
except OSError as e:
- print('fatal: cannot make %s directory: %s'
- % (home_dot_repo, e.strerror), file=sys.stderr)
+ _print('fatal: cannot make %s directory: %s'
+ % (home_dot_repo, e.strerror), file=sys.stderr)
sys.exit(1)
if not os.path.isdir(gpg_dir):
try:
os.mkdir(gpg_dir, stat.S_IRWXU)
except OSError as e:
- print('fatal: cannot make %s directory: %s' % (gpg_dir, e.strerror),
- file=sys.stderr)
+ _print('fatal: cannot make %s directory: %s' % (gpg_dir, e.strerror),
+ file=sys.stderr)
sys.exit(1)
env = os.environ.copy()
@@ -328,18 +348,18 @@
stdin = subprocess.PIPE)
except OSError as e:
if not quiet:
- print('warning: gpg (GnuPG) is not available.', file=sys.stderr)
- print('warning: Installing it is strongly encouraged.', file=sys.stderr)
- print(file=sys.stderr)
+ _print('warning: gpg (GnuPG) is not available.', file=sys.stderr)
+ _print('warning: Installing it is strongly encouraged.', file=sys.stderr)
+ _print(file=sys.stderr)
return False
proc.stdin.write(MAINTAINER_KEYS)
proc.stdin.close()
if proc.wait() != 0:
- print('fatal: registering repo maintainer keys failed', file=sys.stderr)
+ _print('fatal: registering repo maintainer keys failed', file=sys.stderr)
sys.exit(1)
- print()
+ _print()
fd = open(os.path.join(home_dot_repo, 'keyring-version'), 'w')
fd.write('.'.join(map(str, KEYRING_VERSION)) + '\n')
@@ -381,7 +401,7 @@
def _Fetch(url, local, src, quiet):
if not quiet:
- print('Get %s' % url, file=sys.stderr)
+ _print('Get %s' % url, file=sys.stderr)
cmd = [GIT, 'fetch']
if quiet:
@@ -430,16 +450,16 @@
except urllib.error.HTTPError as e:
if e.code in [403, 404]:
return False
- print('fatal: Cannot get %s' % url, file=sys.stderr)
- print('fatal: HTTP error %s' % e.code, file=sys.stderr)
+ _print('fatal: Cannot get %s' % url, file=sys.stderr)
+ _print('fatal: HTTP error %s' % e.code, file=sys.stderr)
raise CloneFailure()
except urllib.error.URLError as e:
- print('fatal: Cannot get %s' % url, file=sys.stderr)
- print('fatal: error %s' % e.reason, file=sys.stderr)
+ _print('fatal: Cannot get %s' % url, file=sys.stderr)
+ _print('fatal: error %s' % e.reason, file=sys.stderr)
raise CloneFailure()
try:
if not quiet:
- print('Get %s' % url, file=sys.stderr)
+ _print('Get %s' % url, file=sys.stderr)
while True:
buf = r.read(8192)
if buf == '':
@@ -463,23 +483,23 @@
try:
os.mkdir(local)
except OSError as e:
- print('fatal: cannot make %s directory: %s' % (local, e.strerror),
- file=sys.stderr)
+ _print('fatal: cannot make %s directory: %s' % (local, e.strerror),
+ file=sys.stderr)
raise CloneFailure()
cmd = [GIT, 'init', '--quiet']
try:
proc = subprocess.Popen(cmd, cwd = local)
except OSError as e:
- print(file=sys.stderr)
- print("fatal: '%s' is not available" % GIT, file=sys.stderr)
- print('fatal: %s' % e, file=sys.stderr)
- print(file=sys.stderr)
- print('Please make sure %s is installed and in your path.' % GIT,
+ _print(file=sys.stderr)
+ _print("fatal: '%s' is not available" % GIT, file=sys.stderr)
+ _print('fatal: %s' % e, file=sys.stderr)
+ _print(file=sys.stderr)
+ _print('Please make sure %s is installed and in your path.' % GIT,
file=sys.stderr)
raise CloneFailure()
if proc.wait() != 0:
- print('fatal: could not create %s' % local, file=sys.stderr)
+ _print('fatal: could not create %s' % local, file=sys.stderr)
raise CloneFailure()
_InitHttp()
@@ -507,18 +527,18 @@
proc.stderr.close()
if proc.wait() != 0 or not cur:
- print(file=sys.stderr)
- print("fatal: branch '%s' has not been signed" % branch, file=sys.stderr)
+ _print(file=sys.stderr)
+ _print("fatal: branch '%s' has not been signed" % branch, file=sys.stderr)
raise CloneFailure()
m = re.compile(r'^(.*)-[0-9]{1,}-g[0-9a-f]{1,}$').match(cur)
if m:
cur = m.group(1)
if not quiet:
- print(file=sys.stderr)
- print("info: Ignoring branch '%s'; using tagged release '%s'"
+ _print(file=sys.stderr)
+ _print("info: Ignoring branch '%s'; using tagged release '%s'"
% (branch, cur), file=sys.stderr)
- print(file=sys.stderr)
+ _print(file=sys.stderr)
env = os.environ.copy()
env['GNUPGHOME'] = gpg_dir.encode()
@@ -536,10 +556,10 @@
proc.stderr.close()
if proc.wait() != 0:
- print(file=sys.stderr)
- print(out, file=sys.stderr)
- print(err, file=sys.stderr)
- print(file=sys.stderr)
+ _print(file=sys.stderr)
+ _print(out, file=sys.stderr)
+ _print(err, file=sys.stderr)
+ _print(file=sys.stderr)
raise CloneFailure()
return '%s^0' % cur
@@ -606,7 +626,7 @@
def _Usage():
- print(
+ _print(
"""usage: repo COMMAND [ARGS]
repo is not yet installed. Use "repo init" to install it here.
@@ -627,23 +647,23 @@
init_optparse.print_help()
sys.exit(0)
else:
- print("error: '%s' is not a bootstrap command.\n"
- ' For access to online help, install repo ("repo init").'
- % args[0], file=sys.stderr)
+ _print("error: '%s' is not a bootstrap command.\n"
+ ' For access to online help, install repo ("repo init").'
+ % args[0], file=sys.stderr)
else:
_Usage()
sys.exit(1)
def _NotInstalled():
- print('error: repo is not installed. Use "repo init" to install it here.',
- file=sys.stderr)
+ _print('error: repo is not installed. Use "repo init" to install it here.',
+ file=sys.stderr)
sys.exit(1)
def _NoCommands(cmd):
- print("""error: command '%s' requires repo to be installed first.
- Use "repo init" to install it here.""" % cmd, file=sys.stderr)
+ _print("""error: command '%s' requires repo to be installed first.
+ Use "repo init" to install it here.""" % cmd, file=sys.stderr)
sys.exit(1)
@@ -680,7 +700,7 @@
proc.stderr.close()
if proc.wait() != 0:
- print('fatal: %s has no current branch' % gitdir, file=sys.stderr)
+ _print('fatal: %s has no current branch' % gitdir, file=sys.stderr)
sys.exit(1)
@@ -729,8 +749,8 @@
try:
os.execv(sys.executable, me)
except OSError as e:
- print("fatal: unable to start %s" % repo_main, file=sys.stderr)
- print("fatal: %s" % e, file=sys.stderr)
+ _print("fatal: unable to start %s" % repo_main, file=sys.stderr)
+ _print("fatal: %s" % e, file=sys.stderr)
sys.exit(148)
diff --git a/subcmds/__init__.py b/subcmds/__init__.py
index 1fac802..84efb4d 100644
--- a/subcmds/__init__.py
+++ b/subcmds/__init__.py
@@ -38,8 +38,8 @@
try:
cmd = getattr(mod, clsn)()
except AttributeError:
- raise SyntaxError, '%s/%s does not define class %s' % (
- __name__, py, clsn)
+ raise SyntaxError('%s/%s does not define class %s' % (
+ __name__, py, clsn))
name = name.replace('_', '-')
cmd.NAME = name
diff --git a/subcmds/branches.py b/subcmds/branches.py
index 06d45ab..c2e7c4b 100644
--- a/subcmds/branches.py
+++ b/subcmds/branches.py
@@ -98,14 +98,13 @@
project_cnt = len(projects)
for project in projects:
- for name, b in project.GetBranches().iteritems():
+ for name, b in project.GetBranches().items():
b.project = project
if name not in all_branches:
all_branches[name] = BranchInfo(name)
all_branches[name].add(b)
- names = all_branches.keys()
- names.sort()
+ names = list(sorted(all_branches))
if not names:
print(' (no branches)', file=sys.stderr)
diff --git a/subcmds/cherry_pick.py b/subcmds/cherry_pick.py
index 01b97e0..520e4c3 100644
--- a/subcmds/cherry_pick.py
+++ b/subcmds/cherry_pick.py
@@ -81,7 +81,7 @@
sys.exit(1)
else:
- print('NOTE: When committing (please see above) and editing the commit'
+ print('NOTE: When committing (please see above) and editing the commit '
'message, please remove the old Change-Id-line and add:')
print(self._GetReference(sha1), file=sys.stderr)
print(file=sys.stderr)
diff --git a/subcmds/forall.py b/subcmds/forall.py
index 4c1c9ff..e2a420a 100644
--- a/subcmds/forall.py
+++ b/subcmds/forall.py
@@ -42,10 +42,14 @@
helpSummary = "Run a shell command in each project"
helpUsage = """
%prog [<project>...] -c <command> [<arg>...]
+%prog -r str1 [str2] ... -c <command> [<arg>...]"
"""
helpDescription = """
Executes the same shell command in each project.
+The -r option allows running the command only on projects matching
+regex or wildcard expression.
+
Output Formatting
-----------------
@@ -103,6 +107,9 @@
setattr(parser.values, option.dest, list(parser.rargs))
while parser.rargs:
del parser.rargs[0]
+ p.add_option('-r', '--regex',
+ dest='regex', action='store_true',
+ help="Execute the command only on projects matching regex or wildcard expression")
p.add_option('-c', '--command',
help='Command (and arguments) to execute',
dest='command',
@@ -166,7 +173,12 @@
rc = 0
first = True
- for project in self.GetProjects(args):
+ if not opt.regex:
+ projects = self.GetProjects(args)
+ else:
+ projects = self.FindProjects(args)
+
+ for project in projects:
env = os.environ.copy()
def setenv(name, val):
if val is None:
@@ -248,7 +260,12 @@
first = False
else:
out.nl()
- out.project('project %s/', project.relpath)
+
+ if mirror:
+ project_header_path = project.name
+ else:
+ project_header_path = project.relpath
+ out.project('project %s/', project_header_path)
out.nl()
out.flush()
if errbuf:
diff --git a/subcmds/help.py b/subcmds/help.py
index 15aab7f..4aa3f86 100644
--- a/subcmds/help.py
+++ b/subcmds/help.py
@@ -34,8 +34,7 @@
def _PrintAllCommands(self):
print('usage: repo COMMAND [ARGS]')
print('The complete list of recognized repo commands are:')
- commandNames = self.commands.keys()
- commandNames.sort()
+ commandNames = list(sorted(self.commands))
maxlen = 0
for name in commandNames:
@@ -49,16 +48,15 @@
except AttributeError:
summary = ''
print(fmt % (name, summary))
- print("See 'repo help <command>' for more information on a"
+ print("See 'repo help <command>' for more information on a "
'specific command.')
def _PrintCommonCommands(self):
print('usage: repo COMMAND [ARGS]')
print('The most commonly used repo commands are:')
- commandNames = [name
- for name in self.commands.keys()
- if self.commands[name].common]
- commandNames.sort()
+ commandNames = list(sorted([name
+ for name, command in self.commands.items()
+ if command.common]))
maxlen = 0
for name in commandNames:
diff --git a/subcmds/info.py b/subcmds/info.py
index 8fb363f..d42860a 100644
--- a/subcmds/info.py
+++ b/subcmds/info.py
@@ -27,7 +27,7 @@
helpSummary = "Get info on the manifest branch, current branch or unmerged branches"
helpUsage = "%prog [-dl] [-o [-b]] [<project>...]"
- def _Options(self, p, show_smart=True):
+ def _Options(self, p):
p.add_option('-d', '--diff',
dest='all', action='store_true',
help="show full info and commit diff including remote branches")
@@ -53,7 +53,10 @@
self.opt = opt
- mergeBranch = self.manifest.manifestProject.config.GetBranch("default").merge
+ manifestConfig = self.manifest.manifestProject.config
+ mergeBranch = manifestConfig.GetBranch("default").merge
+ manifestGroups = (manifestConfig.GetString('manifest.groups')
+ or 'all,-notdefault')
self.heading("Manifest branch: ")
self.headtext(self.manifest.default.revisionExpr)
@@ -61,6 +64,9 @@
self.heading("Manifest merge branch: ")
self.headtext(mergeBranch)
self.out.nl()
+ self.heading("Manifest groups: ")
+ self.headtext(manifestGroups)
+ self.out.nl()
self.printSeparator()
@@ -157,7 +163,7 @@
all_branches = []
for project in self.GetProjects(args):
br = [project.GetUploadableBranch(x)
- for x in project.GetBranches().keys()]
+ for x in project.GetBranches()]
br = [x for x in br if x]
if self.opt.current_branch:
br = [x for x in br if x.name == project.CurrentBranch]
diff --git a/subcmds/init.py b/subcmds/init.py
index 1131260..a44fb7a 100644
--- a/subcmds/init.py
+++ b/subcmds/init.py
@@ -20,6 +20,15 @@
import shutil
import sys
+from pyversion import is_python3
+if is_python3():
+ import urllib.parse
+else:
+ import imp
+ import urlparse
+ urllib = imp.new_module('urllib')
+ urllib.parse = urlparse.urlparse
+
from color import Coloring
from command import InteractiveCommand, MirrorSafeCommand
from error import ManifestParseError
@@ -91,8 +100,9 @@
dest='depth',
help='create a shallow clone with given depth; see git clone')
g.add_option('-g', '--groups',
- dest='groups', default='all,-notdefault',
- help='restrict manifest projects to ones with a specified group',
+ dest='groups', default='default',
+ help='restrict manifest projects to ones with specified '
+ 'group(s) [default|all|G1,G2,G3|G4,-G5,-G6]',
metavar='GROUP')
g.add_option('-p', '--platform',
dest='platform', default='auto',
@@ -134,7 +144,19 @@
if not opt.quiet:
print('Get %s' % GitConfig.ForUser().UrlInsteadOf(opt.manifest_url),
file=sys.stderr)
- m._InitGitDir()
+
+ # The manifest project object doesn't keep track of the path on the
+ # server where this git is located, so let's save that here.
+ mirrored_manifest_git = None
+ if opt.reference:
+ manifest_git_path = urllib.parse(opt.manifest_url).path[1:]
+ mirrored_manifest_git = os.path.join(opt.reference, manifest_git_path)
+ if not mirrored_manifest_git.endswith(".git"):
+ mirrored_manifest_git += ".git"
+ if not os.path.exists(mirrored_manifest_git):
+ mirrored_manifest_git = os.path.join(opt.reference + '/.repo/manifests.git')
+
+ m._InitGitDir(mirror_git=mirrored_manifest_git)
if opt.manifest_branch:
m.revisionExpr = opt.manifest_branch
@@ -169,7 +191,7 @@
groups = [x for x in groups if x]
groupstr = ','.join(groups)
- if opt.platform == 'auto' and groupstr == 'all,-notdefault,platform-' + platform.system().lower():
+ if opt.platform == 'auto' and groupstr == 'default,platform-' + platform.system().lower():
groupstr = None
m.config.SetString('manifest.groups', groupstr)
diff --git a/subcmds/list.py b/subcmds/list.py
index 0d5c27f..945c28d 100644
--- a/subcmds/list.py
+++ b/subcmds/list.py
@@ -14,7 +14,7 @@
# limitations under the License.
from __future__ import print_function
-import re
+import sys
from command import Command, MirrorSafeCommand
@@ -31,13 +31,19 @@
This is similar to running: repo forall -c 'echo "$REPO_PATH : $REPO_PROJECT"'.
"""
- def _Options(self, p, show_smart=True):
+ def _Options(self, p):
p.add_option('-r', '--regex',
dest='regex', action='store_true',
help="Filter the project list based on regex or wildcard matching of strings")
p.add_option('-f', '--fullpath',
dest='fullpath', action='store_true',
help="Display the full work tree path instead of the relative path")
+ p.add_option('-n', '--name-only',
+ dest='name_only', action='store_true',
+ help="Display only the name of the repository")
+ p.add_option('-p', '--path-only',
+ dest='path_only', action='store_true',
+ help="Display only the path of the repository")
def Execute(self, opt, args):
"""List all projects and the associated directories.
@@ -50,6 +56,11 @@
opt: The options.
args: Positional args. Can be a list of projects to list, or empty.
"""
+
+ if opt.fullpath and opt.name_only:
+ print('error: cannot combine -f and -n', file=sys.stderr)
+ sys.exit(1)
+
if not opt.regex:
projects = self.GetProjects(args)
else:
@@ -62,18 +73,12 @@
lines = []
for project in projects:
- lines.append("%s : %s" % (_getpath(project), project.name))
+ if opt.name_only and not opt.path_only:
+ lines.append("%s" % ( project.name))
+ elif opt.path_only and not opt.name_only:
+ lines.append("%s" % (_getpath(project)))
+ else:
+ lines.append("%s : %s" % (_getpath(project), project.name))
lines.sort()
print('\n'.join(lines))
-
- def FindProjects(self, args):
- result = []
- for project in self.GetProjects(''):
- for arg in args:
- pattern = re.compile(r'%s' % arg, re.IGNORECASE)
- if pattern.search(project.name) or pattern.search(project.relpath):
- result.append(project)
- break
- result.sort(key=lambda project: project.relpath)
- return result
diff --git a/subcmds/overview.py b/subcmds/overview.py
index 418459a..eed8cf2 100644
--- a/subcmds/overview.py
+++ b/subcmds/overview.py
@@ -42,7 +42,7 @@
all_branches = []
for project in self.GetProjects(args):
br = [project.GetUploadableBranch(x)
- for x in project.GetBranches().keys()]
+ for x in project.GetBranches()]
br = [x for x in br if x]
if opt.current_branch:
br = [x for x in br if x.name == project.CurrentBranch]
diff --git a/subcmds/rebase.py b/subcmds/rebase.py
index 06cda22..b9a7774 100644
--- a/subcmds/rebase.py
+++ b/subcmds/rebase.py
@@ -68,7 +68,7 @@
cb = project.CurrentBranch
if not cb:
if one_project:
- print("error: project %s has a detatched HEAD" % project.relpath,
+ print("error: project %s has a detached HEAD" % project.relpath,
file=sys.stderr)
return -1
# ignore branches with detatched HEADs
diff --git a/subcmds/stage.py b/subcmds/stage.py
index ff15ee0..2884976 100644
--- a/subcmds/stage.py
+++ b/subcmds/stage.py
@@ -49,7 +49,7 @@
self.Usage()
def _Interactive(self, opt, args):
- all_projects = filter(lambda x: x.IsDirty(), self.GetProjects(args))
+ all_projects = [p for p in self.GetProjects(args) if p.IsDirty()]
if not all_projects:
print('no projects have uncommitted modifications', file=sys.stderr)
return
@@ -98,9 +98,9 @@
_AddI(all_projects[a_index - 1])
continue
- p = filter(lambda x: x.name == a or x.relpath == a, all_projects)
- if len(p) == 1:
- _AddI(p[0])
+ projects = [p for p in all_projects if a in [p.name, p.relpath]]
+ if len(projects) == 1:
+ _AddI(projects[0])
continue
print('Bye.')
diff --git a/subcmds/status.py b/subcmds/status.py
index cce00c8..41c4429 100644
--- a/subcmds/status.py
+++ b/subcmds/status.py
@@ -21,10 +21,16 @@
import dummy_threading as _threading
import glob
+
+from pyversion import is_python3
+if is_python3():
+ import io
+else:
+ import StringIO as io
+
import itertools
import os
import sys
-import StringIO
from color import Coloring
@@ -142,7 +148,7 @@
for project in all_projects:
sem.acquire()
- class BufList(StringIO.StringIO):
+ class BufList(io.StringIO):
def dump(self, ostream):
for entry in self.buflist:
ostream.write(entry)
@@ -182,7 +188,7 @@
try:
os.chdir(self.manifest.topdir)
- outstring = StringIO.StringIO()
+ outstring = io.StringIO()
self._FindOrphans(glob.glob('.*') + \
glob.glob('*'), \
proj_dirs, proj_dirs_parents, outstring)
diff --git a/subcmds/sync.py b/subcmds/sync.py
index 5c369a7..e9d52b7 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -24,8 +24,19 @@
import subprocess
import sys
import time
-import urlparse
-import xmlrpclib
+
+from pyversion import is_python3
+if is_python3():
+ import urllib.parse
+ import xmlrpc.client
+else:
+ import imp
+ import urlparse
+ import xmlrpclib
+ urllib = imp.new_module('urllib')
+ urllib.parse = urlparse
+ xmlrpc = imp.new_module('xmlrpc')
+ xmlrpc.client = xmlrpclib
try:
import threading as _threading
@@ -228,6 +239,9 @@
# We'll set to true once we've locked the lock.
did_lock = False
+ if not opt.quiet:
+ print('Fetching project %s' % project.name)
+
# Encapsulate everything in a try/except/finally so that:
# - We always set err_event in the case of an exception.
# - We always make sure we call sem.release().
@@ -274,6 +288,8 @@
if self.jobs == 1:
for project in projects:
pm.update()
+ if not opt.quiet:
+ print('Fetching project %s' % project.name)
if project.Sync_NetworkHalf(
quiet=opt.quiet,
current_branch_only=opt.current_branch_only,
@@ -372,6 +388,13 @@
print('\nerror: Exited sync due to gc errors', file=sys.stderr)
sys.exit(1)
+ def _ReloadManifest(self, manifest_name=None):
+ if manifest_name:
+ # Override calls _Unload already
+ self.manifest.Override(manifest_name)
+ else:
+ self.manifest._Unload()
+
def UpdateProjectList(self):
new_project_paths = []
for project in self.GetProjects(None, missing_ok=True):
@@ -406,7 +429,7 @@
groups = None)
if project.IsDirty():
- print('error: Cannot remove project "%s": uncommitted changes'
+ print('error: Cannot remove project "%s": uncommitted changes '
'are present' % project.relpath, file=sys.stderr)
print(' commit changes, then run sync again',
file=sys.stderr)
@@ -464,13 +487,17 @@
if opt.manifest_name:
self.manifest.Override(opt.manifest_name)
+ manifest_name = opt.manifest_name
+
if opt.smart_sync or opt.smart_tag:
if not self.manifest.manifest_server:
- print('error: cannot smart sync: no manifest server defined in'
+ print('error: cannot smart sync: no manifest server defined in '
'manifest', file=sys.stderr)
sys.exit(1)
manifest_server = self.manifest.manifest_server
+ if not opt.quiet:
+ print('Using manifest server %s' % manifest_server)
if not '@' in manifest_server:
username = None
@@ -486,7 +513,7 @@
file=sys.stderr)
else:
try:
- parse_result = urlparse.urlparse(manifest_server)
+ parse_result = urllib.parse.urlparse(manifest_server)
if parse_result.hostname:
username, _account, password = \
info.authenticators(parse_result.hostname)
@@ -504,7 +531,7 @@
1)
try:
- server = xmlrpclib.Server(manifest_server)
+ server = xmlrpc.client.Server(manifest_server)
if opt.smart_sync:
p = self.manifest.manifestProject
b = p.GetBranch(p.CurrentBranch)
@@ -513,8 +540,7 @@
branch = branch[len(R_HEADS):]
env = os.environ.copy()
- if (env.has_key('TARGET_PRODUCT') and
- env.has_key('TARGET_BUILD_VARIANT')):
+ if 'TARGET_PRODUCT' in env and 'TARGET_BUILD_VARIANT' in env:
target = '%s-%s' % (env['TARGET_PRODUCT'],
env['TARGET_BUILD_VARIANT'])
[success, manifest_str] = server.GetApprovedManifest(branch, target)
@@ -538,15 +564,16 @@
print('error: cannot write manifest to %s' % manifest_path,
file=sys.stderr)
sys.exit(1)
- self.manifest.Override(manifest_name)
+ self._ReloadManifest(manifest_name)
else:
- print('error: %s' % manifest_str, file=sys.stderr)
+ print('error: manifest server RPC call failed: %s' %
+ manifest_str, file=sys.stderr)
sys.exit(1)
- except (socket.error, IOError, xmlrpclib.Fault) as e:
+ except (socket.error, IOError, xmlrpc.client.Fault) as e:
print('error: cannot connect to manifest server %s:\n%s'
% (self.manifest.manifest_server, e), file=sys.stderr)
sys.exit(1)
- except xmlrpclib.ProtocolError as e:
+ except xmlrpc.client.ProtocolError as e:
print('error: cannot connect to manifest server %s:\n%d %s'
% (self.manifest.manifest_server, e.errcode, e.errmsg),
file=sys.stderr)
@@ -571,7 +598,7 @@
mp.Sync_LocalHalf(syncbuf)
if not syncbuf.Finish():
sys.exit(1)
- self.manifest._Unload()
+ self._ReloadManifest(manifest_name)
if opt.jobs is None:
self.jobs = self.manifest.default.sync_j
all_projects = self.GetProjects(args,
@@ -596,7 +623,7 @@
# Iteratively fetch missing and/or nested unregistered submodules
previously_missing_set = set()
while True:
- self.manifest._Unload()
+ self._ReloadManifest(manifest_name)
all_projects = self.GetProjects(args,
missing_ok=True,
submodules_ok=opt.fetch_submodules)
diff --git a/subcmds/upload.py b/subcmds/upload.py
index e314032..8d801e0 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -21,19 +21,26 @@
from command import InteractiveCommand
from editor import Editor
from error import HookError, UploadError
+from git_command import GitCommand
from project import RepoHook
+from pyversion import is_python3
+if not is_python3():
+ # pylint:disable=W0622
+ input = raw_input
+ # pylint:enable=W0622
+
UNUSUAL_COMMIT_THRESHOLD = 5
def _ConfirmManyUploads(multiple_branches=False):
if multiple_branches:
- print('ATTENTION: One or more branches has an unusually high number'
+ print('ATTENTION: One or more branches has an unusually high number '
'of commits.')
else:
print('ATTENTION: You are uploading an unusually high number of commits.')
- print('YOU PROBABLY DO NOT MEAN TO DO THIS. (Did you rebase across'
+ print('YOU PROBABLY DO NOT MEAN TO DO THIS. (Did you rebase across '
'branches?)')
- answer = raw_input("If you are sure you intend to do this, type 'yes': ").strip()
+ answer = input("If you are sure you intend to do this, type 'yes': ").strip()
return answer == "yes"
def _die(fmt, *args):
@@ -140,6 +147,10 @@
p.add_option('-d', '--draft',
action='store_true', dest='draft', default=False,
help='If specified, upload as a draft.')
+ p.add_option('-D', '--destination', '--dest',
+ type='string', action='store', dest='dest_branch',
+ metavar='BRANCH',
+ help='Submit for review on this target branch.')
# Options relating to upload hook. Note that verify and no-verify are NOT
# opposites of each other, which is why they store to different locations.
@@ -179,7 +190,8 @@
date = branch.date
commit_list = branch.commits
- print('Upload project %s/ to remote branch %s:' % (project.relpath, project.revisionExpr))
+ destination = opt.dest_branch or project.dest_branch or project.revisionExpr
+ print('Upload project %s/ to remote branch %s:' % (project.relpath, destination))
print(' branch %s (%2d commit%s, %s):' % (
name,
len(commit_list),
@@ -213,18 +225,21 @@
b = {}
for branch in avail:
+ if branch is None:
+ continue
name = branch.name
date = branch.date
commit_list = branch.commits
if b:
script.append('#')
+ destination = opt.dest_branch or project.dest_branch or project.revisionExpr
script.append('# branch %s (%2d commit%s, %s) to remote branch %s:' % (
name,
len(commit_list),
len(commit_list) != 1 and 's' or '',
date,
- project.revisionExpr))
+ destination))
for commit in commit_list:
script.append('# %s' % commit)
b[name] = branch
@@ -330,7 +345,21 @@
key = 'review.%s.uploadtopic' % branch.project.remote.review
opt.auto_topic = branch.project.config.GetBoolean(key)
- branch.UploadForReview(people, auto_topic=opt.auto_topic, draft=opt.draft)
+ destination = opt.dest_branch or branch.project.dest_branch
+
+ # Make sure our local branch is not setup to track a different remote branch
+ merge_branch = self._GetMergeBranch(branch.project)
+ full_dest = 'refs/heads/%s' % destination
+ if not opt.dest_branch and merge_branch and merge_branch != full_dest:
+ print('merge branch %s does not match destination branch %s'
+ % (merge_branch, full_dest))
+ print('skipping upload.')
+ print('Please use `--destination %s` if this is intentional'
+ % destination)
+ branch.uploaded = False
+ continue
+
+ branch.UploadForReview(people, auto_topic=opt.auto_topic, draft=opt.draft, dest_branch=destination)
branch.uploaded = True
except UploadError as e:
branch.error = e
@@ -364,6 +393,21 @@
if have_errors:
sys.exit(1)
+ def _GetMergeBranch(self, project):
+ p = GitCommand(project,
+ ['rev-parse', '--abbrev-ref', 'HEAD'],
+ capture_stdout = True,
+ capture_stderr = True)
+ p.Wait()
+ local_branch = p.stdout.strip()
+ p = GitCommand(project,
+ ['config', '--get', 'branch.%s.merge' % local_branch],
+ capture_stdout = True,
+ capture_stderr = True)
+ p.Wait()
+ merge_branch = p.stdout.strip()
+ return merge_branch
+
def Execute(self, opt, args):
project_list = self.GetProjects(args)
pending = []