Summary

Make repository select the deepest repository in the directory tree

Review Request #9620 — Created Feb. 11, 2018 and submitted June 4, 2018, 1:43 p.m.

Information

Owner

maram

Repository

RBTools

Branch

release-0.7.x

Bugs

Depends On

Commit

7a16851...

Reviewers

Groups

rbtools, students

People

Description

Without the presence of a .reviewboardrc file which defines
REPOSITORY_TYPE, RBTools will try to auto-detect the repository type by running
various commands like "svn info", "hg root", etc. This will run through each
repository type until one is found that works.

Unfortunately, if people have nested repositories, this means
RBTools can select the wrong one. For example, some people may have
/home/user/ as a git directory, and /home/user/src/project/ is a subversion
checkout, running "rbt" within their "project" directory may detect it as git
instead of svn.

This change auto-detects all repository types, and then selects the
deepest one. In the case of multiple matching repositories, we output a
warning suggesting that people define REPOSITORY_TYPE in .reviewboardrc in
order to speed up detection.

Testing Done


Tested combinations of nested svn, git, hg repos.
All unit tests pass.

Issues

Description	From	Last Updated
Can you wrap your description to 70 columns?	david	March 18, 2018, 5:23 p.m.
E265 block comment should start with '# '	reviewbot	March 2, 2018, 2:41 p.m.
E501 line too long (98 > 79 characters)	reviewbot	March 2, 2018, 2:41 p.m.
E501 line too long (83 > 79 characters)	reviewbot	March 2, 2018, 2:41 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:47 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:47 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:47 p.m.
E501 line too long (95 > 79 characters)	reviewbot	March 2, 2018, 2:47 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:47 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:47 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:47 p.m.
E265 block comment should start with '# '	reviewbot	March 2, 2018, 2:47 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:47 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:47 p.m.
E501 line too long (80 > 79 characters)	reviewbot	March 2, 2018, 2:47 p.m.
E265 block comment should start with '# '	reviewbot	March 2, 2018, 2:47 p.m.
E501 line too long (110 > 79 characters)	reviewbot	March 2, 2018, 2:47 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:47 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:47 p.m.
E501 line too long (80 > 79 characters)	reviewbot	March 2, 2018, 2:47 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:47 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:47 p.m.
E501 line too long (80 > 79 characters)	reviewbot	March 2, 2018, 2:47 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:48 p.m.
E501 line too long (80 > 79 characters)	reviewbot	March 2, 2018, 2:48 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:48 p.m.
E501 line too long (82 > 79 characters)	reviewbot	March 2, 2018, 2:42 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:48 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:42 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:42 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:42 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:42 p.m.
E501 line too long (95 > 79 characters)	reviewbot	March 2, 2018, 2:42 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:42 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:42 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:42 p.m.
E265 block comment should start with '# '	reviewbot	March 2, 2018, 2:42 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:42 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:42 p.m.
E501 line too long (80 > 79 characters)	reviewbot	March 2, 2018, 2:42 p.m.
E265 block comment should start with '# '	reviewbot	March 2, 2018, 2:42 p.m.
E501 line too long (110 > 79 characters)	reviewbot	March 2, 2018, 2:42 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:42 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:42 p.m.
E501 line too long (80 > 79 characters)	reviewbot	March 2, 2018, 2:42 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:42 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:42 p.m.
E501 line too long (80 > 79 characters)	reviewbot	March 2, 2018, 2:42 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:43 p.m.
E501 line too long (80 > 79 characters)	reviewbot	March 2, 2018, 2:43 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:43 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:43 p.m.
E501 line too long (82 > 79 characters)	reviewbot	March 2, 2018, 2:43 p.m.
E266 too many leading '#' for block comment	reviewbot	March 2, 2018, 2:43 p.m.
E261 at least two spaces before inline comment	reviewbot	Feb. 25, 2018, 9:13 a.m.
E114 indentation is not a multiple of four (comment)	reviewbot	Feb. 25, 2018, 9:13 a.m.
E116 unexpected indentation (comment)	reviewbot	Feb. 25, 2018, 9:13 a.m.
E114 indentation is not a multiple of four (comment)	reviewbot	Feb. 25, 2018, 9:13 a.m.
E116 unexpected indentation (comment)	reviewbot	Feb. 25, 2018, 9:13 a.m.
E126 continuation line over-indented for hanging indent	reviewbot	Feb. 25, 2018, 9:13 a.m.
E261 at least two spaces before inline comment	reviewbot	Feb. 25, 2018, 9:13 a.m.
E114 indentation is not a multiple of four (comment)	reviewbot	Feb. 25, 2018, 9:13 a.m.
E116 unexpected indentation (comment)	reviewbot	Feb. 25, 2018, 9:13 a.m.
E501 line too long (80 > 79 characters)	reviewbot	Feb. 25, 2018, 9:13 a.m.
E251 unexpected spaces around keyword / parameter equals	reviewbot	March 6, 2018, 4:24 p.m.
E501 line too long (86 > 79 characters)	reviewbot	Feb. 25, 2018, 9:26 a.m.
E251 unexpected spaces around keyword / parameter equals	reviewbot	Feb. 25, 2018, 9:26 a.m.
E261 at least two spaces before inline comment	reviewbot	Feb. 25, 2018, 9:27 a.m.
E114 indentation is not a multiple of four (comment)	reviewbot	Feb. 25, 2018, 9:27 a.m.
E116 unexpected indentation (comment)	reviewbot	Feb. 25, 2018, 9:27 a.m.
E251 unexpected spaces around keyword / parameter equals	reviewbot	March 6, 2018, 4:25 p.m.
E261 at least two spaces before inline comment	reviewbot	Feb. 25, 2018, 9:28 a.m.
E114 indentation is not a multiple of four (comment)	reviewbot	Feb. 25, 2018, 9:28 a.m.
E116 unexpected indentation (comment)	reviewbot	Feb. 25, 2018, 9:29 a.m.
E501 line too long (80 > 79 characters)	reviewbot	March 2, 2018, 3:09 p.m.
F841 local variable 'local_root' is assigned to but never used	reviewbot	March 2, 2018, 3:03 p.m.
W293 blank line contains whitespace	reviewbot	March 2, 2018, 3:03 p.m.
E501 line too long (80 > 79 characters)	reviewbot	March 6, 2018, 4:25 p.m.
E303 too many blank lines (2)	reviewbot	March 2, 2018, 3:12 p.m.
E501 line too long (80 > 79 characters)	reviewbot	March 2, 2018, 3:13 p.m.
E501 line too long (80 > 79 characters)	reviewbot	March 2, 2018, 3:24 p.m.
These should be in alphabetical order.	david	March 18, 2018, 5:56 p.m.
Should be "self.path". Even though it's starting a sentence, self refers to a symbol.	david	March 18, 2018, 5:57 p.m.
There's an extra space at the beginning of this comment line.	david	March 18, 2018, 5:57 p.m.
Add a blank line between these (we like to have a bit of space before and after blocks)	david	March 18, 2018, 5:57 p.m.
Add a blank line between these.	david	March 18, 2018, 6:21 p.m.
Hmmm. We should probably just make sure that get_repository_info doesn't change things. Needing a special case here is ugly.	david	June 4, 2018, 1:43 p.m.
Add a blank line between these.	david	March 18, 2018, 6:08 p.m.
We generally prefer to have the joining space at the end of the previous line instead of the beginning of …	david	March 18, 2018, 6:08 p.m.
Blank line between these.	david	March 18, 2018, 6:08 p.m.
Blank line between these.	david	March 18, 2018, 6:09 p.m.
Blank line between these.	david	March 18, 2018, 6:09 p.m.
Also not necessary if we fix up GitClient.	david	June 4, 2018, 1:43 p.m.
This looks like leftover debug output. Can we get rid of it?	david	April 2, 2018, 6:14 a.m.
More fallout from GitClient being dumb.	david	June 4, 2018, 1:43 p.m.
And here.	david	June 4, 2018, 1:43 p.m.
Blank line between these.	david	March 18, 2018, 6:11 p.m.
I think this function might be a bit too long. Might be a good idea to break it up, for …	rpolyano	April 2, 2018, 1:21 p.m.
Too many blank lines here now.	david	March 18, 2018, 6:12 p.m.
Not enough blank lines here now.	david	March 18, 2018, 6:12 p.m.
Blank line here.	david	March 18, 2018, 6:13 p.m.
Would it make sense to move all of these Regexes out into one place and a) have them organized by …	rpolyano	April 2, 2018, 1:21 p.m.
Blank line here.	david	March 18, 2018, 6:13 p.m.
Blank line here.	david	March 18, 2018, 6:13 p.m.
Blank line here.	david	March 18, 2018, 6:22 p.m.
This should fit all on one line.	david	March 18, 2018, 6:20 p.m.
From my understanding, the idea here is to find the deepest repo in terms of directory depth right? Using the …	jshephard	March 26, 2018, 11:10 p.m.
This would wrap more nicely as: if (repo.local_root and len(os.path.normpath(repo.local_root)) > deepest_repo):	david	April 2, 2018, 6:13 a.m.
Does the >>>>>>>> mean anything or is it a part of the reviewboard UI?	JT jtrang	March 26, 2018, 11:02 p.m.
Oh I see! That makes a lot more sense. Thank you!	JT jtrang	March 30, 2018, 8:44 p.m.
Please use single quotes instead of double, and add a blank line above this.	david	April 2, 2018, 6:14 a.m.
Same comment as above. I'm not sure if the chevrons are appearing as part of the UI or not.	JT jtrang	March 26, 2018, 11:03 p.m.

