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
"blame -c" should be compatible with "annotate"
2007-05-19
Simon Hausmann
More clean
u
ps
an
d
sp
e
edups f
o
r
l
a
bels and bra
n
ches
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-19
Si
m
on Hausmann
Cl
e
anup/speed
u
p
t
h
e
br
a
nch
<
> file split
and re
m
ov
e
d
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-19
Simon H
a
usman
n
More work on the i
n
cr
e
me
n
tal imp
o
rting o
f
multiple
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hausmann
Give branches a nice project pref
i
x
a
n
d don't bai
l
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon
Hausma
n
n
Start
e
d
rewriting the branc
h
detection, based on "p4
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hausmann
Removed unus
e
d
cache variables
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon
Hausmann
Fix branch
setup after i
n
i
t
ial clone
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-17
Simon H
a
u
smann
Removed to
d
o item that is impl
e
ment
e
d :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Added support f
o
r git-p4 syn
c
/rebase --
w
ith
-
origin
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
imon Hausmann
Bite
t
he bullet and automatical
l
y conv
e
rt ol
d
sty
l
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Si
m
o
n Hau
s
ma
n
n
Ch
a
n
g
ed t
h
e defa
u
lt p4 impo
r
t branch to b
e
refs/re
m
ote
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
i
mon Hausmann
Cr
e
ate
t
h
e
o
rigin based import
bran
c
h using git
u
pd
a
te
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon H
a
u
s
mann
R
e
m
oved ancient and unused code to find
t
he
last imported
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
i
mon
Hausmann
Removed cleantags command
.
I
t d
o
esn't
have any meaning
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon H
a
usmann
Clean up code dup
l
ic
a
tion for revision parsi
n
g
and
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Haus
m
an
n
Always pass
a
sha1 for the initial parent so that git
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simo
n
Hausmann
Fixing syncing (git
d
ir di
s
c
o
very / cd) for bare repos
i
tories
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-16
S
i
mon Ha
u
smann
A
l
ittle t
o
do n
o
te before I forget it :),
based on
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
S
i
m
on Haus
m
ann
Fix ca
l
l
i
ng g
i
t-p4 rebase f
r
om with
i
n a subdir
e
ct
o
r
y
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Si
m
on Hausmann
Give a better hint i
f
git-p4 s
u
bmit fails
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
S
imon Hausmann
Added
t
he p
o
s
s
i
b
i
lity of skipping
patc
h
es during git
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
M
a
ke git-p4 work with bare
rep
o
s
i
t
ories
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
Simon Haus
m
ann
Fix git-p4 clone //depot/project (head im
p
o
r
t
)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausma
n
n
Converted
t
o
unix
newline
s
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Si
m
on Hausmann
Make submit
t
ing
w
o
rk on Windows
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simo
n
Hausman
n
Make su
r
e all popen calls use
b
inary
mo
d
e (for W
i
ndow
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausm
a
nn
Add
e
d a li
t
tle
.
bat wra
p
per from M
a
riu
s
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon
Hausmann
Use t
h
e subproces
s
module
instea
d
o
f
pope
n
2 t
o
make
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
Simon Hausmann
Docume
n
t s
o
me implement
a
tion details,
f
or the curious
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausma
n
n
Cleanup, removed the old tagging
cod
e
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Sim
o
n H
a
us
m
a
n
n
cleanup, r
e
named self
.
globalPrefix to self
.
de
p
otPath
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
Micro cleanup
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Si
m
on Hausmann
D
o
c
c
l
e
anup
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hausm
a
nn
Handle patch e
r
r
or
s
in git-p4 s
u
bmit better
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
S
imo
n
Hausma
n
n
A new attempt at fixing th
e
c
h
ild-fast-impor
t
-
process
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hau
s
m
a
n
n
Sli
g
h
tly improved fo
r
matting
of the
r
aw_input questio
n
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
S
i
mon Ha
u
sman
n
Removed the ol
d
p
a
tch apply code from git-p4 sub
m
it
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Si
m
o
n Hausmann
Fix the timez
o
ne formatt
i
n
g
.
No
w
qgit also displays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Sim
o
n
H
ausman
n
Pri
n
t an error mes
s
age of some s
o
rt i
f
git
f
a
s
t-import
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Si
m
on Hausmann
A
llow
f
or c
o
nvenient rebasing
a
fter
git-p4 su
b
m
it
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
Added
a s
i
m
ple exam
p
le
o
f
usage to
t
he "document
a
tion" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hau
s
mann
f
ix
v
a
riable usage
(
oo
p
s)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hau
s
man
n
F
i
x file dete
r
min
a
tio
n
for #head
i
m
ports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon H
a
usmann
Added
g
it-p4 clone convenience
c
o
m
mand
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
imon Hausma
n
n
H
onor --sil
e
n
t
for la
b
els
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausma
n
n
Turn off
potentially sl
o
w label det
e
ction by default
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon
H
aus
m
ann
P
r
o
vid
e
a tr
e
e
s
u
mmary after git-p4 reb
a
se
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Si
m
on Hausm
a
nn
Added git-p4 reba
s
e conve
n
i
e
nce
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Simo
n
H
ausmann
C
l
ean up python class
names
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausmann
Fix "compilation" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon Hausmann
Fix t
h
e
docs for git-p4 s
u
bmit
a
n
d
turn
g
it-p4 su
b
mit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simo
n
Hausmann
F
ix v
a
riable usage in tag import
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hausma
n
n
Added support for mapping p4 l
a
bels to g
i
t tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simo
n
Hausmann
git-p4 d
e
bug doesn't need a git repo
s
i
to
r
y
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simon Ha
u
s
m
ann
Don't tr
y
to p
a
rse any optio
n
s
with git-p4 debug but
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Sim
o
n Hausman
n
Prefer git command ov
e
r git-com
m
and
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
S
i
m
o
n
H
ausm
a
nn
Minor cosmetic fixl
e
t
for the git
-
p4 submit sync question
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausmann
D
iffer
e
nt
v
e
rsions
o
f
p
4 have
different
o
u
t
put fo
r
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
Use the
n
ew in
c
rem
e
ntal import st
y
le by default
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
M
ake it possible to run git-p4 sub
m
it from wi
t
hin t
h
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simo
n
Hausma
n
n
Br
a
nd new sm
a
r
t
i
n
cremental import th
a
t doesn
'
t need
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
Haus
m
ann
Set the default
b
ranc
h
in
r
un
,
n
ot in the c
o
nstructor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Si
m
on Hausmann
H
elper
function to
check the existanc
e
of
a revision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hau
s
mann
Add
e
d
some
help
e
r fun
c
ti
o
n(s) to pa
r
s
e
the de
p
ot path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
H
ausman
n
Changed the d
e
fault b
r
anch
f
or
imports from "master
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausm
a
nn
Change
d
the
f
o
rmat of the
i
m
p
orted lo
g
message
s
lig
h
t
l
y
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Si
m
on H
a
usmann
R
emoved the
.
p
y
e
x
tension from g
i
t-p4 as i
t
'
s annoy
i
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Si
m
on
Hausmann
Don
'
t sh
o
w the submit template and
t
h
e
d
i
f
f f
i
rs
t
in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
S
i
mon Hausmann
Make it
p
ossible to invoke
g
it-p4 from wi
t
hin su
b
directo
r
ies
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Si
m
o
n Hausm
a
nn
Made
-
-apply-as-patc
h
the default for git-p4 su
b
mit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
i
m
on H
a
usma
n
n
Fix support
for deletions in
g
it-p4 subm
i
t when
using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Ad
d
e
d
experimental but super-fast --apply-as-patch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Documentation enh
a
ncements
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
S
imon
H
au
s
m
a
nn
Start of the git-p4 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
-
git-sync as
they've been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Fixed the initial version impor
t
by getting the file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simo
n
Hausmann
Added missing
"s
e
lf"
s
to
m
ake the script evaluate correc
t
ly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Si
m
on Hausmann
C
omp
l
etely
untested "
m
erge"
of p4-fas
t
-exp
o
rt
.
py into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simo
n
Hausman
n
s
y
nc-to
-
perforce i
s
now
c
a
lled
s
ubmit
a
nd fixed the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Si
m
o
n Hausma
n
n
Par
t
of
t
he code is cop
y
right by Trolltech ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simo
n
Hausmann
Fi
r
st (unt
e
s
t
ed)
attempt at migrating p4-git
-
sync into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
m
on Hausmann
Provid
e
a litt
l
e bit
o
f help d
e
scr
i
pti
o
n for the git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
imon Hausmann
St
a
rt
m
oving the gi
t
-p4 tools into o
n
e
single script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Pass the righ
t
number of ar
g
uments
to commi
t
, fixes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
imon
H
a
u
sman
n
Improved the g
i
t di
r
detection
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simon H
a
usma
n
n
Default
to
i
nteractive syncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon H
a
u
sma
n
n
Use p4 re
v
ert
.
.
.
inste
a
d of revert -a
.
.
.
a
f
t
e
r
submit
t
ing
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
S
i
mon Haus
m
a
n
n
Au
t
o-detect the current git
b
ran
c
h before submitting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Ignore A
p
ple re
s
ource files when importi
n
g fro
m
perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon H
a
u
s
mann
B
e
nice
a
nd us
e
/usr
/
bin/env python for the g
i
t-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Automatica
l
ly operate on a te
m
porary
branch, n
e
eded
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hau
s
mann
L
o
t
s of b
u
gfixes to p
4
-
git-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Haus
m
ann
Fix git-d
i
r
opt
i
on and a
l
low
r
eading lo
g
su
b
stit
u
tions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon Ha
u
smann
Firs
t
ver
s
ion of a new scri
p
t to submit changes bac
k
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
imon Hausmann
S
p
l
i
t up the
c
a
c
h
e
co
m
mandline options i
n
to (c
o
mmand
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on Hausmann
Reduce the number of false
"
merges" by skipping "
b
ranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausman
n
Mo
r
e
work
o
n br
a
n
ch
d
etec
t
ion b
y
implement
i
ng change
I
sB
r
anch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
More cod
e
clean
u
ps and prep
a
r
a
t
i
ons f
o
r mor
e
branch
.
.
.
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
Hausmann
Make the p4 data/co
m
m
and cache configurable th
r
ough
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
next