repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Set the default branch in run, not in the constructor
2007-03-22
Simon Haus
m
ann
Set the de
f
au
l
t
bran
c
h in run, not in the c
o
n
s
tructor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
Hau
s
man
n
Helper fun
c
tion
t
o ch
e
c
k the exis
t
ance of a revision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Adde
d
some helper function(s
)
to
p
arse the depo
t
path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Sim
o
n
Hausm
a
n
n
C
hanged the defaul
t
b
ranch fo
r
i
mports from "m
a
s
t
e
r
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausm
a
nn
Chang
e
d the format
o
f
t
he
i
mported log message slightly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Sim
o
n H
a
us
m
ann
Removed
th
e
.
p
y extensi
o
n from git-p4 as it's annoying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Don't
s
h
ow the
s
u
b
mit template and the dif
f
first in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
S
i
m
on Hausmann
M
ake
i
t possible to invok
e
g
i
t
-p4 from within subdirectories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
H
ausmann
Made --
a
pply-as-
p
atch the default f
o
r
git-p4 subm
i
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
i
m
on Hau
s
mann
Fix support for delet
i
ons in git
-
p
4
submit
when using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Haus
m
ann
A
dded e
x
pe
r
imental but su
p
er
-
fast --apply-as-patch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n Hausman
n
Do
c
ument
a
t
ion
e
n
h
anc
e
me
n
ts
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Sim
o
n H
a
u
smann
St
a
rt of the git-p4
d
ocumentation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausma
n
n
Removed p4-fast-ex
p
or
t
and p4-git
-
sync as they've been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simo
n
Hausma
n
n
F
i
xed the
i
ni
t
ia
l
version impor
t
by getting the file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausm
a
nn
Added missing "self"s to make t
h
e script evaluate corre
c
tly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
i
mon Hausmann
Completely untes
t
e
d
"merge" of p
4
-fa
s
t
-
export
.
p
y
i
n
to
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
i
mon
H
ausmann
s
ync-
t
o-perforce is now called
submit and f
i
x
e
d th
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
P
art of t
h
e code
is
c
opyri
g
ht by Trollte
c
h
AS
A
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
H
ausma
n
n
First (untested) attempt at migrating p4-gi
t
-sync
i
n
t
o
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
imon Ha
u
smann
P
r
ov
i
d
e
a little bit
of h
e
lp de
s
cr
i
ption for the git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Haus
m
ann
Start moving
t
he git-p4
tools i
n
to one
s
i
n
gle script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Si
m
on H
a
usmann
Pass
t
he
r
i
g
ht
nu
m
ber of arg
u
ments t
o
c
ommit, fixes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
Hausmann
I
m
p
roved the git dir detect
i
on
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Sim
o
n Hausmann
Defa
u
lt to inte
r
a
c
tive sync
i
ng
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon
Hausmann
Use
p
4 revert
.
.
.
in
s
t
e
ad o
f
r
e
ver
t
-
a
.
.
.
after
sub
m
itting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
S
i
mon Hausmann
Auto-detect
the curr
e
n
t
g
it branch before s
u
bmitting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hau
s
mann
Ignore Apple resource fi
l
es
w
hen importing from perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon
H
ausmann
Be nice an
d
use
/
usr/bin/env python for th
e
git
-
p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Si
m
on Hausman
n
Automaticall
y
o
p
erate on a
t
em
p
or
a
ry bra
n
c
h
, needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausmann
L
ots of bug
f
ixes to p4-g
i
t-sy
n
c
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hau
s
mann
Fix git-dir option and a
l
l
o
w readin
g
log sub
s
titutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simo
n
Ha
u
sman
n
F
irst versi
o
n o
f
a new s
c
ript to sub
m
it c
h
anges back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
imon Haus
m
ann
S
p
lit up the cache
co
m
mandline options into (comm
a
nd
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
R
e
du
c
e the number o
f
f
alse "merges" by s
k
i
p
ping "branc
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausman
n
More work on branch detecti
o
n
b
y implementing changeIsBranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on
Hausmann
More
c
ode cle
a
n
up
s
a
nd preparat
i
ons for more bran
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon H
a
usmann
M
i
nor code cl
e
an
u
ps
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
mon Hausma
n
n
M
ake the p4 data/command cache con
f
igurable through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon
Haus
m
ann
F
ixed p4-debug file ex
t
ension
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon
H
a
usmann
Change
d
--know
n
-
b
ranch
e
s
t
o take a file as argument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Si
m
on Hausman
n
Work in progress on
d
e
tecting br
a
nches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simon Ha
u
s
m
ann
Adjust th
e
output parsin
g
o
f git
name
-
rev to
h
andle
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Ha
u
smann
Don't print a p
l
a
i
n
newline at the end of the execution
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Simo
n
Hausmann
Mo
r
e work in -
-
s
ilent support
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon
H
ausmann
Added sup
p
ort
f
or --sile
n
t so tha
t
p4-fast-exp
o
r
t can
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Si
m
on
H
a
usmann
Added
p4 del
e
te behavioural emulation
as todo item
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Simon Hausm
a
nn
F
ix single-bra
n
c
h i
m
ports
by
sk
i
pping th
e
branch/me
r
ge
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hausmann
Use se
t
s
.
Set(
)
i
nst
e
a
d of set() to run also with olde
r
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Haus
m
a
n
n
Mak
e
i
t
p
ossible to spec
i
fy the p4
c
ha
n
ges to import
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
Sim
o
n
Hausmann
When try
i
ng
to map p4 inte
g
rations to git merg
e
s just
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausma
n
n
Set git fast-i
m
port ma
r
ks for
every im
p
orted c
h
ange
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
A
fter marking
a
p4 branch as
m
erg
e
d don't ever merge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon
Hausmann
More fixe
s
i
n
heuristic p4 b
r
a
n
c
h
detect
i
on b
a
sed on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausman
n
Started work
o
n
p
4
b
r
anch dete
c
tion (experimental!)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Si
m
on Hausm
a
nn
Co
d
e cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon Hau
s
mann
Cleanups, remove unused v
a
ria
b
l
e
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon Hausmann
Create lightweigh
t
git tags (usi
n
g th
e
"
r
eset" tr
i
ck
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon
H
aus
m
ann
Add
e
d
a little helper s
c
ript t
o
remove
u
n
u
s
ed tags
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
Changed
the defaul
t
git import branch from "p4" to
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Sim
o
n H
a
u
s
mann
Avoid the excessive use of git t
a
gs
for
e
very per
f
orce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hau
s
ma
n
n
Minor
c
o
d
e
c
lea
n
u
p
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simon
H
ausmann
Added a
littl
e
h
e
lpe
r
script to de
b
ug the ou
t
put of
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simon Hausmann
Made t
h
e name
of
t
he git br
a
nch us
e
d
f
or
the perforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-08
Simon
H
ausmann
Catch io exceptions from
g
i
t f
a
st-import again
and
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
S
i
mon Hausmann
Fix
calc
u
lation of the newest
i
m
po
r
ted re
v
i
sio
n
for
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Sim
o
n Hausman
n
Ma
k
e specifying the revision ranges more conv
e
n
ient
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
S
imon H
a
usmann
Make
i
ncremental
imports easi
e
r to use
by st
o
ring the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
S
im
o
n Hausmann
Fixed increment
a
l imports by using
t
he
c
o
rrect
"from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausmann
M
i
nor c
l
eanups a
n
d print an error
m
e
s
sage of git fast
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon Hausmann
Initi
a
l suppo
r
t for importin
g
a dire
c
tory fro
m
Perforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon
H
aus
m
ann
Cod
e
cleanups, move the code
t
o crea
t
e
a
comm
i
t with
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
S
imon
H
ausmann
Si
m
plify the incre
m
e
n
tal
i
mport by
e
lim
i
nation th
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Si
m
on Hausma
n
n
Star
t
e
d
workin
g
on increm
e
ntal
i
mp
o
rt
s
fr
o
m
P
erfo
r
c
e
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simo
n
Hau
s
mann
Fi
x
fil
e
permiss
i
ons o
f
p
4
-
fast-ex
p
ort
.
py to
b
e executab
l
e
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
C
reate a git tag for every changeset import
e
d
from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Fixed di
s
playing i
m
port
p
r
og
r
ess by callin
g
flus
h
on
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simo
n
Hau
s
mann
Permit calling
p4-fast
-
export with a depot path
t
hat
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
imon Hausmann
Avoid calling fstat for ever
y
impo
r
ted file (slow!
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon
Hausmann
Por
t
ed
t
he remaining function
s
that parsed
p4
s
hell
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon
H
aus
m
ann
Instead
of
p
arsing the output of "p4 use
r
s" use
the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon
H
au
s
m
a
nn
Minor code c
l
eanups
and por
t
e
d
some p
4
interfacing
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
C
hanged t
h
e import m
e
c
h
ani
s
m to
w
rite to git fast-im
p
ort
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Removed unused p4ca
t
function and adde
d
helper func
t
i
o
n
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Speed
up th
e
import of individual files
from P
e
r
forc
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Si
m
on Haus
m
ann
Some f
i
x
e
s to t
h
e
t
i
m
ezo
n
e conv
e
rsion between
the
date
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Sim
o
n Ha
u
smann
Implemented basic supp
o
r
t
fo
r
conve
r
ting the dat
e
of
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Sli
g
ht
l
y
i
m
p
r
ove
d
help usa
g
e output
and
mad
e
speci
f
y
ing
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-31
Simon
Ha
u
smann
Added bas
i
c
s
up
p
ort
f
or
specif
y
ing the depot
path
to
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-30
Simon Hausma
n
n
Initial
i
mpor
t
of a python
scri
p
t to import change
s
ets
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree