repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-p4: Optimize the fetching of data from perforce.
2008-03-13
M
arius Storm-Olsen
git
-
p4: Optimize the
f
etch
i
ng of dat
a
f
r
om perf
o
rce
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
Tor Arvid Lund
git-p4: Support usag
e
of perforce clie
n
t
sp
e
c
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
S
i
mon Hausmann
git-p4:
git-
p
4 submit
cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
Simon H
a
usmann
git-p4: Removed git-p4
s
ubmit --
d
irec
t
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
Simon Hausma
n
n
git-
p
4: Clean
up git-p
4
subm
i
t
's log
mes
s
age handling
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
Simon H
a
usm
a
nn
gi
t
-p4: Remov
e
--log-substitutions feature
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
Tommy
Thorn
g
it-p4: support
e
xc
l
ude p
a
ths
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-03
Simon Ha
u
sman
n
git-p4:
E
ns
u
re the working directory and the
index
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-03
Sim
o
n
Hausma
n
n
git-p
4
: Fix submit user-inter
f
ace
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-03
Jason McMulla
n
Remove $I
d
:
.
.
$
$
H
e
a
d
er:
.
.
$ etc
f
rom +ko
an
d
+k files
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-10-20
Chr
i
s Pettit
t
git-p4 support for perfor
c
e renames
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-10-20
Simon Hausmann
git-
p
4: W
h
en s
k
ip
p
ing a p
a
tch as part of "git-p
4
submit
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon
Hausman
n
git-p4: A
d
ded suppo
r
t for automatic
a
lly importing newly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Si
m
on
H
au
s
mann
git-p4: C
l
eanup
;
moved th
e
(duplica
t
ed) code for t
u
rning
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon
H
ausmann
git-p4: Cleanup; mo
v
ed t
h
e code
f
or the initial #head
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon Ha
u
smann
gi
t
-p
4
:
Cleanup; Turn sel
f
.
revision
i
nto a function
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
S
i
mon Hausmann
git-p4: C
l
eanup; moved the code to impo
r
t a list of
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
S
imon Ha
u
smann
g
i
t-p4:
Cleanup; moved
t
h
e code for getting a
s
orted
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon Hausmann
git-p4
:
After
submission to p4 al
w
ays syn
c
hronize
f
rom
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon Ha
u
smann
git-p4
:
Always call 'p4
sync
.
.
.
' before
s
ubmitting
.
.
.
commit
|
commitdiff
|
tree
2007-08-02
Han-Wen Nienhuys
Fix
s
tyle nit in Python slicing
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-08-02
Han-Wen Nienh
u
ys
Sort o
u
tput of
"p4 change" in incremental import before
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-07-18
S
i
m
on Hausmann
git-p4: Cl
e
anup,
used co
m
mon
f
u
nction for listing
impo
r
ted
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-07-18
Simon Hausmann
git-p4: Fix upstr
e
am br
a
nch det
e
ction for submit
/
re
b
ase
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-07-18
Simon Hausmann
git-p4: Cleanup
,
make listExis
t
ingP4
B
ra
n
ches
a
global
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-07-17
Scott
La
m
b
git-p4:
i
n
p
ut to
"p4
f
iles" by
s
tdin instead of argu
m
ents
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-07-17
Scott
Lamb
git-
p
4: us
e
subprocess in
p4CmdList
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-21
Simon Hau
s
m
a
n
n
Make it pos
s
ible t
o
s
pecify the
H
EA
D
for th
e
internal
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-20
S
i
mo
n
Hausmann
Added git-p4 branche
s
comma
n
d that shows the mapping
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-17
Simon
Hausmann
Warn ab
o
ut conflicting p4 branch mappings and us
e
the
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-17
Simon Hausm
a
n
n
Fix th
e
b
r
a
nch ma
p
ping detection to be independent
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-16
Benjamin Sergean
t
git-p4 fail
s
when cloning
a
p
4 depo
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-16
Simon Hausmann
F
i
x
i
n
i
ti
a
l multi-branch
import
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-12
Simon Hausmann
F
ix git-p4 r
e
base
t
o detect th
e
c
orrect up
s
trea
m
branch
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-12
Simon Hausmann
M
oved the
code f
r
om gi
t
-p4
submit
t
o figure out
the
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-11
Simon Hau
s
m
ann
git-p4 sub
m
it: Fi
x
mis
s
in
g
quotes ar
o
und p4 comman
d
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Simon Hau
s
mann
Mention remotes/p
4
/mas
t
er also
i
n the documentation
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
S
i
m
o
n Hausmann
Pr
o
vi
d
e some i
n
f
o
r
ma
t
ion for si
n
gle branch im
p
o
r
ts
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Kevin Green
git-p
4
: check f
o
r existence of repo d
i
r bef
o
re tryi
n
g
.
.
.
commit
|
commitdiff
|
tree
2007-06-11
Simon H
a
usmann
Write out the options ta
g
in the log message of i
m
ports
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
S
imo
n
Hausm
a
nn
Fix
s
upport for explicit
d
isabling of syncing with
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Simon Hausmann
Fix depot-paths e
n
coding for multi-path imports (don
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Simon Hausmann
Fix project name guessing
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-10
Simon Hausmann
Fix
updating/cr
e
at
i
ng remote
s
/p4/* he
a
ds
f
rom origin
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-09
S
imo
n
Hau
s
mann
F
i
xed the check
to make su
r
e to ex
c
l
u
d
e
the HEAD symbolic
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-08
Simon Hausman
n
Only get th
e
ex
p
ensive
branch mappi
n
g from the p4 s
e
rv
e
r
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-07
S
i
mon
H
ausmann
Make g
i
t
-p
4
subm
i
t detect
the correct reference (
o
rigin
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausm
a
nn
Make clone
be
h
a
ve like git c
l
one by de
f
a
ult again
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-07
M
a
r
i
u
s
Storm-Olsen
Ensure t
h
at the commit message is Wind
o
ws formated
.
.
.
commit
|
commitdiff
|
tree
2007-06-07
S
imon Ha
u
smann
Fix depot-
p
ath d
e
termi
n
ation f
o
r git
-
p4 su
b
mit
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
Fi
x
git-p4 su
b
mit
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Sim
o
n Hausmann
Fix git-p4 rebase
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
Hack to make the multi
-
branch i
m
port work
agai
n
with
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausm
a
nn
Don't at
t
empt to set the ini
t
ialPare
n
t on
multi-branch
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
S
i
mon
H
a
usmann
F
i
x common pat
h
"calculation"
f
rom
logs of mu
l
t
iple
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
S
i
mon Hausmann
Fix support for "depot-path
"
in
o
lder git-p4
i
m
p
o
r
ts
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-28
Simon Hausmann
Fix typo i
n
listE
x
ist
i
ngP4Branches
that broke
sync
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-28
S
i
mon H
a
usmann
In *_p
i
p
e
print th
e
command that failed if it fails
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-28
Simon H
a
u
s
mann
Fix my email
a
ddress, this
isn'
t
really KDE related :
)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-28
Han-Wen Nienhuys
re
n
a
m
e
apply
(
) t
o
applyC
o
mmit(); apply is a pyth
o
n
.
.
.
commit
|
commitdiff
|
tree
2007-05-28
Han-
W
en Nienhuys
ref
o
rmat
t
ing
:
b
re
a
k
long li
n
es
.
commit
|
commitdiff
|
tree
2007-05-28
Han-Wen Nien
h
uys
Cleanups
commit
|
commitdiff
|
tree
2007-05-27
Simon Hau
s
mann
F
ix creatio
n
of re
f
s/re
m
o
t
es/p4/HEAD symbolic ref
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-25
Simon Hausmann
Added
g
it-p4 submi
t
--trust-m
e
-like-
a
-fool for
t
h
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-25
Si
m
on Hausmann
F
orgot to remove this TODO item wh
e
n I made --wi
t
h
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-25
Simon H
a
usmann
Shortcut the
case where we have
no origi
n
branch
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-25
Si
m
on H
a
usmann
Make --with-orig
i
n the defa
u
lt for sync
i
ng
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-25
Si
m
on Hausmann
M
a
ke --with
-
origin al
s
o
w
ork
withou
t
orig
i
n :)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-25
Simo
n
Hausmann
M
a
k
e git-p4 work with
packed refs (d
o
n't use os
.
path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-25
Si
m
on Hau
s
m
a
n
n
A
void creating
n
on
-
p
4 branches
in
r
emo
t
es/p4 off of
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
Simon Ha
u
smann
Oop
s
, fix
-
-wi
t
h-origin to /really/ also call git
fetch :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
S
i
mon Haus
m
ann
Add
e
d
support for --wit
h
-origin
w
i
t
h multi-br
a
nch imports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
Simon
H
ausmann
Forgot t
o
remove
t
h
is return statement from debugging
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
S
imon
H
ausmann
Fix creating the remot
e
s/p4 branches ba
s
ed
on origin
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
Mar
i
us
Stor
m
-Olsen
Repl
a
ce \r\n
w
ith \n
w
h
e
n im
p
o
rt
i
ng from p4 on W
i
ndows
commit
|
commitdiff
|
tree
2007-05-23
Simon Haus
m
a
nn
Load th
e
u
s
er map fro
m
p4 only o
n
c
e at r
u
n-tim
e
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-23
Si
m
on
H
a
usmann
Fix
m
ult
i
-branch import w
i
th --silent
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Simon
Ha
u
smann
Fix p4
execution i
n
git-p4 rol
l
b
ack
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Simon
Hausm
a
nn
Catch p
4
err
o
rs in rollb
a
ck early enough (before
deleting
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Si
m
o
n Hausmann
Oops, f
i
ll the /list/ correct w
i
th the p4 ex
i
t
co
d
e
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Simo
n
H
ausmann
Don't mak
e
len(
p
4
Cmd("p4 changes -m 1 //foo/
.
.
.
"))
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Simon Haus
m
a
n
n
Make rollback
work with locally imported branches
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausmann
Avoid ca
l
li
n
g
git sy
m
b
o
lic-r
e
f refs/head
s
/p4//HEA
D
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-22
Simon
Hausman
n
Do
c
updates
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-22
Simon Hausmann
Use r
e
f
s
/
heads/*
in
s
tead o
f
ref
s
/
h
eads/
p
4/*
f
o
r
local
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-22
Simon Hau
s
mann
A
d
ded
s
upport for
--
m
a
x-changes=<count
>
to ease im
p
ort
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-22
Simon Hausmann
Adde
d
su
p
p
o
rt for importing multiple
branch
e
s into
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon H
a
usmann
Fixes for rol
l
bac
k
,
d
elete
b
ranches t
h
at
d
id
not
e
xist
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausman
n
Fix branch detec
t
ion in multi-
b
ranch impor
t
s
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Added
a
rollback comman
d
fo
r
debugging
.
I
t sets back
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausma
n
n
Make
g
it
-
p4 s
u
bmit --dire
c
t safer by
a
l
s
o creating
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Detec
t
with git
-
p4 su
b
mit --direct when
there are
n
o
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon
H
ausmann
Fix git symb
o
lic-ref warning
o
n ini
t
ial clone
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Fix error detection w
i
th git-p4 submi
t
when the requested
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon H
a
usmann
F
ix conversion from old style head
s
/p4 to remotes/p
4
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-20
Simon
H
a
usm
a
nn
Impr
o
ved
o
utput
f
or multi branch impor
t
s and
n
oted
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-20
Simon Hausmann
A
n
othe
r
(pote
n
tia
l
l
y
life-saving) i
d
ea for sub
m
it
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-20
Simon
H
ausmann
H
a
d an idea f
o
r debugging, rec
o
rd
it :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-20
Simon
H
a
u
smann
Specifying --detect
-
bra
n
ch
e
s is now on
l
y needed for
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-20
Simo
n
H
a
us
m
ann
Ad
d
ed support f
o
r git-p4 su
b
mit --d
i
r
ect
(
e
xperimental)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
next