flake8 failed.

JSHint passed.

flake8

rbtools/clients/__init__.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E265 block comment should start with '# '
```
rbtools/clients/__init__.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E501 line too long (98 > 79 characters)
```
rbtools/clients/__init__.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E501 line too long (83 > 79 characters)
```
rbtools/commands/__init__.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/main.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/main.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/main.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E501 line too long (95 > 79 characters)
```
rbtools/commands/main.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/post.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/post.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/post.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E265 block comment should start with '# '
```
rbtools/commands/post.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/post.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/post.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E501 line too long (80 > 79 characters)
```
rbtools/commands/setup_repo.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E265 block comment should start with '# '
```
rbtools/commands/setup_repo.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E501 line too long (110 > 79 characters)
```
rbtools/commands/setup_repo.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/setup_repo.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/setup_repo.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E501 line too long (80 > 79 characters)
```
rbtools/commands/setup_repo.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/setup_repo.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/setup_repo.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E501 line too long (80 > 79 characters)
```
rbtools/commands/setup_repo.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/setup_repo.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E501 line too long (80 > 79 characters)
```
rbtools/commands/setup_repo.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/setup_repo.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E501 line too long (82 > 79 characters)
```
rbtools/commands/setup_repo.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/setup_repo.py (Diff revision 1)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```

Change Summary:

Check if git changes the CWD, roll back until other clients find their repos, and then find deepest repo. Cannot stop gitClient from changing CWD as that ensures diffs on server are not messed up. Check if git changes the CWD, roll back until other clients find their repos, and then find deepest. Cannot stop gitClient from changing CWD as that ensures diffs on server are not messed up.

Diff:

Revision 2 (+186 -72)

Show changes

	dev-requirements.txt
	rbtools/clients/__init__.py
	rbtools/clients/bazaar.py
	rbtools/clients/clearcase.py
	rbtools/clients/cvs.py
	rbtools/clients/git.py
	rbtools/clients/mercurial.py
	rbtools/clients/perforce.py
	13 more

Checks run (1 failed, 1 succeeded)

flake8 failed.

JSHint passed.

flake8

rbtools/commands/__init__.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/main.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/main.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/main.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (95 > 79 characters)
```
rbtools/commands/main.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/post.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/post.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/post.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E265 block comment should start with '# '
```
rbtools/commands/post.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/post.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/post.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (80 > 79 characters)
```
rbtools/commands/setup_repo.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E265 block comment should start with '# '
```
rbtools/commands/setup_repo.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (110 > 79 characters)
```
rbtools/commands/setup_repo.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/setup_repo.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/setup_repo.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (80 > 79 characters)
```
rbtools/commands/setup_repo.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/setup_repo.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/setup_repo.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (80 > 79 characters)
```
rbtools/commands/setup_repo.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/setup_repo.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (80 > 79 characters)
```
rbtools/commands/setup_repo.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/setup_repo.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```
rbtools/commands/setup_repo.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (82 > 79 characters)
```
rbtools/commands/setup_repo.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E266 too many leading '#' for block comment
```

