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
Give branches a nice project prefix and don't bail out on clone if we failed
2007-05-18
S
i
m
o
n H
a
usmann
Give
b
ranches
a nice project prefix and don'
t
bail
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hausm
a
nn
Started rewriti
n
g
the branch
detection, ba
s
ed
on "p4
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simo
n
Hau
s
mann
Removed unused cache
v
ariab
l
es
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon
Hausmann
Fix branch setup aft
e
r initial clone
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausm
a
n
n
Removed todo item
t
h
a
t is impl
e
me
n
ted :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
i
mon Hausmann
Ad
d
ed support for git
-
p4 sync/
r
e
base --with-origi
n
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
i
mon
H
ausmann
B
ite the bullet and au
t
o
matica
l
ly conver
t
old style
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
im
o
n
Hausmann
C
h
anged the defa
u
lt p4 im
p
o
r
t branch to
be refs/remote
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Creat
e
the
origin bas
e
d import br
a
nch usin
g
gi
t
update
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon
H
au
s
m
a
nn
Removed ancient and unused cod
e
to find
t
he
l
ast impor
t
ed
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
i
mon Hau
s
m
ann
Remov
e
d
c
l
eantags command
.
It doesn't have any meaning
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Clea
n
up co
d
e
d
uplication for revision parsing an
d
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simo
n
Hausman
n
A
l
ways pass
a sha1 for
t
he i
n
i
tial
p
are
n
t s
o
that
g
it
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Ha
u
smann
Fixing syncing
(
git
d
ir discovery
/ cd) for
b
a
re reposito
r
ies
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-16
Simon
H
ausmann
A
little
t
od
o
not
e
before
I
forget it :)
,
b
a
se
d
on
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon Ha
u
smann
Fix
calling gi
t
-p
4
rebase from
w
ithin
a
s
ub
d
i
rector
y
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon Ha
u
sm
a
n
n
Give a better hint if git-p4 submit
fails
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
S
imon H
a
usmann
Added the po
s
sibility of
s
k
ipping patches
during git
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Make g
i
t-p4 work with bare
r
e
positori
e
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
Simon
Hausm
a
n
n
Fix
git-p4 clone
//depot/project (head impor
t
)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Mariu
s
Storm-Olsen
Make the comman
d
call silent
commit
|
commitdiff
|
tree
2007-05-15
S
i
mon Hausmann
Converted to unix new
l
ines
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hau
s
mann
Make
s
ubmi
t
ting wor
k
on W
i
ndows
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon H
a
us
m
a
n
n
M
a
ke sur
e
all pope
n
calls use bin
a
ry m
o
d
e
(for
W
indows
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Haus
m
ann
A
d
ded a l
i
ttle
.
b
a
t wrapper from
M
a
r
ius
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Haus
m
ann
Use the subprocess module
i
n
stead of popen2 to make
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
Simon Hausm
a
nn
Document some i
m
plementation details, for the curious
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon
H
ausmann
Clea
n
up,
r
emo
v
ed
t
he old
t
agging c
o
de
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
S
imo
n
Hausma
n
n
c
l
eanup, renamed self
.
globalPrefix
t
o
self
.
depotPath
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon
H
ausmann
M
icro c
l
eanup
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
S
imon H
a
us
m
ann
D
oc cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Si
m
on H
a
usmann
Handle patch erro
r
s in
git
-
p4
s
u
bmit better
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon H
a
usmann
A
new at
t
empt at fixing the child-fast-import-process
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Si
m
on
H
ausmann
Slightly
i
mproved format
t
ing of the raw_
i
nput question
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simo
n
Hausmann
R
emoved the old pat
c
h apply c
o
de fr
o
m g
i
t-p4 submit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
S
imon Hausmann
Fix the t
i
mez
o
ne f
o
rmat
t
ing
.
No
w
qg
i
t als
o
displays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Simon Hausmann
P
rint an error message of
s
o
me
s
ort if git
fast-impor
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Simon Hausmann
A
l
low
f
or c
o
nvenient r
e
basing after git-p4
s
u
bmit
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Ha
u
smann
Added a simple
example of usage to t
h
e
"documen
t
a
t
i
o
n
"
:)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
fix
v
ar
i
able usage
(
o
ops)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Sim
o
n
H
ausmann
Fix fi
l
e
determination for
#head
i
mports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Haus
m
ann
Added git-p4 clone conve
n
ie
n
ce command
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
i
m
o
n
Hausmann
Honor --silent
f
or labels
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon
Hau
s
mann
Turn of
f
potent
i
al
l
y
s
low labe
l
detec
t
io
n
by
d
ef
a
ult
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Sim
o
n
Hausma
n
n
Provide a tree summary after git-p4 rebase
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon
H
ausm
a
nn
Added git-p4 rebase conve
n
ience
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausma
n
n
Clea
n
up
p
ython class nam
e
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Si
m
on Ha
u
sm
a
nn
F
ix
"
compilation" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
S
imon Hausmann
Fix the docs for git-p4 submit an
d
tu
r
n git
-
p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon Ha
u
s
m
ann
Fix va
r
iable
u
s
age in tag import
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Si
m
on H
a
usma
n
n
Added support fo
r
mapping p
4
labels to git tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon
Hau
s
m
a
nn
git-p4 de
b
ug
does
n
't
n
eed a git repository
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simon
Hau
s
man
n
D
o
n't try to
p
ar
s
e a
n
y opt
i
on
s
wi
t
h git-p4 debug but
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Sim
o
n Hausm
a
nn
P
refer git command o
v
er git-command
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Si
m
on Hausm
a
nn
M
i
n
o
r
c
osmetic fixlet for the
gi
t
-p4 submit sync questi
o
n
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausmann
Different ver
s
ion
s
of p4 h
a
ve diff
e
rent out
p
u
t fo
r
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
Use the ne
w
incrementa
l
import sty
l
e by d
e
fault
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Simon
Hausma
n
n
Make
i
t possible to run git-p4 su
b
mi
t
from within the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Bra
n
d ne
w
smart incremental impo
r
t t
h
at do
e
sn't
need
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Ha
u
smann
Set
the default br
a
nc
h
in run, not in
th
e
cons
t
ructor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Sim
o
n
H
a
us
m
a
nn
Helper
fun
c
tion to
check the existance of a
r
evisio
n
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Added
some
helper function(s) to pa
r
se t
h
e
de
p
ot
p
at
h
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Changed the default branc
h
for imp
o
rts fr
o
m "
m
aster
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Ch
a
nged the format of th
e
impo
r
ted log messa
g
e slightly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Remo
v
e
d
th
e
.
py extens
i
on f
r
o
m g
i
t-
p
4 as it's annoying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
Hausmann
Don't
show the submit template and the diff fi
r
st in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n Hausmann
Make
i
t possible to invoke
git-p4 from with
i
n subdirectories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n Hausma
n
n
Ma
d
e --app
l
y
-
as
-
p
atch th
e
default for git-p
4
s
u
bmi
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Fix support f
o
r deletions in git-p4 subm
i
t when using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n H
a
usmann
Added experimental b
u
t
s
u
p
e
r-fast --apply-as-p
a
tch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Haus
m
ann
Docume
n
tation enhancements
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Si
m
on
Hau
s
mann
Sta
r
t
of the git-p4 d
o
cumentati
o
n
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Rem
o
ved
p
4
-
fast-expor
t
and
p
4-git-sync as t
h
ey've
bee
n
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Fixed t
h
e init
i
al version import
b
y
getting the
file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon
H
a
usmann
Added missing "sel
f
"s to make the script
evaluat
e
correctly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
i
mon
Hausmann
Co
m
pletely un
t
ested "
m
erge" of p4-fast-expo
r
t
.
p
y
into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hau
s
ma
n
n
sync-to-perforce
is now called subm
i
t and fixed the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Part of the cod
e
is copy
r
ight by Trolltec
h
ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon H
a
u
smann
First (
u
ntested) attempt
at migrating
p
4-git-sync into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hau
s
mann
Provide
a
lit
t
le
b
it o
f
he
l
p description for
t
he git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Si
m
o
n Hausmann
Start m
o
ving the git-
p
4
t
ools into one singl
e
sc
r
ipt
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Pas
s
the
right num
b
er of
arguments to
c
ommit, fix
e
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simo
n
Hausmann
Improved the git dir detection
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simo
n
H
ausmann
Default to interac
t
ive syncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Sim
o
n Hausmann
Us
e
p4
r
ever
t
.
.
.
inst
e
ad of revert -a
.
.
.
af
t
er submitting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausman
n
Aut
o
-detect the current git branch bef
o
re submittin
g
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausma
n
n
Ignore Appl
e
resource f
i
le
s
when importin
g
from perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Ha
u
smann
Be nice and use /
u
sr
/
bin/env
python
for t
h
e git-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
S
im
o
n Hausmann
Aut
o
matically ope
r
ate
o
n a temporar
y
branch, neede
d
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Sim
o
n Hausmann
Lots
o
f
b
u
gfixes
t
o
p4-g
i
t-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simo
n
Hausmann
F
ix git-dir option and allo
w
readi
n
g log substitution
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
S
imo
n
Hausmann
First version of a new scrip
t
to submit changes ba
c
k
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Split
u
p t
h
e cache
c
ommand
l
ine op
t
ions int
o
(command
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
R
e
duce the n
u
mber of false "
m
erges" by skipping
"
b
r
anch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
More work on
b
r
anch detection by impl
e
menting changeIsBran
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
Ha
u
smann
More c
o
de
c
leanups
a
nd
p
re
p
a
r
a
t
ions f
o
r
m
o
re branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on Hausma
n
n
Minor code cle
a
nups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on Hausmann
M
a
ke the p4 data/command cache
configurable through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Fixed p4-deb
u
g f
i
le extensi
o
n
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausmann
Chan
g
e
d
--
k
no
w
n-branche
s
to take a
file
as argument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
next