repo.or.cz
/
git
/
jnareb-git.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
Si
m
o
n
Hausmann
Added git
-
p4
c
l
one c
o
nvenience
comman
d
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Si
m
on Hausmann
H
onor --silent f
o
r la
b
els
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Sim
o
n Hausman
n
Turn off pote
n
t
ially slow label detectio
n
by def
a
ult
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausma
n
n
Provide a tree summary
a
fter
g
it-p4 reb
a
se
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Ha
u
smann
Added gi
t
-p4 rebase co
n
venien
c
e
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausm
a
nn
Clean up python class names
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausmann
Fix
"compilation" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon Hausmann
Fix the docs for git-p4
s
ubmit and
t
urn gi
t
-p4 submi
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon Hausman
n
Fix variable usage in tag import
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hausma
n
n
Added s
u
p
port for mappi
n
g p4 labels to
git tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hausmann
git-p4 debug doesn't
n
eed a git repo
s
i
t
ory
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
S
i
mon Hausmann
Do
n
't tr
y
to parse an
y
op
t
ions with git-p4 debug but
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausmann
P
re
f
er
git command over gi
t
-comm
a
nd
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausm
a
nn
Min
o
r cosm
e
tic
f
ixle
t
for the git-p4 submi
t
sync que
s
t
i
on
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hau
s
m
ann
Di
f
ferent
versions of
p4 ha
v
e diffe
r
ent output for
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hau
s
mann
Use the n
e
w
i
ncre
m
ental import style by
default
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Si
m
on
Hausmann
Make it possible to
r
un git-
p
4
s
ubmit
f
rom
w
ithin the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simon
Hausmann
Brand new smart incrementa
l
import
tha
t
do
e
s
n
't ne
e
d
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Sim
o
n
Hausmann
S
e
t the def
a
ult branc
h
in
r
un, not
i
n
the cons
t
ructor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
Hausmann
Hel
p
er
functio
n
t
o
check
t
he ex
i
stance of a rev
i
sion
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon H
a
usmann
A
d
d
ed som
e
helper functio
n
(
s)
t
o parse the depot
path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
Hausma
n
n
Changed the
d
efault bran
c
h for imports from
"
m
a
ster
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Si
m
on H
a
usmann
Changed the format of the import
e
d log
message sli
g
htly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon Hausmann
Removed the
.
py
e
x
tension from git-p4
a
s
i
t's annoying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
Hausmann
Don't
s
h
ow the s
u
bmit te
m
plate and
the
d
iff first in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Si
m
o
n
H
a
usman
n
Make it possible
t
o
invo
k
e git-p4 from within subdi
r
ectories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Si
m
on Hau
s
mann
Made --apply-as-p
a
tch the default fo
r
g
i
t-p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
i
m
o
n Hausmann
F
ix support fo
r
deleti
o
ns in git-p4 submi
t
w
hen using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Haus
m
ann
A
d
ded experimental but super-
f
a
st --apply-as-patch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Documentatio
n
e
n
hancem
e
nts
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausman
n
S
tart of
the git-p4
docum
e
ntation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hau
s
mann
Removed p4-fast-exp
o
rt
a
nd p4-g
i
t-sync as they've been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon H
a
usmann
Fixed the initi
a
l
version import by getting the
file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
i
m
on Hausmann
Added missing "
s
el
f
"s to
ma
k
e the
s
cript evaluate cor
r
ec
t
ly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
i
m
o
n
H
a
usmann
Completely untested "merge
"
o
f p4-
f
ast
-
ex
p
o
r
t
.
py into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausman
n
s
ync-to-perforce i
s
n
o
w called sub
m
it and
f
i
x
e
d
the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausma
n
n
Part of the
code
i
s
cop
y
righ
t
b
y
Trolltech ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
Ha
u
smann
Fi
r
st (unteste
d
) a
t
tempt at mi
g
rating p4-gi
t
-
s
ync into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Pr
o
vide a
l
ittle bi
t
of he
l
p des
c
ri
p
tion for the git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
im
o
n Haus
m
an
n
Start moving t
h
e git-p4 tools into
o
ne single scri
p
t
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
H
ausmann
Pass the
right n
u
mber of argum
e
n
ts to
commit, fixes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Si
m
on Hausma
n
n
Im
p
roved the git di
r
detecti
o
n
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simon H
a
us
m
ann
D
e
fault
t
o interactive
s
yncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simo
n
Hausman
n
U
s
e p
4
revert
.
.
.
instead of revert
-
a
.
.
.
aft
e
r
s
ubmi
t
tin
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Auto
-
detect the
c
u
rrent git branch
be
f
o
r
e submitting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon
H
ausma
n
n
Ignore Apple resource
f
iles wh
e
n importing from perfor
c
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Be nice and use
/us
r
/bin/env python for
t
he gi
t
-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon
H
ausma
n
n
Aut
o
matically o
p
erate on a tempo
r
a
ry
branch,
n
eed
e
d
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon
H
a
usmann
Lots of bu
g
f
i
xes
t
o
p4-git-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausmann
Fix
gi
t
-dir option and al
l
ow reading log subs
t
itutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
S
i
m
o
n
H
ausmann
First versi
o
n of
a ne
w
script t
o
submi
t
cha
n
g
e
s b
a
ck
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
S
p
l
i
t up t
h
e cac
h
e commandline optio
n
s
in
t
o
(com
m
a
nd
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
o
n Hausmann
Redu
c
e the number of false "merges"
by s
k
ipping "branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Ha
u
sman
n
More work on bran
c
h dete
c
tion
b
y impleme
n
ting
c
ha
n
geIsBranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
M
ore
c
o
de
c
leanups and preparations for more
branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
H
ausmann
M
i
n
o
r code cleanu
p
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Make the p4 da
t
a/c
o
mmand
c
a
c
he
configurable thr
o
u
gh
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon
Hausmann
F
ixe
d
p4
-
debug file extensio
n
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausman
n
Change
d
--
k
nown-br
a
nc
h
es
to take
a file as ar
g
ument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Simon H
a
usmann
W
ork in progres
s
on detecting br
a
nc
h
es
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simon Hau
s
m
ann
Adjust
t
he
o
utp
u
t
parsing of git na
m
e
-rev to han
d
le
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausm
a
nn
Don't print a
p
lain newline at
the end of
th
e
execu
t
i
o
n
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
More wor
k
i
n
-
-
sile
n
t support
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
S
i
mon Hausma
n
n
Added support
f
o
r --silent so that p4-fast-
e
xport can
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
S
i
mon Hausmann
A
d
de
d
p4 delete
b
eha
v
ioural
e
mulation as
t
o
d
o i
t
em
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Simon Hausmann
Fix
singl
e
-branch impo
r
ts
by skipp
i
ng th
e
b
r
anch/m
e
rge
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simo
n
Hausmann
Use
s
ets
.
Set() instead of set
(
) to ru
n
als
o
with older
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Si
m
o
n
Hausmann
Make it possible to speci
f
y the p
4
changes to import
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
S
i
mon Hausman
n
When
t
r
yin
g
to map p4 integrations to git merges just
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
i
mon Hausmann
Set git
f
ast-import marks for every imported change
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
i
m
o
n Hausm
a
nn
After mar
k
ing a p4 branch as merged don't e
v
er merge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Haus
m
ann
More fixes
in heuristi
c
p4 branch detection
based
on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
Started work on p4
b
ranch detection (experimental
!
)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Sim
o
n
Hausmann
Code cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
S
i
mon
H
ausmann
Cle
a
nups,
remove unused variable
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon Haus
m
ann
Cre
a
te
lightweight
g
it ta
g
s (
u
sing the
"
r
eset" trick
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon H
a
usmann
Added a little helper script to remov
e
unused t
a
gs
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-10
Simo
n
Hausmann
Changed the de
f
ault git
import branch
from
"
p
4" to
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
S
i
m
on Hausmann
Avoid th
e
excessive use of git tags for ever
y
perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausma
n
n
Mino
r
cod
e
c
l
e
anups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simon Hausmann
Added a little helper script to de
b
ug the output of
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simon Ha
u
s
mann
Made the name of
t
h
e gi
t
b
r
anch
us
e
d f
o
r
t
he perforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-08
Sim
o
n Ha
u
s
m
ann
Catch io exceptions f
r
om git fa
s
t-im
p
ort aga
i
n
and
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausmann
Fix calculat
i
on
o
f the
n
ewest i
m
ported
r
e
v
i
si
o
n for
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Si
m
on Hausmann
Make specifyin
g
the
r
evision range
s
more convenient
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausmann
Make i
n
cremental
i
mports ea
s
ier to use
b
y storing the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hau
s
mann
Fixed incremental imports
b
y usin
g
the correct
"
from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausmann
Minor cleanups and print an err
o
r m
e
ssag
e
of git fa
s
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Sim
o
n
H
ausm
a
nn
Ini
t
i
a
l support
f
or
i
mpor
t
ing a directory from Perforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon
H
ausmann
Code cleanups, m
o
v
e
the code to
cr
e
a
t
e a com
m
it with
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon
Hausma
n
n
Simp
l
ify the incremental i
m
p
o
rt by elimination the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
imon Ha
u
sma
n
n
Star
t
e
d working on increm
e
ntal
imports from Perforce
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
i
mon H
a
usmann
Fix f
i
le
p
ermiss
i
ons
o
f p4-fast-e
x
por
t
.
p
y
to be executable
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simo
n
Hausmann
C
r
eate a git ta
g
for every changeset imported from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
i
mon Hausmann
Fi
x
ed displaying
i
m
p
o
r
t
progr
e
ss by call
i
ng flush on
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Pe
r
mit calling p4-
f
a
st-export with
a depot path that
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
imon Hausm
a
nn
A
void calling
fst
a
t
f
or every impo
r
ted file (slow!
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausma
n
n
Ported
t
he remaini
n
g
fun
c
ti
o
ns th
a
t parsed p4 shell
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon
Haus
m
an
n
I
nstea
d
of par
s
ing the output of
"p4 users" us
e
the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Sim
o
n
H
ausm
a
nn
Minor
c
ode
cle
a
nups and po
r
ted some p4 interfacing
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
next