repo.or.cz
/
fast-export.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Make it possible to invoke git-p4 from within subdirectories of a git working tree.
2007-03-21
Simon Hausmann
Make
i
t
p
os
s
i
b
le to invoke
g
it
-
p4 fr
o
m withi
n
subdirectories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
imon
Hausmann
Made --
a
pply-as-p
a
tch the default for git-p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n Hausmann
F
i
x support
f
or deletions
i
n
git-p4 sub
m
it
w
h
en using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Added expe
r
im
e
n
tal bu
t
s
uper
-
f
a
s
t
--
a
pply-as
-
p
atch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n Ha
u
smann
Documentation en
h
anc
e
men
t
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
S
i
mo
n
Haus
m
a
n
n
St
a
rt o
f
t
he
g
i
t-p4
d
ocumenta
t
ion
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausm
a
n
n
R
emoved p4-f
a
s
t-export and p4-git-s
y
nc as they've been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simo
n
Haus
m
ann
F
ixed the initial vers
i
on import by getting th
e
file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Si
m
on Hau
s
m
ann
Added missi
n
g "sel
f
"s to make the script evaluate correc
t
l
y
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
C
o
m
plet
e
ly untested "merge" of p4-fast-export
.
py i
n
to
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Si
m
o
n
Hausmann
sync-to-perforce is now ca
l
led s
u
b
mit and fixed
th
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
P
ar
t
of the
c
o
d
e is
c
opyright by Trolltech
ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
F
i
rst (untested)
a
t
t
emp
t
at mig
r
ating p4-
g
it-sync into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hau
s
m
ann
Provide a
litt
l
e bit
o
f help descri
p
t
ion for the gi
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
imon Hausmann
S
tart movi
n
g the git-
p
4
tools into one sin
g
le
script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hau
s
mann
Pass
the
right number of ar
g
uments to com
m
it, fixes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Improved the git dir detecti
o
n
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Si
m
on Hausmann
Default to int
e
r
a
ctive syncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon
Hausmann
Use p4 revert
.
.
.
instea
d
of rev
e
r
t -a
.
.
.
after subm
i
t
t
ing
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hau
s
m
ann
Auto-detect the current gi
t
branch before submitt
i
ng
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simo
n
Haus
m
ann
Ignore Apple resource files when importing
from per
f
orce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Si
m
on Hausmann
B
e
nice
a
nd use /us
r
/bin/env py
t
hon for
the g
i
t-p
4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simo
n
Ha
u
smann
Automa
t
ically o
p
erate on
a t
e
mp
o
r
a
ry branch, needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hau
s
mann
Lots
o
f bugf
i
x
e
s
t
o p4
-
git-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
S
i
m
on Hausmann
Fix git-d
i
r
opt
i
o
n
and
allo
w
readi
n
g log s
u
b
s
titutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon Hausmann
First
v
ers
i
on o
f
a new script to sub
m
it chang
e
s
b
ac
k
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
im
o
n Ha
u
smann
Split up the cach
e
commandline
o
p
t
i
o
ns in
t
o (command
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Ha
u
sma
n
n
R
edu
c
e t
h
e nu
m
ber
o
f false
"
m
e
rges" by skipping "branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
More
w
ork
on
b
ranch detection by
i
mplementing change
I
sBranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausm
a
n
n
More code cleanup
s
and preparations for
m
ore
b
ranc
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hau
s
mann
Mi
n
or code
c
le
a
nups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Sim
o
n Hausmann
Mak
e
t
h
e p
4
d
a
ta
/
comman
d
c
ache
c
o
n
f
igurable through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon Haus
m
ann
Fixed p4-debug file
e
xtension
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon
Hausma
n
n
Changed --known-branches to take a file as argum
e
nt
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Sim
o
n Hausm
a
nn
Work in progress on detecting branches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simo
n
Hausman
n
Adjust the output p
a
rsing of g
i
t name-rev
t
o handle
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausm
a
n
n
Don't print a plain newline at the end of the e
x
ecutio
n
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
More wor
k
in --sile
n
t
s
upport
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simo
n
Hausmann
Added suppo
r
t for --silen
t
so
t
hat p4-fast-exp
o
r
t can
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Simon
H
ausmann
Adde
d
p4 delete
behavioural emulati
o
n as todo item
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
S
i
mon Hausmann
F
i
x sing
l
e-br
a
nch imports by s
k
ippi
n
g
t
he bran
c
h/merg
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hausm
a
nn
Use sets
.
Set()
instead o
f
set() to r
u
n a
l
s
o w
i
th o
l
d
e
r
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon
H
ausmann
Make i
t
po
s
sible
t
o
s
p
e
c
if
y
the p4
c
hanges
t
o im
p
o
r
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
When
trying to map p4 integrations to git merges just
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
imon Hausmann
Set
g
i
t
fast-im
p
ort mark
s
for every i
m
ported change
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
i
m
on
Ha
u
s
ma
n
n
Af
t
er
m
arkin
g
a p
4
bra
n
c
h
as
m
erged don't ev
e
r merge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Sim
o
n Hausmann
More
f
i
xes
in heuristic p
4
bra
n
c
h
d
e
tection bas
e
d on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon H
a
usma
n
n
Started
work on p4 branch
d
e
te
c
tion (experimental!)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
Co
d
e cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
S
i
mo
n
Hausmann
Cl
e
anups, remove unused variab
l
e
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
S
i
mon Hausmann
Creat
e
lightweight g
i
t
tags (using the
"
r
e
s
et" tr
i
ck
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Si
m
on Hau
s
mann
Adde
d
a little help
e
r script to remove unused
t
ags
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
Chang
e
d the default git import branch from "p4" to
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon
Hau
s
mann
Avoid the e
x
cessive use o
f
git tags for every per
f
or
c
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon
H
a
usmann
M
i
no
r
code cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simon H
a
usmann
A
d
d
e
d
a little h
e
lper
script to de
b
ug the
o
utp
u
t of
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Si
m
on Hausm
a
n
n
Made th
e
name of the git branch used for the perforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-08
Simon
H
ausmann
Catch io exceptions fro
m
git fast
-
import again and
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausmann
Fix calcu
l
ation of the n
e
west import
e
d
r
e
v
ision f
o
r
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon
H
ausmann
Make s
p
ecifying
t
he revision ranges
m
ore convenient
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausm
a
nn
Make incr
e
menta
l
imports eas
i
er to
u
se by
s
toring the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
S
i
mon Hausma
n
n
Fixed incrementa
l
i
mp
o
rts by using
the correct
"
from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon H
a
usmann
M
i
nor cl
e
an
u
ps and print a
n
error m
e
ssage of git fast
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
S
imo
n
Hausmann
In
i
tial sup
p
ort for
importing a
d
irectory fr
o
m Perforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon Hausmann
C
ode c
l
e
a
nups, mov
e
the code to c
r
eate a commi
t
w
i
th
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Si
m
on Hau
s
mann
Simplify the incremen
t
al i
m
port by elimin
a
tion the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Ha
u
smann
Started workin
g
o
n increme
n
t
a
l impor
t
s from Perfo
r
ce
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Fix file
p
e
rmissions of p4-fast-export
.
p
y
t
o b
e
executable
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Create a g
i
t
t
ag for every ch
a
n
geset imp
o
rted from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
imon H
a
usm
a
nn
Fixed disp
l
ayi
n
g import progre
s
s by calling flush on
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Sim
o
n Hausm
a
nn
Permit calli
n
g p4-f
a
st-export wi
t
h a
depot path that
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
im
o
n
H
au
s
mann
Avoid ca
l
ling fstat for every impor
t
ed file (slow!
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simo
n
H
ausma
n
n
Ported the r
e
maining functio
n
s
t
hat
p
arse
d
p4 s
h
el
l
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
I
n
stead
o
f parsing the out
p
ut of "p4 use
r
s"
use the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hau
s
m
ann
Min
o
r co
d
e c
l
eanups an
d
p
or
t
ed
s
o
m
e p
4
i
n
t
e
rfacing
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausma
n
n
Changed the import mec
h
anism to writ
e
to git
f
ast-imp
o
rt
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
i
mon Hausman
n
Re
m
oved unused p4cat func
t
ion
and added
h
elper func
t
ion
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausma
n
n
Speed
up the import of individ
u
al files from Perforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausma
n
n
S
o
me
f
ixes
t
o the ti
m
ezone conversi
o
n b
e
tween the date
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
imon Hausmann
Impl
e
mented basic sup
p
ort for
co
n
verting t
h
e date
o
f
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-31
Simon H
a
usmann
S
l
ightl
y
im
p
roved help u
s
age output and made specifyin
g
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-31
Sim
o
n Hausmann
Added basic support for specifyin
g
the depot path to
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-30
Si
m
on Hausmann
Initial
i
mport
o
f a pyth
o
n
s
cript to import
ch
a
n
ges
e
ts
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree