repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-p4: Handle Windows EOLs properly after removal of p4 submit template handling.
2008-03-28
Mariu
s
St
o
rm-Olsen
gi
t
-p4: Han
d
l
e
Win
d
ows EOLs pro
p
erly a
f
ter
r
e
m
ov
a
l
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-03-13
Shawn Bohrer
g
i
t-p4
:
Use P4EDIT
O
R environment
vari
a
ble when set
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-03-13
Shawn B
o
h
r
e
r
git-p4: U
n
set P4D
I
FF environment variable wh
e
n usin
g
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-03-13
M
a
r
i
us Storm-Ol
s
en
git-p4:
Op
t
imize the
f
etching
o
f dat
a
from
perforce
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
T
o
r Arvid L
u
nd
git-p4: Support
usage of perforce c
l
ient spec
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
Simon
H
ausman
n
g
i
t-p4:
g
it-p4 submit cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
Simon Hausmann
gi
t
-p4:
Re
m
oved git
-
p4
submit --direct
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
Simon
H
a
u
sm
a
nn
git-p4
:
C
lean up git-p4 submit's
l
og message handlin
g
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
Si
m
on
H
au
s
mann
git-p4: Re
m
ove --log
-
sub
s
tit
u
tions featu
r
e
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
Tommy Thorn
git-p4: s
u
pport exclude paths
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-03
Simon
H
ausma
n
n
g
it-
p
4: Ensure the working directory
a
nd the inde
x
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-03
Simo
n
Hausma
n
n
g
i
t-
p
4: Fix su
b
mit
user-interface
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-03
Jason McMullan
Remove $Id
:
.
.
$
$
Hea
d
er:
.
.
$ etc from +ko and +k files
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-10-20
Chris
Pettitt
g
i
t
-p4 support for pe
r
fo
r
c
e
ren
a
mes
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-10-20
Simon Hausm
a
nn
git-p
4
: When s
k
i
p
ping a patc
h
as
p
art of "git-p
4
submit
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Si
m
on Haus
m
an
n
g
i
t-p4: A
d
ded suppor
t
for automatically importi
n
g newly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Si
m
on H
a
usma
n
n
git-p
4
:
Cl
e
anu
p
; moved the
(
du
p
licated) code for turni
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simo
n
H
ausmann
git-p4: Cleanup; mov
e
d t
h
e code for t
h
e initi
a
l #head
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon Hausman
n
git-
p
4: Cleanup; Turn se
l
f
.
revision int
o
a
f
unction
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simo
n
Hausmann
git
-
p4: Cleanup; moved
the code to imp
o
rt a list of
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
S
i
mon
Hausmann
git-p4: Cleanup
;
mo
v
ed the code for
getting a so
r
ted
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Si
m
o
n Hausmann
g
i
t-p4
:
After su
b
mission to p4
always
synchronize from
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simo
n
Ha
u
s
mann
git-p4: Always c
a
ll 'p4 syn
c
.
.
.
'
b
efore s
u
b
mitting
.
.
.
commit
|
commitdiff
|
tree
2007-08-02
Han-Wen N
i
e
n
huys
Fix style
n
it in Python slicing
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-08-02
Han-Wen Nien
h
uys
S
o
r
t out
p
ut
o
f
"
p4
change" in incremental i
m
port before
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-07-18
Simo
n
Haus
m
ann
git-p4: Cleanup, used
c
ommon function for list
i
n
g imp
o
rted
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-07-18
Simon Hausmann
git-
p
4: Fix upstream branch
d
etection for
s
ubmit/reba
s
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-07-18
Simon H
a
usmann
git-p4: Cleanup, make listExist
i
ngP4Branc
h
es
a
global
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-07-17
S
cott Lam
b
git-p4: input to "p4 f
i
le
s
"
by stdin instead of arguments
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-07-17
S
c
ott Lamb
g
i
t-p4:
us
e
sub
p
r
o
cess
in p4CmdList
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-21
S
i
m
o
n
Hausmann
Ma
k
e it po
s
sible
to specify the HEAD for the internal
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-20
Simon Hausmann
Added git-p4
br
a
nches command
that shows the ma
p
pi
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-17
Simon H
a
usmann
W
a
r
n about conflicting p4 branch
m
appings
and use
t
h
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-17
S
imon Hausm
a
nn
Fix the branch mapping detection to be independe
n
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-16
Benjamin Ser
g
ea
n
t
git-p
4
fail
s
when cloning a p4 depo
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-16
Simon Hausma
n
n
Fix
i
nitial m
u
l
t
i-bran
c
h
i
mp
o
rt
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-12
Si
m
on Ha
u
smann
F
ix gi
t
-
p
4 rebase
t
o d
e
tect the co
r
re
c
t upstr
e
am
branch
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-12
Si
m
on Hausmann
Moved t
h
e
c
ode
f
rom git-p4 submit to f
i
g
u
re
out the
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-11
Simon
H
ausmann
gi
t
-p4 submit: Fix
miss
i
n
g
q
u
otes a
r
ound p4 co
m
mands
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Simon Hausma
n
n
Mentio
n
remotes/p4/maste
r
al
s
o
in the doc
u
m
e
ntat
i
o
n
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Simon H
a
u
s
mann
Provide some
i
n
f
ormation
f
or si
n
gle bra
n
c
h
imports
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Kevin Gre
e
n
git-
p
4: ch
e
ck for
e
x
is
t
ence of
repo dir before tryi
n
g
.
.
.
commit
|
commitdiff
|
tree
2007-06-11
Simon Hausmann
Write out t
h
e options t
a
g in the
log message o
f
imports
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Sim
o
n H
a
usmann
Fix support for explicit disabli
n
g o
f
s
yncing with
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
S
i
m
o
n Haus
m
ann
Fix depot-paths encoding f
o
r mu
l
ti-path imp
o
r
ts (don
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Simon Hausmann
Fix proje
c
t n
a
me guessing
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-10
Simon
Hausmann
Fix upda
t
ing/creat
i
n
g
rem
o
t
e
s/p4/* heads from
orig
i
n
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-09
Simon Ha
u
sm
a
nn
F
i
xed the
c
heck to make sure to e
x
c
lude the HEAD
symbolic
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-08
Simo
n
H
a
usmann
Only
g
et
t
he expens
i
ve branch mapping from the p4
server
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
Make g
i
t-p4 s
u
bmit d
e
tect the co
r
rect reference (origin
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-07
Simon
H
aus
m
an
n
Make cl
o
n
e b
e
have like git clo
n
e by
d
efault
aga
i
n
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-07
Marius Storm-Olsen
Ensure th
a
t the commit mess
a
ge is Wi
n
dows formated
.
.
.
commit
|
commitdiff
|
tree
2007-06-07
Si
m
on Hausmann
Fix d
e
pot-path determination for git-p4
submi
t
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Simo
n
Hausm
a
nn
Fix git-p4 submi
t
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Sim
o
n Hausma
n
n
Fix
gi
t
-p4
rebase
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Simon
H
ausm
a
nn
Hack to make t
h
e mu
l
ti-branc
h
import
work ag
a
in with
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
Don't attempt
t
o set the initialPare
n
t on mult
i
-bran
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Sim
o
n
Haus
m
ann
Fix comm
o
n path "calculation" f
r
om log
s
of multiple
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
Fi
x
suppo
r
t
for "depot-path
"
i
n old
e
r
g
it-p4 impo
r
ts
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-28
Sim
o
n
H
ausmann
Fix typo in li
s
tEx
i
stingP4Branches that bro
k
e
syn
c
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-28
Si
m
on Hausma
n
n
In *_pipe print
the command that failed
i
f it fails
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-28
Simon Hausm
a
nn
F
ix m
y
email
ad
d
ress, thi
s
isn't r
e
ally KDE relat
e
d :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-28
Han-Wen Nienhuys
rename a
p
p
l
y() to ap
p
lyCo
m
mit();
apply is a python
.
.
.
commit
|
commitdiff
|
tree
2007-05-28
Han-Wen Nienhuys
reforma
t
ting: break
l
ong lines
.
commit
|
commitdiff
|
tree
2007-05-28
Han-We
n
Nienhuys
Cleanup
s
commit
|
commitdiff
|
tree
2007-05-27
Si
m
on Hausmann
Fix
creation
o
f refs/remot
e
s/p4/HE
A
D symbolic ref
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-25
S
i
m
on Hausman
n
Added
git-p4 submit --trust
-
me-like-
a
-fool for
the
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-25
S
imon H
a
usmann
Forgot to
r
emove th
i
s TODO item
when I made --w
i
t
h
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-25
Sim
o
n Hau
s
mann
Shortc
u
t the ca
s
e where we
h
ave no origin branch
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-25
Simon Hausmann
Mak
e
-
-
with-ori
g
i
n
th
e
d
efault for syncing
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-25
S
im
o
n
Hausmann
Make --with-or
i
gin also
w
ork without
origin
:)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-25
Simon Hausma
n
n
Make git-p4 work with packed refs (don't use
os
.
path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-25
S
i
mon Hausmann
Avoid c
r
eating non-p4 br
a
nches in re
m
ot
e
s/p4 off of
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
Simon H
a
usmann
Oops,
fix --with-orig
i
n to /really/ also call git fe
t
ch :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
S
i
mon H
a
u
s
m
ann
Added supp
o
rt fo
r
--with-o
r
igin with multi-bra
n
ch imports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
Simon Hausmann
Forgot
to remov
e
t
h
i
s return statement from de
b
ugging
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
Si
m
on Haus
m
ann
Fix cr
e
ating the remotes/p4 b
r
a
nches based on
o
rigin
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
Marius Storm-Olsen
Replace \r\n with \n when i
m
p
orting from
p4 on
W
indo
w
s
commit
|
commitdiff
|
tree
2007-05-23
Simon
H
a
u
s
mann
Load t
h
e user map from p4 only onc
e
at run-time
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausmann
F
ix
multi-b
r
anch import wit
h
-
-
silent
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Simon
H
ausmann
Fix p4 e
x
e
cution in
g
it-p4 rollbac
k
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Simon
H
au
s
m
ann
Catch p4 err
o
r
s in rollback early e
n
ough (before deleting
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
S
i
mon Haus
m
a
nn
Oops,
fill
t
he
/lis
t
/ correct wi
t
h the p4 exi
t
co
d
e
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Simon
Hausmann
D
o
n't make len
(
p
4
C
md("p4 changes -
m
1 //
f
o
o/
.
.
.
")
)
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausm
a
nn
Make
r
ollback
w
ork wit
h
l
o
call
y
imported branc
h
es
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Simon Ha
u
sman
n
Avoi
d
call
i
n
g
gi
t
symbolic-ref refs
/
head
s
/p4//HEA
D
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-22
Si
m
on Hausmann
Doc updat
e
s
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-22
Simon
H
ausmann
U
s
e
re
f
s/head
s
/* instead of refs/hea
d
s/p4/*
for lo
c
a
l
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-22
Simon Hausmann
Added sup
p
ort for --ma
x
-changes=<co
u
nt> to
e
ase import
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-22
Simon Hau
s
m
a
nn
Added suppo
r
t for impor
t
in
g
m
u
l
tip
l
e bran
c
h
es into
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon
H
ausmann
Fixes for
r
ol
l
back, del
e
te b
r
a
n
c
h
es that did no
t
exist
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Fix branch de
t
ec
t
ion in multi
-
bran
c
h
imports
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Added
a
rollback
c
o
mmand f
o
r d
e
bugg
i
ng
.
It
s
e
t
s bac
k
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
S
imon Hausmann
M
ake git-p4 submit --direct s
a
fer by
a
lso cr
e
ating
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon Haus
m
ann
D
e
tect with git-p4 submit --direct when there
are no
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
S
i
mon H
a
usmann
Fix git symbolic-
r
ef warning on initial
c
lone
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Fix erro
r
d
e
tection with gi
t
-p4 submit wh
e
n the requ
e
sted
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Sim
o
n
H
a
u
s
m
ann
Fix
c
onversion from old s
t
yle hea
d
s
/
p
4 to
r
e
m
otes/p4
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-20
Simon Hausmann
Improv
e
d output
f
or mul
t
i branc
h
im
p
orts and
n
oted
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-20
Simon Hausmann
Another (potentially life-saving) idea for sub
m
it
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
next