Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add SVN feature to get last-changed-revision and the current branch/tag/trunk name #2

Merged
merged 15 commits into from Sep 11, 2018
Merged

Add SVN feature to get last-changed-revision and the current branch/tag/trunk name #2

merged 15 commits into from Sep 11, 2018

Conversation

climblinne
Copy link

complement to SVN issue-3130 of conan

@climblinne
Add SVN feature to get last-changed-revision and the current branch/t…
b868f5b 
…ag/trunk name

Change-Id: I0aa798a2bda23569ed93c139dc56ce62938edc6d
@climblinne
Add peg revision to remote url to be safe for file path changes on th…
cea22a4 
…e repository.

This is used for the translation from "auto" to "url@revision" in SCM-URL for Subversion.

Change-Id: I36d41ef5271e195c9d43269173990496733404ef
@climblinne
Copy link
Author

Add also peg revision to remote url.

@jgsogo
Copy link
Owner

jgsogo commented Sep 5, 2018

Ey! Thanks for the PR!

I was waiting for some feedback from the rest of the Conan team about my concerns here. But maybe we can discuss those here and come back there with some conclusions.

About the 3 points we have in the air:

  • peg revision. Completely ok. Although Git doesn't have it, we can easily add it in SVN. I will add a review to your PR with some comments now.
  • last commit: I still think that we need to ask for the last revision number to the root directory of the project in order to know that revision/version you talked about... We need to know at least the root directory of the checkout part (take a look at this PR, we need a SVN.get_repo_root() and ask to that folder for the last revision). I think that PR will we merged soon into develop.
  • branch: ok

jgsogo
jgsogo requested changes Sep 5, 2018
View reviewed changes
conans/client/tools/scm.py Outdated Show resolved Hide resolved
conans/client/tools/scm.py Outdated Show resolved Hide resolved
conans/client/tools/scm.py Outdated Show resolved Hide resolved
conans/client/tools/scm.py Outdated Show resolved Hide resolved
@climblinne
Merge branch 'issue-3130' of https://github.com/jgsogo/conan into iss…
637dea0 
…ue-3130

Change-Id: Iff2fdda89e7dd38eef27e5d1e1fc3b203b8909aa
@climblinne
Removed "Replacement in non alphanumeric" in get_branch()
9feda3e 
Change-Id: I5d4a988b82c55b87afab94c00923490be8c3dd4d
@climblinne
Add function get_qualified_remote_url()
0227b0c 
Replace auto-keyword at export to url + peg revision for SVN. Git keeps the remote url.

Change-Id: I02a97e59123681478a38046e52d90d5b24456242
@climblinne
Move check for local file into SCM tools, to individually check it fo…
a0707cf 
…r SVN & Git.

Change-Id: I6cbabd464feca02e5b6ba78099f8775f61f41d80
@climblinne
Copy link
Author

I added some changes to the code.
I still don't know, what you want to do with the SVN.get_repo_root().
When I use the last changed rev on the repo root it should be identical to the revision. But I would need the rev number of the current folder (in the SVN tree).

We have normally multiple repositories in one SVN repository, which uses different paths.

@climblinne
Make exception message one-line.
19786cb 
Change-Id: I97b0ad4cef164b1d1001c97e96305f8a54be238d
@climblinne
Merge branch 'issue-3130' of https://github.com/jgsogo/conan into iss…
5b115cb 
…ue-3130

Change-Id: I9c935f80b3d1f89407cba62f02b3565f1ae7a436
jgsogo
jgsogo reviewed Sep 7, 2018
View reviewed changes
Copy link
Owner

@jgsogo jgsogo left a comment

Choose a reason for hiding this comment

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

Change these details and I will merge the PR into mine so we can check against the test suite of Conan itself.

conans/client/tools/scm.py Outdated Show resolved Hide resolved
conans/client/tools/scm.py Outdated Show resolved Hide resolved
conans/client/tools/scm.py Show resolved Hide resolved
conans/client/cmd/export.py Show resolved Hide resolved
@climblinne
Removed SVN peg revision from get_revision()
f08be2b 
Change-Id: If0a6cbfd46de014045185a9a9825b6052c6fc2bc
@climblinne
Reuse exiting function in get_qualified_remote_url for SVN
768ba0a 
Change-Id: Ia448a903a61f1c4a77c267652758653b2c6a74d4
@climblinne
Use as a default option the working copy root for determining the `ge…
46e1bf8 
…t_last_changed_revision`

Change-Id: I6a98787b2790547149e247c49015d5a50090b214
@climblinne
Add is_pristine()for Git
2f99787 
Complete `get_last_changed_revision` in SVN

Change-Id: Ia0882eee0d355f7cc060b15f8f99212f79d35532
@jgsogo
Copy link
Owner

jgsogo commented Sep 11, 2018 •
edited

@climblinne , just waiting for my PR on your branch to be accepted ;D

https://github.com/climblinne/conan/pull/1

@jgsogo jgsogo merged commit 65ff4ef into jgsogo:issue-3130 Sep 11, 2018
jgsogo pushed a commit that referenced this pull request Nov 25, 2019
@nicememory
Merge pull request #2 from conan-io/develop
36b1fd6 
Merge code from conan.io
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lasote lasote lasote left review comments

@jgsogo jgsogo jgsogo approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@climblinne @jgsogo @lasote