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
Handle patch errors in git-p4 submit better.
2007-04-15
Sim
o
n Hausmann
Handle patc
h
erro
r
s in
g
it-p4 submit better
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon
H
ausmann
A new attem
p
t a
t
fi
x
ing the child-fast-i
m
port
-
pr
o
ces
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Si
m
on
Hausmann
S
l
ightly impr
o
v
e
d
f
ormatti
n
g
o
f
the
r
aw_inpu
t
question
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon
H
a
usmann
Removed the
o
ld
p
atch ap
p
l
y c
o
d
e
from git-
p
4 su
b
mit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon
H
a
u
sman
n
Fi
x
the timezone formatting
.
Now qgi
t
a
l
so
d
isplay
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Si
m
on Hausmann
Print an e
r
r
o
r message of some
s
ort if git
f
ast-import
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Simon H
a
u
s
man
n
Allo
w
for convenient rebasi
n
g after gi
t
-p
4
submit
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Haus
m
ann
Added
a
simple exam
p
le of
u
sage
t
o the "docu
m
e
n
t
a
tion"
:
)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Si
m
on Hausm
a
n
n
fi
x
var
i
a
ble usage (oops)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausm
a
nn
Fix fi
l
e
determ
i
nation for #head imp
o
rt
s
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
Add
e
d git-
p
4 clone con
v
enience command
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon
Hausm
a
nn
H
on
o
r --silent for labels
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
S
i
mon
H
au
s
mann
Tur
n
o
ff p
o
tentiall
y
sl
o
w label
detecti
o
n by
default
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Si
m
on
Haus
m
ann
Pr
o
vide
a
t
r
ee summary af
t
e
r gi
t
-
p4 rebase
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simo
n
Hausm
a
nn
Added git-p
4
rebase convenience
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Si
m
on H
a
u
smann
Clean
up pyt
h
on cl
a
s
s
names
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hau
s
mann
Fix "comp
i
latio
n
" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon Hausmann
F
i
x the
docs for gi
t
-p4 submit and
t
urn git
-
p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon Hausmann
F
i
x v
a
riabl
e
usage in tag import
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon
H
ausma
n
n
Added
s
upport
f
or
mappin
g
p4 la
b
els
to gi
t
t
a
g
s
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
S
i
mon Hausmann
gi
t
-
p
4
debug do
e
sn't
n
e
e
d
a g
i
t re
p
o
s
itory
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simon Hausm
a
nn
Don
'
t try to parse a
n
y
o
p
tion
s
with
git-
p
4
debug but
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simo
n
Hausmann
Prefer git command over git-command
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon
H
au
s
mann
Mino
r
cosme
t
ic
f
ixlet for the g
i
t-
p
4
subm
i
t sync
q
u
e
s
tion
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Si
m
on
H
ausmann
Differ
e
nt
v
ers
i
ons of p4 have
diffe
r
ent ou
t
pu
t
for
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon H
a
usmann
Use the new inc
r
emental import
s
t
y
le by default
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausm
a
n
n
Make it possib
l
e to run git-p4 submit fr
o
m
within the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausm
a
nn
Brand new smart inc
r
e
m
ental import that
d
o
esn't n
e
ed
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausma
n
n
Set the def
a
u
l
t bra
n
ch in
r
un, no
t
i
n the constructor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simo
n
Hausmann
He
l
per
f
u
nction to check
t
h
e existanc
e
o
f
a rev
i
sion
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Sim
o
n H
a
usmann
Ad
d
ed some helper
function(s) to pars
e
the de
p
ot path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simo
n
Hau
s
mann
Changed t
h
e de
f
ault branch for i
m
ports f
r
om "m
a
ster
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Ch
a
n
ged the format o
f
the i
m
ported log
message slightly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Ha
u
s
m
an
n
Removed th
e
.
p
y
e
x
tens
i
on from
git-p
4
as it's
a
nn
o
ying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Ha
u
s
mann
Do
n
'
t
show the submit
template and the diff first i
n
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
M
a
ke it possib
l
e t
o
invo
k
e git
-
p4 from
w
i
thin
subdire
c
tories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Made
-
-
apply-as-patch
t
h
e
d
ef
a
u
lt for
g
it-p4 s
u
bmit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
Hausmann
Fix support for deletions in git-p4 submit when usi
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
A
dded e
x
perimental but super-fast
--appl
y
-as-
p
a
t
ch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
D
ocu
m
entation e
n
hancements
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
S
tart of the g
i
t-p4 docume
n
ta
t
ion
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simo
n
Hausmann
Re
m
ov
e
d p4-fast-ex
p
ort and p4
-
git-sync
as th
e
y
've been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Sim
o
n Hausmann
Fixe
d
the initial version
imp
o
rt by getting
t
he file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon
Hausmann
Added
m
issing "self"s
t
o make the sc
r
i
pt evaluate correctly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Haus
m
a
nn
Completely un
t
ested
"mer
g
e" o
f
p4-fas
t
-
export
.
py
into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
sync-t
o
-
p
erforce i
s
now ca
l
led submi
t
a
nd fixed the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon H
a
u
sma
n
n
Part of the code is copyri
g
ht
by Trolltech ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
First (untes
t
ed) at
t
empt
at migratin
g
p4-git-sync into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausman
n
Provide
a
litt
l
e
b
it of help descripti
o
n
f
or the git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simo
n
Hausmann
Start mo
v
ing th
e
git-p4
t
o
ols in
t
o one single scr
i
pt
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon H
a
us
m
ann
Pass the right number
of
a
rgument
s
to commit, fixes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Sim
o
n Hausmann
Improv
e
d
the git dir d
e
te
c
t
i
o
n
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simon Hausmann
Default t
o
interactive syncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon Hausmann
U
s
e
p
4
revert
.
.
.
instead
of r
e
v
er
t
-a
.
.
.
after
submitting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Si
m
o
n
Haus
m
ann
Auto-de
t
e
ct the current g
i
t branch be
f
ore submitti
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simo
n
H
ausmann
Ignore Apple resource files wh
e
n importing
f
r
om p
e
rforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Si
m
on Hausmann
Be nice
and
u
se /usr/bin/e
n
v
python for the
git-p
4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
S
i
mon
H
ausmann
Automaticall
y
operat
e
on a tem
p
ora
r
y branch, ne
e
ded
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Si
m
on Hausmann
Lots of bugfi
x
es
t
o p4-git-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
S
i
mon H
a
usmann
Fix git-di
r
optio
n
and allow re
a
ding log subs
t
itution
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon
H
ausmann
First versi
o
n of a ne
w
script
t
o sub
m
it cha
n
ges back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
mon Hausman
n
Split up the
c
ac
h
e
c
o
mma
n
dl
i
ne o
p
tions into (command
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Haus
m
ann
Red
u
ce
t
he num
b
e
r of fals
e
"merges" by skippi
n
g "branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Sim
o
n Hausman
n
More work
on b
r
anch detection
b
y im
p
lem
e
nting changeIsBranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
H
ausmann
More
c
ode cleanups and prepar
a
t
ions for more branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
Hausmann
Mino
r
code cl
e
anups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
M
a
ke t
h
e
p4 data/
c
om
m
a
n
d cache co
n
figurable t
h
rough
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausma
n
n
Fixed p4-debug file exte
n
sion
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
S
i
m
o
n Hausmann
Changed --known-branches to ta
k
e a file as ar
g
u
m
ent
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausman
n
Work
in progress on
detecting branches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simon
H
aus
m
an
n
Adjust t
h
e output p
a
rsing of gi
t
name-rev
t
o ha
n
dle
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon
Hausmann
Don't print a plain newline
a
t the en
d
of the execution
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Sim
o
n Hausman
n
More work in --silent
support
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausm
a
nn
Add
e
d
s
upport
for
--silent so
that p4-fast-exp
o
rt c
a
n
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Simon Hausmann
Added
p4 dele
t
e
behavioural emul
a
tio
n
as to
d
o item
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Sim
o
n Hausmann
Fix si
n
gle-branch imp
o
r
t
s by skippi
n
g the
b
ran
c
h/merge
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
S
imon
Haus
m
ann
Us
e
sets
.
Set() instead
of set() to run also wi
t
h olde
r
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simo
n
H
ausmann
Make it poss
i
ble to specify
the p4
changes to i
m
p
o
rt
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
S
imon Hausmann
When
t
rying
t
o m
a
p
p4 integ
r
ation
s
to git
m
erg
e
s just
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon
H
a
u
smann
Set git fast-import marks for every im
p
orted change
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon H
a
usmann
After marking a p4 br
a
nch as
merged don't ever mer
g
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Si
m
on
H
ausmann
M
o
r
e
fix
e
s
in he
u
ri
s
t
ic p4 branch detectio
n
based on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon
H
ausmann
St
a
rted wo
r
k on
p
4 bra
n
c
h
detection (experi
m
ental!)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
Code c
l
eanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon Hau
s
mann
Cleanups
,
remove unuse
d
variable
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Si
m
o
n
H
ausmann
Create lightweight git tags (using the "r
e
s
et" trick
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon
Hausmann
Add
e
d a lit
t
le helpe
r
scri
p
t to remove unused t
a
gs
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-10
S
i
mon Hau
s
mann
Chang
e
d the default git import bra
n
ch from "p4" to
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Si
m
on Hau
s
m
ann
Avoid
the exc
e
s
s
ive u
s
e of git
t
a
gs f
o
r eve
r
y perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon
H
a
usma
n
n
M
inor code cleanup
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Si
m
o
n
Hausma
n
n
Added a
little
h
elper scr
i
pt to debug the output
o
f
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simon
H
ausmann
M
a
de
the na
m
e of the
git br
a
nch used for
t
he
p
erforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-08
Si
m
on H
a
us
m
an
n
Catch io e
x
ceptions from
g
it fast-import again
a
n
d
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
S
imon Hausmann
Fix calculation of t
h
e
newe
s
t
i
mported revis
i
on for
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
S
imon
Hau
s
mann
Ma
k
e specifyi
n
g the revi
s
i
o
n
range
s
m
ore co
n
venie
n
t
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon
H
a
usmann
Make incrementa
l
im
p
or
t
s eas
i
er to
u
s
e by storing the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Si
m
o
n
Ha
u
smann
Fixed in
c
remen
t
al imports
by using the
correct "from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simo
n
Haus
m
a
nn
M
inor cle
a
nu
p
s and print an error message of git
fast
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon Hausmann
Initial support for impo
r
ting a direc
t
ory from Perforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
S
i
mon Haus
m
ann
Code cle
a
nu
p
s, mo
v
e the c
o
de to c
r
eate a com
m
i
t with
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
next