[v3,0/8] git-p4: a few assorted fixes for branches, excludes

Message

Mazo, Andrey April 1, 2019, 6:02 p.m. UTC

This series fixes a few cases with branch detection
and handling of excludes by git-p4.

This is the third iteration of the patch series.
Changes since v2 [2]:
 * Added new test cases for case-insensitive branch detection.
Changes since v1 [1]:
 * Added new test case for excluded paths when detecting branches;
 * Added a new fix for excluded paths when detecting branches.

[1] https://public-inbox.org/git/[e-mail]
[2] https://public-inbox.org/git/[e-mail]/

Range-diff vs v2:
1:  3ac39171d4 = 1:  bd009a5ca5 git-p4: detect/prevent infinite loop in gitCommitByP4Change()
2:  e644a8ab49 < -:  ---------- git-p4: match branches case insensitively if configured
-:  ---------- > 2:  68b68ce1e4 git-p4: add failing test for "git-p4: match branches case insensitively if configured"
-:  ---------- > 3:  6eaad2582c git-p4: match branches case insensitively if configured
3:  44fed954dc = 4:  1bd5e170e0 git-p4: don't groom exclude path list on every commit
4:  a0d3fa6add = 5:  b657967154 git-p4: add failing test for "don't exclude other files with same prefix"
5:  3330f88a0d = 6:  035abfff2a git-p4: don't exclude other files with same prefix
6:  6170d45951 = 7:  2bde24b7e4 git-p4: add failing test for "git-p4: respect excluded paths when detecting branches"
7:  758d8e8486 = 8:  6d3ffb98a7 git-p4: respect excluded paths when detecting branches

Andrey Mazo (8):
  git-p4: detect/prevent infinite loop in gitCommitByP4Change()
  git-p4: add failing test for "git-p4: match branches case insensitively if configured"
  git-p4: match branches case insensitively if configured
  git-p4: don't groom exclude path list on every commit
  git-p4: add failing test for "don't exclude other files with same prefix"
  git-p4: don't exclude other files with same prefix
  git-p4: add failing test for "git-p4: respect excluded paths when detecting branches"
  git-p4: respect excluded paths when detecting branches

 git-p4.py                 |  44 ++++++++-----
 t/t9801-git-p4-branch.sh  | 132 ++++++++++++++++++++++++++++++++++++++
 t/t9817-git-p4-exclude.sh |  51 +++++++++++++--
 3 files changed, 205 insertions(+), 22 deletions(-)


base-commit: 8104ec994ea3849a968b4667d072fedd1e688642

Comments

Mazo, Andrey April 1, 2019, 7:54 p.m. UTC | #1

> This series fixes a few cases with branch detection
> and handling of excludes by git-p4.
> 
> This is the third iteration of the patch series.
> Changes since v2 [2]:
>  * Added new test cases for case-insensitive branch detection.

Forgot to add:
 * Added a fix for case-insensitive branch detection when running with useClientSpec enabled.
   (range diff below correctly shows the e644a8ab49 vs 6eaad2582c difference)

> Changes since v1 [1]:
>  * Added new test case for excluded paths when detecting branches;
>  * Added a new fix for excluded paths when detecting branches.
> 
> [1] https://public-inbox.org/git/[e-mail]
> [2] https://public-inbox.org/git/[e-mail]/
> 
> Range-diff vs v2:
> 1:  3ac39171d4 = 1:  bd009a5ca5 git-p4: detect/prevent infinite loop in gitCommitByP4Change()
> 2:  e644a8ab49 < -:  ---------- git-p4: match branches case insensitively if configured
> -:  ---------- > 2:  68b68ce1e4 git-p4: add failing test for "git-p4: match branches case insensitively if configured"
> -:  ---------- > 3:  6eaad2582c git-p4: match branches case insensitively if configured
> 3:  44fed954dc = 4:  1bd5e170e0 git-p4: don't groom exclude path list on every commit
> 4:  a0d3fa6add = 5:  b657967154 git-p4: add failing test for "don't exclude other files with same prefix"
> 5:  3330f88a0d = 6:  035abfff2a git-p4: don't exclude other files with same prefix
> 6:  6170d45951 = 7:  2bde24b7e4 git-p4: add failing test for "git-p4: respect excluded paths when detecting branches"
> 7:  758d8e8486 = 8:  6d3ffb98a7 git-p4: respect excluded paths when detecting branches

--
Andrey