Branch:

-	master
+	deepestrepo

Description:

		Without the presence of a .reviewboardrc file which defines REPOSITORY_TYPE, RBTools will try to auto-detect the repository type by running various commands like "svn info", "hg root", etc. This will run through each repository type until one is found that works.

~		Unfortunately, if people have nested repositories, this means RBTools can select the wrong one. For example, some people may have /home/user/ as a git directory, and /home/user/src/project/ is a subversion checkout, running "rbt" within their "project" directory may detect it as git instead of svn. We'd like to auto-detect all repository types, and then select the deepest one.
	~	Unfortunately, if people have nested repositories, this means RBTools can select the wrong one. For example, some people may have /home/user/ as a git directory, and /home/user/src/project/ is a subversion checkout, running "rbt" within their "project" directory may detect it as git instead of svn. This change auto-detects all repository types, and then selects the deepest one.

~		In the case of multiple matching repositories, we may want to output a warning suggesting that people define REPOSITORY_TYPE in .reviewboardrc in order to speed up detection.
	~	In the case of multiple matching repositories, we output a warning suggesting that people define REPOSITORY_TYPE in .reviewboardrc in order to speed up detection.

Commit:

-	1b9c14f1524fb0f4d12834f8fdfef956bddc54e1
+	33dde16cf2afda0204792f8e01a38f75631e8470

