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
Cleanup, removed the old tagging code
2007-05-01
Sim
o
n
Ha
u
sm
a
nn
Clea
n
u
p
, removed the old
tagg
i
ng co
d
e
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon
Hausma
n
n
c
l
e
a
n
u
p,
r
enamed
self
.
glob
a
lP
r
efix to self
.
de
p
ot
P
ath
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simo
n
Hausmann
M
i
cro cl
e
anu
p
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon
H
a
u
smann
Doc cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
S
imon
H
au
s
m
a
n
n
Handle pa
t
ch errors in git-p4 submit better
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon H
a
usmann
A new attemp
t
at fixing
t
he child-f
a
s
t-impo
r
t-proces
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausmann
Slight
l
y improved
f
orm
a
t
tin
g
o
f the raw_inp
u
t
q
uestions
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
S
i
mon Hausm
a
n
n
Removed the ol
d
pa
t
ch
apply code from git-p4 submit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
S
i
mon Hausmann
Fix the
timez
o
ne forma
t
ting
.
N
o
w qgit also displays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Simon Hausmann
Print an erro
r
message
of some sort if gi
t
fast-import
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Simon Hausmann
All
o
w
f
or con
v
enient
reb
a
sing after git-p4 submit
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
i
mon
Haus
m
a
n
n
Added a simple example
o
f usage to the "documentation" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hau
s
ma
n
n
fix variable us
a
ge (o
o
ps)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausm
a
nn
Fix file
d
e
t
erm
i
nation for #head imports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Si
m
on Hausmann
Added g
i
t-p4 clone con
v
enie
n
ce comma
n
d
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausm
a
n
n
Hon
o
r --silent for l
a
b
els
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausman
n
Turn off potentially sl
o
w lab
e
l detecti
o
n by
d
efault
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Ha
u
s
mann
Pr
o
vide a t
r
ee summary afte
r
git
-
p4 rebase
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausma
n
n
Added git-p4 rebas
e
co
n
venien
c
e
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Sim
o
n Hausmann
Clean up python cla
s
s na
m
es
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Simon
H
ausmann
Fix
"compilation" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon Hausmann
F
ix
t
h
e
doc
s
fo
r
git
-
p
4 submit a
n
d turn git-p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon Hau
s
ma
n
n
Fix
v
ariable
u
sage in tag
i
mport
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hausmann
Added s
u
p
por
t
for map
p
ing p4 labels to git tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
S
i
mon Hausmann
git-p4 debug
doesn
'
t need
a git r
e
pository
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simon Hausm
a
nn
D
o
n't try to pars
e
any options with git-p4 debug but
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
S
i
m
on Hau
s
mann
Prefer
git command over git-comma
n
d
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simo
n
Hausmann
Mino
r
cosmetic fix
l
et for the git-p4 s
u
bmit sync ques
t
io
n
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausmann
Differen
t
versions o
f
p4 have diff
e
ren
t
out
p
ut for
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Sim
o
n Haus
m
a
n
n
Us
e
the n
e
w incremental import style by d
e
f
a
ult
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
Make it possible
t
o run git-p4 subm
i
t from
w
it
h
in the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
S
imon Hausm
a
nn
Brand
n
ew sm
a
rt
incremental
i
mport that doesn't nee
d
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
S
e
t
the default branch in run
,
no
t
in t
h
e
co
n
s
t
ructor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simo
n
Hausmann
Helper function to check the existance
o
f
a
revision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon Hausmann
A
d
ded some
helper function(s)
t
o pars
e
the depot path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Ch
a
ng
e
d
t
h
e default bra
n
ch for imp
o
rts
from "master
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
imo
n
Haus
m
ann
Changed the f
o
rmat
of the importe
d
log message slightly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon Hausmann
Removed the
.
p
y
extension
fr
o
m gi
t
-p4 as it's anno
y
ing
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
i
mon Hausmann
Don't sh
o
w the submit template and t
h
e diff f
i
rst in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Make it possible to invoke
git-p4
from
within
su
b
directo
r
ies
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Si
m
o
n H
a
u
s
mann
Mad
e
--app
l
y
-as
-
patch t
h
e
d
efault fo
r
git-
p
4
submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
i
mon
Ha
u
smann
F
i
x support
for deletio
n
s in git-p
4
s
ubmit when using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
i
mon Hausmann
Added
e
xperiment
a
l
but
s
up
e
r
-
f
a
st --a
p
ply-as-patch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n Haus
m
a
nn
Documentat
i
on enhanc
e
ments
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Start of
t
he git-p4 documentation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Removed p4-fast-export and
p
4-git-sync
a
s t
h
ey've
b
ee
n
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon
H
a
u
s
mann
Fi
x
e
d th
e
initi
a
l
versio
n
import by
g
etting the
f
ile
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon
Hausmann
A
d
ded
m
is
s
i
ng "self"
s
to make the scri
p
t evalu
a
te corr
e
ctly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Ha
u
smann
Completely
u
ntested "merge" of p4-fast-export
.
py
i
nto
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Si
m
on Hausmann
sync-to-
p
e
rforce
is now cal
l
ed
submit and fixe
d
the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
Hau
s
m
a
nn
P
a
rt of
t
he code
i
s copyrig
h
t by
T
rolltech ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
im
o
n
Hausmann
First (untested) attem
p
t at mig
r
ating p4-git-syn
c
i
nto
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Sim
o
n Hau
s
mann
Provide a little bit of help descripti
o
n for the g
i
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
m
o
n
Hausmann
S
t
art moving the
g
it-p4 tools into one sin
g
le script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Pass the
r
ight
n
umber of arguments to
c
omm
i
t, fixes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon H
a
usmann
Improved th
e
git dir detection
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Sim
o
n
Hausmann
Defaul
t
to
i
nteract
i
ve
s
yncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon Hausman
n
U
s
e
p4 revert
.
.
.
instead of
revert -a
.
.
.
a
fter submi
t
tin
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Si
m
o
n
Hausmann
Auto-detect
the
curren
t
git
b
r
anch before submitting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
S
imon Hausmann
Ignore Appl
e
resource fil
e
s when
im
p
ortin
g
from per
f
orce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simo
n
Hausm
a
nn
Be nice
and
u
se /usr/bin/e
n
v python for the git-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Si
m
on Hausmann
A
u
t
o
matically operate on a temporary branch, needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Ha
u
smann
L
o
t
s
o
f
bugfi
x
es to p4-git-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simo
n
Hausmann
Fix git-dir option an
d
allo
w
reading log
substitutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
S
i
mon Hau
s
mann
F
irst v
e
rsion
o
f a new s
c
ript to submit changes back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausma
n
n
Spl
i
t up t
h
e ca
c
h
e commandline opti
o
ns i
n
to (command
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
Haus
m
a
n
n
Redu
c
e the n
u
mber of fa
l
se "
m
erge
s
" by skipping "branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
mon
H
a
usman
n
More work on branc
h
de
t
ectio
n
by i
m
p
lementing changeI
s
Branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
mon Ha
u
smann
More code cleanups and preparations for more branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on Hausmann
Minor code clea
n
ups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
m
on H
a
usmann
Mak
e
the p4
da
t
a/command cache
c
o
n
fig
u
r
a
b
le through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Fixed
p4-debug fi
l
e
extension
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausmann
Changed --kno
w
n-br
a
nches
to t
a
ke a file
as
a
rg
u
m
ent
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Simo
n
Hausmann
W
o
r
k
in pro
g
ress on detec
t
ing
b
ranches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simon
Hausmann
Adjust
the
o
utput parsing of
g
it name-rev to hand
l
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Ha
u
smann
Don't print a plain newl
i
ne at the end
o
f
t
h
e exec
u
tion
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Simon
Hausma
n
n
More wor
k
in --silent s
u
pp
o
rt
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
S
imon
Hausmann
Ad
d
ed support fo
r
--sil
e
n
t so that p4-fast-export can
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Simon Hausm
a
nn
Added p4 delete behaviour
a
l emul
a
tion
a
s tod
o
ite
m
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
S
imon
H
a
usman
n
Fix single
-
branch import
s
by
s
kipping the branch/merge
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon
Haus
m
ann
Use sets
.
Set() in
s
tead of s
e
t
(
)
to ru
n
also
w
ith older
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hausmann
M
a
ke it possible to spec
i
fy the p4 c
h
a
ng
e
s to import
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
Simon Ha
u
smann
When trying to map p4 integ
r
ati
o
ns to
git
merges
just
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon
Hausmann
Set git fa
s
t-import marks for every
imp
o
rted change
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon
H
aus
m
ann
After marking a p4 branch as merged do
n
't
e
v
er merge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon
H
ausmann
Mor
e
fixes in heur
i
sti
c
p4
b
ranch detect
i
on based on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausma
n
n
Started work on p4 branch
d
etection (experimental!)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Si
m
on Hausma
n
n
Code cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simo
n
Hausm
a
nn
Clean
u
p
s
, remove unused variable
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon Hau
s
mann
Create lightweight gi
t
tags (u
s
in
g
the "
r
eset" trick
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon
Hausmann
Added a
l
itt
l
e helper scri
p
t to remove unused tags
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-10
Simo
n
Hausmann
C
h
anged the defaul
t
git impor
t
bran
c
h
from
"p4"
t
o
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
Avoid th
e
ex
c
e
ssive us
e
of git
tag
s
for every pe
r
forc
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
S
i
mon
Hausmann
Minor code cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simon Hausmann
Added a
l
i
ttle h
e
lper
s
cript to debug the output of
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simo
n
Hausmann
Made the name of the git branc
h
used for
the perf
o
rce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-08
Simon Hau
s
mann
C
a
tch
io exceptions f
r
om git fast-import again and
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
S
i
m
on H
a
u
s
ma
n
n
F
ix
c
alculati
o
n of the newest import
e
d r
e
vision for
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Si
m
on H
a
usmann
Make
s
pec
i
f
y
ing the
r
evisi
o
n
r
anges more convenient
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausmann
Make in
c
rement
a
l imports easier to use
b
y storin
g
the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
next