This is a reworked version of my earlier patches for adding improved label import/export support to "git p4", and incorporates comments from Pete Wyckoff and Junio: Comments from Pete: * The verbose flag has been hoisted to the Command class. * Uses the existing functions to fish out p4 changelist numbers. * Config options renamed to be self-consistent, and regexp now includes lower-case characters. I have left the tests in t9811 where they are, so that the t9804 script can be used solely for "--detect-labels". Comments from Junio: * P4EDITOR is set to the always-true value in the test harness * Treat an empty P4EDITOR the same as an unset P4EDITOR. There was a discussion about having "git p4" fall back to a default in the same way that "p4" does, but this would change the existing behavior (use git var GIT_EDITOR) and confuse users. This patch series was reworked against ld/git-p4-tags-and-labels and also has a very small documentation fix. Luke Diamand (5): git p4: Fixing script editor checks git p4: Squash P4EDITOR in test harness git p4: Ignore P4EDITOR if it is empty git p4: import/export of labels to/from p4 git p4: move verbose to base class Documentation/git-p4.txt | 54 ++++++-- git-p4.py | 289 ++++++++++++++++++++++++++++++++-------- t/lib-git-p4.sh | 1 + t/t9800-git-p4-basic.sh | 4 +- t/t9811-git-p4-label-import.sh | 202 ++++++++++++++++++++++++++++ 5 files changed, 482 insertions(+), 68 deletions(-) create mode 100755 t/t9811-git-p4-label-import.sh -- 1.7.10.381.gb484f -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html