Diff:

Revision 3 (+247 -117)

Show changes

	dev-requirements.txt
	rbtools/clients/__init__.py
	rbtools/clients/bazaar.py
	rbtools/clients/clearcase.py
	rbtools/clients/cvs.py
	rbtools/clients/git.py
	rbtools/clients/mercurial.py
	rbtools/clients/perforce.py
	13 more

Checks run (1 failed, 1 succeeded)

flake8 failed.

JSHint passed.

flake8

rbtools/clients/__init__.py (Diff revision 3)
The issue has been dropped. Show all issues
```
E261 at least two spaces before inline comment
```
rbtools/clients/__init__.py (Diff revision 3)
The issue has been dropped. Show all issues
```
E114 indentation is not a multiple of four (comment)
```
rbtools/clients/__init__.py (Diff revision 3)
The issue has been dropped. Show all issues
```
E116 unexpected indentation (comment)
```
rbtools/clients/__init__.py (Diff revision 3)
The issue has been dropped. Show all issues
```
E114 indentation is not a multiple of four (comment)
```
rbtools/clients/__init__.py (Diff revision 3)
The issue has been dropped. Show all issues
```
E116 unexpected indentation (comment)
```
rbtools/clients/__init__.py (Diff revision 3)
The issue has been dropped. Show all issues
```
E126 continuation line over-indented for hanging indent
```
rbtools/clients/cvs.py (Diff revision 3)
The issue has been dropped. Show all issues
```
E261 at least two spaces before inline comment
```
rbtools/clients/cvs.py (Diff revision 3)
The issue has been dropped. Show all issues
```
E114 indentation is not a multiple of four (comment)
```
rbtools/clients/cvs.py (Diff revision 3)
The issue has been dropped. Show all issues
```
E116 unexpected indentation (comment)
```
rbtools/clients/git.py (Diff revision 3)
The issue has been dropped. Show all issues
```
E501 line too long (80 > 79 characters)
```
rbtools/clients/git.py (Diff revision 3)
The issue has been dropped. Show all issues
```
E251 unexpected spaces around keyword / parameter equals
```
rbtools/clients/mercurial.py (Diff revision 3)
The issue has been dropped. Show all issues
```
E501 line too long (86 > 79 characters)
```
rbtools/clients/perforce.py (Diff revision 3)
The issue has been dropped. Show all issues
```
E251 unexpected spaces around keyword / parameter equals
```
rbtools/clients/plastic.py (Diff revision 3)
The issue has been dropped. Show all issues
```
E261 at least two spaces before inline comment
```
rbtools/clients/plastic.py (Diff revision 3)
The issue has been dropped. Show all issues
```
E114 indentation is not a multiple of four (comment)
```
rbtools/clients/plastic.py (Diff revision 3)
The issue has been dropped. Show all issues
```
E116 unexpected indentation (comment)
```
rbtools/clients/svn.py (Diff revision 3)
The issue has been dropped. Show all issues
```
E251 unexpected spaces around keyword / parameter equals
```
rbtools/clients/tfs.py (Diff revision 3)
The issue has been dropped. Show all issues
```
E261 at least two spaces before inline comment
```
rbtools/clients/tfs.py (Diff revision 3)
The issue has been dropped. Show all issues
```
E114 indentation is not a multiple of four (comment)
```
rbtools/clients/tfs.py (Diff revision 3)
The issue has been dropped. Show all issues
```
E116 unexpected indentation (comment)
```

