repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'af/maint-install-no-handlink' into maint
2007-05-19
Simon H
a
usmann
Mor
e
cl
e
an
u
ps and speed
u
ps for labe
l
s
and branches
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-19
Simon Haus
m
ann
Cleanup/speed up the branch<> file
s
p
lit and removed
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-19
Simon Ha
u
s
mann
M
ore work on
t
he incremental importing
of mul
t
iple
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Sim
o
n Hausmann
Give
b
r
a
n
c
hes a nice project prefix and don't bail
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Sim
o
n Hausm
a
nn
Started re
w
rit
i
ng
the branch dete
c
t
ion,
b
a
sed on "p4
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hausmann
R
e
moved unused cache variables
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon Haus
m
an
n
Fi
x
bran
c
h setu
p
a
f
ter initial clone
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Rem
o
v
ed tod
o
item th
a
t
i
s
i
mp
l
emented :)
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
imon Ha
u
smann
Bite
t
h
e bullet an
d
auto
m
atically convert
o
ld sty
l
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Chan
g
ed the de
f
ault
p
4
import bran
c
h
t
o
be refs/rem
o
tes
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
i
m
on Hausmann
C
reate the origin based imp
o
rt branch
usi
n
g
git u
p
da
t
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
imon Ha
u
smann
Removed an
c
ient and
u
nused code to find the
l
ast
i
mp
o
rted
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon
Hausmann
R
emov
e
d clea
n
tags comman
d
.
I
t doesn't have
a
ny
meaning
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Ha
u
smann
C
lean up c
o
de duplicatio
n
for revision parsing and
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simo
n
Hausmann
Alw
a
y
s
p
ass a sha1 fo
r
the i
n
itial
par
e
nt so
t
h
a
t git
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
imon Haus
m
a
n
n
F
ixing sync
i
n
g (
g
itdir discov
e
ry /
c
d) for bare reposi
t
ories
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-16
Simon H
a
usmann
A
li
t
tle todo note before
I
forg
e
t
it :),
based on
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausm
a
nn
Fix cal
l
ing git-p4 rebase from
wit
h
i
n a su
b
directory
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon
H
a
usma
n
n
G
iv
e
a better hint
if git-p4 s
u
bm
i
t
fails
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon
Hausm
a
nn
A
d
ded the
p
ossib
i
lit
y
o
f
skipping p
a
tches du
r
ing g
i
t
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausma
n
n
Make git-p4 work
w
ith bare repositories
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Fix g
i
t-p4
cl
o
ne //depot/project (h
e
a
d
i
m
port)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Haus
m
ann
Converted to unix new
l
i
n
es
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Si
m
on Hausmann
Mak
e
submi
t
t
ing
work on
W
indows
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon H
a
usmann
Make
sure
a
ll
p
open calls use bin
a
ry
mode (for Windo
w
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Ha
u
s
m
ann
Added a
l
ittle
.
bat
w
rapper from M
a
rius
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Use the
s
ubpro
c
ess
module instead of popen2 to
m
ake
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
S
i
m
o
n H
a
usmann
Document some i
m
plementat
i
on detai
l
s
,
for
t
he cur
i
ous
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
S
imon Hausm
a
nn
Clea
n
up, removed the old taggin
g
cod
e
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
S
i
m
on Haus
m
ann
c
l
eanup, renamed self
.
globalPrefix to self
.
depotPath
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon
H
au
s
mann
Micro cl
e
a
n
up
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Si
m
on Hausma
n
n
Doc cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
S
i
mon
H
a
usmann
Handle patch
errors
in git
-
p4 su
b
mit better
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hausmann
A ne
w
attempt a
t
fixing
t
h
e child-
f
a
st-import-process
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausm
a
nn
S
l
ightly im
p
roved
f
ormatting of
the raw_
i
nput questio
n
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
S
imon Ha
u
sm
a
nn
Removed th
e
ol
d
patch apply cod
e
from gi
t
-p4 s
u
bmit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon
H
a
u
s
mann
Fix the timezone formatt
i
ng
.
N
o
w qgi
t
also dis
p
lays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Simon Ha
u
sm
a
nn
Pri
n
t
an
err
o
r
message of some s
o
rt i
f
git
f
ast-i
m
po
r
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
S
i
mon H
a
usmann
Allow
fo
r
conv
e
nient rebasing after
gi
t
-p4 submit
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Ha
u
sm
a
nn
Ad
d
ed a si
m
p
l
e example of us
a
ge to the "d
o
cumentatio
n
" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
fix vari
a
ble usage (oops)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
F
i
x fil
e
determination for
#head im
p
orts
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Haus
m
ann
Added git
-
p
4 clone convenience com
m
and
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
imon Hausman
n
Honor --s
i
lent
for lab
e
ls
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Sim
o
n
H
ausmann
Turn
off potenti
a
l
l
y slow labe
l
detecti
o
n by de
f
ault
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
S
i
m
on Hausman
n
Pr
o
vide a tr
e
e summary
a
fter git-p4 rebase
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon H
a
usman
n
Added git-
p
4 rebase conven
i
ence
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Sim
o
n Hau
s
mann
Cl
e
an
up pytho
n
class
n
ames
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Sim
o
n Hausmann
Fix "compilation"
:)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon H
a
usmann
Fix the docs for git-p4 submit and
t
u
rn git-p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon H
a
usmann
Fi
x
vari
a
ble usage
in t
a
g i
m
p
ort
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
S
i
mon Hausman
n
Added su
p
p
ort for ma
p
ping p4 labels to gi
t
tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon
Haus
m
ann
git-p
4
debug doesn't
n
eed a git reposito
r
y
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Si
m
o
n Ha
u
smann
Don't
try
t
o parse a
n
y options with git-p
4
debug
b
ut
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
S
imon Hausmann
Pref
e
r g
i
t command ov
e
r git-command
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon
H
a
usmann
M
inor cosmetic fixle
t
for the git-p4 submi
t
sync
q
ues
t
i
o
n
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Sim
o
n Hausm
a
nn
Differe
n
t versi
o
ns of
p
4 have different output for
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
Use th
e
n
e
w in
c
rement
a
l import style by default
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Sim
o
n Hausmann
Ma
k
e it possible to
run git
-
p4 submit from within th
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Brand n
e
w smart inc
r
emental
i
mpor
t
that doesn't need
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
H
ausmann
S
et
the default br
a
n
ch in ru
n
, not in the
constru
c
t
o
r
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon Hausmann
Helper function to check the existance of a
rev
i
sion
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Si
m
on Hausmann
Added s
o
me
h
elp
e
r func
t
ion(s) to parse the depot
p
ath
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Changed the d
e
fa
u
lt bra
n
ch
f
or imports from
"
master
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hau
s
mann
Changed th
e
f
o
rmat of
t
he import
e
d log
message
slig
h
tly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Haus
m
ann
Removed the
.
p
y extension from git-p4 as it's annoying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
Hausman
n
Don't show the sub
m
i
t templa
t
e a
n
d the di
f
f first in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Simon Haus
m
ann
Ma
k
e it
p
o
s
sible
to invoke g
i
t
-
p4 f
r
om within s
u
b
directories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Made --apply-as-
p
a
t
c
h the de
f
ault for git-p4 s
u
bmit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Ha
u
s
m
an
n
F
i
x support for deletio
n
s in git-p4 s
u
bmit when usin
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
Hausmann
Added exp
e
rimen
t
al but super-f
a
st -
-
app
l
y-as-patch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Doc
u
m
e
ntatio
n
enhance
m
ents
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
S
imon Hausmann
Start of
the git-p
4
doc
u
m
en
t
a
tion
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon
Hausma
n
n
Removed
p
4-fast-export and p4-git-sync as they've be
e
n
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Ha
u
smann
Fixed the ini
t
i
al version
import by
getting the file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Ha
u
smann
Adde
d
missi
n
g
"sel
f
"s to make th
e
scri
p
t
evaluate correctly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hau
s
mann
Completely untested
"merge" of p4
-
fast-
e
xp
o
rt
.
py into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
sync-to-perforce is now called submit and fixed
t
he
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
mon
H
ausmann
P
a
rt of
the
c
ode is copyright by Trolltec
h
A
S
A
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
F
i
rst (untest
e
d) atte
m
pt at migrating p4-
g
it-sync in
t
o
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
im
o
n Hausmann
Provide a little
bit of he
l
p
des
c
ription for the
g
it
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hau
s
ma
n
n
Sta
r
t mov
i
ng
the git
-
p4 tools int
o
one si
n
gle s
c
ript
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Sim
o
n Hausmann
P
a
ss the right
number of argum
e
nts to com
m
i
t, fixes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausman
n
Improved the git d
i
r dete
c
tion
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Sim
o
n Haus
m
ann
Default to int
e
ractive synci
n
g
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
S
i
m
on Hausmann
U
s
e p4 re
v
ert
.
.
.
i
nstead
o
f revert -a
.
.
.
after submitting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Si
m
on Hausmann
Auto-detect the curr
e
n
t
git br
a
nch be
f
ore submitting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simo
n
Hausmann
Ignore Apple re
s
ource
f
iles wh
e
n importing
fro
m
per
f
orc
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausm
a
nn
B
e
nice
a
n
d u
s
e /
u
sr/b
i
n/en
v
python for th
e
git-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Si
m
o
n
Hausm
a
nn
A
utomaticall
y
oper
a
te
on a t
e
mporary b
r
anc
h
, needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon
Ha
u
smann
Lots of bugfixes to p4-git-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausm
a
n
n
Fix git-d
i
r
o
ption a
n
d a
l
low reading log substitutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon Hausmann
Firs
t
version of
a new scrip
t
to s
u
bmit changes
back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
Hau
s
mann
Spl
i
t
u
p the
cache com
m
andl
i
ne options into (command
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausm
a
nn
Reduce
the
number of false "merge
s
" by skipping "branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
imon
H
ausmann
More work on branch detec
t
i
on by
i
mplementing
c
hangeIs
B
r
anch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Mo
r
e
code cleanups and
prep
a
rations for mo
r
e
b
r
a
n
ch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Minor code cleanups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausma
n
n
Make the p
4
da
t
a/com
m
and ca
c
he configurable th
r
ough
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
next