threads / patch / 42686

patchgit-p4: Fix verbose printing

Subject: [PATCH] git-p4: Fix verbose printing

## tl;dr

One message between Jun 22, 2016 and Jun 22, 2016. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Ben Widawsky· Jun 22, 2016, 05:10 UTC · lore

The current logic seems to invert the error message when using verbose messages. The inversion seems to be indicated by the caller: if self.inClientSpec(f['path']) and self.hasBranchPrefix(f['path'])]

This behavior has existed since the original commit:
commit 4ae048e67e5f0d786b9febc438433d95f18e5937
Author: Lars Schneider <larsxschneider@gmail.com>
Date:   Tue Dec 8 10:36:22 2015 +0100
    git-p4: add option to keep empty commits

Note that there are no behavioral changes with this patch since the code did the right thing, just with the wrong messages.

Cc: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---
 git-p4.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to git-p4.py +1 −1
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.9.0

← back to recent threads