Change Summary:

Rebased the branch on release-0.7.x to avoid rbt post error after new changes on master were pulled.

Testing Done:

~		Tested combinations of nested svn and git repos, both were unaffected by this issue.
	~	Tested combinations of nested svn, git, hg repos
-		Tested mercurial repo nested in a git repo.

Branch:

-	deepestrepo
+	release-0.7.x

Commit:

-	33dde16cf2afda0204792f8e01a38f75631e8470
+	6996a3346f42ac105c9025ef413ea7646f9a7e71

Diff:

Revision 4 (+102 -46)

Show changes

	rbtools/clients/__init__.py
	rbtools/clients/bazaar.py
	rbtools/clients/cvs.py
	rbtools/clients/git.py
	rbtools/clients/mercurial.py
	rbtools/clients/perforce.py
	rbtools/clients/plastic.py
	rbtools/clients/svn.py
	3 more

Checks run (1 failed, 1 succeeded)

flake8 failed.

JSHint passed.

flake8

rbtools/clients/git.py (Diff revision 4)
The issue has been dropped. Show all issues
```
E501 line too long (80 > 79 characters)
```
rbtools/clients/svn.py (Diff revision 4)
The issue has been dropped. Show all issues
```
F841 local variable 'local_root' is assigned to but never used
```
rbtools/commands/setup_repo.py (Diff revision 4)
The issue has been dropped. Show all issues
```
W293 blank line contains whitespace
```

Diff:

Revision 5 (+104 -46)

Show changes

	rbtools/clients/__init__.py
	rbtools/clients/bazaar.py
	rbtools/clients/cvs.py
	rbtools/clients/git.py
	rbtools/clients/mercurial.py
	rbtools/clients/perforce.py
	rbtools/clients/plastic.py
	rbtools/clients/svn.py
	2 more

Checks run (1 failed, 1 succeeded)

flake8 failed.

JSHint passed.

flake8

rbtools/clients/git.py (Diff revision 5)
The issue has been dropped. Show all issues
```
E501 line too long (80 > 79 characters)
```
rbtools/clients/svn.py (Diff revision 5)
The issue has been dropped. Show all issues
```
E303 too many blank lines (2)
```

Testing Done:

~		Tested combinations of nested svn, git, hg repos
	~	Tested combinations of nested svn, git, hg repos.

Diff:

Revision 6 (+103 -46)

Show changes

	rbtools/clients/__init__.py
	rbtools/clients/bazaar.py
	rbtools/clients/cvs.py
	rbtools/clients/git.py
	rbtools/clients/mercurial.py
	rbtools/clients/perforce.py
	rbtools/clients/plastic.py
	rbtools/clients/svn.py
	2 more

Checks run (1 failed, 1 succeeded)

flake8 failed.

JSHint passed.

flake8

rbtools/clients/git.py (Diff revision 6)
The issue has been dropped. Show all issues
```
E501 line too long (80 > 79 characters)
```

Summary:

-	[WIP] Make repository select the deepest repository in the directory tree
+	Make repository select the deepest repository in the directory tree

Testing Done:

		Tested combinations of nested svn, git, hg repos.
	+	All unit tests pass.

Diff:

Revision 7 (+104 -46)

Show changes

	rbtools/clients/__init__.py
	rbtools/clients/bazaar.py
	rbtools/clients/cvs.py
	rbtools/clients/git.py
	rbtools/clients/mercurial.py
	rbtools/clients/perforce.py
	rbtools/clients/plastic.py
	rbtools/clients/svn.py
	2 more

Checks run (1 failed, 1 succeeded)

flake8 failed.

JSHint passed.

flake8

rbtools/clients/git.py (Diff revision 7)
The issue has been dropped. Show all issues
```
E501 line too long (80 > 79 characters)
```

Change Summary:

Fixed spacing issues

Commit:

-	6996a3346f42ac105c9025ef413ea7646f9a7e71
+	a2d2924edc36a72f8bad3a4c2d01dfe7fd858574

Diff:

Revision 8 (+106 -46)

