From: Pete Wyckoff Date: Tue, 17 Jan 2012 22:39:49 GMT Subject: Re: [PATCH 1/4] git-p4: handle p4 branches and labels containing shell chars Message-ID: <20120117223949.GA811@padd.com> In-Reply-To: <1326755689-3344-2-git-send-email-luke@diamand.org> luke@diamand.org wrote on Mon, 16 Jan 2012 23:14 +0000: > Don't use shell expansion when detecting branches, as it will > fail if the branch name contains a shell metachar. Similarly > for labels. > > Add additional test for branches with shell metachars. Nice. There will be a fixup on a command in Vitor's series, depending on which goes first. He'll have a couple of un-listified read_pipe{,_lines} that we should treat similarly. > @@ -1758,7 +1758,7 @@ class P4Sync(Command, P4UserMap): > def getLabels(self): > self.labels = {} > > - l = p4CmdList("labels %s..." % ' '.join (self.depotPaths)) > + l = p4CmdList(["labels", "%s..." % ' '.join (self.depotPaths)]) > if len(l) > 0 and not self.silent: > print "Finding files belonging to labels in %s" % `self.depotPaths` I suspect the command "p4" "labels" "//depot/foo/... //depot/bar/..." might confuse p4, but haven't tested. Maybe tuck each one in its own argument? ["labels"] + ["%s..." % p for p in self.depotPaths] What happened to your failing test? It's fun to keep the broken ones around to inspire others to fix them. -- Pete