repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix branch detection in multi-branch imports
2007-03-19
Sim
o
n
H
au
s
mann
P
a
ss
the right number of arguments to commit
,
fixes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Imp
r
oved
t
he git dir
d
etection
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
S
i
mon Hausman
n
D
efa
u
lt to int
e
r
a
ctive syncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon Haus
m
ann
Use
p4 r
e
vert
.
.
.
instead of
r
evert -a
.
.
.
aft
e
r
submitt
i
ng
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Ha
u
smann
Auto-detect
the c
u
rren
t
git branch before submitting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon H
a
u
s
mann
Ign
o
re A
p
p
l
e
r
esour
c
e f
i
les when
imp
o
rtin
g
from perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon
Hausma
n
n
Be nice and use
/
u
s
r/b
i
n/env python fo
r
the
git
-
p
4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Automatically operate on
a temporary br
a
nch,
needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Sim
o
n Hau
s
mann
L
o
ts o
f
b
u
gfi
x
e
s to p4
-
gi
t
-
s
y
nc
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Sim
o
n Hausman
n
Fix gi
t
-di
r
option and allow reading lo
g
substitutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon Hau
s
mann
First version of
a new s
c
ript to
s
ubmit c
h
anges bac
k
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Sim
o
n Hausmann
Split up the cac
h
e
com
m
andline o
p
t
i
ons
i
nto (comma
n
d
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Reduce the number of f
a
lse "mer
g
es" by skip
p
i
ng
"
b
r
anch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
H
au
s
ma
n
n
M
ore work on branch d
e
tection
by implementi
n
g ch
a
nge
I
sBranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on Ha
u
smann
More c
o
de cle
a
n
up
s
and preparations for more
b
ranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon H
a
usma
n
n
Minor code cleanups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Mak
e
the p4 data/comman
d
c
a
che c
o
nfigurable through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon Haus
m
ann
Fixed
p
4
-debu
g
fil
e
exte
n
s
i
on
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausmann
Changed -
-
know
n
-branche
s
to take a file
a
s
a
rgument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
S
i
mo
n
Haus
m
ann
Work in progress on dete
c
ting branches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simon Ha
u
sman
n
Adjust the output
parsing o
f
git
na
m
e
-
rev to handle
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Sim
o
n Hausmann
Don't prin
t
a p
l
ain newli
n
e at t
h
e end o
f
the execu
t
ion
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausm
a
n
n
More work in --silent support
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon
Haus
m
ann
Added suppo
r
t
for --silent so
th
a
t
p4-f
a
st-export can
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Si
m
on Haus
m
ann
Adde
d
p4 dele
t
e behavioural emulation a
s
todo item
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Simo
n
Hau
s
ma
n
n
Fix
si
n
gle
-
branch impo
r
ts by skipping the branc
h
/
m
erge
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hausmann
Use se
t
s
.
Se
t
() instead of
set()
t
o run a
l
so wi
t
h
old
e
r
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Si
m
on Ha
u
sm
a
nn
Make it possible to
s
pecify the p4 changes to import
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
Simon
H
ausmann
When trying t
o
m
a
p p4 integrations
t
o git mer
g
e
s
j
u
st
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Ha
u
smann
Set git fast-
i
mport marks for
e
very i
m
ported change
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
Afte
r
marking a p
4
branch as
m
erged don't
eve
r
merge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hau
s
ma
n
n
More fixes in heuri
s
tic p
4
br
a
nch detection
based
o
n
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausman
n
Started work on p4 b
r
a
n
ch detection (ex
p
erimenta
l
!)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simo
n
Hausmann
Co
d
e cleanu
p
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simo
n
Hausmann
Cleanups, remove unused variable
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon
Ha
u
s
mann
C
reate lightweight git tags (usin
g
t
h
e "reset
"
trick
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
Added a littl
e
helper scri
p
t to
r
e
move unu
s
ed tags
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
Changed the default git import br
a
nch from "p
4
" t
o
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
S
i
mon
Hau
s
mann
Avoi
d
t
h
e excessi
v
e use of
git tag
s
for every perf
o
rce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon
H
ausma
n
n
Minor code cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simon
H
ausma
n
n
Added
a little
h
elper script to d
e
bug the output
of
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simon
Hausma
n
n
Made the nam
e
of the
git branc
h
used for the perforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-08
Simon Ha
u
s
m
ann
Catch io exceptio
n
s fr
o
m
g
it fa
s
t-impor
t
again
and
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
S
imon Hausma
n
n
Fix calculation o
f
the newest im
p
orted revi
s
i
o
n
f
or
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hau
s
mann
Make s
p
e
ci
f
ying the re
v
ision ran
g
e
s more con
v
enient
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon
H
ausmann
Ma
k
e incremental i
m
ports easier
to u
s
e by
s
t
o
ring the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
S
i
mo
n
Hausm
a
nn
F
i
xed inc
r
em
e
ntal
i
mports by us
i
ng t
h
e
c
o
r
r
e
c
t
"from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Sim
o
n Hausma
n
n
Minor clean
u
ps and print an er
r
or
m
es
s
ag
e
of gi
t
fast
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon Hausmann
I
n
i
t
ial support for i
m
porti
n
g a directory fr
o
m
Perf
o
r
ce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon
H
ausma
n
n
Code
cleanu
p
s, move
t
he c
o
de
to create a commit with
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon Hausmann
Simpli
f
y
t
he
i
ncremental import by elimination the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
imon Hau
s
mann
Started work
i
ng on incremental
i
mports from
P
erf
o
rce
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Ha
u
smann
Fix fil
e
permis
s
ions of p4-fast-export
.
py to
b
e execu
t
able
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon
Haus
m
ann
Create a g
i
t tag for every changeset impor
t
e
d from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
i
mon Hausmann
Fix
e
d di
s
play
i
ng imp
o
rt progress
by call
i
ng flush on
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
P
ermit calli
n
g p4-f
a
st-export with a d
e
pot path
tha
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
i
mon
H
a
usmann
Avoi
d
calling
f
stat for every imported file
(
slow!
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
i
mon Ha
u
s
mann
Ported the remaining functi
o
ns that
p
arse
d
p4 shell
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Instead of parsin
g
the o
u
tput
o
f "p4 users" use
t
he
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Ha
u
smann
Minor
c
ode
cle
a
nup
s
and ported some p4 interfacing
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Changed the import mechanism to wr
i
te to git fast-impo
r
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Ha
u
s
mann
Remove
d
unu
s
ed p4cat function
and added hel
p
er function
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
imon
H
a
u
s
m
ann
Speed u
p
the
i
mport of indi
v
idual files fr
o
m
Perforc
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Ha
u
s
m
ann
S
ome f
i
xes to the t
i
mezo
n
e conversion b
e
tween the date
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
i
m
o
n Ha
u
sman
n
Implement
e
d
basic supp
o
rt for c
o
nverting
the
date of
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-31
Simon Ha
u
s
mann
S
l
ightly improved h
e
lp
usage o
u
t
put and made specif
y
in
g
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-31
Simon Haus
m
ann
Add
e
d
basic supp
o
rt for
specify
i
ng th
e
depot
path to
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-30
Sim
o
n
Hausmann
In
i
t
i
al import of a p
y
tho
n
script to import changesets
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree