[PATCH 1/1] git-p4: correct hasBranchPrefix verbose output

Subsystems: the rest

STALE3730d

2 messages, 2 authors, 2016-06-21 · open the first message on its own page

[PATCH 1/1] git-p4: correct hasBranchPrefix verbose output

From: Andrew Oakley <hidden>
Date: 2016-06-21 16:30:57

The logic here was inverted, you got a message saying the file is
ignored for each file that is not ignored.
---
 git-p4.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-p4.py b/git-p4.py
index b6593cf..b123aa2 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -2674,7 +2674,7 @@ class P4Sync(Command, P4UserMap):
             return True
         hasPrefix = [p for p in self.branchPrefixes
                         if p4PathStartsWith(path, p)]
-        if hasPrefix and self.verbose:
+        if not hasPrefix and self.verbose:
             print('Ignoring file outside of prefix: {0}'.format(path))
         return hasPrefix
 
-- 
2.7.3

Re: [PATCH 1/1] git-p4: correct hasBranchPrefix verbose output

From: Lars Schneider <hidden>
Date: 2016-06-21 18:05:46

quoted hunk
On 21 Jun 2016, at 15:53, Andrew Oakley [off-list ref] wrote:

The logic here was inverted, you got a message saying the file is
ignored for each file that is not ignored.
---
git-p4.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-p4.py b/git-p4.py
index b6593cf..b123aa2 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -2674,7 +2674,7 @@ class P4Sync(Command, P4UserMap):
            return True
        hasPrefix = [p for p in self.branchPrefixes
                        if p4PathStartsWith(path, p)]
-        if hasPrefix and self.verbose:
+        if not hasPrefix and self.verbose:
Thanks Andrew! Your fix is correct.

- Lars
            print('Ignoring file outside of prefix: {0}'.format(path))
        return hasPrefix

-- 
2.7.3

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help