repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
format-patch -s: add MIME encoding header if signer's name requires so
2007-05-16
Sim
o
n
Haus
m
a
n
n
Fi
x
c
a
l
ling git-p4
r
e
base from wi
t
hin a s
u
bdirectory
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hau
s
mann
G
ive
a
better hint if g
i
t-p4 s
u
bmit fails
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
Added the p
o
ssibilit
y
of s
k
ipp
i
ng patches during
git
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simo
n
Hausmann
Make gi
t
-
p
4 work with bare rep
o
s
i
t
ories
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
Simon Ha
u
smann
Fix
g
it-p4
c
lone //
d
epot/project
(
head import)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simo
n
Hausmann
Convert
e
d to unix newlines
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
S
im
o
n
H
aus
m
ann
Make submitting
w
ork o
n
W
indows
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
S
i
mon Ha
u
sm
a
nn
Mak
e
sure
a
l
l popen
c
alls use binary mo
d
e (for Win
d
o
ws
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon
H
a
usman
n
Added a little
.
bat w
r
app
e
r fr
o
m Mariu
s
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausman
n
Use the subpro
c
ess module in
s
tead of p
o
pen2 to make
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
Simo
n
H
ausma
n
n
Document some
i
mp
l
ementation d
e
tails, for the curious
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
Cleanup, remo
v
e
d the old tagging code
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Sim
o
n
H
a
u
s
mann
cleanup, renamed self
.
globalPrefix to self
.
depotPath
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausma
n
n
Micro clea
n
up
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Si
m
on Haus
m
a
n
n
D
o
c clean
u
ps
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hausmann
Han
d
le patch
e
rr
o
r
s
in git-p4 su
b
mit better
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hausmann
A
n
ew atte
m
pt at fixi
n
g
t
h
e child-fast-import-proces
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon
H
a
us
m
ann
Slightly i
m
p
roved formatting of the raw_
i
nput qu
e
stions
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simo
n
H
a
us
m
ann
R
emoved the old patch ap
p
ly code fr
o
m git-
p
4 submit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon
H
ausmann
Fix
the timezo
n
e fo
r
m
a
tt
i
n
g
.
Now qgit also displays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Simon Hausmann
Pr
i
nt an error messa
g
e of some sort if
g
it fast
-
im
p
ort
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Simon Hausmann
Allow for convenient rebasing after git-p4
s
ub
m
it
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
imon Hausmann
Added a simple example of usage
to the "documenta
t
ion
"
:)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
fix variabl
e
usage (oops)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon H
a
usmann
Fix
f
ile
d
eterminat
i
o
n for #he
a
d
i
mports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Sim
o
n
Hausma
n
n
A
d
ded
g
it-p4 clone
c
o
nven
i
e
n
c
e
c
ommand
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simo
n
Hausmann
Hono
r
-
-silent for labels
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausma
n
n
Tur
n
of
f
p
otenti
a
lly slo
w
l
abel detection by
defaul
t
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon
H
a
u
sma
n
n
Pro
v
ide a t
r
e
e
summary after git-p
4
reb
a
se
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simo
n
Haus
m
ann
Added git-p4 rebase conven
i
en
c
e
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Simon H
a
usmann
C
l
ean up
p
ython cl
a
ss na
m
es
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
S
i
m
o
n
H
ausmann
Fix
"compilation"
:
)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon Hausmann
F
i
x
the docs fo
r
g
it-p4 submi
t
and turn
git-p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon Hausm
a
nn
Fix variable usag
e
in tag import
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon
Hausma
n
n
Ad
d
ed
s
upport for mapping p4 labels to gi
t
ta
g
s
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hau
s
mann
g
it-p4
d
ebu
g
doesn'
t
ne
e
d a git repository
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Si
m
on Hausmann
D
o
n't try to parse any opt
i
ons wit
h
g
i
t
-p4 d
e
bug but
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon H
a
usm
a
n
n
P
r
efer git
c
ommand
over git-co
m
man
d
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simo
n
Hausmann
Minor
cosmetic fixlet for the gi
t
-p4 submit syn
c
question
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausmann
Different vers
i
ons of
p
4
h
ave different output for
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
Use the
n
e
w in
c
reme
n
tal impor
t
st
y
le by d
e
f
a
ult
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausman
n
Make it possi
b
le to
r
un g
i
t
-p4 su
b
mit
f
r
om
with
i
n the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simon Ha
u
s
mann
B
rand new
s
mar
t
i
ncremental
import
that doesn'
t
need
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon H
a
usmann
Set the default branch
i
n
run, not in the constru
c
tor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Si
m
on Hausm
a
nn
Helper
fun
c
tion to check the exis
t
a
n
ce of a rev
i
sion
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hau
s
mann
Added som
e
helpe
r
function(
s
) to pa
r
se
t
h
e depot
path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
m
on Hausmann
Changed th
e
default
branch
f
or impo
r
ts from "master
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon Hausmann
Changed t
h
e
format
of the im
p
orted lo
g
me
s
sage sl
i
ghtly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
R
e
moved the
.
py extension fr
o
m
gi
t
-
p4 as it's annoy
i
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Si
m
on Hau
s
mann
D
on't s
h
ow the submit template and
t
he diff first in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
Hausmann
Mak
e
i
t
poss
i
ble to invoke git-p4 from
w
ithin subdi
r
ectories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
i
m
on Hausmann
Made
-
-apply-a
s
-patch the def
a
ul
t
for git-p4
s
u
bmit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hau
s
m
a
nn
F
i
x
support for
deletions in git-p4 submit
w
hen using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon H
a
u
s
m
ann
Added experi
m
e
n
tal but s
u
per-fast
-
-ap
p
ly-as-patch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Documentatio
n
e
n
hancements
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Simon Haus
m
ann
Start of th
e
gi
t
-p4 docu
m
entati
o
n
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausma
n
n
Removed p4
-
fast-expo
r
t and p
4
-g
i
t-
s
y
nc as they
'
v
e
been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
i
m
on Hausma
n
n
Fixed
t
he init
i
al
version import by get
t
ing the file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Si
m
on Hausmann
Added
missing "self"s t
o
make the script evaluate corre
c
t
l
y
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
imon Hausmann
Completely un
t
ested "merge
"
of
p4-fast-export
.
py into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
s
y
nc-to
-
perforce
i
s
n
o
w called su
b
m
i
t and fixed th
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
imo
n
Hausmann
Part of the code is copyright
by Trolltech ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausm
a
nn
F
i
r
st (u
n
t
e
s
ted) attempt at
m
igrat
i
n
g
p4-git-sync into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Provide a litt
l
e bit of he
l
p desc
r
iption for the git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Start
m
oving the git-p4 tools into one sing
l
e script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
mon Hausmann
P
ass the righ
t
number of argu
m
en
t
s to commit, fixe
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon H
a
usm
a
nn
Improv
e
d the git di
r
detection
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simon Hausma
n
n
De
f
aul
t
to interactive syncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon Hau
s
m
a
n
n
Use p4 revert
.
.
.
in
s
tead of revert
-a
.
.
.
a
fter s
u
bmitting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausman
n
Auto-detect the current git
b
r
anch before
s
ubm
i
t
ting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Ign
o
re
A
pple resourc
e
files when importing
f
r
om per
f
orce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
S
imon Hausman
n
Be nice and
use /usr/bin/env pyt
h
on for the
git-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hau
s
mann
A
utom
a
t
icall
y
opera
t
e on a temporary branch
,
ne
e
d
e
d
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Haus
m
a
nn
L
o
ts of bugfixes to p
4
-g
i
t
-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hau
s
m
ann
Fix git-d
i
r option
a
nd
allow reading log substitution
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon Hausmann
First version
o
f
a new
s
cript
to submit
c
han
g
es back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausm
a
nn
Split up the cache com
m
andl
i
ne op
t
ions
i
n
t
o
(command
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
R
educe the number of fa
l
s
e
"merges" by
ski
p
ping "branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
More
w
ork on
b
ranch
detection b
y
implemen
t
ing c
h
an
g
eIsBranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on Hausmann
More
c
o
de cleanups and preparations for
m
o
r
e bran
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
H
ausmann
Mi
n
o
r code cleanup
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Sim
o
n
Haus
m
a
nn
Make the
p4 data/comman
d
cac
h
e config
u
rabl
e
through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausman
n
Fixed p4-d
e
bug file extension
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Sim
o
n H
a
usmann
Changed
--known-branches t
o
take a file as argument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
S
i
mon
H
a
usmann
Work
in progress on
de
t
ec
t
i
ng branch
e
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simon Hausmann
Adjust the output parsing of gi
t
na
m
e-re
v
t
o
hand
l
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
Do
n
't print a pl
a
in newl
i
n
e
a
t
t
he
end of th
e
ex
e
c
u
tion
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Simo
n
Hausman
n
Mor
e
work in --silent su
p
port
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
S
i
mon Hausmann
Added support f
o
r
-
-silent so
t
hat p4-fast-export can
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
S
i
mon Hau
s
mann
A
d
ded p4 delete behavioural emulation as todo i
t
em
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Si
m
on Hausmann
F
ix s
i
ngle-branch
impor
t
s by ski
p
p
i
ng the branc
h
/merge
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon
H
a
usma
n
n
Use
s
ets
.
Set() instead o
f
set(
)
to run also with older
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hau
s
mann
Make
i
t possible to
speci
f
y th
e
p4 chan
g
es
t
o
im
p
ort
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
S
i
mon H
a
u
smann
When trying to map p4 integratio
n
s to git merge
s
just
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Ha
u
sm
a
n
n
S
et git fast-impor
t
marks for every im
p
o
r
ted change
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
i
m
on
Ha
u
sm
a
nn
Af
t
er
m
arking a p4 branch as me
r
g
ed
don't ever merge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
More
f
ixes i
n
h
euristic p4 br
a
nch d
e
tection ba
s
ed on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
imon Hausman
n
Started work
o
n
p4
branch
dete
c
tion (ex
p
erime
n
tal!)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Si
m
on
Hausmann
Code cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Si
m
on H
a
usmann
Cleanups, remove unuse
d
variable
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
next