Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

bpo-27593: Revise git SCM build info. (#744) (#746)#1392

Merged
vstinner merged 1 commit into
python:2.7python/cpython:2.7from
vstinner:pcbuild_27Copy head branch name to clipboard
May 2, 2017
Merged

bpo-27593: Revise git SCM build info. (#744) (#746)#1392
vstinner merged 1 commit into
python:2.7python/cpython:2.7from
vstinner:pcbuild_27Copy head branch name to clipboard

Conversation

@vstinner

@vstinner vstinner commented May 2, 2017

Copy link
Copy Markdown
Member

Use --short form of git hash. Use output from "git describe" for tag.

Expected outputs:

  1. previous hg
  2. previous git
  3. updated git

Release (tagged) build:

  1. Python 3.7.0a0 (v3.7.0a0:4def2a2901a5, ...
  2. Python 3.7.0a0 (v3.7.0a0^0:05f53735c8912f8df1077e897f052571e13c3496, ...
  3. Python 3.7.0a0 (v3.7.0a0:05f53735c8, ...

Development build:

  1. Python 3.7.0a0 (default:41df79263a11, ...
  2. Python 3.7.0a0 (master:05f53735c8912f8df1077e897f052571e13c3496, ...
  3. Python 3.7.0a0 (heads/master-dirty:05f53735c8, ...

"dirty" means the working tree has uncommitted changes.
See "git help describe" for more info.
(cherry picked from commit 554626a)
(cherry picked from commit ed512cb)

Use --short form of git hash.  Use output from "git describe" for tag.

Expected outputs:
1. previous hg
2. previous git
3. updated git

Release (tagged) build:
1. Python 3.7.0a0 (v3.7.0a0:4def2a2901a5, ...
2. Python 3.7.0a0 (v3.7.0a0^0:05f53735c8912f8df1077e897f052571e13c3496, ...
3. Python 3.7.0a0 (v3.7.0a0:05f53735c8, ...

Development build:
1. Python 3.7.0a0 (default:41df79263a11, ...
2. Python 3.7.0a0 (master:05f53735c8912f8df1077e897f052571e13c3496, ...
3. Python 3.7.0a0 (heads/master-dirty:05f53735c8, ...

"dirty" means the working tree has uncommitted changes.
See "git help describe" for more info.
(cherry picked from commit 554626a)
(cherry picked from commit ed512cb)

@zooba zooba left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would be okay with simplifying the "-dirty" suffix to a single obvious character, but not a huge deal.

@brettcannon

Copy link
Copy Markdown
Member

@zooba something like *? (Seems to be the most common character I see in shells that support git to signify that a branch is dirty.)

@brettcannon brettcannon added the type-feature A feature request or enhancement label May 2, 2017
@vstinner vstinner merged commit fd6c8bb into python:2.7 May 2, 2017
@vstinner vstinner deleted the pcbuild_27 branch May 2, 2017 19:50
@vstinner

vstinner commented May 2, 2017

Copy link
Copy Markdown
Member Author

@zooba: "I would be okay with simplifying the "-dirty" suffix to a single obvious character, but not a huge deal."

If we change something, I would also suggest to replace "heads/master" with "master". I also like replacing "master-dirty" with "master*".

But this change is just a backport to make 2.7 consistent with other branches. I would suggest to first modify the master branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type-feature A feature request or enhancement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.