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>
Simon Hausmann committed
Feb 19, 2008 at 09:12 UTC
4b61b5c963ad1fd59e858c2bc21b1b48836f04f8
1 file changed
-7
contrib/fast-import/git-p4
-7
@@ -468,7 +468,6 @@ class P4Submit(Command):
468
optparse.make_option("--verbose", dest="verbose", action="store_true"),
469
optparse.make_option("--origin", dest="origin"),
470
optparse.make_option("--reset", action="store_true", dest="reset"),
471
- optparse.make_option("--log-substitutions", dest="substFile"),
471
optparse.make_option("--direct", dest="directSubmit", action="store_true"),
472
optparse.make_option("-M", dest="detectRename", action="store_true"),
473
]
@@ -477,7 +476,6 @@ class P4Submit(Command):
476
self.firstTime = True
477
self.reset = False
478
self.interactive = True
480
- self.substFile = ""
479
self.firstTime = True
480
self.origin = ""
481
self.directSubmit = False
@@ -759,11 +757,6 @@ class P4Submit(Command):
757
if self.reset:
758
self.firstTime = True
759
762
- if len(self.substFile) > 0:
763
- for line in open(self.substFile, "r").readlines():
764
- tokens = line.strip().split("=")
765
- self.logSubstitutions[tokens[0]] = tokens[1]
766
-
760
self.check()
761
self.configFile = self.gitdir + "/p4-git-sync.cfg"
762
self.config = shelve.open(self.configFile, writeback=True)