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
Simon Hausma
n
n
I
gnore Apple resource files
w
hen importing
fr
o
m
pe
r
forc
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Be nice and
u
se /usr/bin/env python
for the git-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Sim
o
n Ha
u
smann
A
utomatically
o
per
a
te
on
a
temp
o
rary
br
a
nch, needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
S
i
mon Ha
u
smann
Lots of bugfixes to p4-gi
t
-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausmann
Fix git-dir opt
i
on
and a
l
l
o
w reading l
o
g substitutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon Haus
m
ann
Fi
r
st
version of a new s
c
rip
t
to s
u
bmit changes bac
k
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on Ha
u
s
m
ann
Split up the ca
c
he commandline options into (comm
a
nd
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon H
a
usmann
Reduce the number of fa
l
se "merges" by skip
p
ing "b
r
anc
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
More w
o
r
k
on b
r
a
nch detectio
n
b
y
im
p
lem
e
nt
i
ng
changeIsBranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
More code cle
a
nups
and prepa
r
atio
n
s for more branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausma
n
n
Min
o
r code clea
n
ups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
H
ausmann
Make t
h
e p
4
d
a
ta/command cache configurabl
e
through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon
Hausmann
Fi
x
ed
p4-debu
g
file
extension
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausmann
Changed --known-b
r
anches to
tak
e
a file a
s
a
rgument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hau
s
mann
Wor
k
in
p
rogress on d
e
t
ecti
n
g branches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simon
Haus
m
ann
Adjust the outp
u
t parsing
o
f git
n
ame-
r
ev
t
o handle
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
Don't
print a
p
l
ain n
e
wline at the
e
nd of the
executi
o
n
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
Mo
r
e work in --sil
e
n
t
s
u
pport
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Sim
o
n H
a
usm
a
nn
Ad
d
e
d support for
-
-silent so that p4-fast-export can
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Simo
n
Haus
m
ann
Added
p
4 delete beha
v
ioural em
u
lation as todo item
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Si
m
on
Hausmann
F
i
x sin
g
le-bran
c
h imports
by skipping
the branc
h
/
merge
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hausmann
Use sets
.
Se
t
() instead of set() to run also with older
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
S
imon Hausmann
Make
it possible to s
p
ec
i
fy the p4 chang
e
s to imp
o
rt
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
S
i
m
o
n
Hausmann
When trying
t
o map p4 in
t
egrations
to git m
e
r
ges ju
s
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
imon Haus
m
ann
Set git fas
t
-i
m
port m
a
rks for every importe
d
cha
n
ge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
Af
t
e
r
m
a
r
king a p4
b
ranch as merged
don't ever merge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
i
mon Hausmann
More fixes in
h
euri
s
ti
c
p4 branch detection based on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon
H
ausmann
Started work on p4 branch
d
etect
i
on (experimental
!
)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
imon Hausmann
Code cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simo
n
H
ausm
a
nn
Cleanups, remove unused variable
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon Hausmann
Crea
t
e
lightweight g
i
t tag
s
(usi
n
g the "
r
eset" trick
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon Ha
u
sm
a
nn
Adde
d
a lit
t
l
e
hel
p
er scri
p
t to
remove unused
t
a
gs
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-10
Si
m
on H
a
usmann
Changed the
d
e
f
au
l
t git import branch f
r
om "p4
"
to
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Si
m
on Hausmann
Avoid the excessive use of git
tags fo
r
every perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
S
i
m
o
n Hausmann
Minor cod
e
cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simon Ha
u
sman
n
A
dded a
little helper script
t
o debug the output of
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
S
i
mon Hausmann
Made the name of the git branch used fo
r
the perforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-08
S
imon Hausmann
Catch io exceptions from git
f
ast-import
a
gain and
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Si
m
on
H
ausma
n
n
Fi
x
calculation
of the newest imported
revision for
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simo
n
Hausmann
Make s
p
ecifyin
g
the revisio
n
ranges more convenient
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simo
n
H
a
u
s
mann
M
a
ke incr
e
menta
l
impor
t
s easie
r
to
u
se
b
y storing the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Si
m
on Haus
m
ann
Fixed incre
m
ental imp
o
r
t
s
b
y using the correc
t
"fr
o
m
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hau
s
man
n
Minor cl
e
anups and pri
n
t an error
m
essa
g
e of g
i
t f
a
st
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
S
imon Haus
m
ann
Initial support for
i
m
porting a directory from Perforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Si
m
on H
a
usmann
Code cleanups
,
move the
c
ode to create
a commit
with
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
S
i
m
o
n Hausmann
Simplify the in
c
remental import by
elimination the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
S
t
arted workin
g
on incremen
t
a
l
i
m
po
r
ts from
P
erfor
c
e
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Fix f
i
le permission
s
o
f p4-fast
-
expor
t
.
py to be ex
e
cu
t
able
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon
Hausm
a
n
n
Cre
a
t
e
a git
t
ag for eve
r
y changeset importe
d
from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Ha
u
smann
Fi
x
ed displaying im
p
ort progress by cal
l
i
n
g
flus
h
o
n
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
i
m
on Hau
s
mann
Permit call
i
ng p4-fast
-
expo
r
t with a
d
epot path that
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausman
n
Avoid
ca
l
l
ing fst
a
t for every impo
r
ted
f
ile (slow
!
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
imon
Hausma
n
n
P
or
t
ed the remaining
f
unctio
n
s that parsed
p
4 shell
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Sim
o
n H
a
u
sma
n
n
Instead of parsing t
h
e output o
f
"p4 users" use the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon
H
a
usmann
Min
o
r c
o
de clean
u
ps and ported some
p4
i
nterfaci
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
i
mon H
a
usm
a
nn
Changed the impo
r
t mechanism to write t
o
git
fast-i
m
port
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hau
s
mann
R
e
mo
v
e
d
unused
p
4cat functio
n
and
added help
e
r fu
n
ction
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon H
a
usman
n
Speed up the import of indiv
i
dual files
f
r
om Perforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Si
m
on H
a
us
m
ann
Some fixes to the
timezone conversion bet
w
een the d
a
te
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
imo
n
Hausmann
Imple
m
ented basic support
f
or
c
onv
e
rting
t
h
e da
t
e of
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausman
n
S
l
ightly improved help usage outpu
t
and made specifyin
g
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-31
Simon Haus
m
a
nn
Added b
a
sic suppo
r
t for spec
i
fying the de
p
ot
p
ath to
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-30
Simon Ha
u
smann
I
n
itial i
m
po
r
t of a
p
y
t
h
o
n script to import ch
a
nge
s
ets
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree