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
Handle patch errors in git-p4 submit better.
2007-04-15
Simon Hausmann
H
a
ndle patch errors
i
n
git-p4
submit better
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
S
i
mon H
a
usmann
A
n
ew at
t
e
mpt at fixing the c
h
i
l
d-fast-import-process
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Ha
u
s
m
a
nn
Slightly improved formatting of
t
he
r
aw_in
p
ut q
u
estions
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausmann
Removed the old patch a
p
p
l
y
code from
g
it-p
4
s
ubmit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Sim
o
n H
a
usm
a
nn
Fix the tim
e
zone formatting
.
Now
q
git
a
l
s
o displays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Sim
o
n Hausmann
Print an e
r
ror me
s
s
age of some sort i
f
git f
a
st-import
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Sim
o
n Hausmann
Allow
f
or
c
onv
e
nient rebasing
a
fter git-p4 submit
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
imon Hausmann
Added a
s
i
m
pl
e
ex
a
mple
o
f
usage to the "documen
t
ation" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
fix v
a
r
iable us
a
ge (oops)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon
Hausman
n
Fix f
i
le determinati
o
n for #
h
ead impo
r
ts
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Ha
u
smann
Added git-p4 c
l
one
c
onvenie
n
ce command
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
i
mon H
a
usman
n
Honor --silent for labels
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausmann
Tur
n
off potential
l
y slo
w
l
abel detection by
d
e
fau
l
t
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon
H
ausmann
Provide a tree summary after git-p
4
rebase
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon
H
ausmann
A
dded git
-
p4
r
ebase
co
n
venience
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Sim
o
n Haus
m
ann
Cl
e
a
n
up python class
names
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausmann
Fix "
c
ompilation" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
S
imon Hausmann
Fix the
d
ocs for git-
p
4 submit and t
u
rn git-p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon
Hausm
a
nn
Fi
x
v
ari
a
b
le
usag
e
in tag
i
m
port
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Si
m
o
n
H
a
u
s
mann
Added support for mapping p4 labels to git t
a
gs
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hausmann
git
-
p4 debug do
e
sn't n
e
ed a git repository
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
S
i
m
on Hausma
n
n
Do
n
't try to parse any
o
ption
s
with
g
it-p4 debu
g
b
ut
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausmann
Prefer
g
it comma
n
d ove
r
git-command
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausmann
M
i
n
o
r co
s
metic f
i
x
l
et for t
h
e git-p
4
submit sync qu
e
s
t
io
n
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simo
n
Hausmann
Diff
e
rent versions of p4
h
ave
different
o
utput f
o
r
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon H
a
usmann
Use t
h
e
n
ew inc
r
emental impo
r
t style
by default
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
Make it possi
b
l
e to run git
-
p4 submi
t
f
ro
m
within the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Brand new smart in
c
remen
t
a
l import tha
t
doesn't n
e
ed
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon
H
ausmann
Set t
h
e default bra
n
ch in
r
un, not in the cons
t
ructor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simo
n
Hausmann
Helper
f
unctio
n
to
check th
e
e
x
i
s
tance
o
f
a revision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon H
a
usmann
Add
e
d some
helper functio
n
(s) to parse t
h
e depot pa
t
h
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
Hausma
n
n
Change
d
the default branch for impor
t
s from "
m
aster
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Sim
o
n Hausmann
Chan
g
ed
t
he fo
r
m
at of t
h
e i
m
ported log message slightly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
R
e
mov
e
d
t
h
e
.
py exte
n
sion from
g
i
t-p4 as it's
ann
o
ying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
H
ausmann
Don't
s
h
ow the sub
m
it te
m
plat
e
and
the
d
iff firs
t
in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Simon H
a
usmann
Make i
t
possible t
o
invok
e
git-p4
f
r
om with
i
n
subdirectories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
H
a
u
s
mann
Ma
d
e
-
-apply-as-pa
t
ch the
d
efault
f
or
g
it-p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
H
aus
m
ann
Fix suppor
t
for
deletion
s
in gi
t
-p4 submit when using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n Hausmann
A
d
d
e
d experime
n
tal
but s
u
per-f
a
st --
a
pply-as-patch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Docum
e
ntat
i
o
n
enh
a
nc
e
ments
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Simon
Hausmann
Start of the git-p4 do
c
umentati
o
n
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Sim
o
n Ha
u
smann
R
e
m
oved p4-fast-expor
t
and p
4
-g
i
t
-
sync as they've
been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Fixed the initial versio
n
impor
t
by
g
etting the
f
ile
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
imon
H
aus
m
ann
Added mis
s
ing
"
s
e
lf
"
s to make the script evalu
a
te correctly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Ha
u
sma
n
n
Complet
e
ly
untested "merge" of p4-
f
ast-export
.
py int
o
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Si
m
on H
a
usmann
sync
-
to
-
perfor
c
e is
n
ow called
submit
a
n
d fixed the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
imon
Hau
s
mann
P
a
rt of the
c
ode is copyri
g
ht by Trolltech
ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausm
a
nn
First (untested) attempt at migrating
p4-git-sync into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Pro
v
ide a
l
ittle b
i
t
o
f h
e
l
p
description
for the git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausman
n
Sta
r
t
m
oving the g
i
t-p4 tools
into on
e
si
n
gle script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Sim
o
n
H
a
usmann
Pass t
h
e right number of arg
u
men
t
s to co
m
mit,
f
ixes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Improved the git dir detectio
n
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Sim
o
n
Hausmann
Default to interactive syn
c
ing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon Hausmann
U
s
e p4 revert
.
.
.
instead of
revert -a
.
.
.
after s
u
b
m
itting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hau
s
mann
Auto-detect
the current gi
t
branch before
submi
t
ting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simo
n
Ha
u
smann
Ignore
Apple r
e
so
u
rce files when
i
mport
i
n
g
from perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Be nic
e
and
use
/
usr/bin/env python for
the
g
it-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon
H
ausmann
Automa
t
ically operate on
a
temporary b
r
a
nch, ne
e
ded
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausmann
L
o
t
s of bugfi
x
es to p4-git-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Si
m
on
H
a
usmann
Fix
g
i
t-
d
i
r
option and allow reading
l
og
s
ub
s
titutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simo
n
Hausmann
F
irst version of
a new script to submit changes
b
ack
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausma
n
n
Spl
i
t up the cache
commandl
i
ne optio
n
s into (command
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausman
n
Reduce the number of false "m
e
rg
e
s" by ski
p
ping "b
r
anch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon H
a
usmann
More work on b
r
anc
h
dete
c
tion
b
y im
p
lementing changeIsBranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon H
a
u
s
mann
More code c
l
eanups an
d
preparations for mo
r
e bra
n
ch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Minor code cleanups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
Hausmann
Mak
e
the
p
4
d
a
ta/co
m
mand cach
e
configur
a
ble through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
S
i
m
o
n Hausmann
Fi
x
e
d
p
4
-
debug file ext
e
nsion
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon Haus
m
ann
Cha
n
ged --known-branches to
t
ake a file as argument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Simon H
a
usm
a
nn
Wo
r
k in
p
ro
g
ress o
n
d
e
tecting branches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simon Hausmann
Adjust the output parsing of git name-
r
ev
t
o handle
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausman
n
Don't print a pl
a
in newline
at the e
n
d of the execution
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
More work in --silent
su
p
port
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
Added support for --silent so that p4-
f
ast-export
c
an
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Simon
H
aus
m
ann
Add
e
d p4 delete behavioural emulation as todo item
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Simon Hausma
n
n
F
ix
s
ingle-
b
r
a
nch imports by ski
p
ping the branch/
m
erg
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hausmann
Use
s
ets
.
S
e
t(
)
in
s
tead of
s
e
t
() to run al
s
o wi
t
h o
l
der
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hausmann
Make it
possible
t
o speci
f
y
t
h
e p4 changes to import
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
Wh
e
n trying
to map p4 integrations to gi
t
merges just
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hau
s
mann
Set git fast
-
import mark
s
for every
importe
d
c
hange
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
Af
t
er marking
a
p4
b
r
a
nch as merged don't
ever merge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
i
m
on Hausman
n
More
f
ixes in heur
i
stic
p4 branch detec
t
ion base
d
on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
imon
H
a
usman
n
S
tarted w
o
r
k
on p4 branch detection (e
x
pe
r
imenta
l
!
)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon
H
ausmann
C
od
e
c
l
eanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Sim
o
n Haus
m
ann
Cleanup
s
, remov
e
unus
e
d variable
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
S
i
mon Hausm
a
nn
Create lightweight git tags (using the "r
e
set" tri
c
k
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
A
d
ded a little helper s
c
ript
t
o remove u
n
used tags
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-10
Sim
o
n Hau
s
mann
Changed the d
e
fault git
i
mpo
r
t bran
c
h from "p4"
to
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon
Hausm
a
nn
Avoid the excessive use of git tags for every perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
Minor code cle
a
nups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simon Hausmann
Ad
d
ed a little hel
p
er script to debug the
o
u
tput of
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simon Hausmann
Mad
e
the name of the git branch used f
o
r the p
e
rforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-08
S
imon H
a
u
sma
n
n
Cat
c
h io
exc
e
ptions fr
o
m gi
t
f
ast-import again
and
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
S
imon
H
aus
m
a
nn
F
i
x calcula
t
ion of the
n
ewest i
m
p
o
r
t
ed revision for
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
S
i
mo
n
H
a
usmann
Make specifying the r
e
vision r
a
nges more
c
onvenient
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausmann
Make inc
r
emental imports e
a
s
i
e
r to use by storing
t
he
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausmann
Fixed incremental imp
o
rt
s
by u
s
ing t
h
e correct "from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
S
i
mon Hausmann
M
inor cl
e
anups
a
nd print an
error m
e
ssage of git fast
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
S
i
mon H
a
usman
n
Initi
a
l support for
i
mporting a director
y
from Perforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon Hausmann
Code cleanups, move t
h
e
code to cr
e
ate a com
m
it wit
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
next