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
Reduce the number of false "merges" by skipping "branch from" entries in the integrat...
2007-03-10
Simon Hausmann
Reduce th
e
number of false "merg
e
s" by
s
k
ip
p
ing "branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
More work on branch
d
etection by implementing changeIsBranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on
H
ausma
n
n
Mor
e
code
c
l
e
anups and preparations for more bran
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
Haus
m
ann
Mi
n
o
r cod
e
clean
u
ps
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon H
a
usmann
Make t
h
e p4 da
t
a/command
cach
e
configurable throu
g
h
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausma
n
n
Fixe
d
p4-debug file e
x
tension
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Sim
o
n Hausmann
C
h
anged --known-branches
t
o ta
k
e a
f
ile as argument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Si
m
on Ha
u
smann
Work in prog
r
ess on detec
t
ing branches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simon
H
ausmann
Adjust
the
o
u
tput
parsin
g
of git name-rev to 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
e
n
d of the
e
xecution
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
More work
in --silent support
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Si
m
on Hausmann
A
d
ded support fo
r
--
s
ilent
s
o that p
4
-
f
ast-
e
xport can
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Simo
n
Hausman
n
Added p4 de
l
ete behavioural emulat
i
on as todo item
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Simon Hausmann
Fix sin
g
l
e
-
b
ranch
imports by skipping th
e
b
r
anch/merge
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simo
n
H
a
u
s
man
n
Use
s
e
t
s
.
S
et() inst
e
ad
o
f
set()
t
o
r
un also with
o
l
d
er
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Si
m
on
H
a
usmann
Make it possible to specify th
e
p4 c
h
ange
s
to
i
mport
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausman
n
W
h
en trying to m
a
p
p4 integr
a
tions to git merg
e
s just
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
i
mon Ha
u
s
m
ann
Set git
fast-
i
mport
m
arks for ev
e
ry i
m
por
t
ed change
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Sim
o
n Ha
u
sm
a
nn
A
fter
m
a
rking a p4 branch a
s
merg
e
d d
o
n
't ev
e
r
merge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
M
ore
f
ix
e
s
i
n heur
i
stic p4 b
r
anch detection
b
a
sed on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hau
s
m
a
nn
Started work on p4 branch d
e
tection (experimental!)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Sim
o
n Ha
u
sma
n
n
Code c
l
ean
u
p
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon
Haus
m
an
n
Clean
u
ps
,
r
emove
un
u
s
ed variable
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon Haus
m
a
nn
Create lightweight
git tag
s
(us
i
ng the "re
s
et
"
trick
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Si
m
on Hausmann
Added a little helper script to remov
e
unused
tags
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-10
Simon
H
a
usman
n
C
h
anged the default git impor
t
b
ranch from
"
p
4
" to
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
Avoid the e
x
cessive use o
f
git tags for every
p
erfo
r
c
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
S
imon Ha
u
sma
n
n
Minor code clea
n
ups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simon
H
ausman
n
Add
e
d a little helper script
t
o
d
e
bug the output of
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Si
m
on Ha
u
smann
M
ade the
n
ame of the git branch
u
sed
for the
perforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-08
Simon H
a
usm
a
nn
Catch io
e
x
c
eptions fr
o
m git fast-imp
o
rt again and
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
S
imon Hausm
a
n
n
Fix c
a
lcul
a
tion of th
e
newest imp
o
r
t
ed
revision
f
or
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Si
m
on Hausmann
Make spec
i
fying the r
e
vision ra
n
ges
more convenient
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausmann
Make i
n
crem
e
ntal imports ea
s
ier
t
o use by storing the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausmann
Fixed incremental
imports by
u
sin
g
the co
r
rec
t
"from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon
H
ausmann
Min
o
r cleanu
p
s
a
nd p
r
int an error message
of git fast
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon Hausmann
Ini
t
ial support for im
p
orting a directo
r
y from Perfo
r
ce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon Haus
m
ann
Code
cleanup
s
, move the
c
ode
t
o
create a commit wi
t
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon Hausm
a
nn
S
i
mplif
y
the incremental import by el
i
min
a
t
ion the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Started workin
g
on inc
r
emental imports
from Per
f
o
rce
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Ha
u
smann
F
ix file permissions of p4
-
fast-e
x
port
.
py to be execu
t
able
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Haus
m
ann
Create
a
g
i
t tag for eve
r
y changeset imported fro
m
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
F
i
xed
d
i
splay
i
ng
i
m
p
ort progress
b
y calling flus
h
on
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
i
mon
H
ausmann
P
e
rmit
ca
l
ling p4-fast
-
e
xpor
t
with a
depot p
a
th that
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon H
a
usmann
Avoid calling fst
a
t
f
or
e
ve
r
y
imported
f
i
le (slow!
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Sim
o
n Haus
m
a
nn
Port
e
d
the re
m
aini
n
g
f
unctio
n
s t
h
at parsed p4 shell
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Instead of par
s
ing the
o
utput of "p4
u
s
ers" use the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
M
i
no
r
code c
l
eanups an
d
porte
d
some p4
interfacing
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon H
a
u
smann
C
h
anged the import mechanis
m
to
write to git fast-
i
m
p
o
rt
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Sim
o
n Hausmann
Remo
v
ed unused p4cat func
t
io
n
and added hel
p
er fun
c
tion
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
S
peed up the
i
mport of indi
v
idual
f
iles from Perf
o
rce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Some fix
e
s
t
o the
t
imezone
conversi
o
n between the date
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausm
a
nn
I
m
p
lemente
d
basic suppor
t
for conve
r
t
i
ng the date of
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Slightly improved
h
elp usage output
a
nd made sp
e
cifying
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-31
S
i
m
o
n
H
ausmann
Added basic
s
uppo
r
t for specify
i
n
g
the
d
epot path
to
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-30
S
i
m
on Hausm
a
nn
Initial impo
r
t
o
f a pytho
n
s
c
r
i
p
t to import
c
ha
n
ge
s
ets
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree