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 multi-branch import with --silent.
2007-03-21
Simon Hausma
n
n
A
d
de
d
experimental
but super-fast --app
l
y
-
as-pat
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
H
a
usmann
Do
c
ume
n
tation enhancements
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Sta
r
t of th
e
git-
p
4 documentation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hau
s
mann
Removed p4
-
fast
-
export and
p4-
g
it-sync as the
y
've b
e
en
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon H
a
usmann
Fixe
d
t
he initial
v
ersion
import by
g
etting the file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simo
n
Hausmann
Added missing "self"s to mak
e
t
he scri
p
t evaluate
correctly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simo
n
Hausmann
Comple
t
e
l
y unteste
d
"m
e
rge"
o
f p4-fa
s
t-export
.
py in
t
o
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Haus
m
ann
sync-
t
o-perforce is now calle
d
s
ubmit and
fixed the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simo
n
Hausmann
Part of the co
d
e
is copyright by Trollt
e
c
h
ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon H
a
usmann
First (unteste
d
) attempt at mi
g
rating p
4
-git-s
y
nc int
o
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simo
n
Hausmann
Provide a li
t
tle bit of
h
elp de
s
cription for the
git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Sim
o
n Hausmann
Start moving the git-p4 tools into one s
i
ngle script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
Hausmann
Pass the right nu
m
b
e
r of ar
g
u
ments to
c
ommit, fix
e
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
mon Hau
s
mann
Improved the git dir detection
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simon Hausmann
Default to intera
c
tive syncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon
H
ausmann
Use
p
4 revert
.
.
.
in
s
tead of
r
evert -a
.
.
.
after subm
i
tting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausma
n
n
Auto-detect the cur
r
en
t
git br
a
nch be
f
ore
s
ubmittin
g
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Ha
u
s
m
a
n
n
I
g
n
o
re Apple
resource files when
importing from perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Be
n
i
ce
an
d
use
/
u
s
r/b
i
n/env python for
t
h
e
git-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Sim
o
n
H
ausmann
Autom
a
tic
a
l
l
y operate on a temp
o
rary branch, needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Si
m
on Hau
s
mann
Lots of bugfi
x
es to p4
-
g
it-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausmann
F
i
x
git-d
i
r
o
ption and all
o
w rea
d
ing log substitutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon Hausmann
First v
e
rsion of a new s
c
ript
t
o s
u
bmit
cha
n
ge
s
back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
imon
H
a
usm
a
nn
S
p
l
i
t up
t
he cache commandl
i
ne optio
n
s into (command
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
mon Ha
u
sman
n
R
educe the
number of false "merges" by ski
p
ping "branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Mo
r
e work on br
a
n
c
h
detection by imple
m
enti
n
g changeIsB
r
anch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Ha
u
s
mann
More code cleanups and
p
reparations
f
or more
b
ranc
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
Hausmann
Mi
n
or cod
e
cleanups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausm
a
n
n
Make th
e
p4 d
a
ta/com
m
and
c
ache configu
r
ab
l
e through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Fi
x
ed p4-debug file extensio
n
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Si
m
on
Hausmann
Cha
n
ged --known-bran
c
hes t
o
take a
file as argument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausmann
Work i
n
p
rogress on detect
i
ng bran
c
hes
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Si
m
on Hausmann
A
d
j
ust the ou
t
p
u
t
p
ar
s
ing of
g
i
t
n
a
m
e
-rev to h
a
ndle
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Sim
o
n Hausmann
Don't pr
i
nt a plain
newline at the en
d
of the execution
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Sim
o
n Hausmann
More work in --silent support
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Ha
u
s
m
ann
Added support
f
or --silen
t
so that p
4
-f
a
st-exp
o
rt c
a
n
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Simon Haus
m
ann
Add
e
d p4
de
l
ete behavioural emulat
i
on
as todo item
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Simon
Hausman
n
Fix single-branch imports by skipping the
b
r
anch/merge
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon
Hau
s
mann
U
s
e sets
.
Set()
i
nstead of set() to
r
un also with ol
d
er
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simo
n
Hausm
a
nn
Make it possible to specify the
p
4
c
han
g
es to import
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
Simon
H
ausmann
When
trying to ma
p
p4
integrati
o
ns to git merges just
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon
H
a
usmann
Set git
f
ast-import marks
f
o
r every imported change
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
imon Haus
m
ann
After mark
i
ng a p4 branch as merged don't ever merge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon H
a
usmann
More fixes in heuristic p4
b
ranch detection base
d
on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon
H
ausmann
Started w
o
r
k on p4 branch detection (expe
r
im
e
n
tal!)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
Code cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon Hausma
n
n
Clea
n
u
ps
,
remove unuse
d
varia
b
le
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon Ha
u
sm
a
nn
Create l
i
ghtweigh
t
git tag
s
(using the "reset" t
r
i
c
k
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
S
imon Hausmann
A
dded a l
i
ttle helper scr
i
pt to rem
o
ve unused t
a
gs
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-10
Si
m
on Hausm
a
nn
Changed the
d
ef
a
ult git import b
r
anch from
"p
4
" to
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
S
imon
Hausm
a
nn
Avoid
the
exce
s
sive
u
se of g
i
t tags
f
or every perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
Minor code cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
S
imon Hau
s
mann
Added a lit
t
le
h
elper scr
i
p
t to
d
eb
u
g the output o
f
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
Simon Hausmann
Mad
e
the nam
e
o
f the git
b
ra
n
ch used for the per
f
orce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-08
Simon Hausmann
Catch io exc
e
ptions fro
m
git fast-import again and
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausman
n
Fix
c
alculation
o
f the newest imported revisi
o
n for
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Sim
o
n
Hausmann
Mak
e
specifyi
n
g
the revisi
o
n ranges more c
o
nvenient
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Haus
m
a
nn
Make incrementa
l
i
m
p
orts e
a
s
i
er
t
o use by st
o
ring the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Ha
u
smann
F
i
xed incrementa
l
i
m
po
r
t
s by
u
s
ing t
h
e corr
e
ct "from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausmann
Minor
c
leanups and
p
rint an error m
e
ssage of git
f
ast
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
S
i
m
o
n Haus
m
ann
Initial supp
o
rt for importing a
di
r
e
ctory f
r
o
m Pe
r
force
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Si
m
on
Hausmann
Code clean
u
p
s, move the code to create a commit
w
ith
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simo
n
Hausmann
S
imp
l
i
f
y the incremental impo
r
t by eli
m
ination th
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Starte
d
worki
n
g o
n
incre
m
e
n
tal imports from Perforce
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
i
m
on Hausmann
F
i
x fil
e
per
m
is
s
ions of p4-fast-expo
r
t
.
py to be executable
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Create
a
git tag for every ch
a
ngeset im
p
orte
d
from
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
i
m
on Hausmann
Fixed dis
p
la
y
i
ng import pr
o
gress by
c
all
i
ng
f
lush on
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon
Haus
m
an
n
Pe
r
m
it calling p4-fast-
e
xport
w
ith a
d
epot
p
ath
t
hat
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon
H
ausmann
Av
o
i
d
calling
f
stat f
o
r every imported fi
l
e (
s
low!
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Ha
u
smann
Ported t
h
e remaining
function
s
t
hat pa
r
sed p4 shell
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Inste
a
d
o
f parsi
n
g
t
h
e output
of "p4 users" use the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Haus
m
ann
Minor code cleanups
and ported some p4 interfacin
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon Ha
u
smann
C
h
anged the impor
t
mec
h
anism t
o
write
t
o
git fast
-
im
p
ort
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Sim
o
n
Hau
s
man
n
Removed unused p4cat function and added helper fu
n
cti
o
n
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simon
Hau
s
mann
Speed up the imp
o
r
t
of
i
ndividua
l
fi
l
es fro
m
Perforce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
i
mon Hausmann
Some fixes to the timezone co
n
versio
n
between the date
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
Simo
n
Haus
m
ann
Implemented basic
sup
p
o
r
t
for converti
n
g the date o
f
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hau
s
ma
n
n
S
lightly impro
v
ed help usage
output
a
nd made sp
e
cifying
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-31
S
i
mon
H
a
u
s
m
ann
Added basic sup
p
ort
for
s
peci
f
yi
n
g
the d
e
pot path to
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-01-30
Simon Hausm
a
nn
I
n
itial
i
m
port of
a
pyth
o
n
s
cri
p
t
to import changesets
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree