repo.or.cz
/
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: Support usage of perforce client spec
2008-02-27
Tor Arvi
d
Lu
n
d
git-p4:
Supp
o
r
t us
a
ge of perforce client spe
c
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
Simon Hausmann
g
i
t-p4:
g
it-p4
s
ubmit cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
Si
m
on Hausm
a
nn
git-p4: Removed g
i
t-
p
4 submit --direc
t
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
Simo
n
Hausma
n
n
git-p4: Clean
u
p
git-
p
4 submit's
log mess
a
ge handl
i
ng
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
S
im
o
n Haus
m
a
n
n
git-p4: R
e
move --log-substitution
s
feature
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
Tommy Thorn
git-
p
4: support exc
l
ud
e
paths
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-03
Simon
H
au
s
m
an
n
git-p4: Ensur
e
the worki
n
g d
i
rectory and the
inde
x
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-03
Simon
H
a
usmann
git-p4: Fix
s
ubmit user-i
n
terf
a
ce
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-03
Jason McMullan
Remove
$Id:
.
.
$ $Header:
.
.
$ et
c
f
r
om
+
ko
a
nd +k files
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-10-20
Chris Pet
t
itt
git-p4 support
f
or
p
erforce r
e
names
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-10-20
Simon H
a
usmann
git-p4: When skip
p
ing a patch as part
of "git-p4
submit
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon Hausmann
gi
t
-p4: Added support for aut
o
matically imp
o
rting newly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon Hausmann
git-p4: Cleanup;
m
oved
t
h
e
(dup
l
icated) cod
e
for tu
r
ning
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon Hausm
a
nn
git
-
p4:
Cle
a
nup; mo
v
ed the code
for t
h
e ini
t
ial #hea
d
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon
H
aus
m
ann
git-p4: Cl
e
anup; Tur
n
self
.
revision into a function
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon Hausmann
git-p4
:
Cl
e
anup; mov
e
d
t
he
code to import a list of
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
S
i
mon
Hausman
n
git-p4: Cleanup; moved the
code for g
e
tting a so
r
ted
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon Hau
s
mann
git-p4
:
After submissi
o
n
t
o p4 alwa
y
s synchronize
from
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon H
a
usmann
git-
p
4: Always call 'p
4
s
ync
.
.
.
' before sub
m
ittin
g
.
.
.
commit
|
commitdiff
|
tree
2007-08-02
Ha
n
-Wen Nienhuys
Fix s
t
y
l
e
n
it
i
n Python slicing
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-08-02
Han-W
e
n Nienhuys
Sor
t
o
u
t
put of "p4
ch
a
nge" in increme
n
tal
i
mpor
t
be
f
ore
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-07-18
Simon Hausma
n
n
git
-
p
4
:
C
l
eanup, used common f
u
nction for listing
i
mporte
d
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-07-18
Simo
n
Haus
m
ann
git-p4
:
Fix upst
r
eam bran
c
h
d
etecti
o
n for submit/rebase
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-07-18
Simon Hausm
a
nn
git-p4: Cle
a
nup, make
listExistingP4Branches a g
l
oba
l
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-07-17
Scott Lam
b
git-p4:
i
nput to
"
p4 files"
by stdin instead of arguments
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-07-17
S
c
o
tt
L
amb
git-p4:
use
s
u
bprocess in p4
C
mdLi
s
t
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-21
Sim
o
n H
a
usm
a
nn
Make
i
t
possible to specify the HEAD
f
or the interna
l
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-20
Simon Hausmann
Added git
-
p4 bra
n
ches command that shows the mappi
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-17
Simon
H
ausmann
W
arn
a
b
out
conf
l
ic
t
ing p4 branch mappings and us
e
t
he
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-17
Simon Hausmann
Fix the branc
h
mapping detecti
o
n to be independent
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-16
Benjamin Sergeant
g
i
t-p4 fails when cloning a p
4
d
epo
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-16
Simon
H
ausm
a
nn
Fix initi
a
l multi-branch import
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-12
Simon Haus
m
ann
Fix git-p
4
reb
a
se to detect the co
r
r
e
ct up
s
tream branch
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-12
Sim
o
n Hausmann
Moved th
e
code from git-p4
s
ubmit t
o
figure out the
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-11
Simon Hausmann
git-p4 submit: Fix miss
i
ng
q
uotes ar
o
und
p4 comman
d
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
S
i
mo
n
Hausmann
Mention remotes/p4/master also in
t
h
e
document
a
tion
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Simon Hausmann
Provide some information for single bra
n
ch impo
r
ts
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Kevin
Green
git-p4: che
c
k for exist
e
n
ce of
repo
dir before t
r
yin
g
.
.
.
commit
|
commitdiff
|
tree
2007-06-11
Si
m
on Hausmann
W
r
ite out the options tag
i
n the log
mes
s
age of import
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Si
m
on
H
ausmann
Fi
x
su
p
port for ex
p
licit
d
isa
b
ling of
s
yncing with
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Simon Hausmann
Fix depot-p
a
ths e
n
c
o
din
g
for multi-
p
ath
i
mports (d
o
n
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Simon Hausma
n
n
Fix project name g
u
essing
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-10
Si
m
o
n
Hausmann
Fi
x
updating/crea
t
ing remot
e
s/p4/*
heads from origin
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-09
Sim
o
n H
a
usmann
Fixed the chec
k
to make sure to exclude the HEAD sy
m
bolic
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-08
Si
m
on Hau
s
mann
Only get the expensive
branch m
a
pping from the
p4 server
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
Make git-p4 s
u
b
mit detect
t
he co
r
rect reference (origin
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
Ma
k
e cl
o
ne b
e
have like git clone by defa
u
lt again
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-07
Marius Stor
m
-Olsen
E
n
s
ure that the co
m
mi
t
m
essage is Wind
o
w
s format
e
d
.
.
.
commit
|
commitdiff
|
tree
2007-06-07
Simon Haus
m
ann
Fix depot-path dete
r
mination
for git-p4 submit
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Si
m
on Hausmann
Fix
g
i
t-p4 submit
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Simon H
a
u
sman
n
Fix
git-p4 rebas
e
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
S
i
m
on Hausmann
H
ack to make the multi-bra
n
ch
import work
a
ga
i
n
w
i
th
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Si
m
on Haus
m
ann
Don't attempt
to set the initialParent
on multi-b
r
anch
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Simon Haus
m
ann
Fix common
pa
t
h "calculation"
f
rom logs of multi
p
le
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
Fix support for "
d
epot-path" in older git-p4 im
p
orts
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-28
S
imon Haus
m
a
nn
Fi
x
typo
i
n
listEx
i
sting
P
4
B
ranche
s
that broke sy
n
c
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-28
Simo
n
Haus
m
ann
In *_pipe print the
c
ommand that failed i
f
it fails
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-28
Simon Ha
u
smann
Fix my e
m
a
il ad
d
ress
,
this isn't r
e
ally KDE rel
a
ted :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-28
Han-W
e
n Nienhu
y
s
rename
apply() to app
l
yCommi
t
(); apply is a python
.
.
.
commit
|
commitdiff
|
tree
2007-05-28
Han-Wen Nienhuys
reformatting:
b
rea
k
long lines
.
commit
|
commitdiff
|
tree
2007-05-28
Han-W
e
n
Ni
e
nhuys
Cleanups
commit
|
commitdiff
|
tree
2007-05-27
S
i
m
on Ha
u
smann
Fix creation of refs/remote
s
/p4/HEAD symbolic ref
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-25
Simon H
a
us
m
ann
Added git-p4 submit
--tr
u
st-me-like-
a
-fool for the
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-25
Simon
H
ausmann
Forgot to remove this TODO item w
h
en I
m
ade --with
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-25
Simon Hausmann
Shortcut
th
e
case
w
here we have no origin branch
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-25
Si
m
on Hausmann
M
ake --wi
t
h-origin th
e
d
e
f
a
u
lt
f
or
synci
n
g
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-25
Simon Hausm
a
nn
Make --with-origin also work without ori
g
in :)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-25
S
i
mon Hausmann
Make
git-p
4
work with packe
d
r
efs (don't
u
s
e
os
.
path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-25
S
im
o
n Hausmann
Avoid
creat
i
n
g
non-p4 branc
h
es
i
n
remotes/p4 of
f
o
f
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
S
i
mon Hausm
a
nn
Oops, fix --wit
h
-origin to /re
a
lly/ also
c
a
ll git fe
t
ch :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
Simon Ha
u
smann
Added su
p
port f
o
r --with-
o
r
i
gi
n
with multi-branch i
m
ports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
Simon Hausm
a
nn
Forg
o
t to r
e
m
o
ve this retur
n
statement from debu
g
ging
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
S
i
mo
n
Ha
u
smann
Fix
c
reating t
h
e rem
o
tes/p4 branches
b
a
s
ed o
n
origin
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
Marius
Stor
m
-Olsen
Repla
c
e \
r
\n with
\
n
w
hen impo
r
t
ing from
p
4
on
Windo
w
s
commit
|
commitdiff
|
tree
2007-05-23
Si
m
on Hausmann
Load
t
he user map from p4
only o
n
ce
a
t r
u
n-time
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-23
S
i
mon Hausmann
Fix mult
i
-b
r
anch import with
-
-silent
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausma
n
n
Fix p4 exec
u
tion in git-p4 rollback
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausmann
Catc
h
p
4
errors in rollback early enoug
h
(before delet
i
ng
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausma
n
n
Oo
p
s, fill the /list/ correct w
i
th t
h
e
p4
e
xi
t
code
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
S
i
mo
n
Hausma
n
n
Don't
m
ake le
n
(p4
C
md("
p
4 changes -m
1
//foo/
.
.
.
"))
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausman
n
M
a
k
e rol
l
b
ack w
o
r
k
with lo
c
ally imported b
r
anches
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Simon H
a
usma
n
n
Avoid callin
g
gi
t
symbolic
-
ref
r
efs/hea
d
s/p4/
/
HEAD
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-22
Simon Hausm
a
nn
Doc updates
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-22
Simon Haus
m
ann
Use
refs/heads/* i
n
s
tead of refs
/
heads/p4/*
f
o
r
loc
a
l
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-22
Simon Hausmann
Added su
p
port for --ma
x
-
c
hanges=<count> to ease import
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-22
S
i
mon Hausmann
A
dded
s
upport
f
o
r importin
g
multiple branches into
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
S
i
mon Hausmann
F
i
xes for
rollback, delete branches
t
hat di
d
n
ot exist
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
S
imon Ha
u
s
m
ann
F
i
x
branc
h
detection in multi-
b
ranch imports
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simo
n
Hausmann
Added a rollback command f
o
r debugging
.
It s
e
ts back
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon
H
a
u
s
mann
Make
g
it-p
4
submit --d
i
rect
s
afer by also
crea
t
i
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Det
e
c
t
with git-p4 submit --di
r
ect w
h
en there are no
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Sim
o
n H
a
us
m
a
nn
Fix git symboli
c
-ref
w
arning on i
n
itial
c
lone
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Fix error detection with
gi
t
-
p
4 submit when the reques
t
ed
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Sim
o
n
H
a
usmann
F
ix
conversion from old style heads/p4 to remotes/p4
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-20
Simo
n
Hausm
a
nn
I
m
proved ou
t
pu
t
for mult
i
branc
h
i
mports and n
o
ted
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-20
S
imon Hausmann
Anot
h
er (pot
e
ntially
lif
e
-saving) idea for submit
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-20
S
imon Hausma
n
n
Had an idea for debuggin
g
, record it :
)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-20
S
imon Hausmann
S
pecifying --detect-branches is now only neede
d
for
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-20
S
imo
n
Hausmann
Added suppor
t
for git-p4 submit
--dir
e
ct (experim
e
n
t
a
l)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-20
S
i
mon
Hausmann
Use
git format-
p
atc
h
and git
apply --apply when extracting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
next