Ignore untracked files when running checkout #57
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gold2718
requested changes
Jan 5, 2018
Collaborator
gold2718
left a comment
gold2718
left a comment
There was a problem hiding this comment.
A minor grammar nit and a question.
| if tracked: | ||
| # NOTE(bja, 2018-01) brittle hack to obtain repo dir and | ||
| # file name | ||
| path_data = filename.split('/') |
Collaborator
There was a problem hiding this comment.
Why not use repo_dir, tracked_file = os.path.split(filename) here?
| self._check_container_simple_optional_st_dirty(overall, tree) | ||
|
|
||
| def test_container_simple_untracked(self): | ||
| """Verify that a container with simple subrepos and a untracked files |
billsacks
reviewed
Jan 5, 2018
manic/repository_git.py
Outdated
| is_dirty = True | ||
| status_list = git_output.split('\0') | ||
| for item in status_list: | ||
| if item.startswith('??'): |
Member
There was a problem hiding this comment.
Another way to do this would be to add -uno to the git status command. But I'm fine with this approach if you had a reason for doing it this way.
Member
|
Thank you very much for making this change! |
bandre-ucar
added a commit
that referenced
this pull request
Jan 18, 2018
Merge remote-tracking branch 'wjs/print_command_error' Two related changes here: 1. For any failed command run via execute_subprocess, print more information about the problem to stdout 2. After doing an svn switch, check the status of the resulting repository; if dirty, abort with a helpful message The immediate purpose of both of these is to give more helpful error messages if there are failures due to the presence of untracked files, now that we attempt a checkout even if there are untracked files (via overwritten by a tracked file in the new version: git aborts the checkout with an error code; the new information printed by (1) will help users in this case svn attempts the checkout and returns a 0 error status, but may leave you in a conflict state; we check this via (2) Note that (2) should never happen currently (due to the up-front conservative check of the repository status, which doesn't even allow untracked files), but it will become possible after #57. User interface changes?: No Testing: new unit tests added for some utility functions unit tests: pass system tests: pass manual testing: For both git and svn, tested having an untracked file in the working directory that gets overwritten after checking out a new branch;
Untracked files in a git or svn external have the potential to abort a checkout and leave the sandbox in a poorly defined state that the user needs to resolve. The initial implementation refused to update if untracked files were present to prevent this. This restriction has been deamed too restrictive. It is possible to request svn to do a dry-run and determine if a checkout or switch will be successful. Git does not have a mechanism to determine if a checkout will be successful before running, and there are not any clear workarounds. For now untracked files are being ignored. If problems arise, restrictions and checks will be re-added to address specific problems. Testing: new unit tests added for new git functionality existing tests were updated to test for new behavior. python2 - make test - all tests pass, one skip.
|
Changes Unknown when pulling 013b82c on bandre-ucar:ignore-untracked-files into ** on NCAR:master**. |
1 similar comment
|
Changes Unknown when pulling 013b82c on bandre-ucar:ignore-untracked-files into ** on NCAR:master**. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Untracked files in a git or svn external have the potential to abort a checkout
and leave the sandbox in a poorly defined state that the user needs to resolve.
The initial implementation refused to update if untracked files were present to
prevent this. This restriction has been deamed too restrictive. It is possible
to request svn to do a dry-run and determine if a checkout or switch will be
successful. Git does not have a mechanism to determine if a checkout will be
successful before running, and there are not any clear workarounds.
For now untracked files are being ignored. If problems arise, restrictions and
checks will be re-added to address specific problems.
Closes: GH-51
Testing:
new unit tests added for new git functionality
existing tests were updated to test for new behavior.
python2 - make test - all tests pass, one skip.