Show changes

	rbtools/clients/__init__.py
	rbtools/clients/bazaar.py
	rbtools/clients/cvs.py
	rbtools/clients/git.py
	rbtools/clients/mercurial.py
	rbtools/clients/perforce.py
	rbtools/clients/plastic.py
	rbtools/clients/svn.py
	2 more

Checks run (2 succeeded)

flake8 passed.

JSHint passed.

The issue has been resolved. Show all issues

Can you wrap your description to 70 columns?

rbtools/clients/__init__.py (Diff revision 8)
The issue has been resolved. Show all issues
```
These should be in alphabetical order.
```

rbtools/clients/__init__.py (Diff revision 8)

The issue has been resolved. Show all issues

Should be "self.path". Even though it's starting a sentence, self refers to a symbol.

rbtools/clients/__init__.py (Diff revision 8)
The issue has been resolved. Show all issues
```
There's an extra space at the beginning of this comment line.
```

rbtools/clients/__init__.py (Diff revision 8)

The issue has been resolved. Show all issues

Add a blank line between these (we like to have a bit of space before and after blocks)

rbtools/clients/__init__.py (Diff revision 8)
The issue has been resolved. Show all issues
```
Add a blank line between these.
```

rbtools/clients/__init__.py (Diff revision 8)

The issue has been resolved. Show all issues

Hmmm. We should probably just make sure that get_repository_info doesn't change things. Needing a special case here is ugly.

maram April 2, 2018, 2:54 p.m.

Should I create a separate function to handle chdir for GitClient and have all calls to GitCleint.get_repository_info() call that function as well? 

(GitClient.get_repository_info() has been doing the directory change for quite some time (https://reviews.reviewboard.org/r/2960/diff/1/#))

rbtools/clients/__init__.py (Diff revision 8)
The issue has been resolved. Show all issues
```
Add a blank line between these.
```

rbtools/clients/__init__.py (Diff revision 8)

The issue has been resolved. Show all issues

We generally prefer to have the joining space at the end of the previous line instead of the beginning of the next.

rbtools/clients/__init__.py (Diff revision 8)
The issue has been resolved. Show all issues
```
Blank line between these.
```
rbtools/clients/__init__.py (Diff revision 8)
The issue has been resolved. Show all issues
```
Blank line between these.
```
rbtools/clients/__init__.py (Diff revision 8)
The issue has been resolved. Show all issues
```
Blank line between these.
```
rbtools/clients/__init__.py (Diff revision 8)
The issue has been resolved. Show all issues
```
Also not necessary if we fix up GitClient.
```

rbtools/clients/__init__.py (Diff revision 8)

The issue has been resolved. Show all issues

This looks like leftover debug output. Can we get rid of it?

maram April 2, 2018, 2:54 p.m.

I thought it would be helpful to have that as part of the output when -debug is specified... Unneccessary? Better phrasing maybe?

rbtools/clients/__init__.py (Diff revision 8)
The issue has been resolved. Show all issues
```
More fallout from GitClient being dumb.
```
rbtools/clients/__init__.py (Diff revision 8)
The issue has been resolved. Show all issues
```
And here.
```
rbtools/clients/cvs.py (Diff revision 8)
The issue has been resolved. Show all issues
```
Blank line between these.
```
rbtools/clients/git.py (Diff revision 8)
The issue has been resolved. Show all issues
```
Too many blank lines here now.
```
rbtools/clients/git.py (Diff revision 8)
The issue has been resolved. Show all issues
```
Not enough blank lines here now.
```
rbtools/clients/git.py (Diff revision 8)
The issue has been resolved. Show all issues
```
Blank line here.
```
rbtools/clients/git.py (Diff revision 8)
The issue has been resolved. Show all issues
```
Blank line here.
```
rbtools/clients/perforce.py (Diff revision 8)
The issue has been resolved. Show all issues
```
Blank line here.
```
rbtools/clients/svn.py (Diff revision 8)
The issue has been resolved. Show all issues
```
Blank line here.
```
rbtools/clients/svn.py (Diff revision 8)
The issue has been resolved. Show all issues
```
This should fit all on one line.
```

rbtools/clients/git.py (Diff revision 8)

The issue has been resolved. Show all issues

I think this function might be a bit too long. Might be a good idea to break it up, for example some of the if/branches can be separate functions.

rbtools/clients/git.py (Diff revision 8)

The issue has been resolved. Show all issues

Would it make sense to move all of these Regexes out into one place and a) have them organized by version ranges (e.x. git may change these in some version) and b) compile them

