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
A little todo note before I forget it :), based on a suggestion from Lars.
2007-05-16
Simon Hausmann
A
l
ittle todo n
o
te before I forget it :), based on
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Si
m
o
n Ha
u
smann
Fix calli
n
g
g
i
t-p4 rebase fr
o
m
within a subd
i
rectory
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
S
i
mon Hausmann
G
ive a better
h
i
n
t i
f
git-p4 submit f
a
ils
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simo
n
Haus
m
an
n
Added the possibility of skipping patches
duri
n
g git
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon
Hausmann
Make git-p4
work
with bare repositories
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
S
i
mon Hausm
a
nn
Fix git-p4 cl
o
n
e
/
/d
e
pot/pro
j
ect (head imp
o
r
t
)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
M
arius Stor
m
-Olsen
Ma
k
e the command call silen
t
commit
|
commitdiff
|
tree
2007-05-15
Si
m
on Hausmann
Convert
e
d
to unix
n
e
w
lin
e
s
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausm
a
nn
Make s
u
b
mitting work on
W
ind
o
ws
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Mak
e
sure all popen calls use binary mode
(for W
i
ndows
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Added a li
t
tl
e
.
bat wra
p
per from
Mari
u
s
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Use
t
h
e
subprocess mod
u
le instead of popen2 to mak
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
S
i
mon Hausm
a
nn
Documen
t
some im
p
l
e
ment
a
tion de
t
ai
l
s, for t
h
e
c
urious
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
Cleanup, r
e
moved the o
l
d
t
agging
code
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
c
leanup, ren
a
med self
.
gl
o
b
alPr
e
fix
t
o self
.
d
epotPa
t
h
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Si
m
on Hausma
n
n
Micro
c
lea
n
u
p
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
Doc cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hausmann
Ha
n
dle
p
a
tch err
o
rs in gi
t
-p4
submit
b
ett
e
r
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon
H
a
usmann
A new att
e
mpt
a
t
fixi
n
g the
chil
d
-fast-import-proc
e
ss
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon H
a
usmann
S
l
i
g
h
tly improved for
m
atti
n
g of the raw_input
questions
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausmann
Rem
o
ved the old pat
c
h apply code
f
rom git-p4
submit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simo
n
Haus
m
ann
Fix
t
h
e
timezone format
t
ing
.
Now qgit
a
lso displays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Simon Hausma
n
n
P
r
in
t
an error messag
e
o
f some sort if gi
t
fast-import
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
S
i
mon Ha
u
sma
n
n
Allow for convenie
n
t rebasing after git-p4 sub
m
it
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simo
n
Hau
s
mann
Added a si
m
ple ex
a
mple of usage to the "
d
ocume
n
t
ation" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
fix vari
a
bl
e
usage (oops)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon H
a
usmann
Fix fi
l
e
de
t
e
r
mi
n
at
i
o
n for #head imports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon H
a
usman
n
Ad
d
e
d
g
it-p4
clo
n
e co
n
veni
e
nce command
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
imon
H
ausmann
H
onor --si
l
ent for labe
l
s
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon H
a
usmann
Turn off pote
n
ti
a
ll
y
slow label de
t
ection by
default
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
S
i
mon
Hausmann
Provide a tr
e
e su
m
mar
y
af
t
er git-p4 rebase
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon
Hausmann
Added git
-
p4 r
e
bas
e
convenience
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
S
i
m
o
n Haus
m
ann
Clean up python
c
lass names
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Simon
H
ausmann
Fix "co
m
pilation" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon Hausm
a
nn
Fix the docs for g
i
t-p4 subm
i
t and turn git-p4 subm
i
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
S
i
mon Hausmann
Fix variable usage
i
n tag impo
r
t
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon H
a
us
m
ann
A
dded support for mapping
p
4 la
b
el
s
t
o git tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hau
s
mann
git-p4 debug doe
s
n't need a git re
p
osi
t
ory
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
S
i
mon Haus
m
ann
Don't t
r
y to
par
s
e any options with git-p4 debug b
u
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon
H
a
u
smann
P
r
efer git command ove
r
git-command
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausmann
Min
o
r c
o
smetic fixlet for
t
he gi
t
-p4
s
ubmit sync question
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Sim
o
n
H
ausmann
Diff
e
rent
v
ers
i
ons of
p
4 have different out
p
ut
f
or
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Sim
o
n H
a
u
s
man
n
Use the new increme
n
tal i
m
po
r
t style by defa
u
lt
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
M
a
ke it possible to
r
un git-p4 submit
fr
o
m
within
t
he
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simo
n
Hau
s
man
n
B
r
and n
e
w s
m
art increment
a
l import that
doesn't need
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon Ha
u
smann
Set the default branch in r
u
n, not in the constructo
r
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
im
o
n Hausman
n
H
elper fun
c
ti
o
n
t
o
check
the exist
a
nce of
a
r
evision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simo
n
Hausma
n
n
Added
some helper function(s) to parse
t
he depot
path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon Hausmann
Changed the default branch for imports from
"mast
e
r
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
m
o
n H
a
u
s
mann
Changed the format of
t
he imported lo
g
mes
s
ag
e
s
li
g
htly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
m
on
Hausmann
Removed the
.
py exten
s
ion from gi
t
-p
4
as
i
t's anno
y
in
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
i
mon
H
ausmann
Don't sh
o
w t
h
e submit template
a
nd the diff
first
i
n
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Si
m
on Hausmann
Make
i
t possible to invoke gi
t
-p4 f
r
om
w
ith
i
n subdirectories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausm
a
nn
Made --apply-as
-
p
a
t
ch t
h
e default for
g
it-p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausm
a
nn
Fix support
for dele
t
io
n
s in git-p
4
submit w
h
en using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n Ha
u
sma
n
n
Added
expe
r
imental but
s
uper-fast --apply-as-pa
t
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Haus
m
ann
Docume
n
ta
t
ion en
h
a
ncements
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Star
t
o
f
the git-p
4
do
c
umentation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
R
e
mov
e
d p4-fast-ex
p
ort a
n
d
p4-git-s
y
nc
a
s they've been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon
Ha
u
sman
n
Fixed the initi
a
l version import by getting the fi
l
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Sim
o
n Hausmann
Ad
d
ed
m
iss
i
ng "
s
elf
"
s to make the script ev
a
l
uate
c
o
rrectly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
i
mon Hausma
n
n
Completely untested "merge" of
p
4-f
a
st-exp
o
rt
.
py
i
nto
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Haus
m
ann
s
ync-to-perfor
c
e is n
o
w called submit
and fixed the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
Hausman
n
P
art of the code is copyright by T
r
olltech ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simo
n
Hausmann
Fir
s
t (untested) at
t
empt at mi
g
rating p
4
-git-sync int
o
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Si
m
on Haus
m
a
nn
Provi
d
e a little bit of help descripti
o
n f
o
r t
h
e git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
mon H
a
usmann
St
a
rt moving the g
i
t
-p4
tools into
one single script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausma
n
n
Pass the right
number o
f
a
r
gumen
t
s to commit, fixes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
imon Hausmann
Improved the git d
i
r detection
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Sim
o
n Hausmann
Default
t
o
interacti
v
e s
y
ncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon Hausmann
Use
p
4 r
e
v
e
rt
.
.
.
i
n
stead o
f
rev
e
rt -a
.
.
.
after submitti
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon H
a
usmann
Auto-d
e
tect
the
current
git branch before
s
ubmitting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
S
i
mon Hausmann
Ignore
A
pple resource files when
importing from pe
r
f
or
c
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon H
a
usm
a
nn
Be nice and use /
u
sr/bin/env python for the git-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Autom
a
tical
l
y operate on a tempor
a
ry
b
ranch, needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Si
m
on Hausmann
Lots
of bug
f
ixes t
o
p4-g
i
t
-
sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
S
i
m
on Hausmann
F
i
x git-
d
ir option and allow readi
n
g log substitutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
S
imo
n
H
ausman
n
First versio
n
of a new scrip
t
to submit c
h
anges back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on
H
ausmann
Split
up th
e
c
ache commandline options into (command
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
Hau
s
mann
Reduce
the n
u
m
b
er of false "merges"
b
y skipping
"branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
mo
n
H
a
usmann
More
wo
r
k
on
b
r
a
nch det
e
ction by
i
mp
l
e
men
t
ing c
h
angeIsBra
n
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon H
a
u
s
mann
More
co
d
e cleanups and p
r
ep
a
ration
s
for
m
ore branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Minor
code clea
n
ups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
mon Hausm
a
nn
Mak
e
the p4 dat
a
/comma
n
d
c
ache configurabl
e
th
r
ough
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
S
imon H
a
usmann
Fixed p4-debug file extens
i
on
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Si
m
on Hausman
n
C
hanged --kno
w
n
-branches to t
a
ke a file as a
r
gument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausmann
Work
i
n progress on dete
c
ting br
a
n
c
hes
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
S
i
mon Hausm
a
nn
Adjust th
e
output
p
arsing of g
i
t
n
a
me-rev t
o
h
a
ndle
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
S
i
mon H
a
us
m
ann
Don't prin
t
a plain new
l
ine a
t
the end of the ex
e
cution
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Si
m
on
H
ausmann
More work in -
-
si
l
ent
s
upport
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Ha
u
smann
A
dded
s
upp
o
rt for -
-
s
ilent so th
a
t
p4-fast-e
x
port can
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Simon
H
ausm
a
nn
A
d
ded p4 delete behavioural emulatio
n
as to
d
o item
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
S
i
mon Hausmann
Fix single-branch
imports by
s
kipping the branch/merge
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hausmann
Use set
s
.
Set(
)
instead of set()
t
o
r
un a
l
s
o
w
i
th o
l
der
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
S
i
mon
H
ausman
n
Mak
e
it po
s
sib
l
e to specify th
e
p4 changes to import
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausm
a
nn
When
trying
to map p4 integrations to git merges
j
u
st
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Ha
u
sm
a
nn
Set git fast-im
p
ort marks
for every imported
c
h
ange
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hau
s
mann
After marking a p4 branch
as mer
g
ed don't ever
merge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausm
a
nn
Mo
r
e
f
ixes in heur
i
stic p4 bra
n
ch detect
i
o
n
based on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
i
mon Hausmann
Started work on
p4 b
r
anch dete
c
tion (exp
e
r
imental!)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
next