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
Fix potentially dangerous uses of mkpath and git_path
2007-05-19
Simon
H
ausm
a
nn
More cleanups and speed
u
ps for labels and branches
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-19
Simon
H
ausman
n
Cleanup/speed up
t
he br
a
nch<> file
s
plit and removed
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-19
Simon Hausmann
More work
on
t
h
e incremental im
p
or
t
ing of multiple
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
S
i
mon H
a
usmann
Give branches a nice project prefix
a
nd d
o
n
'
t bail
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hausma
n
n
St
a
rted rewri
t
ing the
branch det
e
ction,
b
ased on "p4
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hau
s
m
ann
Removed
u
nused cache variabl
e
s
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
S
i
mon
H
ausmann
F
i
x
bran
c
h setup aft
e
r initial cl
o
ne
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-17
Si
m
on H
a
u
smann
Re
m
oved todo item tha
t
is imp
l
emen
t
ed
:)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Ad
d
ed support for git-p
4
sync/rebase --
w
ith-origin
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simo
n
Hausmann
Bit
e
the
bullet
a
nd automatically
c
onvert old s
t
yle
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Chang
e
d t
h
e default p4 import branch to be refs/remot
e
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
imon Hausman
n
Create the origi
n
based import br
a
n
ch using git
u
pd
a
te
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon
Hau
s
mann
Removed ancient
and un
u
sed code to
f
i
n
d the last imported
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausman
n
Re
m
oved cl
e
a
n
tags
c
o
mmand
.
It
do
e
sn't ha
v
e any meaning
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausman
n
Clean up code dup
l
ica
t
ion fo
r
revision parsing a
n
d
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Si
m
on Hausmann
Alway
s
pass a s
h
a1 for the
initial parent so that git
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Fi
x
i
n
g
syncing (gitdir discovery / c
d
) for bare repo
s
ito
r
ies
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
A little todo
n
o
te before I
fo
r
get it :),
b
ased on
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon
H
aus
m
ann
Fix calling
g
it-
p
4 r
e
b
a
s
e
f
rom
w
ithin a
s
ubdire
c
tory
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon Ha
u
smann
Give
a
b
etter hin
t
if git-
p
4 su
b
mit fails
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon H
a
usman
n
Adde
d
t
he
p
ossibi
l
i
t
y
of skipping patches dur
i
ng git
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Si
m
on Hausmann
Make git-p4 work wit
h
bare reposi
t
o
ries
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
Simon Ha
u
s
ma
n
n
F
ix g
i
t-
p
4 clone /
/
d
e
pot/project (head import)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausma
n
n
Converted to
u
nix n
e
wlines
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Mak
e
submitting work on Windows
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
S
imon Hausm
a
nn
Make sure all popen calls use b
i
nary mode
(
for
Windo
w
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Added a little
.
bat wrapper from Marius
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon H
a
usmann
Use the subprocess module instead
o
f popen2 to mak
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
Simon
Hausman
n
Do
c
ument some imple
m
entation
deta
i
ls,
f
or the curious
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Ha
u
smann
Cleanup, removed th
e
o
ld t
a
g
gi
n
g
cod
e
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
cleanup,
r
enamed self
.
gl
o
balPrefix to se
l
f
.
depotPat
h
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
M
icr
o
cleanup
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausm
a
nn
Doc c
l
eanu
p
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hausmann
Handle patch errors in git-
p
4 s
u
bmit better
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simo
n
Hausman
n
A n
e
w attempt at fi
x
ing
t
he child
-
fast-i
m
p
ort-
p
roc
e
ss
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausmann
Slightly improved formattin
g
of the ra
w
_input questions
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
S
i
m
o
n Hau
s
mann
Remov
e
d the old patch apply
code f
r
om git-p4 submi
t
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Sim
o
n
Hausmann
F
i
x the
t
imezon
e
formattin
g
.
Now qgit also di
s
plays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Simon Hau
s
mann
Print
a
n
e
rror message of some sort
i
f git
fast-
i
mport
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Simo
n
Hausmann
All
o
w for conv
e
nie
n
t rebasing afte
r
git-p4 su
b
mi
t
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausm
a
nn
A
dded a simple example of
usage to
t
he
"document
a
tio
n
" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
fix variable usa
g
e (oops)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Si
m
on Hausmann
Fix file det
e
rmina
t
ion fo
r
#head imports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Sim
o
n
H
a
usmann
Added git-p4
clone convenien
c
e command
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
i
m
on Hausm
a
nn
H
o
nor --silent for la
b
els
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausm
a
n
n
Turn off p
o
tentially slow la
b
el detection by default
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon
H
ausmann
Provide a
t
r
e
e summa
r
y af
t
er gi
t
-
p
4 rebase
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausmann
Added git-p4 rebase convenience
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
S
imon H
a
u
sma
n
n
C
l
ean up python class names
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausmann
F
ix
"
com
p
ilation" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Sim
o
n Hausmann
Fix the docs for git-p4 submit and
tu
r
n git-p4 s
u
bmit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon Hausmann
Fix
va
r
i
a
ble us
a
ge
i
n
tag import
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hausma
n
n
Added su
p
port for mapping p
4
labels to git tag
s
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hausmann
git-p4 debug d
o
esn
'
t need a git rep
o
sitory
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simon Hausmann
Do
n
't
tr
y
to p
a
rse
a
ny options with git-p4 debug but
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausmann
Pre
f
er git co
m
ma
n
d ov
e
r g
i
t-comm
a
nd
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausmann
Minor cosm
e
t
i
c
fixle
t
for the
g
it-p4 s
u
bmit sync question
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Ha
u
smann
Different versions of p4 have different output
for
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon H
a
usman
n
Use t
h
e new incr
e
mental impo
r
t s
t
yle
by
de
f
a
ult
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
Make it pos
s
ible to run
gi
t
-p4 sub
m
it from
with
i
n th
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simo
n
Hausmann
B
ra
n
d ne
w
smart incr
e
me
n
tal import that doe
s
n't need
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausma
n
n
Set
the defau
l
t
b
ranch in run, no
t
i
n the c
o
nstructor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
imon
Hausma
n
n
Helper
f
un
c
tion
t
o check th
e
existanc
e
of a revision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
A
d
ded
some helpe
r
func
t
i
on(s) t
o
pa
r
se t
h
e
d
e
pot
path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
H
ausma
n
n
Ch
a
n
g
ed the default branc
h
for impor
t
s from "master
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Haus
m
ann
Changed the fo
r
mat of
t
he imported l
o
g message sligh
t
ly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mo
n
Hausmann
Rem
o
ved the
.
py
e
x
tension
f
rom g
i
t-p4 as i
t
's annoy
i
ng
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
H
ausmann
Don'
t
show the submit template and the di
f
f first in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Make it
possi
b
l
e to in
v
oke
g
it-
p
4 from within subdi
r
e
ctories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
imon
H
ausmann
M
a
de --app
l
y-
a
s-p
a
tc
h
the default for git-p
4
submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
Haus
m
ann
Fix s
u
pport
for del
e
tions in
git-p
4
submit when using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
imo
n
H
a
usma
n
n
Added experimental bu
t
s
uper-fast --
a
p
p
l
y-a
s
-patch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Ha
u
sman
n
Documentation e
n
hancements
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Start of
t
he git-p4 d
o
cum
e
n
t
a
t
ion
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Removed p4
-
fast-exp
o
rt an
d
p4-git-sync as
t
hey've been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Fixed th
e
init
i
a
l
versi
o
n
im
p
ort by gett
i
ng the file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Sim
o
n Hausma
n
n
Added m
i
ssing "sel
f
"s to make
t
h
e scr
i
pt
evaluate correctly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausman
n
Completely unte
s
ted "merge" of p4-
f
ast
-
expo
r
t
.
py
into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Sim
o
n Hausmann
sync-to-perforce
is n
o
w
calle
d
submit a
n
d fixed the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Sim
o
n H
a
u
s
m
ann
Part of t
h
e
code is copyright by Tro
l
ltech ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon H
a
usmann
Fi
r
st (untested) a
t
tempt at migrating
p
4-
g
it-sync into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Sim
o
n Hau
s
mann
P
r
o
vide a lit
t
le bi
t
of
help descript
i
o
n
fo
r
the
git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Start moving the
g
it-p4 tool
s
i
nto
one
single scr
i
pt
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Pass
the right number of argu
m
ents
t
o
commit, fixes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simo
n
Hausmann
Improved the git
d
ir de
t
ecti
o
n
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simon Hausman
n
D
efaul
t
to
interactive sync
i
ng
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Sim
o
n Haus
m
ann
Use p4
reve
r
t
.
.
.
instead of r
e
vert
-
a
.
.
.
aft
e
r submitting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Auto-
d
ete
c
t t
h
e current gi
t
b
r
a
n
ch bef
o
re submitting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Si
m
o
n
Ha
u
smann
Ign
o
re Apple
r
esource file
s
wh
e
n importing from perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Ha
u
s
m
a
nn
Be nic
e
and use /usr/
b
in/env pytho
n
for the git
-
p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon
Hausmann
A
u
tomatically ope
r
ate on
a
t
emporary
branch, needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon
H
ausman
n
Lots of bugfixes to p
4
-git-
s
yn
c
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausmann
Fix g
i
t
-
dir
o
pt
i
on and a
l
low reading l
o
g
su
b
s
titutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon H
a
usmann
First ver
s
i
o
n of a new
s
cript
t
o submit
changes back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
mon Hausmann
Spli
t
up the c
a
che commandli
n
e opt
i
ons i
n
to (comma
n
d
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Sim
o
n Hausmann
Reduce
t
he
n
u
m
b
er of f
a
ls
e
"merges" by sk
i
pping "
b
ranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Sim
o
n
Haus
m
a
n
n
M
o
r
e
w
o
rk on
br
a
nch detection by implementing changeIsB
r
anch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
Hausmann
M
o
re cod
e
clea
n
ups and prepara
t
ions
for
more branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Minor code
c
lea
n
u
p
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Sim
o
n Hausmann
Make the p4 data/comm
a
nd cache con
f
ig
u
r
able through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
next