Browse Source

git-p4: Remove --log-substitutions feature.

This turns out to be rarely useful and is already covered by git's commit.template configuration variable.

Signed-off-by: Simon Hausmann <simon@lst.de>
maint
Simon Hausmann 17 years ago
parent
commit
4b61b5c963
  1. 7
      contrib/fast-import/git-p4

7
contrib/fast-import/git-p4

@ -468,7 +468,6 @@ class P4Submit(Command): @@ -468,7 +468,6 @@ class P4Submit(Command):
optparse.make_option("--verbose", dest="verbose", action="store_true"),
optparse.make_option("--origin", dest="origin"),
optparse.make_option("--reset", action="store_true", dest="reset"),
optparse.make_option("--log-substitutions", dest="substFile"),
optparse.make_option("--direct", dest="directSubmit", action="store_true"),
optparse.make_option("-M", dest="detectRename", action="store_true"),
]
@ -477,7 +476,6 @@ class P4Submit(Command): @@ -477,7 +476,6 @@ class P4Submit(Command):
self.firstTime = True
self.reset = False
self.interactive = True
self.substFile = ""
self.firstTime = True
self.origin = ""
self.directSubmit = False
@ -759,11 +757,6 @@ class P4Submit(Command): @@ -759,11 +757,6 @@ class P4Submit(Command):
if self.reset:
self.firstTime = True

if len(self.substFile) > 0:
for line in open(self.substFile, "r").readlines():
tokens = line.strip().split("=")
self.logSubstitutions[tokens[0]] = tokens[1]

self.check()
self.configFile = self.gitdir + "/p4-git-sync.cfg"
self.config = shelve.open(self.configFile, writeback=True)

Loading…
Cancel
Save