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
Slightly improved formatting of the raw_input questions.
2007-04-14
Simon Hausman
n
S
lightly imp
r
oved f
o
rmatting of the raw_i
n
put
questio
n
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Sim
o
n Hausmann
Removed the
o
ld patch apply code from git-p4 su
b
mit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Sim
o
n
Hausm
a
nn
F
i
x the timezone formatting
.
Now qgit als
o
displays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Simon Hausmann
Print
an error
message of som
e
sort if git fast-im
p
ort
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Simon
H
a
usmann
Allow for c
o
nvenient reb
a
sing
after git-p4 submit
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausma
n
n
A
dded a simple
exa
m
ple
o
f usa
g
e to
t
he "document
a
tion" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simo
n
Hausmann
fi
x
variable
usage (oops)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
imon Hausma
n
n
Fix file deter
m
inat
i
on fo
r
#
h
ead imports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Sim
o
n
Hausmann
Added gi
t
-p4 clone co
n
venien
c
e com
m
and
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Haus
m
ann
Honor --silen
t
for labels
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
S
imo
n
Hau
s
mann
Turn o
f
f pote
n
t
ially slow
l
abel detect
i
o
n
by
d
e
fault
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
S
imon
H
ausm
a
nn
Provide a tree summary after git-p
4
r
e
bas
e
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon
H
ausmann
A
dde
d
git-
p
4 rebase convenience
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hau
s
mann
Clean up python class name
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Si
m
on H
a
usmann
Fix "compilati
o
n" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon Hausmann
Fix
the docs for
git-p4 submit and turn g
i
t
-p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon Hausmann
Fi
x
v
ariable usage
i
n ta
g
import
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Si
m
on H
a
usman
n
Added support for
m
a
pping
p
4 labels to
git tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon H
a
u
smann
git-p4 debug doesn't need
a g
i
t repository
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simon Hausmann
Don't try to
p
arse any o
p
tions wi
t
h g
i
t-p
4
deb
u
g
but
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon
H
ausmann
Pr
e
f
e
r git
c
ommand over git-com
m
and
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Sim
o
n Hausmann
Minor
c
o
smetic fixlet for the g
i
t-p4
sub
m
it sync question
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausmann
Diff
e
rent v
e
rsio
n
s of p4 have dif
f
erent
ou
t
put
for
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausm
a
n
n
Use the
n
ew incremental impo
r
t st
y
le by de
f
a
u
lt
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
S
imon Hau
s
mann
Make i
t
possible to run
g
i
t-p4 submi
t
from
with
i
n th
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Brand new s
m
art
i
nc
r
emental
im
p
o
rt that doesn't need
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simo
n
H
a
u
sman
n
S
et the default
b
ranc
h
in
r
u
n, not in
the c
o
nstructor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
imon
H
aus
m
ann
Hel
p
er
fu
n
ction to c
h
eck the existan
c
e of a revision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Sim
o
n
Hausmann
Added some helper function(s) t
o
parse the depot path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simo
n
Hausmann
Changed the de
f
ault bra
n
ch for impor
t
s from "maste
r
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
C
h
an
g
ed t
h
e f
o
r
mat o
f
th
e
im
p
ort
e
d
log m
e
ssage slightly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon H
a
u
smann
Removed
the
.
py exte
n
s
i
on from git-p4 as it's a
n
noy
i
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Don't
s
h
o
w th
e
submi
t
template and the d
i
ff first in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
S
i
mon Hau
s
mann
Make i
t
po
s
s
i
b
le to invoke
gi
t
-p4 from withi
n
subdirect
o
ries
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n Hausmann
Made --
a
ppl
y
-a
s
-
patch th
e
default for git-p4 sub
m
it
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausman
n
Fix support
for de
l
etions i
n
git-p4
s
ubmit when using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
imon Hausma
n
n
Add
e
d experime
n
tal but super-fast --apply-as-
p
a
t
ch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
Hau
s
mann
Docume
n
tation e
n
hancements
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
S
imon Hau
s
mann
Start of the git-p4 documentation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simo
n
Hausmann
Remo
v
ed p4-fast-e
x
port and p
4
-g
i
t-sync
a
s t
h
ey'v
e
been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon H
a
usmann
Fixed
the initial v
e
rs
i
on import by get
t
ing t
h
e
file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Ad
d
ed missing "self"s
t
o make the script
e
valuate c
o
rrectly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Com
p
lete
l
y
untes
t
ed "merge"
o
f p4-fast-export
.
py in
t
o
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
i
m
on H
a
usmann
sync
-
t
o-p
e
rforce
i
s
now called submit and
f
i
x
ed t
h
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Part of the code is
c
opyright by Trolltech ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
m
on
H
ausmann
First (untested)
attem
p
t at m
i
grating p4-git
-
sy
n
c
i
n
to
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Pro
v
i
de a little bit of help
desc
r
iption for the
gi
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
S
t
a
rt
moving the git-p4 tools in
t
o one s
i
ngle script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Sim
o
n Hausmann
Pas
s
the
right
n
umbe
r
of arguments t
o
commit, fix
e
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hau
s
m
ann
Improv
e
d the g
i
t
dir
detection
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Si
m
on Ha
u
smann
Default to interactive syncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon Hausmann
Use p
4
reve
r
t
.
.
.
instead of
revert -a
.
.
.
after s
u
bmitt
i
ng
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hau
s
mann
Auto-detect
t
he cu
r
rent
g
it
b
ranch b
e
fore sub
m
itt
i
ng
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausm
a
nn
I
g
nore
A
pple re
s
ource files when importing fr
o
m
perfo
r
c
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon
H
au
s
m
ann
Be nice and use /usr/bi
n
/env python for the gi
t
-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon H
a
usmann
A
u
tomatically op
e
rate on a temporary branch, needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Si
m
on Hausmann
Lots of
bugfixes to
p
4-git-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
S
imo
n
H
a
u
sman
n
Fix
g
i
t-dir o
p
tion and
a
llow
r
eading
log
substitut
i
ons
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
S
i
mon Hausmann
First version of a n
e
w script to
submit chang
e
s
back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
S
p
li
t
up the cache commandline opt
i
o
ns into (command
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Ha
u
s
m
a
nn
Reduc
e
the numbe
r
of false "merges" by skipping
"
branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on Hausmann
More work
on branch de
t
e
ction
b
y implementing c
h
a
n
geIsBranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausma
n
n
More code clean
u
ps
a
n
d preparations for more branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
H
a
usmann
Minor code
cleanu
p
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
imo
n
Hausmann
Ma
k
e the p4 data/command c
a
che confi
g
u
ra
b
le through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Fixed p4-debu
g
fi
l
e extension
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausmann
Changed --known-branches t
o
take
a file as argument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausmann
Work in
p
r
ogre
s
s o
n
detecting bran
c
hes
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simo
n
H
ausmann
A
d
just
t
he output pa
r
sing of
git nam
e
-re
v
to
handle
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Ha
u
sman
n
Don't
p
rint a pl
a
in newline at t
h
e e
n
d of the execu
t
ion
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Sim
o
n Ha
u
smann
More work in --s
i
l
e
n
t
s
upport
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
S
imon
H
aus
m
a
nn
A
d
ded support for --sil
e
nt so
that p4
-
f
ast-export can
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Si
m
o
n
H
ausma
n
n
Added p4 delete behavio
u
ral
e
mulation
a
s todo item
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Sim
o
n
Hausmann
Fix
s
ingle-branch im
p
o
r
ts
b
y skipping the br
a
n
c
h/merge
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hausmann
Use sets
.
Set(
)
ins
t
ead o
f
set() to run also with older
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hausmann
Make it possible to spec
i
fy the p4 changes to import
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
When trying
to map p4
integrations to git
merges just
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
Set git fas
t
-
import
m
arks for e
v
ery im
p
o
rt
e
d
change
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hau
s
mann
Afte
r
m
arking a p4 branch a
s
merged don't ever merge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
More fixes
i
n he
u
r
istic p4 branch de
t
ectio
n
ba
s
ed on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
Started work on p4 br
a
nch detec
t
ion (ex
p
e
r
i
m
en
t
al!
)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon
Hausma
n
n
Code cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
S
i
mon Hausmann
Cleanups, remove unused variab
l
e
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
S
imon Hau
s
mann
Crea
t
e ligh
t
we
i
ght
g
it tags (using the "reset" tr
i
ck
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
S
i
mon Haus
m
ann
Added a little
h
e
lper scri
p
t to remove u
n
used
tags
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-10
S
i
mon Hausma
n
n
C
h
an
g
ed the default git im
p
ort branch from "p4" t
o
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
S
i
mon Haus
m
a
nn
Avoid the excessive use of git
tags
f
or
every perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Si
m
on Haus
m
ann
Minor code clean
u
p
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
S
i
mon
Hausma
n
n
Adde
d
a little
h
elper script
to debug
the
output
of
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-08
S
imon Hausmann
M
a
de
t
h
e
nam
e
of the g
i
t bran
c
h
u
se
d
for the p
e
rfor
c
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-08
Simon H
a
us
m
ann
C
atch io exceptions from git fast
-
import again
a
nd
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
S
i
mon Hausmann
Fix c
a
l
c
ulat
i
on of the newest imported revision fo
r
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon Hausmann
Make specif
y
in
g
the revision ranges m
o
re
conveni
e
nt
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon
H
ausm
a
n
n
Mak
e
incremental imports easier to use by storing
the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
S
imo
n
Haus
m
ann
Fix
e
d
in
c
reme
n
t
al imports by u
s
ing the
co
r
r
e
c
t
"fro
m
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-07
Simon
H
aus
m
ann
Minor c
l
ean
u
ps an
d
print a
n
error
m
essage
o
f g
i
t fast
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Simon Haus
m
ann
Ini
t
ial support
f
o
r
import
i
ng a directory from P
e
rfo
r
ce
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
S
i
mon H
a
usma
n
n
Cod
e
c
leanups,
m
ove the code to create a c
o
m
m
it wi
t
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-01
Si
m
on Hausmann
Si
m
plif
y
the
incre
m
ental import by
elimi
n
ation the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-01-31
S
imo
n
Hausm
a
nn
Started working on i
n
creme
n
tal
i
mports from Perfo
r
c
e
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
next