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
Started rewriting the branch detection, based on "p4 branches" and "p4 branch -o...
2007-05-18
Simon Hausmann
Started rew
r
iting the bran
c
h
detection, based
o
n "p4
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hau
s
ma
n
n
Rem
o
ved unused cache variab
l
es
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon Haus
m
ann
Fix branch setup aft
e
r initial clone
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-17
Sim
o
n
Hausmann
Removed todo item that i
s
i
mplemented
:)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Added support for git-p4 sync/rebase --with-origin
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
i
mon Hausmann
Bi
t
e the b
u
llet and automatically
convert o
l
d style
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
C
h
anged the default p4 import branch to b
e
ref
s
/remotes
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Haus
m
a
nn
C
r
eate
the or
i
gin bas
e
d import branch usi
n
g
g
it update
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausman
n
Removed a
n
cien
t
and unused code to find the last imported
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Haus
m
ann
Remove
d
cl
e
a
ntag
s
comm
a
nd
.
I
t
d
o
e
s
n
'
t have
any meaning
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
i
mon
H
a
u
sman
n
Clea
n
up code
d
u
p
licat
i
on for
revision parsing
a
nd
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Sim
o
n Hausmann
Always pas
s
a sha1 for the i
n
itial pa
r
ent s
o
that gi
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausma
n
n
Fixing syncing
(
g
itdir
di
s
co
v
ery /
c
d) for ba
r
e
repositori
e
s
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
A littl
e
todo note bef
o
re I f
o
rget it :
)
, based
o
n
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
S
i
mon Hausmann
Fix calli
n
g git-p4 rebase from within a s
u
bdirector
y
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
S
i
mon H
a
usmann
Gi
v
e a better hi
n
t i
f
git-p4 submit fail
s
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
Added the p
o
ssibility of skipping pat
c
hes during git
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausman
n
Make git-p4 wo
r
k wi
t
h bare re
p
ositories
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
Sim
o
n Hausmann
F
ix git-p4 clone //depot/project (head import)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon H
a
usmann
Converted to u
n
ix new
l
in
e
s
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
S
i
m
on Hausman
n
Make submitting work on
W
indows
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Make su
r
e all popen calls use b
i
nary mode (for Windows
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon
Hausmann
Added a little
.
bat wrapp
e
r fro
m
Marius
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon H
a
usmann
U
s
e
t
h
e subproce
s
s module i
n
s
tead of popen2 to make
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
S
i
m
o
n
H
a
us
m
ann
Docume
n
t some implemen
t
a
t
ion det
a
ils, for the
c
urious
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
Cle
a
nup, removed t
h
e
o
ld
t
agging code
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausma
n
n
cleanup, renamed
s
elf
.
glob
a
lPre
f
ix to self
.
depo
t
P
ath
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Sim
o
n Hausm
a
n
n
Micro cleanu
p
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Sim
o
n Hausmann
D
oc clean
u
ps
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simo
n
Hausma
n
n
H
a
ndle patch err
o
rs in git-p4
subm
i
t better
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Si
m
on H
a
usm
a
nn
A
n
ew attempt
a
t
fixing the
c
hild-fast-import-process
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon
H
a
u
s
mann
Slightly improved formatti
n
g o
f
the
raw_inp
u
t questions
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Si
m
o
n
Hau
s
mann
Removed the old
p
atch apply code f
r
o
m
git-p4 submit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
S
i
m
on Hausma
n
n
Fix the timez
o
ne formatting
.
Now qgi
t
a
lso displays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Simo
n
Hausmann
Print
an err
o
r me
s
sage of some sort if
g
it
f
ast-impo
r
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Simon Hau
s
mann
Al
l
ow fo
r
convenient rebas
i
n
g after git-p4 submit
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
Add
e
d a simple exam
p
le of us
a
ge to the "documentation"
:)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
i
m
o
n Ha
u
smann
fix v
a
ria
b
le usage (oops)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
Fix file det
e
rmi
n
ation for #head impor
t
s
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Sim
o
n Hausmann
Ad
d
ed git-p4 c
l
one co
n
ve
n
ience
command
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon
Hausmann
H
o
n
or --silent fo
r
label
s
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon H
a
u
s
mann
Turn
o
ff p
o
tent
i
ally slow label detection
by def
a
u
l
t
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon
H
ausmann
Pro
v
ide a tree summary after git-p4 rebase
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
S
i
mon Ha
u
smann
Added git-
p
4 r
e
bas
e
convenien
c
e
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausma
n
n
Clean up
python
c
l
a
s
s
names
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
S
i
mon Hausmann
Fix "compilati
o
n" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
S
i
m
on
H
ausmann
Fi
x
the docs for git-p4 submit an
d
turn git-p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon Hausmann
Fix v
a
ri
a
ble usage in tag import
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hausmann
A
dded support
for m
a
pping p4
l
abe
l
s to git tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
S
imon Hausmann
git-p4 debug does
n
't need a git repository
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simon Hausmann
D
on't
try
t
o pars
e
any options w
i
th git
-
p4 debug
b
ut
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausmann
Pref
e
r gi
t
command over git-command
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Sim
o
n Hausmann
Mino
r
cos
m
etic
f
ixlet fo
r
the git-
p
4 sub
m
i
t
sync question
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Sim
o
n Ha
u
smann
Differen
t
versions of
p4
h
ave diff
e
rent outpu
t
for
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
Use the new incremental import s
t
yle by
d
efa
u
lt
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
S
i
mo
n
Hausma
n
n
Make
i
t possible to r
u
n git-p4
s
ubmit
from with
i
n the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simon Ha
u
smann
Brand
n
e
w
smar
t
incremen
t
al import that d
o
es
n
'
t need
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simo
n
Hausmann
Set the default branch i
n
run
,
not in the constructor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hau
s
man
n
He
l
per function to chec
k
the existance of a
revision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
A
d
ded some h
e
lper
f
unction(
s
) to
p
a
rs
e
the dep
o
t pat
h
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hau
s
mann
Cha
n
ged
the de
f
a
u
lt branch for im
p
orts from "m
a
s
ter
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Sim
o
n Haus
m
ann
Changed
t
h
e format of th
e
imported log mess
a
ge slightly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
H
ausmann
Remov
e
d the
.
py e
x
tension f
r
om
g
i
t
-
p4 as
it's
a
nnoying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausm
a
nn
Don
'
t show
t
he
s
u
b
m
it template and the diff first in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Simon Ha
u
smann
Make it pos
s
ibl
e
to invoke g
i
t-p4 f
r
om w
i
thin subdirectories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Made --apply
-
as-patch the defa
u
lt
f
o
r
git-p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausm
a
nn
Fix suppo
r
t for
deletions in git-p4 submit when using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n Hausmann
Added expe
r
i
m
ental but super-fast --a
p
ply
-
as-patch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon H
a
usmann
Documentation enhancements
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausm
a
nn
Sta
r
t of the g
i
t
-p
4
documentation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon
H
ausmann
R
em
o
v
e
d p4
-
fa
s
t
-export an
d
p4-git-sync as
they
'
ve be
e
n
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simo
n
Hausma
n
n
Fi
x
ed the initi
a
l ver
s
ion
i
mport by get
t
ing
t
he file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hau
s
mann
Added missing "
s
elf"s to
make t
h
e script
e
valuate
c
orrectly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
i
mon Hau
s
mann
Compl
e
tely untested
"merge" of p4-fast-export
.
p
y
in
t
o
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausm
a
nn
sync-to-pe
r
f
o
rce is now cal
l
ed submi
t
and
fi
x
ed t
h
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Sim
o
n Hau
s
mann
Part of
the code i
s
copyright by Trolltech ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Si
m
on Hausmann
F
i
rst
(untested) att
e
mpt at migrating p4-git-sync int
o
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Pro
v
i
de
a
l
ittl
e
bit
o
f
help de
s
c
r
iption f
o
r the
g
i
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hau
s
mann
S
t
art
m
oving
t
he git-p4 to
o
ls in
t
o o
n
e sing
l
e script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausman
n
Pass the
r
ight num
b
er of ar
g
u
ments to comm
i
t, fixe
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
I
mproved t
h
e
g
it dir dete
c
tion
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simon Hausmann
Defau
l
t to interac
t
ive syn
c
ing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Sim
o
n
Ha
u
sm
a
nn
Use p
4
revert
.
.
.
inst
e
ad
o
f revert
-
a
.
.
.
after
s
u
b
mitting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Ha
u
smann
Au
t
o-detect the
current g
i
t br
a
nch
before submittin
g
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausman
n
I
g
nore Apple resource
f
iles when
i
mporti
n
g
f
rom per
f
orce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Si
m
on Hausman
n
Be nice and use /u
s
r
/bin/env python for
the
g
it
-
p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Aut
o
m
a
tically operate on
a t
e
mpora
r
y
branch, needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausma
n
n
L
o
ts of bugf
i
xes to
p4-git
-
s
ync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon
H
au
s
mann
Fix git-dir
option a
n
d allo
w
readi
n
g
log subst
i
tutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon
Ha
u
smann
First versio
n
of a new script
t
o su
b
mit chan
g
es back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Split
up the
cache commandline options into (comman
d
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Reduce the
n
umber of fa
l
s
e "merges" by ski
p
ping
"bran
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
Hausm
a
n
n
More work on branch detection by impleme
n
ting changeIsBranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
More code cleanups and
prepara
t
ions for more branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
M
inor
c
o
de
c
leanups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
Ha
u
smann
Make the
p4 data/co
m
mand cache
configu
r
able through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon
H
a
u
smann
Fixed p4-de
b
u
g
file
e
xtension
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
S
i
mon Ha
u
smann
Cha
n
g
e
d
--known-branch
e
s to
t
ake a file
a
s
argument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hau
s
mann
Work in
p
rogress on detecting
bran
c
he
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
S
i
mon Hausmann
A
d
just the
o
ut
p
ut parsing
of
g
it name-rev to handle
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
next