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
More work on the incremental importing of multiple branches.
2007-05-19
Simon Hausman
n
M
o
re work on the i
n
crem
e
ntal
i
mporting of mu
l
tiple
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon Haus
m
ann
G
i
ve
branches
a nice project prefix and don't bail
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon Ha
u
sm
a
nn
Started
rewriting the branch detection, bas
e
d on "p4
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hausm
a
n
n
Re
m
oved
unu
s
e
d cach
e
varia
b
les
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
S
i
mon H
a
usman
n
F
i
x branch s
e
tup af
t
er i
n
itial clone
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-17
Sim
o
n Hausmann
Removed todo
item that
is implemented
:)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
imon Hausmann
Added
s
upport for git-p4 sync/
r
eba
s
e
-
-
w
ith-origin
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
B
i
te th
e
bullet a
n
d automat
i
cally conve
r
t old style
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
imon H
a
usmann
Changed the
defaul
t
p
4 impor
t
branch to be
r
e
fs/remotes
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausm
a
nn
Create the origin based
i
mport
b
ranch using g
i
t update
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
R
emoved anc
i
e
n
t and unused code
t
o find
the
l
a
st imported
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
R
e
move
d
cleant
a
gs command
.
It doesn't have any meanin
g
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausman
n
Clean up code
duplication for revi
s
ion parsing
a
nd
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausm
a
nn
Al
w
ays pass a sha1 for
the ini
t
ial par
e
nt s
o
that git
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
imon Hausman
n
Fixing
syncing (gitdir discovery
/ cd)
for bare repo
s
itories
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-16
S
imon
Hausmann
A
l
ittle todo not
e
be
f
ore I forget it :), based on
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
S
imo
n
H
a
u
smann
F
i
x calling
git-p4 rebase from
w
i
th
i
n
a subdirector
y
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon
Haus
m
ann
Gi
v
e a better hint if git-
p
4 submit fails
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Si
m
on Hausmann
Added the p
o
ssibility of skippi
n
g patches
du
r
ing git
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
S
i
mon H
a
usman
n
Make git-p4 work with bare
re
p
ositories
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hau
s
mann
Fix git-p4 clone
/
/
depot/pr
o
j
e
ct (h
e
ad
i
m
port)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon
H
ausma
n
n
Con
v
erted to unix ne
w
lines
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Si
m
on Hau
s
mann
M
a
ke submitting work on W
i
ndows
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon
H
aus
m
ann
Make sure all pope
n
c
a
lls use bi
n
a
r
y
m
ode (for Windows
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
S
i
mon H
a
usmann
A
dded a li
t
tle
.
bat w
r
apper f
r
om
M
a
rius
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Use t
h
e
subprocess module instead of
popen2 to make
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
Sim
o
n Hausma
n
n
Docum
e
n
t
some i
m
p
lement
a
tio
n
details, for t
h
e
curious
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausm
a
nn
Cleanup, removed the
old ta
g
g
i
ng
code
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
S
i
m
on Hausmann
cl
e
a
nup, renamed sel
f
.
g
lobalPrefix to se
l
f
.
depotPa
t
h
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
S
i
m
on Hausmann
Micro cleanup
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon
Haus
m
ann
Do
c
clea
n
u
ps
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simo
n
H
ausmann
Handl
e
patch
e
rrors
i
n git-p4 su
b
mit better
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hausmann
A new
a
ttempt at fi
x
ing t
h
e chil
d
-fast
-
import-process
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausmann
Sl
i
ghtly i
m
p
r
oved fo
r
matting of the raw_input que
s
t
i
ons
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Ha
u
smann
R
e
moved
the old p
a
t
c
h
a
pply code from git-
p
4 submit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Si
m
o
n
Ha
u
smann
Fix t
h
e timezone
f
o
r
matting
.
Now qgit also displays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Simon Haus
m
ann
Print an
e
rror me
s
sa
g
e
of some sort if g
i
t
fast-import
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Simon Hausmann
A
llow for convenient rebasing af
t
er git-p4 s
u
b
mit
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
Added a simple exa
m
ple
of u
s
a
g
e to
the "documentation" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
f
i
x
variable usage (
o
op
s
)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausm
a
n
n
Fix
file determin
a
tion fo
r
#head i
m
ports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Sim
o
n
Hausman
n
Add
e
d git-p4 clo
n
e convenience c
o
mmand
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
Honor
-
-silent fo
r
labels
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
S
i
mon Hau
s
mann
Turn off pote
n
tially
s
l
ow label dete
c
tion by default
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon
Haus
m
a
nn
Provide a tree summary
a
f
ter git-p4 rebase
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausmann
A
d
ded gi
t
-p4 r
e
base convenience
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausm
a
nn
C
l
ean up
p
ytho
n
cla
s
s names
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Sim
o
n Hausmann
Fix "com
p
ila
t
ion" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon
H
ausmann
Fix the docs for git-p4 submit an
d
t
urn
g
it-p4 sub
m
it
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon Haus
m
ann
Fix variable usage in tag
i
m
port
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hausmann
Added support for mapping p4 labels
t
o git tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Si
m
on
H
a
u
sm
a
nn
git-p4 debug
doesn
'
t need
a
g
it reposit
o
ry
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simon Hausman
n
Don't try
to pars
e
any opt
i
o
n
s with git
-
p
4 d
e
bug
b
u
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Si
m
on Hausm
a
nn
Prefe
r
git command over git-comm
a
n
d
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Ha
u
smann
Minor cosmetic fixlet for the git
-
p4 submit sync que
s
tion
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Ha
u
sm
a
nn
Dif
f
e
rent versions of
p4
h
ave
d
ifferent
output
f
or
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Sim
o
n H
a
us
m
ann
Use the new incremental impor
t
st
y
le by d
e
fault
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
S
imon Hausmann
M
ake i
t
possi
b
le to
run git-p4 submit from within th
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausm
a
nn
B
r
a
n
d new
smart increme
n
tal import that doesn
'
t
n
eed
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
m
on
H
a
us
m
ann
S
et the default branch i
n
ru
n
, not in t
h
e constructor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Helper funct
i
on to check the existance of a revisi
o
n
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
m
on Hausmann
Added some helper f
u
nction(s) to parse t
h
e
depot path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
C
h
ang
e
d
the defa
u
lt branch fo
r
imports
fro
m
"master
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
H
a
usma
n
n
Changed the for
m
a
t of the
i
mported
log mess
a
g
e slightly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon H
a
usmann
Removed the
.
py extension fr
o
m git-p4 as
it's annoying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Si
m
o
n Hausmann
Don't show the
submit templ
a
te and the
d
iff
first in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
S
i
mon Hausmann
Ma
k
e
it possibl
e
t
o invoke git-
p
4 f
r
om within subdirectories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
Hausmann
Ma
d
e --apply-as-
p
a
t
ch the default for git-p4
su
b
mit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
H
ausmann
Fix support for
deletio
n
s in gi
t
-p4 submit
w
hen
usi
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
H
ausmann
Added ex
p
e
r
i
m
ental but super-fast --ap
p
ly-as-patch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Doc
u
mentation enha
n
cements
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
S
imo
n
Hausmann
Start of the git-p4
documentation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausma
n
n
Remove
d
p4-fas
t
-expo
r
t
a
n
d
p4-g
i
t-syn
c
a
s they've be
e
n
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Si
m
on
H
ausmann
Fi
x
ed t
h
e initial version im
p
o
rt
b
y g
e
tti
n
g the file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Added missing "self"s
to make the
s
cript ev
a
l
u
a
t
e
corre
c
tly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
imon Ha
u
sm
a
nn
C
ompl
e
tel
y
untested "mer
g
e"
o
f
p
4-f
a
st
-
export
.
py into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon H
a
usma
n
n
sync-
t
o
-per
f
orce is n
o
w calle
d
submit and f
i
xed the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Si
m
o
n Hausmann
P
a
rt of
t
he code
i
s copyr
i
ght by Trollte
c
h AS
A
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Sim
o
n Hausmann
First (unte
s
t
ed
)
a
ttempt
at migrating p4-git-sy
n
c int
o
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Sim
o
n H
a
usmann
Provide a little bit of help description fo
r
t
he git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Start moving t
h
e
git-p4 tools into on
e
single script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
H
a
usmann
Pass the righ
t
nu
m
ber of
a
rgume
n
ts to comm
i
t
, f
i
xes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Improved the git dir dete
c
tion
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simon Hausmann
Default to
i
nt
e
r
a
ctive syncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon
H
a
usmann
Use
p
4 revert
.
.
.
i
nst
e
ad
of
r
ev
e
rt -a
.
.
.
af
t
e
r
submitt
i
ng
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Auto-dete
c
t
t
he curr
e
n
t
g
it branch
before s
u
bmit
t
i
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hau
s
mann
Ignore Apple
resource files
when imp
o
rtin
g
from perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Be n
i
c
e and use /usr/bin/env python for t
h
e git-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
S
i
mon Hausmann
Automatically o
p
erate
on a t
e
mporary branch, nee
d
ed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
S
i
mon Ha
u
sm
a
nn
L
o
ts of bugf
i
x
e
s to p4-g
i
t-s
y
n
c
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hau
s
mann
Fix git-dir option an
d
allow reading
l
o
g
s
u
bst
i
tutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Sim
o
n
H
ausmann
First version of
a
n
ew script
to submit c
h
anges back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hau
s
mann
Split up
t
h
e
cache
c
ommandl
i
ne
options into (co
m
mand
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Reduce
t
he num
b
er
of false "me
r
ges" by skip
p
ing "branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
mon
H
au
s
man
n
More work on branch detection by implementing changeI
s
B
r
a
nch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
mon
H
a
u
s
ma
n
n
Mor
e
code clea
n
ups and
p
reparat
i
o
n
s
for more branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
Hausmann
Minor c
o
de cleanups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on H
a
usmann
M
a
ke the p4 data/command c
a
che config
u
rabl
e
through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Fixe
d
p4-deb
u
g
fi
l
e e
x
t
e
nsi
o
n
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausmann
Changed --known-branches to
t
a
ke a file as argument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
next