Description:

~		Without the presence of a .reviewboardrc file which defines REPOSITORY_TYPE, RBTools will try to auto-detect the repository type by running various commands like "svn info", "hg root", etc. This will run through each repository type until one is found that works.
	~	Without the presence of a .reviewboardrc file which defines
	+	REPOSITORY_TYPE, RBTools will try to auto-detect the repository type by running
	+	various commands like "svn info", "hg root", etc. This will run through each
	+	repository type until one is found that works.

~		Unfortunately, if people have nested repositories, this means RBTools can select the wrong one. For example, some people may have /home/user/ as a git directory, and /home/user/src/project/ is a subversion checkout, running "rbt" within their "project" directory may detect it as git instead of svn. This change auto-detects all repository types, and then selects the deepest one.
	~	Unfortunately, if people have nested repositories, this means
	+	RBTools can select the wrong one. For example, some people may have
	+	/home/user/ as a git directory, and /home/user/src/project/ is a subversion
	+	checkout, running "rbt" within their "project" directory may detect it as git
	+	instead of svn.

~		In the case of multiple matching repositories, we output a warning suggesting that people define REPOSITORY_TYPE in .reviewboardrc in order to speed up detection.
	~	This change auto-detects all repository types, and then selects the
	+	deepest one. In the case of multiple matching repositories, we output a
	+	warning suggesting that people define REPOSITORY_TYPE in .reviewboardrc in
	+	order to speed up detection.

Commit:

-	a2d2924edc36a72f8bad3a4c2d01dfe7fd858574
+	7a16851cc4b4cc37183d14a7e882dbdbfa74ac16

Diff:

Revision 9 (+113 -44)

Show changes

	rbtools/clients/__init__.py
	rbtools/clients/bazaar.py
	rbtools/clients/cvs.py
	rbtools/clients/git.py
	rbtools/clients/mercurial.py
	rbtools/clients/perforce.py
	rbtools/clients/plastic.py
	rbtools/clients/svn.py
	2 more

Checks run (2 succeeded)

flake8 passed.

JSHint passed.

rbtools/clients/__init__.py (Diff revision 9)

The issue has been dropped. Show all issues

From my understanding, the idea here is to find the deepest repo in terms of directory depth right? Using the length of the path to determine this might result in selecting a repo that is in a directory with a large name over another repo that is deeper.

I'm not sure if this is an issue here though, as your description makes it sound like you're just looking at parent directories of the user's current working directory. In that case this is a non-issue.

david March 26, 2018, 11:10 p.m.

Good insticts asking this question, but your caveat is correct--the selected directories will always be parents of the cwd.

rbtools/clients/__init__.py (Diff revision 9)

The issue has been dropped. Show all issues

Does the >>>>>>>> mean anything or is it a part of the reviewboard UI?

david March 26, 2018, 11:02 p.m.

This is Review Board's diff viewer showing that the code was indented but otherwise unchanged.

rbtools/clients/git.py (Diff revision 9)

The issue has been dropped. Show all issues

Same comment as above. I'm not sure if the chevrons are appearing as part of the UI or not.

rbtools/clients/__init__.py (Diff revision 9)

The issue has been resolved. Show all issues

This would wrap more nicely as:

if (repo.local_root and
    len(os.path.normpath(repo.local_root)) > deepest_repo):

rbtools/clients/__init__.py (Diff revision 9)
The issue has been resolved. Show all issues
```
Please use single quotes instead of double, and add a blank line above this.
```

rbtools/clients/__init__.py (Diff revision 9)
The issue has been resolved. Show all issues
```
Oh I see! That makes a lot more sense. Thank you!
```

Diff:

Revision 10 (+192 -98)

Show changes

	rbtools/clients/__init__.py
	rbtools/clients/bazaar.py
	rbtools/clients/cvs.py
	rbtools/clients/git.py
	rbtools/clients/mercurial.py
	rbtools/clients/perforce.py
	rbtools/clients/plastic.py
	rbtools/clients/svn.py
	2 more

Checks run (2 timed out)

flake8 timed out.

JSHint timed out.

Ship it!

Fixed up remaining issues and landing. Thanks!

Status: Closed (submitted)

Change Summary:

Pushed to release-1.0.x (72dc722)