summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorHan-Wen Nienhuys <hanwen@google.com>2007-05-23 21:49:35 (GMT)
committerHan-Wen Nienhuys <hanwen@google.com>2007-05-31 17:21:58 (GMT)
commitb1ce94472684957cd5aba759f495a889f154a9a2 (patch)
treeee51cb5ed9730e21bc7600c8f895f7f89b9378c1 /contrib
parentb17f88b5445210c2223b0642917c43581c767761 (diff)
downloadgit-b1ce94472684957cd5aba759f495a889f154a9a2.zip
git-b1ce94472684957cd5aba759f495a889f154a9a2.tar.gz
git-b1ce94472684957cd5aba759f495a889f154a9a2.tar.bz2
thinko: really ignore deleted files.
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/fast-import/git-p428
1 files changed, 18 insertions, 10 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 5dae1f1..294c2ec 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -173,13 +173,18 @@ class P4Debug(Command):
def __init__(self):
Command.__init__(self)
self.options = [
- optparse.make_option("--verbose", dest="verbose", action="store_true"),
+ optparse.make_option("--verbose", dest="verbose", action="store_true",
+ default=False),
]
self.description = "A tool to debug the output of p4 -G."
self.needsGit = False
+ self.verbose = False
def run(self, args):
+ j = 0
for output in p4CmdList(" ".join(args)):
+ print 'Element: %d' % j
+ j += 1
print output
return True
@@ -676,24 +681,27 @@ class P4Sync(Command):
## Should move this out, doesn't use SELF.
def readP4Files(self, files):
- specs = [(f['path'] + "#" + f['rev'], f) for f in files
+ files = [f for f in files
if f['action'] != 'delete']
- if not specs:
+ if not files:
return
- filedata = p4CmdList('print %s' % ' '.join(['"%s"' % path
- for (path, info) in specs]))
+ filedata = p4CmdList('print %s' % ' '.join(['"%s#%s"' % (f['path'],
+ f['rev'])
+ for f in files]))
j = 0;
contents = {}
- while filedata[j:]:
+ while j < len(filedata):
stat = filedata[j]
- text = filedata[j+1]
- j += 2
+ j += 1
+ text = ''
+ while j < len(filedata) and filedata[j]['code'] == 'text':
+ text += filedata[j]['data']
+ j += 1
- assert stat['code'] == 'stat' and text['code'] == 'text'
- contents[stat['depotFile']] = text['data']
+ contents[stat['depotFile']] = text
for f in files:
assert not f.has_key('data')