You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2016/02/11 16:22:00 UTC
[1/3] lucene-solr git commit: LUCENE-6938: fix buggy detection of
dirty git checkout
Repository: lucene-solr
Updated Branches:
refs/heads/branch_5_5 329167872 -> 850c6c248
LUCENE-6938: fix buggy detection of dirty git checkout
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e3a06f03
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e3a06f03
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e3a06f03
Branch: refs/heads/branch_5_5
Commit: e3a06f0334034c1280f416b4afd6a6249cda395e
Parents: 3291678
Author: Mike McCandless <mi...@apache.org>
Authored: Thu Feb 11 09:59:13 2016 -0500
Committer: Mike McCandless <mi...@apache.org>
Committed: Thu Feb 11 09:59:13 2016 -0500
----------------------------------------------------------------------
dev-tools/scripts/buildAndPushRelease.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e3a06f03/dev-tools/scripts/buildAndPushRelease.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/buildAndPushRelease.py b/dev-tools/scripts/buildAndPushRelease.py
index 68671a2..c735621 100644
--- a/dev-tools/scripts/buildAndPushRelease.py
+++ b/dev-tools/scripts/buildAndPushRelease.py
@@ -59,10 +59,8 @@ def runAndSendGPGPassword(command, password):
def getGitRev():
status = os.popen('git status').read().strip()
- if 'Your branch is up-to-date' not in status:
- raise RuntimeError('git clone has local changes:\n\n%s' % status)
- if 'Untracked files' in status:
- raise RuntimeError('there are untracked files; please run git clean -xfd:\n\n%s' % status)
+ if 'nothing to commit, working directory clean' not in status:
+ raise RuntimeError('git clone is dirty:\n\n%s' % status)
return os.popen('git rev-parse HEAD').read().strip()
[2/3] lucene-solr git commit: LUCENE-6938: add TODO that we should
also detect unpushed commits
Posted by mi...@apache.org.
LUCENE-6938: add TODO that we should also detect unpushed commits
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9a4ff707
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9a4ff707
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9a4ff707
Branch: refs/heads/branch_5_5
Commit: 9a4ff707ed8d4aafa20dd3cc9c0fd4c7378046f2
Parents: e3a06f0
Author: Mike McCandless <mi...@apache.org>
Authored: Thu Feb 11 10:07:05 2016 -0500
Committer: Mike McCandless <mi...@apache.org>
Committed: Thu Feb 11 10:07:05 2016 -0500
----------------------------------------------------------------------
dev-tools/scripts/buildAndPushRelease.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9a4ff707/dev-tools/scripts/buildAndPushRelease.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/buildAndPushRelease.py b/dev-tools/scripts/buildAndPushRelease.py
index c735621..6774e42 100644
--- a/dev-tools/scripts/buildAndPushRelease.py
+++ b/dev-tools/scripts/buildAndPushRelease.py
@@ -61,8 +61,10 @@ def getGitRev():
status = os.popen('git status').read().strip()
if 'nothing to commit, working directory clean' not in status:
raise RuntimeError('git clone is dirty:\n\n%s' % status)
+
+ # TODO: we should also detect unpushed changes here? Something like "git cherry -v origin/branch_5_5"?
+ print(' git clone is clean')
return os.popen('git rev-parse HEAD').read().strip()
-
def prepare(root, version, gpgKeyID, gpgPassword):
print()
[3/3] lucene-solr git commit: fix usage line
Posted by mi...@apache.org.
fix usage line
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/850c6c24
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/850c6c24
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/850c6c24
Branch: refs/heads/branch_5_5
Commit: 850c6c248373d80617e771f776041fd0d59ac31a
Parents: 9a4ff70
Author: Mike McCandless <mi...@apache.org>
Authored: Thu Feb 11 10:08:29 2016 -0500
Committer: Mike McCandless <mi...@apache.org>
Committed: Thu Feb 11 10:08:29 2016 -0500
----------------------------------------------------------------------
dev-tools/scripts/buildAndPushRelease.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/850c6c24/dev-tools/scripts/buildAndPushRelease.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/buildAndPushRelease.py b/dev-tools/scripts/buildAndPushRelease.py
index 6774e42..8a6d6ba 100644
--- a/dev-tools/scripts/buildAndPushRelease.py
+++ b/dev-tools/scripts/buildAndPushRelease.py
@@ -206,7 +206,7 @@ def read_version(path):
def parse_config():
epilogue = textwrap.dedent('''
Example usage for a Release Manager:
- python3.2 -u buildAndPushRelease.py --push-remote mikemccand --sign 6E68DA61 --rc-num 1 --version 4.7.0 /path/to/lucene_solr_4_7
+ python3.2 -u buildAndPushRelease.py --push-remote mikemccand --sign 6E68DA61 --rc-num 1 /path/to/lucene_solr_4_7
''')
description = 'Utility to build, push, and test a release.'
parser = argparse.ArgumentParser(description=description, epilog=epilogue,