repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Provide a tree summary after git-p4 rebase
2007-04-07
Simon Hausmann
Provide a
t
ree summary af
t
e
r git-p4 rebase
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Si
m
on Hausmann
Added git-p4 rebase c
o
nvenience
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Simon Ha
u
smann
Clean up p
y
thon class n
a
mes
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Si
m
o
n
Hausmann
Fix
"co
m
pil
a
tion"
:
)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
S
i
mon Hausmann
Fix the
d
ocs f
o
r
g
i
t-p
4
submit and
turn
git-p4 subm
i
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon Hausmann
F
ix variab
l
e usage
i
n tag
import
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Sim
o
n Hausmann
Added su
p
port
f
or mappin
g
p4 labels to git tag
s
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hausmann
git-p
4
debug doesn't ne
e
d a
git repository
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
S
i
mon H
a
usmann
Don't
t
ry to parse any options with git-p4
debug
b
u
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausmann
Prefer git com
m
and o
v
er git-comman
d
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon H
a
usma
n
n
M
i
n
o
r cosmetic fixlet fo
r
the git
-
p4 s
u
bmit sync question
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausmann
Different
v
er
s
i
ons o
f
p
4
hav
e
differ
e
nt
o
utput for
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon H
a
u
smann
Use
t
he new inc
r
em
e
nta
l
import style b
y
default
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hau
s
ma
n
n
M
a
ke it possible to ru
n
g
i
t-
p
4 sub
m
it
from with
i
n the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simon H
a
u
smann
B
rand new s
m
ar
t
incremental import tha
t
d
o
esn't need
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hau
s
ma
n
n
Set the
d
efau
l
t br
a
nch in run, not in the
c
o
nstructor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
Hausmann
Helper function to c
h
ec
k
the existance of a revision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Added so
m
e helper function(s) to pa
r
se the
depot path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
Haus
m
ann
Cha
n
ged the defaul
t
branch
for im
p
ort
s
from "master
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Change
d
the format of th
e
i
m
ported log message slightly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
Hausmann
Removed the
.
py ext
e
n
s
ion
f
rom gi
t
-p4 as i
t
's annoyin
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
Hausm
a
nn
Don't show the s
u
bmit templat
e
and the diff firs
t
i
n
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Make it possible to invoke git-p4
f
r
om within
subdirectories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
H
a
usman
n
Made --a
p
ply-as-patch the default for git-p4 subm
i
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Fix
suppor
t
for de
l
eti
o
n
s
in git-p4 su
b
mit when usin
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
Hausmann
Added experi
m
e
n
tal but
super-fast --apply-as-patch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Documentation
enhancements
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Si
m
on Hausm
a
nn
S
t
a
rt of
t
h
e git-p4
d
ocum
e
n
t
atio
n
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Si
m
on Hau
s
ma
n
n
Re
m
oved
p
4
-fast-export a
n
d
p
4-git
-
s
y
nc as they've been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
i
mon Hausmann
Fi
x
ed t
h
e ini
t
ial version import by getti
n
g
t
he file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Si
m
o
n
Hausmann
Adde
d
m
issing "self"s to
m
ake the script evaluate co
r
re
c
tly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Comp
l
etely untes
t
ed "merge" o
f
p4-fast-
e
xpor
t
.
py into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
s
y
n
c
-to-
p
erforce is now called submit a
n
d
fixed the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Ha
u
sma
n
n
Part
o
f the code is copyright
by
Tr
o
lltech ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
F
i
r
st (untested) a
t
te
m
p
t
at
migrating p4-git
-
sync into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
mon
H
ausmann
Prov
i
de a little b
i
t of help
descri
p
tion for th
e
g
i
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Sim
o
n
H
a
usmann
Start movin
g
t
he git-p4 tools into one s
i
n
gle script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Pass th
e
right number of
arguments
t
o commit
,
f
ixes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Improved
the git d
i
r detection
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simon Hau
s
m
a
nn
Default to i
n
teractive syncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Sim
o
n Haus
m
a
n
n
Use p4 rever
t
.
.
.
instead of
rever
t
-a
.
.
.
a
f
t
er su
b
m
i
tting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Auto-detect the curren
t
g
it branch
b
efore submit
t
ing
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
S
i
m
o
n Hausmann
Ignore Appl
e
resource f
i
le
s
when imp
o
rting from per
f
orce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon H
a
usma
n
n
B
e
nice and u
s
e /usr/bin/env python
f
o
r the gi
t
-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Automati
c
a
lly operate on a temporary branch, needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Si
m
on Hausmann
L
o
t
s o
f
bugfixes to p4-git-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
S
imon
H
ausm
a
nn
Fix git-dir optio
n
and
allow
reading l
o
g substituti
o
n
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon
Hausm
a
nn
First
v
ersion
o
f a new scr
i
pt to sub
m
it ch
a
nges back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Split up the ca
c
he commandline
op
t
ions into (com
m
and
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
Hausma
n
n
Red
u
ce the number of false
"
m
erge
s
" by sk
i
pping
"br
a
nch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
Hausman
n
More
work
o
n br
a
nch d
e
t
ection by i
m
plementing changeIsB
r
anch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
m
o
n Hausm
a
nn
M
o
re
code c
l
eanups and prepa
r
ations for more bra
n
ch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon H
a
u
s
m
a
nn
Min
o
r
c
o
d
e cleanups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on Hausmann
Make the p4 data/command cache
c
onfi
g
urable
t
hrough
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausm
a
nn
Fix
e
d p
4
-
d
ebu
g
fi
l
e ext
e
nsion
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausmann
C
h
a
nged --kn
o
wn-branches to take a file
a
s argument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
S
imo
n
Ha
u
s
mann
Work in progress on de
t
ecting branches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
S
imon
Ha
u
smann
Adjust the output parsin
g
of gi
t
name-rev to handl
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
Don
'
t
p
r
i
nt a plain
new
l
ine at
t
he end of
the execution
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
S
i
mon Hausmann
More work in --si
l
e
nt support
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
A
d
ded suppo
r
t
f
or --si
l
ent so t
h
at
p4-fast-expo
r
t ca
n
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Simon Hausmann
Added p4
delete beh
a
v
i
oural
emula
t
ion as tod
o
i
tem
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Simon Hausmann
Fix s
i
ngl
e
-bran
c
h i
m
ports
b
y
skipp
i
n
g
the branch/mer
g
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hausman
n
Use sets
.
Set() instead of set() to run also with older
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Sim
o
n
Hau
s
m
a
nn
M
ak
e
it possible to specify
t
h
e p
4
changes to
i
mport
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
Whe
n
trying to map p4 integrat
i
ons to git me
r
ges just
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon
Hausm
a
nn
Set git
f
a
s
t-
i
mport marks for ever
y
i
mpor
t
ed
c
h
ange
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
Aft
e
r mark
i
ng a p4
b
ranch as merged
d
on't ever me
r
ge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon H
a
u
smann
M
ore fixes in heuri
s
tic p4 b
r
anch
detection
based on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Si
m
o
n
Hausmann
Started work on p
4
branc
h
detection
(exp
e
r
im
e
n
t
al!)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Sim
o
n Hausmann
Code cleanup
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon Hausmann
Cleanups, remove
u
n
use
d
v
a
riable
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simo
n
Hausm
a
nn
C
r
e
a
te lightwe
i
ght
g
it tags (using
the
"rese
t
"
t
r
i
ck
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausman
n
Added a
l
i
t
tle helper script to
r
emove unused tags
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-10
Simon
H
au
s
mann
Chan
g
ed the default git im
p
ort branch from
"p4" to
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon
Hau
s
mann
A
void the excessive
u
se o
f
g
it tag
s
for every perfo
r
ce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
Minor
c
ode
cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
S
im
o
n Hausmann
Added a little helper sc
r
ipt to debug the
o
utput of
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simon Hausmann
M
ade the na
m
e of the git branch used for the pe
r
f
o
r
ce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-08
Simon H
a
usmann
Catch
io
exc
e
ptions
from
g
it
f
ast
-
im
p
ort
ag
a
i
n and
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
S
imon Haus
m
a
n
n
Fix
c
al
c
ulation of the newest imported revision for
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon
Haus
m
ann
Make s
p
ecifying the
r
e
v
isi
o
n ranges more convenien
t
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon
H
a
usmann
Make incremental imports easier to
use by storing the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
S
imo
n
H
a
usmann
Fixed incremental import
s
by using the correct
"
f
rom
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon
H
ausmann
Minor cleanups a
n
d
print an error message
o
f gi
t
fas
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon Ha
u
sman
n
Initial support f
o
r importing
a directory f
r
o
m
Perforc
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
S
imon Hausma
n
n
Code cleanups, move
t
he code to crea
t
e a commit with
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon Hausmann
S
i
mplify the incremental import b
y
e
limin
a
t
ion the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
i
mo
n
H
a
u
smann
Started worki
n
g on incremental imp
o
rts from Per
f
orc
e
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
i
m
o
n Hausmann
Fi
x
file pe
r
m
issions of
p
4-fast-export
.
py to b
e
e
x
e
cutable
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausma
n
n
Create
a git tag for every changese
t
i
m
ported from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
im
o
n Hausm
a
nn
Fixed displaying i
m
port
p
rogress b
y
calli
n
g flush on
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
imon
H
ausma
n
n
Permit
calling
p
4-fast-ex
p
ort with a depot path that
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Sim
o
n Hausmann
Avoid calling
fstat for eve
r
y imp
o
rted
file (slow!
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hau
s
mann
Ported the r
e
maining f
u
nctions that parsed p4
shell
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Ins
t
ea
d
of parsing the out
p
u
t
o
f "p4 users
"
us
e
the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Mino
r
code cleanups
and ported s
o
me
p
4 i
n
terfacing
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Changed
t
he i
m
port mecha
n
ism
t
o write to git fast
-
imp
o
r
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
R
emoved
unused p4
c
at fun
c
t
ion and added helpe
r
function
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Haus
m
ann
Sp
e
ed up the impo
r
t of
i
ndiv
i
dual files from Pe
r
f
orc
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
next