repo.or.cz
/
git
/
vmiklos.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Added git-p4 clone convenience command
2007-04-08
Simon Hausmann
Added git-
p
4
clone convenience comman
d
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon
Hausmann
Honor --silent for
l
abels
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Si
m
on
H
au
s
mann
Turn off potentially slow l
a
bel
detection by default
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
S
i
m
on
H
ausmann
Provide
a tr
e
e
summary after g
i
t-
p
4 rebase
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Sim
o
n
Hausmann
A
d
ded git-p4
rebase convenien
c
e
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausmann
Clean up py
t
hon class names
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausmann
Fix "c
o
mpilation
"
:)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
S
imon Hausmann
Fix the
d
ocs for git-
p
4 subm
i
t a
n
d turn git-p4 subm
i
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Sim
o
n
H
ausm
a
n
n
Fix varia
b
le usage i
n
t
a
g im
p
ort
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Si
m
o
n
Hausmann
Added s
u
p
p
ort for mapping
p4 labels to gi
t
t
a
gs
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hau
s
mann
git-
p
4 debug doesn't need a git rep
o
sitory
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simon Hau
s
mann
Don'
t
try to pa
r
se
a
ny op
t
ions with
git-p4
debug bu
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausmann
Pref
e
r
git com
m
and
over
git-command
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
S
i
m
on Hausman
n
Mino
r
co
s
me
t
i
c
fixle
t
f
o
r the
git-p4
s
ub
m
it sync question
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon H
a
usmann
Differen
t
versions
of p4 have different output for
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
Use th
e
new in
c
remental import style by default
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Si
m
on
H
ausmann
Make i
t
possible
t
o
r
u
n git-p4 submit fr
o
m
within
t
he
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Brand new
s
mart incremental import that
doesn't need
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Set t
h
e
defa
u
l
t bran
c
h in run, not in t
h
e
con
s
tr
u
c
t
or
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon H
a
usm
a
nn
Helper funct
i
on to check the existance of a revision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Ha
u
smann
Added som
e
helper fun
c
tion(s) to parse th
e
depot
path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Changed the d
e
fault branch
f
or
i
mports fr
o
m "master
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
imon Hausmann
Ch
a
nged the
forma
t
of t
h
e
i
mported log messag
e
slightly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Removed
the
.
py extension from
g
it-p4 as it's
a
nnoying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
H
a
usman
n
Don't
s
ho
w
the submit t
e
mp
l
a
t
e
an
d
the
d
i
f
f fir
s
t in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
S
i
m
on Hausmann
Make
i
t possible to invoke git
-
p4 from within su
b
direc
t
o
r
i
e
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
H
a
u
smann
Made --
a
pply-as-p
a
tch
t
he
d
e
f
ault for git-p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Haus
m
ann
Fix support for de
l
etions in git-p4
s
ubmit when using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Si
m
on Hausmann
A
d
ded
experimental but super-fast --apply-as
-
pa
t
ch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
i
mon H
a
u
smann
Documen
t
ation enhancements
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausm
a
nn
St
a
rt of the git-p4
d
o
cumentation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
imon Hausman
n
Removed p4-
f
ast-expo
r
t and p4-git-sync as
they'v
e
been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
F
i
xed the in
i
t
i
al version import by g
e
tting th
e
f
ile
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Sim
o
n Haus
m
ann
Add
e
d
m
issing
"
self"s to make the script evaluate correctly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
C
ompletel
y
unteste
d
"merge" of p
4
-fast-export
.
py in
t
o
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
s
y
nc-to-perforce is
n
o
w
called
s
ubmit and fixed th
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Si
m
on Hausmann
Par
t
of
t
h
e code is copyright
by Troll
t
ec
h
AS
A
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Haus
m
ann
Fi
r
st (untested) a
t
tempt
at migrati
n
g
p4-gi
t
-sync
into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
H
au
s
mann
Provide a
l
ittle
bit of help d
e
scri
p
ti
o
n f
o
r
t
he git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
Ha
u
smann
Sta
r
t moving the git-p4
tools into o
n
e single scrip
t
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
Hausmann
P
a
s
s
t
h
e righ
t
number of arguments to commit,
f
ix
e
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Si
m
on Hausma
n
n
Impr
o
ved the git dir detection
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Si
m
on Hausmann
Default to in
t
eractive syn
c
ing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
S
imo
n
Hausmann
Use p4 revert
.
.
.
i
nstead of r
e
vert -a
.
.
.
after s
u
b
mittin
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Haus
m
an
n
A
uto-detect
the curr
e
n
t git branch
b
e
f
ore submit
t
ing
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
I
gnore Apple resource f
i
les when importing from p
e
rforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Haus
m
ann
Be nice and use /
u
sr/bin/en
v
python for the gi
t
-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
S
i
mon Hausmann
Automatically operat
e
on a te
m
porary branch,
needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simo
n
Hausm
a
nn
Lo
t
s
of bug
f
i
x
es to p4-git-sy
n
c
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Si
m
on Hausmann
Fix git-
d
ir o
p
tion
a
nd all
o
w reading
lo
g
substitutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon
H
ausmann
First
v
ersio
n
of a
n
ew sc
r
ipt to submit
c
hanges back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Sim
o
n Hausmann
Split
up the ca
c
h
e comm
a
n
dline o
p
tions into (command
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
Hausmann
Reduce
the numb
e
r of false "merg
e
s" by skipping "branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
H
a
u
smann
M
o
re work o
n
branch dete
c
t
i
on by implementin
g
c
hangeI
s
Bra
n
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
More cod
e
cleanups a
n
d
preparati
o
ns for more branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon H
a
u
sman
n
Min
o
r code cleanups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Sim
o
n Hausm
a
nn
Make t
h
e p4 da
t
a/c
o
m
m
and ca
c
he con
f
igurable through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
S
i
mon Hausmann
Fixed p4-debug file ex
t
ension
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausm
a
nn
Changed --know
n
-b
r
anches to t
a
ke a file as argume
n
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausman
n
Wo
r
k in pr
o
gress o
n
detecting branches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simon Hausmann
Adjust the output
p
arsing of git name-rev to handle
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simo
n
Hausmann
Don't p
r
int
a
pl
a
in newli
n
e at the end o
f
the execut
i
on
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Sim
o
n Hausmann
More work in --silent su
p
port
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
S
imon Hausmann
Added support for
--silent
so that p4-fast-export c
a
n
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Si
m
on Ha
u
smann
Ad
d
ed
p4 delete behavioural emu
l
ati
o
n as to
d
o i
t
em
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Simon Hausman
n
Fix sing
l
e-branch i
m
ports
by
s
kipping
the branch/
m
erge
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
S
imon Hausma
n
n
U
s
e se
t
s
.
Se
t
(
) instead of
s
et()
t
o run also with
ol
d
er
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Ha
u
smann
Mak
e
it p
o
s
s
ible to
specify the p4
changes to i
m
port
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
When trying to map
p
4 integrat
i
ons to git merges just
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
imon
H
a
u
sma
n
n
S
e
t git fast-imp
o
rt marks for ev
e
ry imp
o
rted chang
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
i
mon
H
a
u
smann
After marking a p4 bran
c
h
as m
e
rged don't ev
e
r merge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Ha
u
sm
a
nn
More fixes i
n
heur
i
stic p4 branch detectio
n
based
o
n
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simo
n
Hausmann
Star
t
ed work on p4 branch
d
ete
c
ti
o
n (exper
i
m
e
n
ta
l
!
)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Haus
m
ann
Code cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
S
i
mon
Hausmann
Cleanups, remove unused vari
a
ble
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
S
imon Hausm
a
nn
C
r
eate
light
w
eight
git tags (usin
g
the "reset" trick
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon H
a
usmann
Ad
d
ed a little helper sc
r
ipt
to
re
m
ove unuse
d
tags
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-10
Simon
H
ausm
a
n
n
Changed the
d
efault git import branch from "
p
4
"
t
o
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
S
imon Ha
u
smann
Avoid the
excessive use of git tags
for e
v
ery perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon Haus
m
ann
Minor code cleanup
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simon Hausman
n
Added a little helper s
c
ript to
d
ebu
g
the output of
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
S
i
mon Hausm
a
n
n
Mad
e
the
name
o
f the git
b
r
a
nch used for t
h
e perforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-08
Simon Hausmann
Catch
i
o exceptions fr
o
m git fast-import a
g
ain and
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
S
i
mon Hausm
a
nn
Fix calculat
i
on of the newe
s
t imported revi
s
ion for
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausman
n
Mak
e
s
pe
c
i
fying t
h
e revision ranges
more convenient
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Ha
u
smann
Make i
n
cremental imports easier to use by storing th
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simo
n
H
a
usmann
Fix
e
d
inc
r
eme
n
t
a
l im
p
orts b
y
using
t
h
e correc
t
"from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
S
i
m
o
n
H
ausmann
Minor
cl
e
a
nup
s
and print an error message
of git fast
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
S
imon Hau
s
m
a
nn
Initial support for importing a direc
t
ory
f
rom
Perforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon Haus
m
an
n
Code cleanups, move the c
o
de to c
r
eate
a comm
i
t with
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon Hausmann
Sim
p
l
ify t
h
e incre
m
enta
l
import by elimination the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon
H
a
usmann
Started
working on incrementa
l
impor
t
s from Pe
r
force
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
i
mon Hausmann
Fix fi
l
e
pe
r
missions of p4-fast-export
.
p
y
to be executable
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Creat
e
a git
t
ag
f
or every
changeset importe
d
from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
imon Haus
m
an
n
Fi
x
ed displa
y
i
n
g imp
o
r
t
progres
s
by calling flush on
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
P
e
rmit calling p4-
f
ast-
e
xpor
t
with a
depot pat
h
that
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausm
a
nn
Avoid calling fsta
t
for ever
y
im
p
orted file (slow!
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
i
m
on Hausma
n
n
P
orted the re
m
a
i
ning funct
i
ons that
p
arsed p4
s
hell
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Si
m
o
n
Hausmann
I
nstead of par
s
i
n
g the output of
"p4 users" use
the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
M
i
nor code cleanups
a
nd p
o
rted
s
ome p4 interfacing
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
next