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
Provide a little bit of help description for the git-p4 "tools".
2007-03-19
Simon Hausm
a
n
n
P
rovide
a
l
i
ttle bit of help description
f
o
r the
git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Si
m
o
n
H
ausmann
Start moving the git
-
p4 tools
in
t
o one single sc
r
ipt
.
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 arguments to com
m
it,
fixes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
m
o
n Hausmann
Improve
d
t
h
e git dir
d
etection
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simo
n
Haus
m
a
nn
Defaul
t
to i
n
t
e
ractive
syncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Sim
o
n
H
a
u
smann
U
s
e p
4
re
v
ert
.
.
.
instead of r
e
vert -a
.
.
.
after su
b
mitting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Ha
u
smann
Auto-detect
t
he
c
urren
t
git br
a
n
ch b
e
fore
s
u
bmitti
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
S
imon Hausmann
Ignore Appl
e
resource files
w
he
n
importin
g
f
r
o
m
perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausma
n
n
Be nice and use
/
usr/b
i
n/env python for the git-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
S
i
mon Hausman
n
Automatically
o
pe
r
ate on a temporary bra
n
c
h
,
n
eeded
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausmann
L
o
ts of bu
g
fix
e
s
to p
4
-git-syn
c
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausmann
F
i
x git-dir
o
p
tion and a
l
low reading log substitutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
S
imo
n
H
a
usmann
First ver
s
ion
of a new script to submi
t
changes back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
mon Ha
u
s
m
a
n
n
Split up the cache com
m
andlin
e
optio
n
s in
t
o (command
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Haus
m
a
n
n
R
e
duce the num
b
er of f
a
l
se "m
e
rg
e
s" by ski
p
ping
"
bran
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
Hausmann
Mor
e
work on branch detect
i
on by implementing changeIsBranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
m
on Ha
u
smann
More code cleanu
p
s and preparations f
o
r
mo
r
e
branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
imon Hausmann
Minor code
cleanups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Sim
o
n Hausmann
Make the
p
4 data/command
cache
c
o
n
figurabl
e
t
hrough
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Fixed p4-d
e
bug file e
x
tension
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausman
n
Chan
g
ed
-
-k
n
own-bran
c
hes to take a file as argument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
S
i
mon Ha
u
smann
Work in progress o
n
d
e
t
ectin
g
branches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simon Hausmann
Adju
s
t the output
parsin
g
of git name-rev to han
d
le
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
S
i
m
on
H
ausmann
Don't print a plain newline at
the end of t
h
e exec
u
tion
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Simo
n
Hausma
n
n
M
ore w
o
rk in --s
i
lent s
u
pport
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon
Ha
u
smann
Added support
for
-
-sile
n
t so that p4-fast-export
c
an
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
S
imon Hausmann
Added p4 delete
behavioural emulation a
s
to
d
o item
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
S
imon Ha
u
smann
Fix single-branch i
m
po
r
ts by skipping the branch/
m
erge
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Ha
u
s
m
ann
Use sets
.
S
e
t() instead
o
f set() to run also with older
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hausmann
Ma
k
e it pos
s
ible to speci
f
y
t
he p4 changes to im
p
ort
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
Whe
n
tryi
n
g
to map p4 integrations to git merges just
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
i
mon Hausmann
Se
t
git fast-im
p
o
rt
m
arks
for every
imported change
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Sim
o
n Hausmann
After m
a
rking a p4 bra
n
ch as merged don'
t
ever merge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon
H
ausmann
More fixes in heuristic p4
branch detection based on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausm
a
n
n
S
t
arted w
o
rk
o
n
p
4 branch detectio
n
(ex
p
erimental!)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hau
s
m
a
nn
Code cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simo
n
H
au
s
mann
Cleanups,
remove unused variable
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon
Hau
s
man
n
C
reate
l
ightwei
g
h
t
g
it 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
Add
e
d a
l
ittle hel
p
e
r
sc
r
ipt to remove
unused
t
ags
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
Changed the defa
u
lt git im
p
o
r
t bra
n
ch
from "p4" to
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
A
void the e
x
cessive
use of git
tags
for every p
e
r
f
o
rce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Si
m
o
n
H
ausmann
Minor
c
ode
c
leanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Sim
o
n Hausman
n
Added a
l
ittle
helper
script to
d
ebug the o
u
tput
of
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simon Hausmann
Made the name
o
f the git bra
n
c
h
use
d
f
o
r the perforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-08
Simon H
a
usmann
Catch
i
o
exce
p
tio
n
s
f
ro
m
git fa
s
t
-i
m
p
ort again and
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausmann
Fix
c
a
l
culation of th
e
newest i
m
ported re
v
ision f
o
r
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon
H
ausm
a
nn
M
ake specifyi
n
g the revi
s
ion ranges
m
ore convenient
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon
H
au
s
m
ann
Make in
c
remental imports easi
e
r
t
o
use b
y
stori
n
g
t
he
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausmann
Fixed incre
m
en
t
a
l
impor
t
s by
u
sing the correct "from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simo
n
H
ausmann
M
i
n
o
r
cle
a
nups and pr
i
nt an
e
rror message
of git fast
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
S
i
m
on
H
ausmann
Initial support for impo
r
ting a directory from Perforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Si
m
o
n Hausmann
Code cleanups, m
o
ve the c
o
de to c
r
e
ate a
c
ommit with
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon Hausm
a
n
n
Simpl
i
fy the
incrementa
l
import by elimination th
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simo
n
Haus
m
ann
Star
t
ed working on
incremental imports from Perforce
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon H
a
usmann
Fix file permiss
i
ons of p4-fast-export
.
py to be executab
l
e
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Ha
u
smann
Create a git t
a
g for
e
very change
s
et imported from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Si
m
on Hausm
a
nn
Fi
x
ed displaying impo
r
t progress
b
y calling flush on
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Si
m
on Haus
m
an
n
Perm
i
t calling
p4-fast-
e
xport wi
t
h a d
e
po
t
pa
t
h that
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Avoid
c
alling fstat fo
r
e
very import
e
d
f
ile (slow!
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Haus
m
ann
P
orted
the rem
a
i
n
ing f
u
nctions that parsed p4
s
hell
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Instead
o
f parsi
n
g the output
o
f "p4 users" us
e
t
he
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon
Hausma
n
n
Minor code cleanups and ported s
o
me p4
int
e
rfacing
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon
H
ausmann
Changed the import
m
echanism to w
r
i
t
e to git fast-i
m
p
o
r
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Removed unused
p
4cat function
and added help
e
r func
t
ion
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Ha
u
sm
a
nn
Speed u
p
the import of
i
nd
i
v
idual f
i
les from Perfor
c
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Some fixes
to the time
z
one conversion
between the date
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon
H
a
usmann
Implemented
b
asic sup
p
o
r
t for convert
i
ng the d
a
te of
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-31
Simo
n
Ha
u
smann
Sli
g
htly improv
e
d
h
elp
usa
g
e
o
u
tput and
m
ade specifying
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-31
Simon Haus
m
ann
Added basic support for sp
e
cifying the
depo
t
path t
o
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-30
Simon H
a
us
m
a
nn
Initial impor
t
o
f a python scri
p
t t
o
im
p
ort changes
e
ts
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree