repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Ignore Apple resource files when importing from perforce to git.
2007-03-14
Si
m
on Hausmann
Ignore A
p
ple resource fil
e
s
when impo
r
ting from perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Be nice and use /
u
sr/bin/env
p
ython for the git-
p
4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Si
m
on H
a
usmann
Automatical
l
y operate on a temporary branc
h
, needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simo
n
Haus
m
ann
Lot
s
of bug
f
ixes to p4-git-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Haus
m
an
n
Fix
g
it-dir o
p
tion
and
a
llow reading lo
g
substitutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simo
n
Hausmann
F
i
r
st version of a new script to s
u
bmit changes
back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on Hausma
n
n
Spli
t
up the cac
h
e comm
a
ndline
options i
n
to (command
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Re
d
uce
t
h
e
numb
e
r
of
false
"merges
"
b
y
skipp
i
n
g
"branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausm
a
nn
More work
on branc
h
d
e
tection by
impleme
n
ting changeIsBranc
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on Haus
m
ann
More code cleanups and prepar
a
ti
o
ns for
more bra
n
ch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
o
n
H
au
s
ma
n
n
Minor code cleanu
p
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
im
o
n Ha
u
s
m
ann
Ma
k
e the p4 data/command cache c
o
nfigurable through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausm
a
nn
Fixed
p4-debug f
i
le extension
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausmann
Chan
g
ed
--known-branch
e
s
t
o
tak
e
a fi
l
e as argume
n
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
S
i
m
on Haus
m
ann
Work in progress on
de
t
ecting br
a
nches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simon Ha
u
smann
Adjus
t
t
h
e out
p
ut parsing
o
f git na
m
e-rev to
handle
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simo
n
H
a
u
s
mann
Don't
print
a
p
l
ain n
e
wline
a
t the end of
t
he execution
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
M
ore work in --silent support
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
Added su
p
po
r
t
fo
r
--silent
s
o
that p4-fast-export c
a
n
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
S
i
m
on Haus
m
ann
Add
e
d p
4
dele
t
e behavioural
e
m
u
lation as todo item
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Simo
n
Hausma
n
n
F
i
x single-branc
h
imports by s
k
ippin
g
the
b
ranch/merg
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simo
n
Hausmann
Use sets
.
Se
t
() i
n
s
tead
of set() to run also wi
t
h older
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hausmann
Make i
t
possibl
e
to speci
f
y the p4 changes to
import
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
S
imo
n
Hausmann
W
hen
t
rying to map p4 i
n
tegrations to git merges just
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Si
m
on Hausma
n
n
Se
t
git fast-import m
a
rks f
o
r e
v
ery imported change
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
i
m
on Haus
m
ann
A
f
ter
m
a
r
king a p4 branch as merged
d
on'
t
ever mer
g
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausma
n
n
M
or
e
f
i
x
es i
n
h
euri
s
tic p4 branc
h
detection b
a
sed on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon
H
ausman
n
St
a
r
te
d
work on p
4
branch de
t
e
c
tion (experimental!)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Ha
u
s
m
a
n
n
C
od
e
cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon
Hausm
a
nn
Clean
u
ps
,
remove
u
n
used variable
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
S
i
m
o
n
H
ausmann
Create lightweight git
t
a
gs (using th
e
"r
e
set" trick
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Si
m
on
Hausmann
Added
a li
t
tle
h
elpe
r
scr
i
pt to remove unused tags
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-10
Simon
Hausma
n
n
Changed th
e
defaul
t
git im
p
ort bra
n
c
h
from "p4
"
to
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Si
m
on Haus
m
ann
Avoid the e
x
cessive use of git tag
s
f
o
r
e
very perfo
r
ce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
S
imon Hausm
a
nn
Minor code
cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simon Ha
u
sma
n
n
Added a litt
l
e h
e
l
per scr
i
pt to debug t
h
e
output of
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simon
H
ausmann
Mad
e
the name
of the git
branc
h
use
d
f
o
r the per
f
orce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-08
Simon Ha
u
s
m
a
nn
Catch io
e
xceptions fr
o
m
g
i
t fast-import again
a
nd
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
S
i
mon H
a
usmann
Fix calcu
l
ation of the
n
ewe
s
t
i
mpor
t
e
d revisio
n
for
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausmann
Make
s
pecifying the re
v
ision
r
anges more convenie
n
t
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Si
m
on Hausmann
Make in
c
reme
n
ta
l
imports easi
e
r to use by storing the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon H
a
usm
a
n
n
Fixed increm
e
ntal impor
t
s
b
y using the correct "from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Si
m
on Hausmann
Minor
cleanups and
p
rint an error message of git fa
s
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon Ha
u
smann
Initial suppor
t
for impor
t
ing
a
di
r
ectory f
r
o
m
Pe
r
force
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Si
m
on Hausma
n
n
C
o
de cleanups, move the
code to cr
e
ate a
c
ommit with
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Si
m
o
n Hausm
a
nn
Simplify t
h
e i
n
crem
e
ntal import by
e
l
i
m
ination t
h
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
imon Hausmann
S
t
arted workin
g
on in
c
remental im
p
orts from
Perforce
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Fix file p
e
rmission
s
of p
4
-fast-export
.
py to be
e
xecu
t
able
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Creat
e
a git tag for every changeset imported f
r
om
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simo
n
Hausmann
Fixed
dis
p
laying
i
m
port progress by calling f
l
ush on
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausm
a
nn
Per
m
it cal
l
ing p4-fast-ex
p
ort with a depot path t
h
at
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon
H
ausmann
Avoi
d
cal
l
ing f
s
t
a
t
for every im
p
or
t
e
d
f
ile
(slow!
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
imon
Hausmann
Ported the remai
n
i
n
g
functions that
parsed
p
4
shel
l
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Instead of parsing
the out
p
u
t
o
f
"
p
4 us
e
rs" use the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
imon
Hau
s
mann
Minor co
d
e cleanups and p
o
rted some p
4
interfacing
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Changed th
e
i
m
p
o
rt mechanism to wr
i
te to
g
i
t
fast-import
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon
H
a
u
smann
Remov
e
d un
u
sed p4
c
at fun
c
t
i
on and adde
d
helper function
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon H
a
usmann
S
pe
e
d up t
h
e im
p
ort of individual files from Perfo
r
ce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon
H
ausmann
Some fixe
s
to the
timez
o
ne
c
onversion b
e
t
ween the
date
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon
Hausmann
I
mplemented basic su
p
port for converting the
d
ate of
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-31
S
imon Hausmann
Slightl
y
im
p
roved
h
elp u
s
age out
p
u
t
a
nd made specifying
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-31
Simon Ha
u
s
mann
Add
e
d basic
s
upport for specifying the
depo
t
path to
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-30
Simon Hausm
a
n
n
Initial imp
o
rt of
a
p
ython script to import c
h
a
n
g
esets
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree